[TASK] Remove require statements for classes
authorBenjamin Mack <benni@typo3.org>
Sun, 17 Jun 2012 10:04:06 +0000 (12:04 +0200)
committerSteffen Ritter <info@rs-websystems.de>
Thu, 21 Jun 2012 20:06:32 +0000 (22:06 +0200)
Since the autoloader is in place, the require statements for
all classes (including template.php) is not necessary.

This patch adds the core classes to the autoloader file,
and removes all unnecessary require statements.
This change also brings modification with that moves the
initialization of $GLOBALS['TBE_TEMPLATE'] from template.php
into init.php. This means that TBE_TEMPLATE is always
available in the backend now.

Change-Id: I0759d678d42d122e0dc99568e761a05f4b036af4
Resolves: #38131
Reviewed-on: http://review.typo3.org/12142
Reviewed-by: Steffen Ritter
Tested-by: Steffen Ritter
65 files changed:
t3lib/class.t3lib_tceforms_fe.php
t3lib/class.t3lib_tceforms_inline.php
t3lib/core_autoload.php
typo3/ajax.php
typo3/alt_clickmenu.php
typo3/alt_db_navframe.php
typo3/alt_doc.php
typo3/alt_doc_nodoc.php
typo3/alt_file_navframe.php
typo3/alt_shortcut.php
typo3/backend.php
typo3/browse_links.php
typo3/browser.php
typo3/class.browse_links.php
typo3/classes/class.shortcutmenu.php
typo3/classes/class.typo3_tcefile.php
typo3/db_new.php
typo3/dummy.php
typo3/file_edit.php
typo3/file_newfolder.php
typo3/file_rename.php
typo3/file_upload.php
typo3/index.php
typo3/listframe_loader.php
typo3/login_frameset.php
typo3/mod.php
typo3/show_item.php
typo3/show_rechis.php
typo3/sysext/adodb/checkconnectionwizard.php
typo3/sysext/cms/layout/db_layout.php
typo3/sysext/cms/layout/db_new_content_el.php
typo3/sysext/cms/layout/wizard_backend_layout.php
typo3/sysext/cms/tslib/class.tslib_extdirecteid.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo.php
typo3/sysext/filelist/mod1/index.php
typo3/sysext/form/Classes/Controller/Wizard.php
typo3/sysext/func/mod1/index.php
typo3/sysext/impexp/app/index.php
typo3/sysext/impexp/ext_autoload.php
typo3/sysext/indexed_search/mod/index.php
typo3/sysext/info/mod1/index.php
typo3/sysext/lang/hooks/clearcache/class.tx_lang_clearcachemenu.php
typo3/sysext/lowlevel/dbint/cli/cleaner_cli.php
typo3/sysext/opendocs/class.tx_opendocs.php
typo3/sysext/perm/ext_autoload.php [new file with mode: 0644]
typo3/sysext/perm/mod1/index.php
typo3/sysext/recordlist/mod1/index.php
typo3/sysext/rtehtmlarea/mod3/browse_links.php
typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php
typo3/sysext/rtehtmlarea/mod4/select_image.php
typo3/sysext/rtehtmlarea/mod5/user.php
typo3/sysext/sys_action/task/class.tx_sysaction_task.php
typo3/sysext/t3editor/classes/class.tx_t3editor_hooks_fileedit.php
typo3/tce_db.php
typo3/tce_file.php
typo3/template.php
typo3/wizard_add.php
typo3/wizard_colorpicker.php
typo3/wizard_edit.php
typo3/wizard_forms.php
typo3/wizard_list.php
typo3/wizard_rte.php
typo3/wizard_table.php
typo3/wizard_tsconfig.php

index 4f90cd4..ced5cbb 100644 (file)
@@ -143,7 +143,6 @@ class t3lib_TCEforms_FE extends t3lib_TCEforms {
         * @return void
         */
        public function initializeTemplateContainer() {
-               t3lib_div::requireOnce(PATH_typo3 . 'template.php');
                $GLOBALS['TBE_TEMPLATE'] = t3lib_div::makeInstance('frontendDoc');
                $GLOBALS['TBE_TEMPLATE']->getPageRenderer()->addInlineSetting(
                        '', 'PATH_typo3', t3lib_div::dirname(t3lib_div::getIndpEnv('SCRIPT_NAME')) . '/' . TYPO3_mainDir
index d04b141..06c3fe3 100644 (file)
@@ -1047,8 +1047,6 @@ class t3lib_TCEforms_inline {
         * @return void
         */
        protected function processAjaxRequestConstruct(&$ajaxArguments) {
-               require_once(PATH_typo3 . 'template.php');
-
                $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_alt_doc.xml');
 
                        // Create a new anonymous object:
index 8271c49..4950d25 100644 (file)
@@ -310,7 +310,40 @@ $t3libClasses = array(
        'tx_lang_clearcachemenu' => t3lib_extMgm::extPath('lang') . 'hooks/clearcache/class.tx_lang_clearcachemenu.php',
 );
 
+       // all utility classes from typo3/ that are not part of a sysext, excluding scripting classes
+$typo3CoreClasses = array(
+       'clickmenu' => PATH_typo3 . 'alt_clickmenu.php',
+       'typo3backend' => PATH_typo3 . 'backend.php',
+       'typo3_bootstrap' => PATH_typo3 . 'Bootstrap.php',
+       'tbe_browser_recordlist' => PATH_typo3 . 'class.browse_links.php',
+       'recordlist' => PATH_typo3 . 'class.db_list.inc',
+       'localrecordlist' => PATH_typo3 . 'class.db_list_extra.inc',
+       'filelist' => PATH_typo3 . 'class.file_list.inc',
+       'filelistfoldertree' => PATH_typo3 . 'class.filelistfoldertree.php',
+       'recordhistory' => PATH_typo3 . 'class.show_rechis.inc',
+       'webpagetree' => PATH_typo3 . 'class.webpagetree.php',
+       'ajaxlogin' => PATH_typo3 . 'classes/class.ajaxlogin.php',
+       'clearcachemenu' => PATH_typo3 . 'classes/class.clearcachemenu.php',
+       'livesearch' => PATH_typo3 . 'classes/class.livesearch.php',
+       'modulemenu' => PATH_typo3 . 'classes/class.modulemenu.php',
+       'shortcutmenu' => PATH_typo3 . 'classes/class.shortcutmenu.php',
+       'typo3_tcefile' => PATH_typo3 . 'classes/class.typo3_tcefile.php',
+       'typo3ajax' => PATH_typo3 . 'classes/class.typo3ajax.php',
+       'typo3logo' => PATH_typo3 . 'classes/class.typo3logo.php',
+       'backend_cacheactionshook' => PATH_typo3 . 'interfaces/interface.backend_cacheActionsHook.php',
+       'backend_toolbaritem' => PATH_typo3 . 'interfaces/interface.backend_toolbaritem.php',
+       'cms_newcontentelementwizardshook' => PATH_typo3 . 'interfaces/interface.cms_newcontentelementwizardshook.php',
+       'filelist_editiconhook' => PATH_typo3 . 'interfaces/interface.filelist_editiconhook.php',
+       'localrecordlist_actionshook' => PATH_typo3 . 'interfaces/interface.localrecordlist_actionsHook.php',
+       'template' => PATH_typo3 . 'template.php',
+       'bigdoc' => PATH_typo3 . 'template.php',
+       'nodoc' => PATH_typo3 . 'template.php',
+       'smalldoc' => PATH_typo3 . 'template.php',
+       'mediumdoc' => PATH_typo3 . 'template.php',
+       'frontenddoc' => PATH_typo3 . 'template.php',
+);
+
 $tslibClasses = require(PATH_typo3 . 'sysext/cms/ext_autoload.php');
 
-return array_merge($t3libClasses, $tslibClasses);
+return array_merge($t3libClasses, $typo3CoreClasses, $tslibClasses);
 ?>
\ No newline at end of file
index 0197db7..aa30cc1 100644 (file)
@@ -56,7 +56,6 @@ if (in_array($ajaxID, $noUserAjaxIDs)) {
 }
 
 require('init.php');
-require('classes/class.typo3ajax.php');
 
        // finding the script path from the variable
 $ajaxScript = $TYPO3_CONF_VARS['BE']['AJAX'][$ajaxID];
index 8522780..a2501fe 100644 (file)
@@ -42,8 +42,7 @@
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 
-require ('init.php');
-require ('template.php');
+require('init.php');
 $LANG->includeLLFile('EXT:lang/locallang_misc.xml');
 
 /**
index 9e7730b..8f6b7f3 100644 (file)
@@ -36,8 +36,6 @@
 
 $BACK_PATH = '';
 require_once('init.php');
-require('template.php');
-require_once('class.webpagetree.php');
 
 
 /**
index c9cb99f..8a62770 100644 (file)
@@ -37,7 +37,6 @@
  */
 
 require_once('init.php');
-require_once('template.php');
 $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_alt_doc.xml');
 
 t3lib_BEfunc::lockRecords();
index 7288ffd..ed9dbf2 100644 (file)
@@ -37,7 +37,6 @@
  */
 
 require('init.php');
-require('template.php');
 $LANG->includeLLFile('EXT:lang/locallang_alt_doc.xml');
 
 require_once(t3lib_extMgm::extPath('opendocs') . 'class.tx_opendocs.php');
index a4e9621..15f2113 100644 (file)
@@ -35,8 +35,6 @@
 
 $BACK_PATH = '';
 require_once('init.php');
-require('template.php');
-require_once('class.filelistfoldertree.php');
 
 /**
  * Main script class for rendering of the folder tree
index 79c8eb8..7a0f0b3 100644 (file)
@@ -38,7 +38,6 @@
  */
 
 require('init.php');
-require('template.php');
 $LANG->includeLLFile('EXT:lang/locallang_misc.xml');
 
 /**
index 589d20e..317ea92 100644 (file)
 ***************************************************************/
 
 require_once('init.php');
-require_once('template.php');
-require_once(PATH_typo3 . 'interfaces/interface.backend_toolbaritem.php');
-
-require('classes/class.typo3logo.php');
-require('classes/class.modulemenu.php');
-
-       // Core toolbar items
-require('classes/class.clearcachemenu.php');
-require('classes/class.shortcutmenu.php');
-require('classes/class.livesearch.php');
-
 $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_misc.xml');
 
 /**
index 025f4c5..c0606ad 100644 (file)
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 $BACK_PATH = '';
-require ('init.php');
-require ('template.php');
+require('init.php');
 $LANG->includeLLFile('EXT:lang/locallang_browse_links.xml');
 
-require_once (PATH_typo3.'/class.browse_links.php');
-
 /**
  * Script class for the Element Browser window.
  *
index 74aabbe..9f5f311 100644 (file)
@@ -34,7 +34,6 @@
  * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 require('init.php');
-require('template.php');
 
 /**
  * Script Class, putting the frameset together.
index ef93e7f..b4d06d1 100644 (file)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
-
-       // Include classes
-require_once(PATH_typo3.'/class.db_list.inc');
-require_once(PATH_typo3.'/class.db_list_extra.inc');
-
 /**
  * Local version of the record list.
  *
index 91c6cb7..567086a 100644 (file)
@@ -26,7 +26,6 @@
 ***************************************************************/
 
 if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_AJAX) {
-       require_once(PATH_typo3 . 'interfaces/interface.backend_toolbaritem.php');
        $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_misc.xml');
 
                // Needed to get the correct icons when reloading the menu after saving it
index 56e8076..dcf5261 100644 (file)
@@ -40,9 +40,6 @@
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
-
-require_once(PATH_typo3 . 'template.php');
-
 /**
  * Script Class, handling the calling of methods in the file admin classes.
  *
index 65a4d12..a8d3f62 100644 (file)
@@ -39,7 +39,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 $LANG->includeLLFile('EXT:lang/locallang_misc.xml');
 
 /**
index bedd375..07fe741 100644 (file)
@@ -34,8 +34,7 @@
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 
-require ('init.php');
-require ('template.php');
+require('init.php');
 
 /**
  * Script Class, creating the content for the dummy script - which is just blank output.
index f8a5104..e2feb2d 100644 (file)
@@ -36,7 +36,6 @@
 
 $GLOBALS['BACK_PATH'] = '';
 require('init.php');
-require('template.php');
 
 /**
  * Script Class for rendering the file editing screen
index 83093c7..b3e6563 100644 (file)
@@ -35,7 +35,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 
 /**
  * Script Class for the create-new script; Displays a form for creating up to 10 folders or one new text file
index ff867d7..9689e91 100644 (file)
@@ -35,7 +35,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 
 /**
  * Script Class for the rename-file form.
index e12fbbc..decde66 100644 (file)
@@ -35,7 +35,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 $LANG->includeLLFile('EXT:lang/locallang_misc.xml');
 
 /**
index 1be1685..f3cca01 100644 (file)
@@ -36,7 +36,6 @@
 
 define('TYPO3_PROCEED_IF_NO_USER', 1);
 require('init.php');
-require('template.php');
 
 /**
  * Script Class for rendering the login form
index 2997636..bd337fe 100644 (file)
@@ -35,7 +35,6 @@
  */
 
 require('init.php');
-require('template.php');
 
 /**
  * Script Class for redirecting shortcut actions to the correct script
index 78ce0b3..1775190 100644 (file)
@@ -38,7 +38,6 @@
  */
 define('TYPO3_PROCEED_IF_NO_USER', 1);
 require('init.php');
-require('template.php');
 
 /**
  * Script Class, putting the frameset together.
index 06db2f2..2f18a6f 100644 (file)
@@ -33,7 +33,6 @@
 
 unset($MCONF);
 require('init.php');
-require('template.php');
 
        // Find module path:
 $temp_M = (string)t3lib_div::_GET('M');
index 1560c45..60c0838 100644 (file)
@@ -35,7 +35,6 @@
 
 $GLOBALS['BACK_PATH'] = '';
 require_once('init.php');
-require_once('template.php');
 
 /**
  * Extension of transfer data class
index cf2fa75..15602f3 100644 (file)
@@ -36,9 +36,7 @@
 
 $BACK_PATH = '';
 require($BACK_PATH.'init.php');
-require($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:lang/locallang_show_rechis.xml');
-require_once('class.show_rechis.inc');
 
 /**
  * Script Class for showing the history module of TYPO3s backend
index 2d7b6d0..fd52127 100644 (file)
@@ -32,7 +32,6 @@
 $BACK_PATH = '../../../typo3/';
 define('TYPO3_MOD_PATH', 'sysext/adodb/');
 require($BACK_PATH.'init.php');
-require($BACK_PATH.'template.php');
 
        // Include ADODB library:
 require_once(t3lib_extMgm::extPath('adodb').'adodb/adodb.inc.php');
index 53ae2df..5e416b3 100755 (executable)
@@ -39,9 +39,7 @@
 unset($MCONF);
 require('conf.php');
 require($BACK_PATH.'init.php');
-require($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:cms/layout/locallang.xml');
-require_once(PATH_typo3.'class.db_list.inc');
 require_once('class.tx_cms_layout.php');
 $BE_USER->modAccess($MCONF, 1);
 
@@ -236,19 +234,6 @@ class SC_db_layout {
                        // Setting sys language from session var:
                $this->current_sys_language=intval($this->MOD_SETTINGS['language']);
 
-                       // Include scripts: QuickEdit
-               if ($this->MOD_SETTINGS['function']==0) {
-                       $this->include_once[]=PATH_t3lib.'class.t3lib_tceforms.php';
-                       $this->include_once[]=PATH_t3lib.'class.t3lib_clipboard.php';
-                       $this->include_once[]=PATH_t3lib.'class.t3lib_loaddbgroup.php';
-                       $this->include_once[]=PATH_t3lib.'class.t3lib_transferdata.php';
-               }
-
-                       // Include scripts: Clear-cache cmd.
-               if ($this->clear_cache) {
-                       $this->include_once[]=PATH_t3lib.'class.t3lib_tcemain.php';
-               }
-
                        // CSH / Descriptions:
                $this->descrTable = '_MOD_'.$this->MCONF['name'];
        }
index b9eee24..bda25fc 100644 (file)
@@ -38,7 +38,6 @@
 unset($MCONF);
 require('conf.php');
 require($BACK_PATH.'init.php');
-require($BACK_PATH.'template.php');
 
        // Unset MCONF/MLANG since all we wanted was back path etc. for this particular script.
 unset($MCONF);
index 7981596..f6bb639 100644 (file)
@@ -30,7 +30,6 @@
  */
 require_once('conf.php');
 require($BACK_PATH . 'init.php');
-require($BACK_PATH . 'template.php');
 $LANG->includeLLFile('EXT:lang/locallang_wizards.xml');
 
 /**
index 877c341..a6e4705 100644 (file)
@@ -22,9 +22,6 @@
  *
  * This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-
-require_once(PATH_site . 'typo3/classes/class.typo3ajax.php');
-
 /**
  * eID controller for ExtDirect
  *
index 61349b0..5fe5a33 100644 (file)
@@ -32,7 +32,6 @@
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 
-require_once(PATH_typo3.'class.db_list.inc');
 require_once(t3lib_extMgm::extPath('cms').'layout/class.tx_cms_layout.php');
 
 
index 01ceb47..250bba6 100644 (file)
@@ -34,7 +34,6 @@
 
 $LANG->includeLLFile('EXT:lang/locallang_mod_file_list.xml');
 $LANG->includeLLFile('EXT:lang/locallang_misc.xml');
-require_once(PATH_typo3 . 'class.file_list.inc');
 $BE_USER->modAccess($MCONF, 1);
 
 /**
index df8757a..c927781 100644 (file)
@@ -24,7 +24,6 @@
 define('TYPO3_MOD_PATH', 'sysext/form/Classes/Controller/');
 $BACK_PATH = '../../../../';
 require($BACK_PATH . 'init.php');
-require($BACK_PATH . 'template.php');
 
 /**
  * The form wizard controller
index 4876c9e..4f093b9 100755 (executable)
@@ -37,7 +37,6 @@
 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);
index 264805e..8882daa 100755 (executable)
@@ -64,9 +64,7 @@
 unset($MCONF);
 require ('conf.php');
 require_once ($BACK_PATH.'init.php');
-require_once ($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:impexp/app/locallang.php');
-require_once (t3lib_extMgm::extPath('impexp').'class.tx_impexp.php');
 
 t3lib_extMgm::isLoaded('impexp', 1);
 
index 38be7ec..93017b7 100644 (file)
@@ -2,6 +2,7 @@
        // Register necessary class names with autoloader
 $extensionPath = t3lib_extMgm::extPath('impexp');
 return array(
+       'tx_impexp' => $extensionPath . 'class.tx_impexp.php',
        'tx_impexp_task' => $extensionPath . 'task/class.tx_impexp_task.php',
 );
 ?>
\ No newline at end of file
index e03479a..40e538e 100755 (executable)
@@ -34,7 +34,6 @@
 $BE_USER->modAccess($MCONF, 1);
 
 t3lib_extMgm::isLoaded('indexed_search', 1);
-require_once(t3lib_extMgm::extPath('indexed_search') . 'class.indexer.php');
 
 
 
index 12e032f..91c227b 100755 (executable)
@@ -37,7 +37,6 @@
 unset($MCONF);
 require('conf.php');
 require($BACK_PATH.'init.php');
-require($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:lang/locallang_mod_web_info.xml');
 
 $BE_USER->modAccess($MCONF, 1);
index bf0b6f1..6af1c02 100644 (file)
@@ -32,7 +32,6 @@
  * @package    TYPO3
  * @subpackage tx_Lang
  */
-require_once (PATH_typo3 . 'interfaces/interface.backend_cacheActionsHook.php');
 class tx_lang_clearcachemenu implements backend_cacheActionsHook {
 
        /**
index 0fcd754..7c6daf8 100755 (executable)
@@ -4,8 +4,6 @@ if (!defined('TYPO3_cliMode'))  die('You cannot run this script directly!');
 
 require_once(t3lib_extMgm::extPath('lowlevel').'class.tx_lowlevel_cleaner_core.php');
 
-require(PATH_typo3.'template.php');
-
        // Call the functionality
 $cleanerObj = t3lib_div::makeInstance('tx_lowlevel_cleaner_core');
 $cleanerObj->cli_main($_SERVER["argv"]);
index 7921d03..b790752 100644 (file)
@@ -25,8 +25,6 @@
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 
-require_once(PATH_typo3 . 'interfaces/interface.backend_toolbaritem.php');
-
        // load the language file
 $GLOBALS['LANG']->includeLLFile('EXT:opendocs/locallang_opendocs.xml');
 
diff --git a/typo3/sysext/perm/ext_autoload.php b/typo3/sysext/perm/ext_autoload.php
new file mode 100644 (file)
index 0000000..cd09a8a
--- /dev/null
@@ -0,0 +1,8 @@
+<?php
+
+$extensionPath = t3lib_extMgm::extPath('perm');
+return array(
+       'sc_mod_web_perm_ajax' => $extensionPath . 'mod1/class.sc_mod_web_perm_ajax.php',
+       'sc_mod_web_perm_index' => $extensionPath . 'mod1/index.php',
+);
+?>
\ No newline at end of file
index 29952b7..031e3a0 100755 (executable)
@@ -33,7 +33,6 @@
  * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 
-require('class.sc_mod_web_perm_ajax.php');
 $LANG->includeLLFile('EXT:lang/locallang_mod_web_perm.xml');
 $BE_USER->modAccess($MCONF, 1);
 
index 0491ea6..d3a56d3 100644 (file)
 
 
 $LANG->includeLLFile('EXT:lang/locallang_mod_web_list.xml');
-require_once ($BACK_PATH.'class.db_list.inc');
-require_once ($BACK_PATH.'class.db_list_extra.inc');
 $BE_USER->modAccess($MCONF, 1);
-
 t3lib_BEfunc::lockRecords();
 
 
@@ -125,11 +122,6 @@ class SC_db_list {
 
                        // Initialize menu
                $this->menuConfig();
-
-                       // Inclusions?
-               if ($this->clear_cache || $this->cmd=='delete') {
-                       $this->include_once[]=PATH_t3lib.'class.t3lib_tcemain.php';
-               }
        }
 
        /**
index 96351ac..b6be47f 100644 (file)
@@ -40,7 +40,6 @@ error_reporting(E_ALL & ~(E_STRICT | E_NOTICE));
 unset($MCONF);
 require('conf.php');
 require($BACK_PATH.'init.php');
-require($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:rtehtmlarea/mod3/locallang.xml');
 $LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xml');
 
index c5dee1c..5fb72d8 100644 (file)
  * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author     Stanislas Rolland <typo3(arobas)sjbr.ca>
  */
-
-require_once (PATH_typo3.'class.browse_links.php');
-
-
 /**
  * Class which generates the page tree
  *
index f5e0141..dad203b 100644 (file)
@@ -31,9 +31,6 @@
  * @author     Kasper Skårhøj <kasper@typo3.com>
  * @author     Stanislas Rolland <typo3(arobas)sjbr.ca>
  */
-require_once(PATH_typo3 . 'class.browse_links.php');
-require_once(PATH_t3lib . 'file/Service/MagicImageService.php');
-
 /**
  * Local Folder Tree
  *
index ccf5c0a..2b9a518 100644 (file)
@@ -36,7 +36,6 @@ error_reporting(E_ALL & ~(E_STRICT | E_NOTICE));
 unset($MCONF);
 require('conf.php');
 require($BACK_PATH.'init.php');
-require($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:lang/locallang_browse_links.xml');
 $LANG->includeLLFile('EXT:rtehtmlarea/mod4/locallang.xml');
 $LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xml');
index 2c80266..279aa92 100644 (file)
@@ -36,7 +36,6 @@ error_reporting(E_ALL & ~(E_STRICT | E_NOTICE));
 unset($MCONF);
 require('conf.php');
 require($BACK_PATH.'init.php');
-require($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:rtehtmlarea/mod5/locallang.xml');
 $LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xml');
 
index b52ea57..6a1555d 100644 (file)
@@ -927,9 +927,6 @@ class tx_sysaction_task implements tx_taskcenter_Task {
                        return $content;
                }
 
-               require_once($GLOBALS['BACK_PATH'] . 'class.db_list.inc');
-               require_once($GLOBALS['BACK_PATH'] . 'class.db_list_extra.inc');
-
                        // Loading current page record and checking access:
                $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id, $this->taskObject->perms_clause);
                $access = is_array($this->pageinfo) ? 1 : 0;
index 8b67b9f..79a3bf2 100644 (file)
@@ -137,7 +137,6 @@ class tx_t3editor_hooks_fileedit {
                $savingsuccess = FALSE;
                if ($parameters['type'] == $this->ajaxSaveType) {
                        require_once('init.php');
-                       require_once('classes/class.typo3_tcefile.php');
 
                        $tceFile = t3lib_div::makeInstance('TYPO3_tcefile');
                        $tceFile->processAjaxRequest(array(), $parameters['ajaxObj']);
index 5550630..86f71dd 100644 (file)
@@ -36,7 +36,6 @@
  */
 
 require('init.php');
-require('template.php');
 
 /**
  * Script Class, creating object of t3lib_TCEmain and sending the posted data to the object.
@@ -133,11 +132,6 @@ class SC_tce_db {
                if ($this->flags['reverseOrder']) {
                        $this->tce->reverseOrder=1;
                }
-
-                       // Clipboard?
-               if (is_array($this->CB)) {
-                       $this->include_once[]=PATH_t3lib.'class.t3lib_clipboard.php';
-               }
        }
 
        /**
index 5fd325b..e113e2c 100644 (file)
@@ -38,7 +38,6 @@
  */
 
 require_once('init.php');
-require_once('classes/class.typo3_tcefile.php');
 
        // Make instance:
 $SOBE = t3lib_div::makeInstance('TYPO3_tcefile');
index f8052d0..da3ea8b 100644 (file)
@@ -2103,7 +2103,4 @@ class frontendDoc extends template {
        }
 }
 
-       // The template is loaded
-$GLOBALS['TBE_TEMPLATE'] = t3lib_div::makeInstance('template');
-
-?>
+?>
\ No newline at end of file
index f1b7dfa..26b96a5 100644 (file)
@@ -35,7 +35,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 $LANG->includeLLFile('EXT:lang/locallang_wizards.xml');
 
 /**
@@ -116,10 +115,6 @@ class SC_wizard_add {
                                        if ($LiveRec = t3lib_BEfunc::getLiveVersionOfRecord($this->table, $this->id, 'uid')) {
                                                $this->id=$LiveRec['uid'];
                                        }
-
-                                       $this->include_once[] = PATH_t3lib.'class.t3lib_loaddbgroup.php';
-                                       $this->include_once[] = PATH_t3lib.'class.t3lib_transferdata.php';
-                                       $this->include_once[] = PATH_t3lib.'class.t3lib_tcemain.php';
                                        $this->processDataFlag = 1;
                                }
                        }
index d8f053d..af2fe0b 100644 (file)
@@ -36,7 +36,6 @@
 
 $GLOBALS['BACK_PATH'] = '';
 require('init.php');
-require('template.php');
 $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_wizards.xml');
 
 /**
index 6b256f7..04fbfd7 100644 (file)
@@ -35,7 +35,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 $LANG->includeLLFile('EXT:lang/locallang_wizards.xml');
 
 /**
index 19aecd6..66c9e9f 100644 (file)
@@ -36,7 +36,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_wizards.xml');
 
 /**
@@ -192,11 +191,6 @@ class SC_wizard_forms {
                        // Setting form tag:
                list($rUri) = explode('#', t3lib_div::getIndpEnv('REQUEST_URI'));
                $this->doc->form ='<form action="'.htmlspecialchars($rUri).'" method="post" name="wizardForm">';
-
-                       // If save command found, include tcemain:
-               if ($_POST['savedok_x'] || $_POST['saveandclosedok_x']) {
-                       $this->include_once[] = PATH_t3lib.'class.t3lib_tcemain.php';
-               }
        }
 
        /**
index 12a7485..742260b 100644 (file)
@@ -36,7 +36,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 $LANG->includeLLFile('EXT:lang/locallang_wizards.xml');
 
 /**
index 397a9bf..b4a6ee2 100644 (file)
@@ -35,7 +35,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_wizards.xml');
 
 t3lib_BEfunc::lockRecords();
index a8de2d4..fd738a3 100644 (file)
@@ -36,7 +36,6 @@
 
 $BACK_PATH = '';
 require('init.php');
-require('template.php');
 $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_wizards.xml');
 
 /**
@@ -117,11 +116,6 @@ class SC_wizard_table {
                list($rUri) = explode('#', t3lib_div::getIndpEnv('REQUEST_URI'));
                $this->doc->form ='<form action="'.htmlspecialchars($rUri).'" method="post" name="wizardForm">';
 
-                       // If save command found, include tcemain:
-               if ($_POST['savedok_x'] || $_POST['saveandclosedok_x']) {
-                       $this->include_once[] = PATH_t3lib.'class.t3lib_tcemain.php';
-               }
-
                $this->tableParsing_delimiter = '|';
                $this->tableParsing_quote = '';
        }
index ee33388..a97b733 100644 (file)
@@ -36,7 +36,6 @@
 
 $GLOBALS['BACK_PATH'] = '';
 require('init.php');
-require('template.php');
 $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_wizards.xml');
 
 /**