Fixed bug #15155: Move file list from mod to sysext
authorSteffen Kamper <info@sk-typo3.de>
Sun, 18 Jul 2010 19:56:05 +0000 (19:56 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Sun, 18 Jul 2010 19:56:05 +0000 (19:56 +0000)
Fixed bug #15154: Move Extension manager from mod to sysext
Fixed bug #15153: Move mod/user/ws to sysext version
Fixed bug #15152: Move Web>List from mod to sysext
Fixed bug #15151: Move Web>Access from mod to sysext
Fixed bug #15150: Move Web>Func from mod to sysext
Fixed bug #15149: Move Web>Info from mod to sysext

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

typo3/sysext/func/clear.gif [deleted file]
typo3/sysext/func/conf.php [deleted file]
typo3/sysext/func/func.gif [deleted file]
typo3/sysext/func/index.php [deleted file]
typo3/sysext/func/mod1/clear.gif [new file with mode: 0755]
typo3/sysext/func/mod1/conf.php [new file with mode: 0755]
typo3/sysext/func/mod1/func.gif [new file with mode: 0755]
typo3/sysext/func/mod1/index.php [new file with mode: 0755]

diff --git a/typo3/sysext/func/clear.gif b/typo3/sysext/func/clear.gif
deleted file mode 100755 (executable)
index 9ed1269..0000000
Binary files a/typo3/sysext/func/clear.gif and /dev/null differ
diff --git a/typo3/sysext/func/conf.php b/typo3/sysext/func/conf.php
deleted file mode 100755 (executable)
index 09b56c7..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-define('TYPO3_MOD_PATH', 'mod/web/func/');
-$BACK_PATH='../../../';
-
-$MLANG['default']['tabs_images']['tab'] = 'func.gif';
-$MLANG['default']['ll_ref']='LLL:EXT:lang/locallang_mod_web_func.php';
-
-$MCONF['script']='index.php';
-$MCONF['access']='user,group';
-$MCONF['name']='web_func';
-?>
\ No newline at end of file
diff --git a/typo3/sysext/func/func.gif b/typo3/sysext/func/func.gif
deleted file mode 100755 (executable)
index 3656f2f..0000000
Binary files a/typo3/sysext/func/func.gif and /dev/null differ
diff --git a/typo3/sysext/func/index.php b/typo3/sysext/func/index.php
deleted file mode 100755 (executable)
index 2e22d7a..0000000
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 1999-2010 Kasper Skaarhoj (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!
-***************************************************************/
-/**
- * Module: Advanced functions
- * Advanced Functions related to pages
- *
- * $Id$
- * Revised for TYPO3 3.6 November/2003 by Kasper Skaarhoj
- * XHTML compliant
- *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
- */
-/**
- * [CLASS/FUNCTION INDEX of SCRIPT]
- *
- *
- *
- *   71: class SC_mod_web_func_index extends t3lib_SCbase
- *   84:     function main()
- *  172:     function printContent()
- *
- * TOTAL FUNCTIONS: 2
- * (This index is automatically created/updated by the extension "extdeveval")
- *
- */
-
-
-unset($MCONF);
-require('conf.php');
-require($BACK_PATH.'init.php');
-require($BACK_PATH.'template.php');
-$LANG->includeLLFile('EXT:lang/locallang_mod_web_func.xml');
-
-$BE_USER->modAccess($MCONF,1);
-
-
-
-/**
- * Script Class for the Web > Functions module
- * This class creates the framework to which other extensions can connect their sub-modules
- *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
- */
-class SC_mod_web_func_index extends t3lib_SCbase {
-
-               // Internal, dynamic:
-       var $pageinfo;
-       var $fileProcessor;
-
-       /**
-        * Document Template Object
-        *
-        * @var mediumDoc
-        */
-       var $doc;
-
-
-
-       /**
-        * Initialize module header etc and call extObjContent function
-        *
-        * @return      void
-        */
-       function main() {
-               global $BE_USER,$LANG,$BACK_PATH;
-
-               // Access check...
-               // The page will show only if there is a valid page and if this page may be viewed by the user
-               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id,$this->perms_clause);
-               $access = is_array($this->pageinfo) ? 1 : 0;
-
-                       // Template markers
-               $markers = array(
-                       'CSH' => '',
-                       'FUNC_MENU' => '',
-                       'CONTENT' => ''
-               );
-
-               $this->doc = t3lib_div::makeInstance('template');
-               $this->doc->backPath = $BACK_PATH;
-               $this->doc->setModuleTemplate('templates/func.html');
-
-               // **************************
-               // Main
-               // **************************
-               if ($this->id && $access)       {
-                               // JavaScript
-                       $this->doc->JScode = $this->doc->wrapScriptTags('
-                               script_ended = 0;
-                               function jumpToUrl(URL) {       //
-                                       window.location.href = URL;
-                               }
-                       ');
-                       $this->doc->postCode=$this->doc->wrapScriptTags('
-                               script_ended = 1;
-                               if (top.fsMod) top.fsMod.recentIds["web"] = '.intval($this->id).';
-                       ');
-
-
-                               // Setting up the context sensitive menu:
-                       $this->doc->getContextMenuCode();
-
-                       $this->doc->form='<form action="index.php" method="post"><input type="hidden" name="id" value="'.$this->id.'" />';
-
-                       $vContent = $this->doc->getVersionSelector($this->id,1);
-                       if ($vContent)  {
-                               $this->content.=$this->doc->section('',$vContent);
-                       }
-
-
-                       $this->extObjContent();
-
-                               // Setting up the buttons and markers for docheader
-                       $docHeaderButtons = $this->getButtons();
-                       $markers['CSH'] = $docHeaderButtons['csh'];
-                       $markers['FUNC_MENU'] = t3lib_BEfunc::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']);
-                       $markers['CONTENT'] = $this->content;
-               } else {
-                               // If no access or if ID == zero
-                       $flashMessage = t3lib_div::makeInstance(
-                               't3lib_FlashMessage',
-                               $LANG->getLL('clickAPage_content'),
-                               $LANG->getLL('title'),
-                               t3lib_FlashMessage::INFO
-                       );
-                       $this->content = $flashMessage->render();
-
-                               // Setting up the buttons and markers for docheader
-                       $docHeaderButtons = $this->getButtons();
-                       $markers['CSH'] = $docHeaderButtons['csh'];
-                       $markers['CONTENT'] = $this->content;
-               }
-                       // Build the <body> for the module
-               $this->content = $this->doc->startPage($LANG->getLL('title'));
-               $this->content.= $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
-               $this->content.= $this->doc->endPage();
-               $this->content = $this->doc->insertStylesAndJS($this->content);
-       }
-
-       /**
-        * Print module content (from $this->content)
-        *
-        * @return      void
-        */
-       function printContent() {
-               echo $this->content;
-       }
-
-       /**
-        * Create the panel of buttons for submitting the form or otherwise perform operations.
-        *
-        * @return      array   all available buttons as an assoc. array
-        */
-       protected function getButtons() {
-               global $TCA, $LANG, $BACK_PATH, $BE_USER;
-
-               $buttons = array(
-                       'csh' => '',
-                       'view' => '',
-                       'record_list' => '',
-                       'shortcut' => '',
-               );
-                       // CSH
-               $buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH'], '', TRUE);
-
-               if($this->id && is_array($this->pageinfo)) {
-
-                               // View page
-                       $buttons['view'] = '<a href="#"
-                                       onclick="' . htmlspecialchars(t3lib_BEfunc::viewOnClick($this->pageinfo['uid'], $BACK_PATH, t3lib_BEfunc::BEgetRootLine($this->pageinfo['uid']))) . '"
-                                       title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', 1) . '
-                               ">' .   t3lib_iconWorks::getSpriteIcon('actions-document-view') . '</a>';
-
-                               // Shortcut
-                       if ($BE_USER->mayMakeShortcut())        {
-                               $buttons['shortcut'] = $this->doc->makeShortcutIcon('id, edit_record, pointer, new_unique_uid, search_field, search_levels, showLimit', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
-                       }
-
-                               // If access to Web>List for user, then link to that module.
-                       if ($BE_USER->check('modules','web_list'))      {
-                               $href = $BACK_PATH . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'));
-                               $buttons['record_list'] = '<a href="' . htmlspecialchars($href) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', 1) . '">' .
-                                               t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . '</a>';
-                       }
-               }
-
-               return $buttons;
-       }
-}
-
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/web/func/index.php'])   {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/web/func/index.php']);
-}
-
-
-
-// Make instance:
-$SOBE = t3lib_div::makeInstance('SC_mod_web_func_index');
-$SOBE->init();
-
-// Include files?
-foreach($SOBE->include_once as $INC_FILE)      include_once($INC_FILE);
-$SOBE->checkExtObj();  // Checking for first level external objects
-
-// Repeat Include files! - if any files has been added by second-level extensions
-foreach($SOBE->include_once as $INC_FILE)      include_once($INC_FILE);
-$SOBE->checkSubExtObj();       // Checking second level external objects
-
-$SOBE->main();
-$SOBE->printContent();
-
-?>
\ No newline at end of file
diff --git a/typo3/sysext/func/mod1/clear.gif b/typo3/sysext/func/mod1/clear.gif
new file mode 100755 (executable)
index 0000000..9ed1269
Binary files /dev/null and b/typo3/sysext/func/mod1/clear.gif differ
diff --git a/typo3/sysext/func/mod1/conf.php b/typo3/sysext/func/mod1/conf.php
new file mode 100755 (executable)
index 0000000..09b56c7
--- /dev/null
@@ -0,0 +1,11 @@
+<?php
+define('TYPO3_MOD_PATH', 'mod/web/func/');
+$BACK_PATH='../../../';
+
+$MLANG['default']['tabs_images']['tab'] = 'func.gif';
+$MLANG['default']['ll_ref']='LLL:EXT:lang/locallang_mod_web_func.php';
+
+$MCONF['script']='index.php';
+$MCONF['access']='user,group';
+$MCONF['name']='web_func';
+?>
\ No newline at end of file
diff --git a/typo3/sysext/func/mod1/func.gif b/typo3/sysext/func/mod1/func.gif
new file mode 100755 (executable)
index 0000000..3656f2f
Binary files /dev/null and b/typo3/sysext/func/mod1/func.gif differ
diff --git a/typo3/sysext/func/mod1/index.php b/typo3/sysext/func/mod1/index.php
new file mode 100755 (executable)
index 0000000..2e22d7a
--- /dev/null
@@ -0,0 +1,239 @@
+<?php
+/***************************************************************
+*  Copyright notice
+*
+*  (c) 1999-2010 Kasper Skaarhoj (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!
+***************************************************************/
+/**
+ * Module: Advanced functions
+ * Advanced Functions related to pages
+ *
+ * $Id$
+ * Revised for TYPO3 3.6 November/2003 by Kasper Skaarhoj
+ * XHTML compliant
+ *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ */
+/**
+ * [CLASS/FUNCTION INDEX of SCRIPT]
+ *
+ *
+ *
+ *   71: class SC_mod_web_func_index extends t3lib_SCbase
+ *   84:     function main()
+ *  172:     function printContent()
+ *
+ * TOTAL FUNCTIONS: 2
+ * (This index is automatically created/updated by the extension "extdeveval")
+ *
+ */
+
+
+unset($MCONF);
+require('conf.php');
+require($BACK_PATH.'init.php');
+require($BACK_PATH.'template.php');
+$LANG->includeLLFile('EXT:lang/locallang_mod_web_func.xml');
+
+$BE_USER->modAccess($MCONF,1);
+
+
+
+/**
+ * Script Class for the Web > Functions module
+ * This class creates the framework to which other extensions can connect their sub-modules
+ *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @package TYPO3
+ * @subpackage core
+ */
+class SC_mod_web_func_index extends t3lib_SCbase {
+
+               // Internal, dynamic:
+       var $pageinfo;
+       var $fileProcessor;
+
+       /**
+        * Document Template Object
+        *
+        * @var mediumDoc
+        */
+       var $doc;
+
+
+
+       /**
+        * Initialize module header etc and call extObjContent function
+        *
+        * @return      void
+        */
+       function main() {
+               global $BE_USER,$LANG,$BACK_PATH;
+
+               // Access check...
+               // The page will show only if there is a valid page and if this page may be viewed by the user
+               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id,$this->perms_clause);
+               $access = is_array($this->pageinfo) ? 1 : 0;
+
+                       // Template markers
+               $markers = array(
+                       'CSH' => '',
+                       'FUNC_MENU' => '',
+                       'CONTENT' => ''
+               );
+
+               $this->doc = t3lib_div::makeInstance('template');
+               $this->doc->backPath = $BACK_PATH;
+               $this->doc->setModuleTemplate('templates/func.html');
+
+               // **************************
+               // Main
+               // **************************
+               if ($this->id && $access)       {
+                               // JavaScript
+                       $this->doc->JScode = $this->doc->wrapScriptTags('
+                               script_ended = 0;
+                               function jumpToUrl(URL) {       //
+                                       window.location.href = URL;
+                               }
+                       ');
+                       $this->doc->postCode=$this->doc->wrapScriptTags('
+                               script_ended = 1;
+                               if (top.fsMod) top.fsMod.recentIds["web"] = '.intval($this->id).';
+                       ');
+
+
+                               // Setting up the context sensitive menu:
+                       $this->doc->getContextMenuCode();
+
+                       $this->doc->form='<form action="index.php" method="post"><input type="hidden" name="id" value="'.$this->id.'" />';
+
+                       $vContent = $this->doc->getVersionSelector($this->id,1);
+                       if ($vContent)  {
+                               $this->content.=$this->doc->section('',$vContent);
+                       }
+
+
+                       $this->extObjContent();
+
+                               // Setting up the buttons and markers for docheader
+                       $docHeaderButtons = $this->getButtons();
+                       $markers['CSH'] = $docHeaderButtons['csh'];
+                       $markers['FUNC_MENU'] = t3lib_BEfunc::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']);
+                       $markers['CONTENT'] = $this->content;
+               } else {
+                               // If no access or if ID == zero
+                       $flashMessage = t3lib_div::makeInstance(
+                               't3lib_FlashMessage',
+                               $LANG->getLL('clickAPage_content'),
+                               $LANG->getLL('title'),
+                               t3lib_FlashMessage::INFO
+                       );
+                       $this->content = $flashMessage->render();
+
+                               // Setting up the buttons and markers for docheader
+                       $docHeaderButtons = $this->getButtons();
+                       $markers['CSH'] = $docHeaderButtons['csh'];
+                       $markers['CONTENT'] = $this->content;
+               }
+                       // Build the <body> for the module
+               $this->content = $this->doc->startPage($LANG->getLL('title'));
+               $this->content.= $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
+               $this->content.= $this->doc->endPage();
+               $this->content = $this->doc->insertStylesAndJS($this->content);
+       }
+
+       /**
+        * Print module content (from $this->content)
+        *
+        * @return      void
+        */
+       function printContent() {
+               echo $this->content;
+       }
+
+       /**
+        * Create the panel of buttons for submitting the form or otherwise perform operations.
+        *
+        * @return      array   all available buttons as an assoc. array
+        */
+       protected function getButtons() {
+               global $TCA, $LANG, $BACK_PATH, $BE_USER;
+
+               $buttons = array(
+                       'csh' => '',
+                       'view' => '',
+                       'record_list' => '',
+                       'shortcut' => '',
+               );
+                       // CSH
+               $buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH'], '', TRUE);
+
+               if($this->id && is_array($this->pageinfo)) {
+
+                               // View page
+                       $buttons['view'] = '<a href="#"
+                                       onclick="' . htmlspecialchars(t3lib_BEfunc::viewOnClick($this->pageinfo['uid'], $BACK_PATH, t3lib_BEfunc::BEgetRootLine($this->pageinfo['uid']))) . '"
+                                       title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', 1) . '
+                               ">' .   t3lib_iconWorks::getSpriteIcon('actions-document-view') . '</a>';
+
+                               // Shortcut
+                       if ($BE_USER->mayMakeShortcut())        {
+                               $buttons['shortcut'] = $this->doc->makeShortcutIcon('id, edit_record, pointer, new_unique_uid, search_field, search_levels, showLimit', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
+                       }
+
+                               // If access to Web>List for user, then link to that module.
+                       if ($BE_USER->check('modules','web_list'))      {
+                               $href = $BACK_PATH . 'db_list.php?id=' . $this->pageinfo['uid'] . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'));
+                               $buttons['record_list'] = '<a href="' . htmlspecialchars($href) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', 1) . '">' .
+                                               t3lib_iconWorks::getSpriteIcon('actions-system-list-open') . '</a>';
+                       }
+               }
+
+               return $buttons;
+       }
+}
+
+
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/web/func/index.php'])   {
+       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/mod/web/func/index.php']);
+}
+
+
+
+// Make instance:
+$SOBE = t3lib_div::makeInstance('SC_mod_web_func_index');
+$SOBE->init();
+
+// Include files?
+foreach($SOBE->include_once as $INC_FILE)      include_once($INC_FILE);
+$SOBE->checkExtObj();  // Checking for first level external objects
+
+// Repeat Include files! - if any files has been added by second-level extensions
+foreach($SOBE->include_once as $INC_FILE)      include_once($INC_FILE);
+$SOBE->checkSubExtObj();       // Checking second level external objects
+
+$SOBE->main();
+$SOBE->printContent();
+
+?>
\ No newline at end of file