[BUGFIX] Namespace: Revert extension split-up: wizard_sortpages
authorFelix Kopp <felix-source@phorax.com>
Sat, 25 Aug 2012 12:16:57 +0000 (14:16 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 25 Aug 2012 14:28:16 +0000 (16:28 +0200)
Reverts the split-up for the extension wizard_sortpages:
erroneous extKey was 'wizard_sort_pages'.

Change-Id: I17d48af00094707981983011eddb4777810ac2c1
Releases: 6.0
Fixes: #40181
Related: #40095
Reviewed-on: http://review.typo3.org/14075
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/wizard_sort_pages/Classes/View/SortPagesWizardModuleFunction.php [deleted file]
typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php [new file with mode: 0644]
typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php

diff --git a/typo3/sysext/wizard_sort_pages/Classes/View/SortPagesWizardModuleFunction.php b/typo3/sysext/wizard_sort_pages/Classes/View/SortPagesWizardModuleFunction.php
deleted file mode 100644 (file)
index 21080ab..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-namespace TYPO3\CMS\WizardSortPages\View;
-
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-/**
- * Contains class for "Sort pages" wizard
- *
- * Revised for TYPO3 3.6 July/2003 by Kasper Skårhøj
- * XHTML compliant
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-/**
- * Creates the "Sort pages" wizard
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_wizardsortpages
- */
-class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
-
-       /**
-        * Adds menu items... but I think this is not used at all. Looks very much like some testing code. If anyone cares to check it we can remove it some day...
-        *
-        * @return array
-        * @ignore
-        * @todo Define visibility
-        */
-       public function modMenu() {
-               global $LANG;
-               $modMenuAdd = array();
-               return $modMenuAdd;
-       }
-
-       /**
-        * Main function creating the content for the module.
-        *
-        * @return string HTML content for the module, actually a "section" made through the parent object in $this->pObj
-        * @todo Define visibility
-        */
-       public function main() {
-               global $SOBE, $LANG;
-               $out = $this->pObj->doc->header($LANG->getLL('wiz_sort'));
-               if ($GLOBALS['BE_USER']->workspace === 0) {
-                       $theCode = '';
-                       // Check if user has modify permissions to
-                       $sys_pages = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository');
-                       $sortByField = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('sortByField');
-                       if ($sortByField) {
-                               $menuItems = array();
-                               if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('title,subtitle,crdate,tstamp', $sortByField)) {
-                                       $menuItems = $sys_pages->getMenu($this->pObj->id, 'uid,pid,title', $sortByField, '', 0);
-                               } elseif ($sortByField == 'REV') {
-                                       $menuItems = $sys_pages->getMenu($this->pObj->id, 'uid,pid,title', 'sorting', '', 0);
-                                       $menuItems = array_reverse($menuItems);
-                               }
-                               if (count($menuItems)) {
-                                       $tce = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\DataHandler\\DataHandler');
-                                       $tce->stripslashes_values = 0;
-                                       $menuItems = array_reverse($menuItems);
-                                       $cmd = array();
-                                       foreach ($menuItems as $r) {
-                                               $cmd['pages'][$r['uid']]['move'] = $this->pObj->id;
-                                       }
-                                       $tce->start(array(), $cmd);
-                                       $tce->process_cmdmap();
-                                       \TYPO3\CMS\Backend\Utility\BackendUtility::setUpdateSignal('updatePageTree');
-                               }
-                       }
-                       $menuItems = $sys_pages->getMenu($this->pObj->id, '*', 'sorting', '', 0);
-                       $lines = array();
-                       $lines[] = ((((((('<tr class="t3-row-header">
-                               <td>' . $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_title'), 'title')) . '</td>
-                               ') . (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('cms') ? ('<td> ' . $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_subtitle'), 'subtitle')) . '</td>' : '')) . '
-                               <td>') . $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tChange'), 'tstamp')) . '</td>
-                               <td>') . $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tCreate'), 'crdate')) . '</td>
-                               </tr>';
-                       foreach ($menuItems as $rec) {
-                               $m_perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(2);
-                               // edit permissions for that page!
-                               $pRec = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecord('pages', $rec['uid'], 'uid', ' AND ' . $m_perms_clause);
-                               $lines[] = ((((((((('<tr><td nowrap="nowrap">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('pages', $rec)) . (!is_array($pRec) ? $GLOBALS['TBE_TEMPLATE']->rfw(('<strong>' . $LANG->getLL('wiz_W', 1)) . '</strong> ') : '')) . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($rec['title'], $GLOBALS['BE_USER']->uc['titleLen']))) . '&nbsp;</td>
-                                       ') . (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('cms') ? ('<td nowrap="nowrap">' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($rec['subtitle'], $GLOBALS['BE_USER']->uc['titleLen']))) . '&nbsp;</td>' : '')) . '
-                                       <td nowrap="nowrap">') . \t3lib_Befunc::datetime($rec['tstamp'])) . '&nbsp;&nbsp;</td>
-                                       <td nowrap="nowrap">') . \t3lib_Befunc::datetime($rec['crdate'])) . '&nbsp;&nbsp;</td>
-                                       </tr>';
-                       }
-                       $theCode .= ((('<h4>' . $LANG->getLL('wiz_currentPageOrder', TRUE)) . '</h4>
-                       <table border="0" cellpadding="0" cellspacing="0" class="typo3-dblist">') . implode('', $lines)) . '</table><br />';
-                       if (count($menuItems)) {
-                               // Menu:
-                               $lines = array();
-                               $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_title'), 'title');
-                               if (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('cms')) {
-                                       $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_subtitle'), 'subtitle');
-                               }
-                               $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tChange'), 'tstamp');
-                               $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tCreate'), 'crdate');
-                               $lines[] = '';
-                               $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_REVERSE'), 'REV');
-                               $theCode .= (('<h4>' . $LANG->getLL('wiz_changeOrder')) . '</h4>') . implode('<br />', $lines);
-                       }
-                       // CSH:
-                       $theCode .= \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_web_func', 'tx_wizardsortpages', $GLOBALS['BACK_PATH'], '<br />|');
-                       $out .= $this->pObj->doc->section('', $theCode, 0, 1);
-               } else {
-                       $out .= $this->pObj->doc->section('', 'Sorry, this function is not available in the current draft workspace!', 0, 1, 1);
-               }
-               return $out;
-       }
-
-       /**
-        * Creates a link for the sorting order
-        *
-        * @param string $title Title of the link
-        * @param string $order Field to sort by
-        * @return string HTML string
-        * @todo Define visibility
-        */
-       public function wiz_linkOrder($title, $order) {
-               return ((((('&nbsp; &nbsp;<a class="t3-link" href="' . htmlspecialchars(((('index.php?id=' . $GLOBALS['SOBE']->id) . '&sortByField=') . $order))) . '" onclick="return confirm(') . $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->getLL('wiz_changeOrder_msg1'))) . ')">') . htmlspecialchars($title)) . '</a>';
-       }
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php b/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php
new file mode 100644 (file)
index 0000000..4f641c7
--- /dev/null
@@ -0,0 +1,142 @@
+<?php
+namespace TYPO3\CMS\WizardSortpages\View;
+
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *  A copy is found in the textfile GPL.txt and important notices to the license
+ *  from the author is found in LICENSE.txt distributed with these scripts.
+ *
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+/**
+ * Creates the "Sort pages" wizard
+ *
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @package TYPO3
+ * @subpackage wizard_sortpages
+ */
+class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
+
+       /**
+        * Adds menu items... but I think this is not used at all. Looks very much like some testing code. If anyone cares to check it we can remove it some day...
+        *
+        * @return array
+        * @ignore
+        * @todo Define visibility
+        */
+       public function modMenu() {
+               global $LANG;
+               $modMenuAdd = array();
+               return $modMenuAdd;
+       }
+
+       /**
+        * Main function creating the content for the module.
+        *
+        * @return string HTML content for the module, actually a "section" made through the parent object in $this->pObj
+        * @todo Define visibility
+        */
+       public function main() {
+               global $SOBE, $LANG;
+               $out = $this->pObj->doc->header($LANG->getLL('wiz_sort'));
+               if ($GLOBALS['BE_USER']->workspace === 0) {
+                       $theCode = '';
+                       // Check if user has modify permissions to
+                       $sys_pages = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository');
+                       $sortByField = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('sortByField');
+                       if ($sortByField) {
+                               $menuItems = array();
+                               if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('title,subtitle,crdate,tstamp', $sortByField)) {
+                                       $menuItems = $sys_pages->getMenu($this->pObj->id, 'uid,pid,title', $sortByField, '', 0);
+                               } elseif ($sortByField == 'REV') {
+                                       $menuItems = $sys_pages->getMenu($this->pObj->id, 'uid,pid,title', 'sorting', '', 0);
+                                       $menuItems = array_reverse($menuItems);
+                               }
+                               if (count($menuItems)) {
+                                       $tce = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\DataHandler\\DataHandler');
+                                       $tce->stripslashes_values = 0;
+                                       $menuItems = array_reverse($menuItems);
+                                       $cmd = array();
+                                       foreach ($menuItems as $r) {
+                                               $cmd['pages'][$r['uid']]['move'] = $this->pObj->id;
+                                       }
+                                       $tce->start(array(), $cmd);
+                                       $tce->process_cmdmap();
+                                       \TYPO3\CMS\Backend\Utility\BackendUtility::setUpdateSignal('updatePageTree');
+                               }
+                       }
+                       $menuItems = $sys_pages->getMenu($this->pObj->id, '*', 'sorting', '', 0);
+                       $lines = array();
+                       $lines[] = ((((((('<tr class="t3-row-header">
+                               <td>' . $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_title'), 'title')) . '</td>
+                               ') . (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('cms') ? ('<td> ' . $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_subtitle'), 'subtitle')) . '</td>' : '')) . '
+                               <td>') . $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tChange'), 'tstamp')) . '</td>
+                               <td>') . $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tCreate'), 'crdate')) . '</td>
+                               </tr>';
+                       foreach ($menuItems as $rec) {
+                               $m_perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(2);
+                               // edit permissions for that page!
+                               $pRec = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecord('pages', $rec['uid'], 'uid', ' AND ' . $m_perms_clause);
+                               $lines[] = ((((((((('<tr><td nowrap="nowrap">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIconForRecord('pages', $rec)) . (!is_array($pRec) ? $GLOBALS['TBE_TEMPLATE']->rfw(('<strong>' . $LANG->getLL('wiz_W', 1)) . '</strong> ') : '')) . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($rec['title'], $GLOBALS['BE_USER']->uc['titleLen']))) . '&nbsp;</td>
+                                       ') . (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('cms') ? ('<td nowrap="nowrap">' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($rec['subtitle'], $GLOBALS['BE_USER']->uc['titleLen']))) . '&nbsp;</td>' : '')) . '
+                                       <td nowrap="nowrap">') . \t3lib_Befunc::datetime($rec['tstamp'])) . '&nbsp;&nbsp;</td>
+                                       <td nowrap="nowrap">') . \t3lib_Befunc::datetime($rec['crdate'])) . '&nbsp;&nbsp;</td>
+                                       </tr>';
+                       }
+                       $theCode .= ((('<h4>' . $LANG->getLL('wiz_currentPageOrder', TRUE)) . '</h4>
+                       <table border="0" cellpadding="0" cellspacing="0" class="typo3-dblist">') . implode('', $lines)) . '</table><br />';
+                       if (count($menuItems)) {
+                               // Menu:
+                               $lines = array();
+                               $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_title'), 'title');
+                               if (\TYPO3\CMS\Core\Extension\ExtensionManager::isLoaded('cms')) {
+                                       $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_subtitle'), 'subtitle');
+                               }
+                               $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tChange'), 'tstamp');
+                               $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_tCreate'), 'crdate');
+                               $lines[] = '';
+                               $lines[] = $this->wiz_linkOrder($LANG->getLL('wiz_changeOrder_REVERSE'), 'REV');
+                               $theCode .= (('<h4>' . $LANG->getLL('wiz_changeOrder')) . '</h4>') . implode('<br />', $lines);
+                       }
+                       // CSH:
+                       $theCode .= \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_web_func', 'tx_wizardsortpages', $GLOBALS['BACK_PATH'], '<br />|');
+                       $out .= $this->pObj->doc->section('', $theCode, 0, 1);
+               } else {
+                       $out .= $this->pObj->doc->section('', 'Sorry, this function is not available in the current draft workspace!', 0, 1, 1);
+               }
+               return $out;
+       }
+
+       /**
+        * Creates a link for the sorting order
+        *
+        * @param string $title Title of the link
+        * @param string $order Field to sort by
+        * @return string HTML string
+        * @todo Define visibility
+        */
+       public function wiz_linkOrder($title, $order) {
+               return ((((('&nbsp; &nbsp;<a class="t3-link" href="' . htmlspecialchars(((('index.php?id=' . $GLOBALS['SOBE']->id) . '&sortByField=') . $order))) . '" onclick="return confirm(') . $GLOBALS['LANG']->JScharCode($GLOBALS['LANG']->getLL('wiz_changeOrder_msg1'))) . ')">') . htmlspecialchars($title)) . '</a>';
+       }
+
+}
+
+?>
\ No newline at end of file
index 7023a9a..5780b47 100755 (executable)
@@ -2,7 +2,7 @@
 /*
  * @deprecated since 6.0, the classname tx_wizardsortpages_webfunc_2 and this file is obsolete
  * and will be removed by 7.0. The class was renamed and is now located at:
- * typo3/sysext/wizard_sort_pages/Classes/View/SortPagesWizardModuleFunction.php
+ * typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php
  */
-require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('wizard_sort_pages') . 'Classes/View/SortPagesWizardModuleFunction.php';
+require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('wizard_sortpages') . 'Classes/View/SortPagesWizardModuleFunction.php';
 ?>
\ No newline at end of file