* Fixed bug #1236 again: 404 error while using the new content wizard
authorMichael Stucki <michael.stucki@typo3.org>
Thu, 2 Nov 2006 11:27:35 +0000 (11:27 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Thu, 2 Nov 2006 11:27:35 +0000 (11:27 +0000)
        * Fixed bug #4443: Items in CE "Insert Records" don't have edit options in context menu any longer
        * Small EM change: Annotate if all or only reviewed extensions should be searched

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@1778 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_div.php
typo3/db_new.php
typo3/mod/tools/em/class.em_index.php
typo3/template.php

index d0b2d17..b7eda8c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2006-11-02  Michael Stucki  <michael@typo3.org>
+
+       * Fixed bug #1236 again: 404 error while using the new content wizard
+       * Fixed bug #4443: Items in CE "Insert Records" don't have edit options in context menu any longer
+       * Small EM change: Annotate if all or only reviewed extensions should be searched
+
 2006-10-30  Karsten Dambekalns <karsten@typo3.org>
 
-       * Applied patch adding security hints to typo3/mod/tools/em/class.em_index.php
+       * Add security hints in typo3/mod/tools/em/class.em_index.php
        * Fixed bug #3637 in EM (translation handling)
 
 2006-10-29  Martin Kutschker  <martin.t.kutschker@blackbox.net>
@@ -9,6 +15,7 @@
        * Changed occurences of PATH_site.'typo3conf/' to PATH_typo3conf and PATH_site.TYPO3_mainDir to PATH_typo3
 
 2006-10-25  Kasper Skårhøj     <kasper2006@typo3.com>
+
        * Added "alt_main_new.php" including various modifications around to support this.
        * Added clean-up functions in extension "lowlevel" plus modified t3lib_refindex and t3lib_tcemain accordingly
        * Added word index to sys_refindex.
@@ -17,9 +24,9 @@
 
 2006-10-14  Dmitry Dulepov  <dmitry@typo3.org>
 
-       * Fixed bug 3199: SUing to myself?
-       * Fixed bug 3720: Multilanguage Flexforms don't work after migrating a site from one language to more languages
-       * Fixed bug 4358: Add an option to t3lib_div::xml2array to remove all unnecessary spaces
+       * Fixed bug #3199: SUing to myself?
+       * Fixed bug #3720: Multilanguage Flexforms don't work after migrating a site from one language to more languages
+       * Fixed bug #4358: Add an option to t3lib_div::xml2array to remove all unnecessary spaces
 
 2006-10-17  Ernesto Baschny  <ernst@cron-it.de>
 
index 32009a9..2970f98 100755 (executable)
@@ -1992,7 +1992,7 @@ class t3lib_div {
         * @param       string          tag-prefix, eg. a namespace prefix like "T3:"
         * @param       integer         Current recursion level. Don't change, stay at zero!
         * @param       string          Alternative document tag. Default is "phparray".
-        * @param       integer         If greater then zero, than number of spaces corresponding to this number is used for indenting, if less than zero - no indentation, if zero - a single chr(9) (TAB) is used
+        * @param       integer         If greater than zero, then the number of spaces corresponding to this number is used for indenting, if less than zero - no indentation, if zero - a single chr(9) (TAB) is used
         * @param       array           Options for the compilation. Key "useNindex" => 0/1 (boolean: whether to use "n0, n1, n2" for num. indexes); Key "useIndexTagForNum" => "[tag for numerical indexes]"; Key "useIndexTagForAssoc" => "[tag for associative indexes"; Key "parentTagMap" => array('parentTag' => 'thisLevelTag')
         * @param       string          Stack data. Don't touch.
         * @return      string          An XML string made from the input content in the array.
index 6402d50..ac0e488 100755 (executable)
@@ -363,10 +363,8 @@ class SC_db_new {
                                                                // If mod.web_list.newContentWiz.overrideWithExtension is set, use that extension's wizard instead:
                                                        $overrideExt = $this->web_list_modTSconfig['properties']['newContentWiz.']['overrideWithExtension'];
                                                        $pathToWizard = (t3lib_extMgm::isLoaded($overrideExt)) ? (t3lib_extMgm::extRelPath($overrideExt).'mod1/db_new_content_el.php') : 'sysext/cms/layout/db_new_content_el.php';
-                                                               // Fix the backpath for the returnUrl of this wizard:
-                                                       $R_URI = preg_replace('|[^/]+|','..',dirname($pathToWizard)) . '/' . $this->R_URI;
 
-                                                       $href = $pathToWizard.'?id='.$this->id.'&returnUrl='.rawurlencode($R_URI);
+                                                       $href = $pathToWizard.'?id='.$this->id.'&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'));
                                                        $rowContent.= '<br /><img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/ol/line.gif','width="18" height="16"').' alt="" />'.
                                                                                '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/ol/joinbottom.gif','width="18" height="16"').' alt="" />'.
                                                                                '<a href="'.htmlspecialchars($href).'"><img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/new_record.gif','width="16" height="12"').' alt="" /> '.
index 8acf734..55a65b3 100644 (file)
@@ -824,7 +824,7 @@ EXTENSION KEYS:
                                                // CSH:
                                        $content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import_ter', $GLOBALS['BACK_PATH'],'|<br/>');
                                        $onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;";
-                                       $content.= '</form><form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'">List or look up extensions<br />
+                                       $content.= '</form><form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'">List or look up <strong'.($this->MOD_SETTINGS['display_unchecked']?' style="color:#900;">all':' style="color:#090;">reviewed').'</strong> extensions<br />
                                                        <input type="text" name="_lookUp" value="'.htmlspecialchars($this->listRemote_search).'" /> <input type="submit" value="Look up" /><br /><br />';
 
                                        $content.= '
@@ -863,7 +863,7 @@ EXTENSION KEYS:
                        } else {
                                $content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import_ter', $GLOBALS['BACK_PATH'],'|<br/>');
                                $onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;";
-                               $content.= '</form><form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'">List or look up extensions<br />
+                               $content.= '</form><form action="index.php" method="post" onsubmit="'.htmlspecialchars($onsubmit).'">List or look up <strong'.($this->MOD_SETTINGS['display_unchecked']?' style="color:#900;">all':' style="color:#090;">reviewed').'</strong> extensions<br />
                                        <input type="text" name="_lookUp" value="'.htmlspecialchars($this->listRemote_search).'" /> <input type="submit" value="Look up" /><br /><br />';
 
                                $content.= '<p><strong>No matching extensions found.</strong></p>';
index bcd26a9..47fe013 100755 (executable)
@@ -297,7 +297,7 @@ class template {
         */
        function wrapClickMenuOnIcon($str,$table,$uid='',$listFr=1,$addParams='',$enDisItems='', $returnOnClick=FALSE)  {
                $backPath = rawurlencode($this->backPath).'|'.t3lib_div::shortMD5($this->backPath.'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']);
-               $onClick = 'showClickmenu("'.$table.'","'.$uid.'","'.$listFr.'","'.$enDisItems.'","'.str_replace('&','&amp;',addcslashes($backPath,'"')).'","'.str_replace('&','&amp;',addcslashes($addParams,'"')).'");return false;';
+               $onClick = 'showClickmenu("'.$table.'","'.$uid.'","'.$listFr.'","'.str_replace('+','%2B',$enDisItems).'","'.str_replace('&','&amp;',addcslashes($backPath,'"')).'","'.str_replace('&','&amp;',addcslashes($addParams,'"')).'");return false;';
                return $returnOnClick ? $onClick : '<a href="#" onclick="'.htmlspecialchars($onClick).'"'.($GLOBALS['TYPO3_CONF_VARS']['BE']['useOnContextMenuHandler'] ? ' oncontextmenu="'.htmlspecialchars($onClick).'"' : '').'>'.$str.'</a>';
        }