[TASK] Remove commented-out code
authorOliver Klee <typo3-coding@oliverklee.de>
Sat, 26 May 2012 12:28:08 +0000 (14:28 +0200)
committerGeorg Ringer <mail@ringerge.org>
Sun, 27 May 2012 09:35:03 +0000 (11:35 +0200)
Commented-out code usually is not maintained, makes the code harder to
read and cannot be unit-tested. It should be removed.

Change-Id: I966ff1b88cf2196106110c57b9e48dceae21727e
Resolves: #37502
Releases: 6.0
Reviewed-on: http://review.typo3.org/11640
Reviewed-by: Wouter Wolters
Tested-by: Tolleiv Nietsch
Reviewed-by: Tolleiv Nietsch
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
74 files changed:
t3lib/class.t3lib_div.php
t3lib/class.t3lib_extfilefunc.php
t3lib/class.t3lib_foldertree.php
t3lib/class.t3lib_iconworks.php
t3lib/class.t3lib_modsettings.php
t3lib/class.t3lib_parsehtml_proc.php
t3lib/class.t3lib_querygenerator.php
t3lib/class.t3lib_tceforms.php
t3lib/class.t3lib_treeview.php
t3lib/class.t3lib_tsparser_ext.php
t3lib/file/Service/FileProcessingService.php
t3lib/stddb/tbl_be.php
t3lib/thumbs.php
typo3/alt_doc.php
typo3/class.show_rechis.inc
typo3/mod/tools/conf.php
typo3/sysext/aboutmodules/class.tx_aboutmodules_functions.php
typo3/sysext/beuser/mod/conf.php
typo3/sysext/beuser/mod/index.php
typo3/sysext/cms/layout/class.tx_cms_layout.php
typo3/sysext/cms/layout/wizard_backend_layout.php
typo3/sysext/cms/tbl_cms.php
typo3/sysext/cms/tbl_tt_content.php
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/cms/tslib/class.tslib_menu.php
typo3/sysext/cms/tslib/class.tslib_pibase.php
typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc
typo3/sysext/cms/tslib/media/scripts/gmenu_layers.php
typo3/sysext/cms/tslib/media/scripts/tmenu_layers.php
typo3/sysext/css_styled_content/css/example.css
typo3/sysext/em/classes/class.tx_em_extensionmanager.php
typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php
typo3/sysext/em/classes/connection/class.tx_em_connection_soap.php
typo3/sysext/em/classes/database/class.tx_em_database.php
typo3/sysext/em/classes/import/class.tx_em_import_extensionlistimporter.php
typo3/sysext/em/classes/install/class.tx_em_install.php
typo3/sysext/em/classes/tools/class.tx_em_tools.php
typo3/sysext/em/classes/tools/class.tx_em_tools_unzip.php
typo3/sysext/form/Classes/View/Mail/Html/Element/Fieldset.php
typo3/sysext/impexp/class.tx_impexp.php
typo3/sysext/indexed_search/Classes/Controller/SearchController.php
typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
typo3/sysext/indexed_search/class.indexer.php
typo3/sysext/indexed_search/class.lexer.php
typo3/sysext/indexed_search/example/class.pihook.php
typo3/sysext/indexed_search/mod/index.php
typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
typo3/sysext/indexed_search_mysql/class.tx_indexedsearch_mysql.php
typo3/sysext/install/Classes/Updates/Base.php
typo3/sysext/install/mod/class.tx_install.php
typo3/sysext/install/requirements.php
typo3/sysext/lowlevel/clmods/class.rte_images.php
typo3/sysext/lowlevel/config/index.php
typo3/sysext/lowlevel/dbint/index.php
typo3/sysext/recycler/classes/helper/class.tx_recycler_helper.php
typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
typo3/sysext/rtehtmlarea/mod5/class.tx_rtehtmlarea_user.php
typo3/sysext/statictemplates/media/scripts/fe_adminLib.inc
typo3/sysext/statictemplates/media/scripts/gmenu_layers.php
typo3/sysext/statictemplates/media/scripts/tmenu_layers.php
typo3/sysext/t3editor/classes/ts_codecompletion/class.tx_t3editor_codecompletion.php
typo3/sysext/t3editor/classes/ts_codecompletion/class.tx_t3editor_tsrefloader.php
typo3/sysext/t3editor/res/css/t3editor.css
typo3/sysext/t3skin/ext_tables.php
typo3/sysext/t3skin/stylesheets/visual/module_web_list.css
typo3/sysext/tsconfig_help/mod1/index.php
typo3/sysext/tstemplate/ts/index.php
typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php
typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php
typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php
typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php
typo3/tce_db.php
typo3/template.php
typo3/view_help.php

index 173a5cd..1306add 100644 (file)
@@ -2594,7 +2594,6 @@ final class t3lib_div {
                                }
                        }
                        $errno = 0;
-                               // $errstr = '';
                        $fp = @fsockopen($scheme . $parsedURL['host'], $port, $errno, $errstr, 2.0);
                        if (!$fp || $errno > 0) {
                                if (isset($report)) {
@@ -3436,7 +3435,6 @@ final class t3lib_div {
                                        // $_SERVER['PATH_INFO']!=$_SERVER['SCRIPT_NAME'] is necessary because some servers (Windows/CGI) are seen to set PATH_INFO equal to script_name
                                        // Further, there must be at least one '/' in the path - else the PATH_INFO value does not make sense.
                                        // IF 'PATH_INFO' never works for our purpose in TYPO3 with CGI-servers, then 'PHP_SAPI=='cgi'' might be a better check. Right now strcmp($_SERVER['PATH_INFO'],t3lib_div::getIndpEnv('SCRIPT_NAME')) will always return FALSE for CGI-versions, but that is only as long as SCRIPT_NAME is set equal to PATH_INFO because of PHP_SAPI=='cgi' (see above)
-                                       //                              if (strcmp($_SERVER['PATH_INFO'],self::getIndpEnv('SCRIPT_NAME')) && count(explode('/',$_SERVER['PATH_INFO']))>1) {
                                if (PHP_SAPI != 'cgi' && PHP_SAPI != 'cgi-fcgi' && PHP_SAPI != 'fpm-fcgi') {
                                        $retVal = $_SERVER['PATH_INFO'];
                                }
index 76c1087..e5e7bec 100644 (file)
@@ -383,7 +383,6 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions {
                $fileObject = $this->getFileObject($cmds['data']);
 
                        // @todo implement the recycler feature which has been removed from the original implementation
-                       // $this->writelog(4, 0, 4, 'Item "%s" moved to recycler at "%s"', array($theFile, $recyclerPath));
 
                        // Copies the file
                if ($fileObject instanceof t3lib_file_File) {
index 73f570d..e880ad4 100644 (file)
@@ -227,7 +227,6 @@ class t3lib_folderTree extends t3lib_treeView {
                                // show the expansion of the current one, not the rest of the mounts
                        if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_AJAX) {
                                // @todo: currently the AJAX script runs through all storages thus, if something is expanded on storage #2, it does not work, the break stops this, the goal should be that only the $this->storages iterates over the selected storage/bank
-                               // break;
                        }
                }
 
index 0bd724c..4ec5491 100644 (file)
@@ -350,10 +350,6 @@ final class t3lib_iconWorks {
                        $GLOBALS['TBE_STYLES']['skinImg'][$srcKey] = array($src, $wHattribs); // Set default...
                }
 
-                       // DEBUG: This doubles the size of all icons - for testing/debugging:
-                       // if (preg_match('/^width="([0-9]+)" height="([0-9]+)"$/', $wHattribs, $reg))  $wHattribs='width="'.($reg[1]*2).'" height="'.($reg[2]*2).'"';
-
-
                        // Rendering disabled (greyed) icons using _i (inactive) as name suffix ("_d" is already used)
                $matches = array();
                $srcBasename = basename($src);
index 3aecbaf..23d6e61 100644 (file)
@@ -369,9 +369,6 @@ class t3lib_modSettings {
         * @return void
         */
        function writeStoredSetting($writeArray = array(), $mconfName = '') {
-                       // for debugging: just removes all module data from user settings
-                       // $GLOBALS['BE_USER']->pushModuleData($GLOBALS['SOBE']->MCONF['name'],array());
-
                        // Making sure, index 0 is not set
                unset($this->storedSettings[0]);!
                $this->storedSettings = $this->cleanupStorageArray($this->storedSettings);
index b442508..2108022 100644 (file)
@@ -511,10 +511,6 @@ class t3lib_parsehtml_proc extends t3lib_parsehtml {
                                                                $imgSplit[$k] = '<img ' . $params . ' />';
                                                        }
                                                }
-                                       } else { // Remove image if it was not found in a proper position on the server!
-
-                                               // Commented out; removing the image tag might not be that logical...
-                                               // $imgSplit[$k]='';
                                        }
                                }
 
@@ -777,7 +773,6 @@ class t3lib_parsehtml_proc extends t3lib_parsehtml {
                                                        } elseif (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['typolinkLinkHandler'][array_shift(explode(':', $link_param))])) {
                                                                $href = $link_param;
                                                        } else {
-                                                               #$href = '';
                                                                $href = $siteUrl . '?id=' . $link_param;
                                                                $error = 'No page found: ' . $idPart;
                                                        }
index 66c2621..4f53a6f 100644 (file)
@@ -1339,7 +1339,6 @@ class t3lib_queryGenerator {
                        }
                        if (in_array('order', $enableArr) && !$GLOBALS['BE_USER']->userTS['mod.']['dbint.']['disableOrderBy']) {
                                $orderByArr = explode(',', $this->extFieldLists['queryOrder']);
-                                       //              debug($orderByArr);
                                $orderBy = '';
                                $orderBy .= $this->mkTypeSelect('SET[queryOrder]', $orderByArr[0], '') .
                                                        '&nbsp;' . t3lib_BEfunc::getFuncCheck($GLOBALS['SOBE']->id, 'SET[queryOrderDesc]', $modSettings['queryOrderDesc'], '', '', 'id="checkQueryOrderDesc"') . '&nbsp;<label for="checkQueryOrderDesc">Descending</label>';
index 8dfa70b..2444d5c 100644 (file)
@@ -2476,12 +2476,6 @@ class t3lib_TCEforms {
                                // Find the data structure if sheets are found:
                        $sheet = $editData['meta']['currentSheetId'] ? $editData['meta']['currentSheetId'] : 'sDEF'; // Sheet to display
 
-                               // Create sheet menu:
-                               //TODO; Why is this commented out?
-                       //                      if (is_array($dataStructArray['sheets'])) {
-                       //                              #$item.=$this->getSingleField_typeFlex_sheetMenu($dataStructArray['sheets'], $PA['itemFormElName'].'[meta][currentSheetId]', $sheet).'<br />';
-                       //                      }
-
                                // Create language menu:
                        $langChildren = $dataStructArray['meta']['langChildren'] ? 1 : 0;
                        $langDisabled = $dataStructArray['meta']['langDisable'] ? 1 : 0;
@@ -2516,11 +2510,6 @@ class t3lib_TCEforms {
 
                        $editData['meta']['currentLangId'] = array_unique($editData['meta']['currentLangId']);
 
-                               //TODO: Why is this commented out?
-                       //                      if (!$langDisabled && count($languages) > 1) {
-                       //                              $item.=$this->getSingleField_typeFlex_langMenu($languages, $PA['itemFormElName'].'[meta][currentLangId]', $editData['meta']['currentLangId']).'<br />';
-                       //                      }
-
                        $PA['_noEditDEF'] = FALSE;
                        if ($langChildren || $langDisabled) {
                                $rotateLang = array('DEF');
@@ -2848,7 +2837,6 @@ class t3lib_TCEforms {
                                                        $toggleIcon_close = t3lib_iconWorks::getSpriteIcon('actions-move-right');
 
                                                                // Create on-click actions.
-                                                               //$onClickCopy = 'new Insertion.After($("'.$idTagPrefix.'"), getOuterHTML("'.$idTagPrefix.'").replace(/'.$idTagPrefix.'-/g,"'.$idTagPrefix.'-copy"+Math.floor(Math.random()*100000+1)+"-")); return false;';    // Copied elements doesn't work (well) in Safari while they do in Firefox and MSIE! UPDATE: It turned out that copying doesn't work for any browser, simply because the data from the copied form never gets submitted to the server for some reason! So I decided to simply disable copying for now. If it's requested by customers we can look to enable it again and fix the issue. There is one un-fixable problem though; Copying an element like this will violate integrity if files are attached inside that element because the file reference doesn't get an absolute path prefixed to it which would be required to have TCEmain generate a new copy of the file.
                                                        $onClickRemove = 'if (confirm("Are you sure?")){/*###REMOVE###*/;$("' . $idTagPrefix . '").hide();setActionStatus("' . $idPrefix . '");} return false;';
                                                        $onClickToggle = 'flexFormToggle("' . $idTagPrefix . '"); return false;';
 
@@ -5125,8 +5113,7 @@ class t3lib_TCEforms {
                                                $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.new', 1) .
                                                '</span>';
 
-                               // Kasper: Should not be used here because NEW records are not offline workspace versions...
-                       #t3lib_BEfunc::fixVersioningPid($table,$rec);
+                               // t3lib_BEfunc::fixVersioningPid Should not be used here because NEW records are not offline workspace versions...
                        $truePid = t3lib_BEfunc::getTSconfig_pidValue($table, $rec['uid'], $rec['pid']);
                        $prec = t3lib_BEfunc::getRecordWSOL('pages', $truePid, 'title');
                        $pageTitle = t3lib_BEfunc::getRecordTitle('pages', $prec, TRUE, FALSE);
index ccf5bd0..93c1368 100644 (file)
@@ -717,7 +717,6 @@ class t3lib_treeView {
                        if ($this->makeHTML) {
                                $HTML = $depthData . $this->PMicon($row, $a, $c, $nextCount, $exp);
                                $HTML .= $this->wrapStop($this->getIcon($row), $row);
-                               #       $HTML.=$this->wrapStop($this->wrapIcon($this->getIcon($row),$row),$row);
                        }
 
                                // Finally, add the row/HTML content to the ->tree array in the reserved key.
index 6b21ccb..a998e29 100644 (file)
@@ -1478,7 +1478,6 @@ class t3lib_tsparser_ext extends t3lib_TStemplate {
                        $this->rawP++;
                        if ($line) {
                                if (substr($line, 0, 1) == '[') {
-                                       // return $line;
                                } elseif (strcspn($line, '}#/') != 0) {
                                        $varL = strcspn($line, ' {=<');
                                        $var = substr($line, 0, $varL);
index 0fcfe89..d27d9c4 100644 (file)
@@ -291,7 +291,6 @@ class t3lib_file_Service_FileProcessingService {
                $targetFileName = 'previewcrm_' . $processedFile->calculateChecksum() . '.' . $targetFileExtension;
 
                        // @todo: implement meaningful TempFileIndex
-               // $processConfiguration['useTargetFileNameAsPrefix'] == 1;
 
                if ($configuration['useSample']) {
                        $gifBuilder->scalecmd = '-sample';
index 5f3e850..fc32c25 100644 (file)
@@ -69,7 +69,6 @@ $TCA['be_users'] = array(
                                'foreign_table_where' => 'ORDER BY be_groups.title',
                                'size' => '5',
                                'maxitems' => '20',
-                               #                               'renderMode' => $GLOBALS['TYPO3_CONF_VARS']['BE']['accessListRenderMode'],
                                'iconsInOptionTags' => 1,
                                'wizards' => array(
                                        '_PADDING' => 1,
index 5eafdc0..dd456ed 100644 (file)
@@ -53,7 +53,7 @@ class SC_t3lib_thumbs {
        var $imageList;         // Coming from $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext']
        /**
         * will hold the file Object
-        * 
+        *
         * @var t3lib_file_File $input
         */
        var $image;
@@ -155,7 +155,6 @@ class SC_t3lib_thumbs {
                if ($OK) {
                        $this->image = $fileObject;
                        $this->size = $size;
-                       //$this->mtime = $fileObject->getProperty('mtime');
                } else {
                                // hide the path to the document root;
                        throw new RuntimeException(
index db40bcc..f426292 100644 (file)
@@ -623,7 +623,6 @@ class SC_alt_doc {
                                                                                $CALC_PERMS = $GLOBALS['BE_USER']->calcPerms($calcPRec);
                                                                                if ($table=='pages')    {       // If pages:
                                                                                        $hasAccess = $CALC_PERMS&8 ? 1 : 0;
-                                                                                       #$this->viewId = $calcPRec['pid'];
                                                                                        $this->viewId = 0;
                                                                                } else {
                                                                                        $hasAccess = $CALC_PERMS&16 ? 1 : 0;
@@ -1248,7 +1247,6 @@ class SC_alt_doc {
                                                                                $ids[$idKey] = $calcPRec['uid'];
                                                                        }
                                                                }
-       #else unset($ids[$idKey]);
                                                        }
 
                                                                // Add the possibly manipulated IDs to the new-build newConf array:
index 9160d2e..dd611c2 100644 (file)
@@ -701,7 +701,6 @@ class recordHistory {
                                        );
 
                                // Traversing the result, building up changesArray / changeLog:
-                       #$changesArray=array(); // used temporarily to track intermedia changes
                        $changeLog = array();
 
                        while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
@@ -723,10 +722,6 @@ class recordHistory {
                                        $hisDat['recuid'] = $row['recuid'];
 
                                        $changeLog[$row['sys_log_uid']] = $hisDat;
-
-                                               // Update change array
-                                               // This is used to detect if any intermedia changes have been made.
-                                       #$changesArray = array_merge($changesArray,$hisDat['oldRecord']);
                                } else {
                                        debug('ERROR: [getHistoryData]');
                                        return 0;       // error fallback
index 8826c47..45eb2be 100755 (executable)
@@ -4,5 +4,4 @@ $MLANG['default']['ll_ref']='LLL:EXT:lang/locallang_mod_admintools.xml';
 
 $MCONF['name']='tools';
 $MCONF['access']='admin';
-#$MCONF['workspaces']='online';
 ?>
\ No newline at end of file
index 2ffd53f..7cce6b5 100644 (file)
@@ -170,7 +170,7 @@ class tx_aboutmodules_Functions {
                        $label = $GLOBALS['LANG']->moduleLabels['tabs'][$moduleKey];
                        if ($link && $prefix) $link = $prefix . rawurlencode($link);
                        if ($link && !$dontLink) {
-                               $label = '<a href="#" onclick="top.goToModule(\'' . $moduleName . '\');' . $onBlur . 'return false;">' . $label . '</a>'; //  && !$link_sub
+                               $label = '<a href="#" onclick="top.goToModule(\'' . $moduleName . '\');' . $onBlur . 'return false;">' . $label . '</a>';
 
                                $mIcons[] = '<a href="#" onclick="top.goToModule(\'' . $moduleName . '\');' . $onBlur . 'return false;" class="c-mainitem" id="' . $moduleCSSId . '">' . $descr3_imageCode . '</a>';
 
index 694d8aa..3f55964 100755 (executable)
@@ -5,6 +5,4 @@ $MLANG['default']['ll_ref']='LLL:EXT:beuser/mod/locallang_mod.xml';
 $MCONF['script']='_DISPATCH';
 $MCONF['access']='admin';
 $MCONF['name']='tools_beuser';
-#$MCONF['workspaces']='online';
-
 ?>
\ No newline at end of file
index ece4955..de1e599 100755 (executable)
@@ -1112,7 +1112,6 @@ class SC_mod_tools_be_user_index {
                }
                        // Setting up the buttons and markers for docheader
                $docHeaderButtons = $this->getButtons();
-               //$markers['CSH'] = $docHeaderButtons['csh'];
                $markers['FUNC_MENU'] = t3lib_BEfunc::getFuncMenu(0,'SET[function]',$this->MOD_SETTINGS['function'],$this->MOD_MENU['function']);
                $markers['CONTENT'] = $this->content;
 
@@ -1147,9 +1146,6 @@ class SC_mod_tools_be_user_index {
                        'save' => ''
                );
 
-                       // CSH
-               //$buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']);
-
                        // Add user
                if ($this->MOD_SETTINGS['function'] === 'compare') {
                        $buttons['add'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick('&edit[be_users][0]=new', $this->doc->backPath, -1)) .
index bda8606..690ce5f 100755 (executable)
@@ -677,7 +677,6 @@ class tx_cms_layout extends recordList {
                                $out .= t3lib_BEfunc::cshItem($this->descrTable, 'language_list', $GLOBALS['BACK_PATH']);
                        }
                } else { // SINGLE column mode (columns shown beneath each other):
-                       #debug('single column');
                        if ($this->tt_contentConfig['sys_language_uid'] == 0 || !$this->defLangBinding) {
 
                                // Initialize:
index 1114e21..658b042 100644 (file)
@@ -65,7 +65,6 @@ class SC_wizard_backend_layout {
                // Setting GET vars (used in frameset script):
                $this->P = t3lib_div::_GP('P', 1);
 
-               //data[layouts][2][config]
                $this->formName = $this->P['formName'];
                $this->fieldName = $this->P['itemName'];
                $this->md5ID = $this->P['md5ID'];
index 523b118..62c5333 100755 (executable)
@@ -282,7 +282,6 @@ $TCA['fe_users'] = array(
                                'wizards' => array(
                                        '_PADDING' => 4,
                                        '0' => array(
-#                                              'type' => t3lib_extMgm::isLoaded('tsconfig_help')?'popup':'',
                                                'title'  => 'TSconfig QuickReference',
                                                'script' => 'wizard_tsconfig.php?mode=fe_users',
                                                'icon'   => 'wizard_tsconfig.gif',
@@ -394,7 +393,6 @@ $TCA['fe_groups'] = array(
                                'wizards' => array(
                                        '_PADDING' => 4,
                                        '0' => array(
-#                                              'type' => t3lib_extMgm::isLoaded('tsconfig_help')?'popup':'',
                                                'title' => 'TSconfig QuickReference',
                                                'script' => 'wizard_tsconfig.php?mode=fe_users',
                                                'icon' => 'wizard_tsconfig.gif',
@@ -1064,7 +1062,6 @@ $TCA['sys_template'] = array(
                                'wizards' => array(
                                        '_PADDING' => 4,
                                        '0' => array(
-#                                              'type' => t3lib_extMgm::isLoaded('tsconfig_help')?'popup':'',
                                                'title' => 'TSref online',
                                                'script' => 'wizard_tsconfig.php?mode=tsref',
                                                'icon' => 'wizard_tsconfig.gif',
index 57f6c4f..ec5d85f 100755 (executable)
@@ -1984,9 +1984,7 @@ $TCA['tt_content'] = array(
                                --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended',
                        'subtype_value_field' => 'list_type',
                        'subtypes_excludelist' => array(
-//                             '' => 'layout,select_key,pages',        // When no plugin is selected.
                                '3' => 'layout',
-//                             '4' => 'layout',        // List type forum
                                '2' => 'layout',
                                '5' => 'layout',
                                '9' => 'layout',
index cd0df28..7089d82 100644 (file)
@@ -2230,12 +2230,7 @@ class tslib_fe {
 
                        // Setting locale
                if ($this->config['config']['locale_all']) {
-                       # Change by RenĂ© Fritz, 22/10 2002
                        # there's a problem that PHP parses float values in scripts wrong if the locale LC_NUMERIC is set to something with a comma as decimal point
-                       # this does not work in php 4.2.3
-                       #setlocale('LC_ALL', $this->config['config']['locale_all']);
-                       #setlocale('LC_NUMERIC', 'en_US');
-
                        # so we set all except LC_NUMERIC
                        $locale = setlocale(LC_COLLATE, $this->config['config']['locale_all']);
                        if ($locale) {
@@ -3347,11 +3342,6 @@ if (version == "n3") {
                } else {
                                // Build headers:
                        $headers = array(
-                               #'Last-Modified: '.gmdate('D, d M Y H:i:s T', $this->register['SYS_LASTCHANGED']),
-                               #'ETag: '.md5($this->content),
-
-                               #'Cache-Control: no-cache',
-                               #'Pragma: no-cache',
                                'Cache-Control: private',               // Changed to this according to Ole Tange, FI.dk
                        );
 
index d2dcf2f..aaa82b8 100644 (file)
@@ -2418,7 +2418,6 @@ class tslib_gmenu extends tslib_menu {
                        $totalWH['H'][$key]=$gifCreator->XY[1];
                        $totalWH['W_total']+=$gifCreator->XY[0];
                        $totalWH['H_total']+=$gifCreator->XY[1];
-                               // ---- //
 
                        $Hcounter+=$gifCreator->XY[1];          // counter is increased
                        $Wcounter+=$gifCreator->XY[0];          // counter is increased
index 9f248ef..f0cda80 100644 (file)
@@ -204,7 +204,7 @@ class tslib_pibase {
         * @see pi_linkToPage()
         */
        function pi_getPageLink($id,$target='',$urlParameters=array()) {
-               return $this->cObj->getTypoLink_URL($id,$urlParameters,$target);        // ?$target:$GLOBALS['TSFE']->sPre
+               return $this->cObj->getTypoLink_URL($id,$urlParameters,$target);
        }
 
        /**
@@ -220,7 +220,7 @@ class tslib_pibase {
         * @see pi_getPageLink(), tslib_cObj::getTypoLink()
         */
        function pi_linkToPage($str,$id,$target='',$urlParameters=array()) {
-               return $this->cObj->getTypoLink($str,$id,$urlParameters,$target);       // ?$target:$GLOBALS['TSFE']->sPre
+               return $this->cObj->getTypoLink($str,$id,$urlParameters,$target);
        }
 
        /**
@@ -1293,7 +1293,6 @@ class tslib_pibase {
                                        $c=0;
                                        foreach($tempArr as $values) {
                                                if ($c==$v) {
-                                                       #debug($values);
                                                        $tempArr=$values;
                                                        break;
                                                }
index ec42fc4..823b9cd 100755 (executable)
@@ -210,11 +210,6 @@ class user_feAdmin {
                                $this->dataArr = $this->userProcess('evalFunc',$this->dataArr);
                        }
 
-               /*
-               debug($this->dataArr);
-               debug($this->failure);
-               debug($this->preview);
-               */
                                // if not preview and no failures, then set data...
                        if (!$this->failure && !$this->preview && !t3lib_div::_GP('doNotSave')) {       // doNotSave is a global var (eg a 'Cancel' submit button) that prevents the data from being processed
                                $this->save();
@@ -431,7 +426,6 @@ class user_feAdmin  {
         * @see parseValues()
         */
        function processFiles($cmdParts,$theField) {
-//debug($_FILES);
                        // First, make an array with the filename and file reference, whether the file is just uploaded or a preview
                $filesArr = array();
 
@@ -1392,14 +1386,14 @@ class user_feAdmin      {
                        $this->cObj->sendNotifyEmail(
                                                                strip_tags($content),
                                                                $recipient,
-                                                               '',                     // ($admMail ? '' : $admin),            // If the special administration mail was not found and send, the regular is...
+                                                               '',
                                                                $this->conf['email.']['from'],
                                                                $this->conf['email.']['fromName']
                                                );
                } else {
                        $this->sendHTMLMail($content,
                                                                $recipient,
-                                                               '',                     // ($admMail ? '' : $admin),            // If the special administration mail was not found and send, the regular is...
+                                                               '',
                                                                $this->conf['email.']['from'],
                                                                $this->conf['email.']['fromName']
                                                );
index 7ea25cf..e8cf4fc 100644 (file)
@@ -190,7 +190,6 @@ GLV_restoreMenu["'.$this->WMid.'"] = "'.$this->WMactiveKey.'";
                                }
                                $GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['layerCounter']++;
                                $zIndex = 10000-$GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['layerCounter'];
-#                              $zIndex = (($key+2)*$this->menuNumber*100);
                                $divStart = '<div id="Menu'.$this->WMid.$key.'" style="z-index:'.$zIndex.';'.$exStyle.'">';
                                $divStop = '</div>';
 
index 8745a0f..e7e85ee 100644 (file)
@@ -190,7 +190,6 @@ GLV_restoreMenu["'.$this->WMid.'"] = "'.$this->WMactiveKey.'";
                                }
                                $GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['layerCounter']++;
                                $zIndex = 10000-$GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['layerCounter'];
-#                              $zIndex = (($key+2)*$this->menuNumber*100);
                                $divStart = '<div id="Menu'.$this->WMid.$key.'" style="z-index:'.$zIndex.';'.$exStyle.'">';
                                $divStop = '</div>';
 
index 70ea9a2..e05aef4 100755 (executable)
@@ -294,15 +294,3 @@ TABLE.typo3-adminPanel TD FONT { font-family: verdana; font-size: 10px; color: b
 TABLE.typo3-adminPanel TD A FONT { font-family: verdana; font-size: 10px; color: black; }
 TABLE.typo3-editPanel { border: 1px solid black; background-color: #F6F2E6; }
 TABLE.typo3-editPanel TD { border: 0px; }
-
-
-/*************/
-/* Debugging */
-/*************/
-/*
-H1, H2, H3, H4, H5, P, UL, OL, LI, BLOCKQUOTE, PRE { border: 1px dotted #999999;}
-TD TABLE { border: 1px dotted #000099;}
-DIV { border: 1px dotted #990000;}
-IMG.spacer-gif { border: 1px solid black; }
-*/
-
index 00484d9..390009b 100644 (file)
@@ -182,11 +182,11 @@ class tx_em_ExtensionManager {
                        'debug' => $GLOBALS['TYPO3_CONF_VARS']['BE']['debug'] > 0,
                        //TODO: some are disabled until feater-proofed
                        'fileAllowSave' => $GLOBALS['TYPO3_CONF_VARS']['EXT']['noEdit'] == 0,
-                       'fileAllowMove' => 0, //$fileAllowMove,
-                       'fileAllowDelete' => 0, //$fileAllowDelete,
-                       'fileAllowRename' => 0, //$fileAllowRename,
-                       'fileAllowUpload' => 0, //$fileAllowUpload,
-                       'fileAllowCreate' => 0, //$fileAllowCreate,
+                       'fileAllowMove' => 0,
+                       'fileAllowDelete' => 0,
+                       'fileAllowRename' => 0,
+                       'fileAllowUpload' => 0,
+                       'fileAllowCreate' => 0,
                        'fileAllowDownload' => $fileAllowDownload,
 
                );
index 68871f7..46eec08 100644 (file)
@@ -279,8 +279,6 @@ class tx_em_Connection_ExtDirectServer {
                if (!$form) {
                        return '<p>' . $GLOBALS['LANG']->sL('LLL:EXT:em/language/locallang.xml:msg_extNoConfiguration') . '</p>';
                } else {
-                       //$form = preg_replace('/<form([^>]+)>/', '', $form);
-                       //$form = str_replace('</form>', '', $form);
                        return $form;
                }
        }
index a0801a4..182c898 100644 (file)
@@ -192,11 +192,6 @@ class tx_em_Connection_Soap {
                                $this->password = FALSE;
                        }
                }
-               /*return array(
-                                               'username' => $this->username,
-                                               'password' => $this->password,
-                                       'func' => $func
-                                       );*/
 
                $result = $this->client->__soapCall($func, $param, NULL, $header);
 
index a208a49..0862c13 100644 (file)
@@ -106,7 +106,7 @@ final class tx_em_Database {
                        $order,
                        $limit
                );
-               //debug($GLOBALS['TYPO3_DB']->debug_lastBuiltQuery);
+
                return $ret;
        }
 
index 39bf0db..84aa88a 100644 (file)
@@ -89,8 +89,6 @@ class tx_em_Import_ExtensionListImporter implements SplObserver {
                'description',
                'dependencies',
                'uploadcomment',
-               //'lastversion',
-               //'lastreviewedversion'
        );
 
        /**
index 133846e..9053044 100644 (file)
@@ -1185,9 +1185,6 @@ class tx_em_Install {
                                                                $shouldBePath
                                                        );
                                                }
-                                       } else {
-                                               // It seems like TYPO3_MOD_PATH and therefore also this warning is no longer needed.
-                                               // $infoArray['errors'][] = 'No definition of TYPO3_MOD_PATH constant found inside!';
                                        }
                                        if (is_array($confFileInfo['MCONF_name'])) {
                                                $mName = $confFileInfo['MCONF_name'][1][1];
index be2c1a6..292abde 100644 (file)
@@ -558,7 +558,7 @@ final class tx_em_Tools {
 
                if ($typePath) {
                        $path = $typePath . ($returnWithoutExtKey ? '' : $extKey . '/');
-                       return $path; # @is_dir($path) ? $path : '';
+                       return $path;
                } else {
                        return '';
                }
index 0281e0f..de37b53 100644 (file)
@@ -520,7 +520,6 @@ class tx_em_Tools_Unzip {
                        // Look for path to remove
                else {
                        if ($p_remove_path != "") {
-                               //if (strcmp($p_remove_path, $p_entry['filename'])==0)
                                if ($this->_tool_PathInclusion($p_remove_path, $p_entry['filename']) == 2) {
 
                                        // Change the file status
@@ -584,18 +583,12 @@ class tx_em_Tools_Unzip {
                                if (is_dir($p_entry['filename'])) {
                                        // Change the file status
                                        $p_entry['status'] = "already_a_directory";
-
-                                       // Return
-                                       //return $v_result;
                                }
                                        // Look if file is write protected
                                else {
                                        if (!is_writeable($p_entry['filename'])) {
                                                // Change the file status
                                                $p_entry['status'] = "write_protected";
-
-                                               // Return
-                                               //return $v_result;
                                        }
 
                                                // Look if the extracted file is older
@@ -603,9 +596,6 @@ class tx_em_Tools_Unzip {
                                                if (filemtime($p_entry['filename']) > $p_entry['mtime']) {
                                                        // Change the file status
                                                        $p_entry['status'] = "newer_exist";
-
-                                                       // Return
-                                                       //return $v_result;
                                                }
                                        }
                                }
@@ -631,7 +621,6 @@ class tx_em_Tools_Unzip {
                                        $p_entry['status'] = "path_creation_fail";
 
                                        // Return
-                                       //return $v_result;
                                        $v_result = 1;
                                }
                        }
@@ -810,10 +799,6 @@ class tx_em_Tools_Unzip {
 
                // Other informations
 
-               // TBC
-               //for(reset($v_data); $key = key($v_data); next($v_data)) {
-               //}
-
                // Set the stored filename
                $p_header['stored_filename'] = $p_header['filename'];
 
index 495a41e..ee819f0 100644 (file)
@@ -46,14 +46,6 @@ class tx_form_View_Mail_Html_Element_Fieldset extends tx_form_View_Mail_Html_Ele
        ';
 
        /**
-        * True if element needs no element wrap
-        * like <li>element</li>
-        *
-        * @var boolean
-        */
-       //protected $noWrap = TRUE;
-
-       /**
         * Constructor
         *
         * @param tx_form_Domain_Model_Element_Fieldset $model Model for this element
index 53aa7e7..46fa68d 100755 (executable)
  *             // Finally load all the files.
  *     $this->export->export_addFilesFromRelations();  // MUST be after the DBrelations are set so that file from ALL added records are included!
  *
- *             // Now the internal DAT array is ready to export:
- *     #debug($this->export->dat);
- *
  *             // Write export
  *     $out = $this->export->compileMemoryToFileContent();
- *     #t3lib_div::writeFile(PATH_site."fileadmin/relations.t3d",$out);
- *     #debug(strlen($out));
  */
 
-
 /**
  * T3D file Import/Export library (TYPO3 Record Document)
  *
@@ -797,7 +791,7 @@ class tx_impexp {
         */
        function flatSoftRefs($dbrels) {
                $list = array();
-#debug($dbrels);
+
                foreach($dbrels as $field => $dat) {
                        if (is_array($dat['softrefs']['keys'])) {
                                foreach($dat['softrefs']['keys'] as $spKey => $elements) {
@@ -833,7 +827,6 @@ class tx_impexp {
                        }
                }
 
-#debug($list);
                return $list;
        }
 
@@ -1281,7 +1274,6 @@ class tx_impexp {
                                if ($this->update && $this->doesRecordExist($table,$uid) && $this->import_mode[$table.':'.$uid]!=='as_new') {
                                        $ID = $uid;
                                } else {
-#debug($this->import_mode[$table.':'.$uid],$table.':'.$uid);
                                        $ID = uniqid('NEW');
                                }
                                $this->import_newId[$table.':'.$ID] = array('table' => $table, 'uid' => $uid);
@@ -1296,11 +1288,6 @@ class tx_impexp {
                                                // Have to reset the user/group IDs so pages are owned by importing user. Otherwise strange things may happen for non-admins!
                                        unset($this->import_data[$table][$ID]['perms_userid']);
                                        unset($this->import_data[$table][$ID]['perms_groupid']);
-
-                                               // user/group/everybody settings is kept - but these might still conflict with possibilities for writing the content!"
-                                       #unset($this->import_data[$table][$ID]['perms_user']);
-                                       #unset($this->import_data[$table][$ID]['perms_group']);
-                                       #unset($this->import_data[$table][$ID]['perms_everybody']);
                                }
 
                                        // PID and UID:
@@ -1311,7 +1298,6 @@ class tx_impexp {
                                        $this->import_data[$table][$ID]['pid'] = $pid;
 
                                        if ((($this->import_mode[$table.':'.$uid]==='force_uid' && $this->update) || $this->force_all_UIDS) && $GLOBALS['BE_USER']->isAdmin()) {
-#debug($this->import_mode[$table.':'.$uid],$table.':'.$uid);
                                                $this->import_data[$table][$ID]['uid'] = $uid;
                                                $this->suggestedInsertUids[$table.':'.$uid] = 'DELETE';
                                        }
@@ -1480,11 +1466,9 @@ class tx_impexp {
                foreach($itemArray as $relDat) {
                        if (is_array($this->import_mapId[$relDat['table']]) && isset($this->import_mapId[$relDat['table']][$relDat['id']])) {
 
-                               #debug('FOUND: '.$relDat['table'].':'.$relDat['id']);
                                $valArray[] = $relDat['table'].'_'.$this->import_mapId[$relDat['table']][$relDat['id']];
                        } elseif ($this->isTableStatic($relDat['table']) || $this->isExcluded($relDat['table'], $relDat['id']) || $relDat['id']<0) {    // Checking for less than zero because some select types could contain negative values, eg. fe_groups (-1, -2) and sys_language (-1 = ALL languages). This must be handled on both export and import.
 
-                               #debug('STATIC: '.$relDat['table'].':'.$relDat['id']);
                                $valArray[] = $relDat['table'].'_'.$relDat['id'];
                        } else {
 
@@ -1930,14 +1914,12 @@ class tx_impexp {
                                $fileProcObj = $this->getFileProcObj();
                                $newName = $fileProcObj->getUniqueName($fileName, PATH_site.$dirPrefix);
                        }
-#debug($newName,'$newName');
 
                                // Write main file:
                        if ($this->writeFileVerify($newName, $fileID)) {
 
                                        // If the resource was an HTML/CSS file with resources attached, we will write those as well!
                                if (is_array($fileHeaderInfo['EXT_RES_ID'])) {
-#debug($fileHeaderInfo['EXT_RES_ID']);
                                        $tokenizedContent = $this->dat['files'][$fileID]['tokenizedContent'];
                                        $tokenSubstituted = FALSE;
 
@@ -2061,8 +2043,6 @@ class tx_impexp {
        function verifyFolderAccess($dirPrefix, $noAlternative=FALSE) {
                $fileProcObj = $this->getFileProcObj();
 
-#$fileProcObj->mounts['1f390e42e1dc46f125310ead30c7bd9d']['path'] = '/var/www/typo3/dev/testsite-3.6.0/fileadmin/user_upload/';
-
                        // Check, if dirPrefix is inside a valid Filemount for user:
                $result = $fileProcObj->checkPathAgainstMounts(PATH_site.$dirPrefix);
 
@@ -2629,7 +2609,6 @@ class tx_impexp {
 
                                        // Add files:
                                if ($info['subst']['type'] == 'file') {
-#debug($info);
                                        $this->addFiles(array($info['file_ID']),$lines,$preCode_B, '', $info['subst']['tokenID']);
                                }
                        }
@@ -2674,13 +2653,10 @@ class tx_impexp {
 
                                                        $pInfo['msg'] = 'LOST RELATION'.(!$doesRE ? ' (Record not found!)' : ' (Path: '.$lostPath.')');
                                                        $Iprepend = '_lost';
-       #                                               debug('MISSING relation: '.$table.':'.$uid);
                                                }
                                        } else {
                                                $pInfo['title'] = htmlspecialchars($record['title']);
                                                $pInfo['title'] = '<span title="'.htmlspecialchars($this->getRecordPath($table==='pages' ? $record['uid'] : $record['pid'])).'">'.$pInfo['title'].'</span>';
-
-                                       #       $pInfo['size'] = $record['size'];
                                        }
                                } else {        // Negative values in relation fields. This is typically sys_language fields, fe_users fields etc. They are static values. They CAN theoretically be negative pointers to uids in other tables but this is so rarely used that it is not supported
                                        $pInfo['title'] = htmlspecialchars('FIXED: '.$pInfo['ref']);
@@ -3097,9 +3073,6 @@ class tx_impexp {
                                                        );
                                                }
                                                unset($importRecord[$fN]);
-                                       } else {
-                                                       // This will tell us if the field is not in the import file, but who cares? It is totally ok that the database contains fields that are not in the import, isn't it (extensions could be installed that added these fields!)?
-                                               #$output[$fN] = '<strong>Field missing</strong> in import file';
                                        }
                                }
                        }
index 5fcc1ce..6d84f92 100644 (file)
@@ -621,10 +621,6 @@ class Tx_IndexedSearch_Controller_SearchController extends Tx_Extbase_MVC_Contro
                                        $file = substr(PATH_tslib, strlen(PATH_site)) . 'media/flags/flag_' . $flag;
                                        $imgInfo = @getimagesize(PATH_site . $file);
 
-                                       // original
-                                       # $file = TYPO3_mainDir.'gfx/flags/'.$flag;
-                                       # $imgInfo = @getimagesize(PATH_site.$file);
-
                                        if (is_array($imgInfo)) {
                                                $output = '<img src="' . $file . '" ' . $imgInfo[3] . ' title="' . htmlspecialchars($languageRow['title']) . '" alt="' . htmlspecialchars($languageRow['title']) . '" />';
                                        }
@@ -747,7 +743,6 @@ class Tx_IndexedSearch_Controller_SearchController extends Tx_Extbase_MVC_Contro
 
                        // Split and combine:
                $parts = preg_split('/'.$regExString.'/i', ' '.$str.' ', 20000, PREG_SPLIT_DELIM_CAPTURE);
-// debug($parts,$regExString);
                        // Constants:
                $summaryMax = 300;
                $postPreLgd = 60;
@@ -829,7 +824,7 @@ class Tx_IndexedSearch_Controller_SearchController extends Tx_Extbase_MVC_Contro
                                // Number of hits on the search
                        'hits'   => intval($count),
                                // Time stamp
-                       'tstamp' => $GLOBALS['EXEC_TIME']                                       
+                       'tstamp' => $GLOBALS['EXEC_TIME']
                );
 
                $GLOBALS['TYPO3_DB']->exec_INSERTquery('index_stat_search', $insertFields);
@@ -838,7 +833,7 @@ class Tx_IndexedSearch_Controller_SearchController extends Tx_Extbase_MVC_Contro
                if ($newId) {
                        foreach ($searchWords as $val) {
                                $insertFields = array(
-                                       'word' => $val['sword'],        // $GLOBALS['TSFE']->csConvObj->conv_case('utf-8', $val['sword'], 'toLower'),
+                                       'word' => $val['sword'],
                                        'index_stat_search_id' => $newId,
                                                // Time stamp
                                        'tstamp' => $GLOBALS['EXEC_TIME'],
@@ -897,10 +892,6 @@ class Tx_IndexedSearch_Controller_SearchController extends Tx_Extbase_MVC_Contro
                                        array('+', 'AND'),
                                        array('|', 'OR'),
                                        array('-', 'AND NOT'),
-                                               // english
-                                       // array('AND', 'AND'),
-                                       // array('OR', 'OR'),
-                                       // array('NOT', 'AND NOT'),
                                                // Add operators for various languages
                                                // Converts the operators to UTF-8 and lowercase
                                        array($GLOBALS['TSFE']->csConvObj->conv_case('utf-8',$GLOBALS['TSFE']->csConvObj->utf8_encode(Tx_Extbase_Utility_Localization::translate('localizedOperandAnd', 'indexed_search'), $GLOBALS['TSFE']->renderCharset), 'toLower'), 'AND'),
index 767b2c6..0c0d537 100644 (file)
@@ -292,7 +292,7 @@ class Tx_IndexedSearch_Domain_Repository_IndexSearchRepository {
                        // Traverse searchwords; for each, select all phash integers and merge/diff/intersect them with previous word (based on operator)
                foreach ($searchWords as $k => $v) {
                                // Making the query for a single search word based on the search-type
-                       $sWord = $v['sword'];   // $GLOBALS['TSFE']->csConvObj->conv_case('utf-8',$v['sword'],'toLower');       // lower-case all of them...
+                       $sWord = $v['sword'];
                        $theType = (string) $this->searchType;
                                // If there are spaces in the search-word, make a full text search instead.
                        if (strstr($sWord,' ')) {
@@ -659,7 +659,7 @@ class Tx_IndexedSearch_Domain_Repository_IndexSearchRepository {
                }
                        // otherwise select all / disable everything
 
-                       // If any of the ranking sortings are selected, we must make a 
+                       // If any of the ranking sortings are selected, we must make a
                        // join with the word/rel-table again, because we need to
                        // calculate ranking based on all search-words found.
                if (substr($this->sortOrder, 0, 5) == 'rank_') {
@@ -711,7 +711,7 @@ class Tx_IndexedSearch_Domain_Repository_IndexSearchRepository {
                                        );
                } else {
 
-                               // Otherwise, if sorting are done with the pages table or other fields, 
+                               // Otherwise, if sorting are done with the pages table or other fields,
                                // there is no need for joining with the rel/word tables:
                        $orderBy = '';
                        switch((string) $this->sortOrder) {
@@ -777,10 +777,8 @@ class Tx_IndexedSearch_Domain_Repository_IndexSearchRepository {
                                $res = FALSE;
                        }
                        if ($res && $GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
-                               #debug("Look up for external media '".$row['data_filename']."': phash:".$row['phash_t3'].' YES - ('.$this->frontendUserGroupList.")!");
                                return TRUE;
                        } else {
-                               #debug("Look up for external media '".$row['data_filename']."': phash:".$row['phash_t3'].' NO - ('.$this->frontendUserGroupList.")!");
                                return FALSE;
                        }
                } else {
@@ -797,14 +795,11 @@ class Tx_IndexedSearch_Domain_Repository_IndexSearchRepository {
                                        $res = FALSE;
                                }
                                if ($res && $GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
-                                       #debug('Checking on it ...'.$row['item_title'].'/'.$row['phash'].' - YES ('.$this->frontendUserGroupList.")");
                                        return TRUE;
                                } else {
-                                       #debug('Checking on it ...'.$row['item_title'].'/'.$row['phash']." - NOPE");
                                        return FALSE;
                                }
                        } else {
-                                       #debug('Resume can be shown, because the document was in fact indexed by this combination of groups!'.$this->frontendUserGroupList.' - '.$row['item_title'].'/'.$row['phash']);
                                return TRUE;
                        }
                }
index 9e6f7e4..d698a79 100755 (executable)
@@ -1139,7 +1139,6 @@ class tx_indexedsearch_indexer {
                                        } else $this->log_setTSlogMessage('Indexing not needed, reason: '.$this->reasons[$check]);
 
                                                // Checking and setting sections:
-               #                       $this->submitFile_grlist($phash_arr['phash']);  // Setting a gr_list record if there is none already (set for default fe_group)
                                        $this->submitFile_section($phash_arr['phash']);         // Setting a section-record for the file. This is done also if the file is not indexed. Notice that section records are deleted when the page is indexed.
                                        $this->log_pull();
                                }
@@ -1274,8 +1273,6 @@ class tx_indexedsearch_indexer {
                        // Setting description
                $maxL = t3lib_utility_Math::forceIntegerInRange($this->conf['index_descrLgd'],0,255,200);
                if ($maxL) {
-                               // Takes the quadruple lenght first, because whitespace and entities may be removed and thus shorten the string more yet.
-       #               $bodyDescription = implode(' ',split('[[:space:],]+',substr(trim($contentArr['body']),0,$maxL*4)));
                        $bodyDescription = str_replace(array(' ',TAB,CR,LF),' ',$contentArr['body']);
 
                                // Shorten the string:
index d59dbe3..6cbdd47 100755 (executable)
@@ -73,7 +73,6 @@ class tx_indexedsearch_lexer {
                        0x3a,   // ":"
                        0x2f,   // "/"
                        0x27,   // "'"
-                       // 0x615,       // ARABIC SMALL HIGH TAH
                ),
                'casesensitive' => FALSE,       // Set, if case sensitive indexing is wanted.
                'removeChars' => array(         // List of unicode numbers of chars that will be removed before words are returned (eg. "-")
@@ -270,7 +269,6 @@ class tx_indexedsearch_lexer {
                                                        if ($printJoinLgd) {
                                                                $len = $printJoinLgd;
                                                        }
-                                                       #debug($cp);
                                                        return TRUE;
                                                } else {        // If a printJoin char is found, record the length if it has not been recorded already:
                                                        if (!$printJoinLgd)     $printJoinLgd = $len;
@@ -316,11 +314,6 @@ class tx_indexedsearch_lexer {
                        // Numeric?
                if (
                                ($cp >= 0x30 && $cp <= 0x39)            // Arabic
-/*
-                               ($cp >= 0x660 && $cp <= 0x669) ||       // Arabic-Indic
-                               ($cp >= 0x6F0 && $cp <= 0x6F9) ||       // Arabic-Indic (Iran, Pakistan, and India)
-                               ($cp >= 0x3021 && $cp <= 0x3029) ||     // Hangzhou
-*/
                        )       {
                        return array('num');
                }
index ba61c44..6237006 100755 (executable)
@@ -64,9 +64,8 @@ class tx_indexedsearch_pihook {
         * @param       array           Array of search words
         * @return      array           Array of first row, result rows, count
         */
-#      function getResultRows($sWArr) {
-
-#      }
+       function getResultRows($sWArr) {
+       }
 
        /**
         * Example of how the content displayed in the result rows can be post processed before rendered into HTML.
index 2b4228b..1e70cf4 100755 (executable)
@@ -391,7 +391,6 @@ class SC_mod_tools_isearch_index {
                                        );
                                }
                        }
-       //              debug($row);
                }
                return $recList;
        }
index ccdb768..5f5eaf4 100755 (executable)
@@ -59,10 +59,6 @@ class tx_indexedsearch extends tslib_pibase {
                Array ('+', 'AND'),
                Array ('|', 'OR'),
                Array ('-', 'AND NOT'),
-                       // english
-#              Array ('AND', 'AND'),
-#              Array ('OR', 'OR'),
-#              Array ('NOT', 'AND NOT'),
        );
 
                // Internal variable
@@ -799,7 +795,7 @@ class tx_indexedsearch extends tslib_pibase {
                        // Traverse searchwords; for each, select all phash integers and merge/diff/intersect them with previous word (based on operator)
                foreach ($sWArr as $k => $v) {
                                // Making the query for a single search word based on the search-type
-                       $sWord = $v['sword'];   // $GLOBALS['TSFE']->csConvObj->conv_case('utf-8',$v['sword'],'toLower');       // lower-case all of them...
+                       $sWord = $v['sword'];
                        $theType = (string)$this->piVars['type'];
                        if (strstr($sWord,' ')) $theType = 20;  // If there are spaces in the search-word, make a full text search instead.
 
@@ -1214,10 +1210,8 @@ class tx_indexedsearch extends tslib_pibase {
                        }
 
                        if ($res && $GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
-                               #debug("Look up for external media '".$row['data_filename']."': phash:".$row['phash_t3'].' YES - ('.$GLOBALS['TSFE']->gr_list.")!");
                                return TRUE;
                        } else {
-                               #debug("Look up for external media '".$row['data_filename']."': phash:".$row['phash_t3'].' NO - ('.$GLOBALS['TSFE']->gr_list.")!");
                                return FALSE;
                        }
                } else {        // Ordinary TYPO3 pages:
@@ -1230,14 +1224,11 @@ class tx_indexedsearch extends tslib_pibase {
                                }
 
                                if ($res && $GLOBALS['TYPO3_DB']->sql_num_rows($res)) {
-                                       #debug('Checking on it ...'.$row['item_title'].'/'.$row['phash'].' - YES ('.$GLOBALS['TSFE']->gr_list.")");
                                        return TRUE;
                                } else {
-                                       #debug('Checking on it ...'.$row['item_title'].'/'.$row['phash']." - NOPE");
                                        return FALSE;
                                }
                        } else {
-                                       #debug('Resume can be shown, because the document was in fact indexed by this combination of groups!'.$GLOBALS['TSFE']->gr_list.' - '.$row['item_title'].'/'.$row['phash']);
                                return TRUE;
                        }
                }
@@ -1299,7 +1290,7 @@ class tx_indexedsearch extends tslib_pibase {
                if ($newId) {
                        foreach ($sWArr as $val) {
                                $insertFields = array(
-                                       'word' => $val['sword'],                // $GLOBALS['TSFE']->csConvObj->conv_case('utf-8', $val['sword'], 'toLower'),
+                                       'word' => $val['sword'],
                                        'index_stat_search_id' => $newId,
                                        'tstamp' => $GLOBALS['EXEC_TIME'],              // Time stamp
                                        'pageid' => $GLOBALS['TSFE']->id        //search page id for indexed search stats
@@ -1934,21 +1925,19 @@ class tx_indexedsearch extends tslib_pibase {
                                        $base = $row['order_val1']*256; // (3 MSB bit, 224 is highest value of order_val1 currently)
                                        $freqNumber = $row['order_val2']/$this->firstRow['order_val2']*pow(2,12);       // 15-3 MSB = 12
                                        $total = t3lib_utility_Math::forceIntegerInRange($base+$freqNumber,0,32767);
-                                       #debug($total);
                                        return ceil(log($total)/log(32767)*100).'%';
                                }
                        break;
                        case 'rank_freq':       // Based on frequency
                                $max = 10000;
                                $total = t3lib_utility_Math::forceIntegerInRange($row['order_val'],0,$max);
-#                              debug($total);
                                return ceil(log($total)/log($max)*100).'%';
                        break;
                        case 'crdate':  // Based on creation date
-                               return $this->cObj->calcAge($GLOBALS['EXEC_TIME'] - $row['item_crdate'],0); // ,$conf['age']
+                               return $this->cObj->calcAge($GLOBALS['EXEC_TIME'] - $row['item_crdate'],0);
                        break;
                        case 'mtime':   // Based on modification time
-                               return $this->cObj->calcAge($GLOBALS['EXEC_TIME'] - $row['item_mtime'],0); // ,$conf['age']
+                               return $this->cObj->calcAge($GLOBALS['EXEC_TIME'] - $row['item_mtime'],0);
                        break;
                        default:        // fx. title
                                return '&nbsp;';
@@ -2017,7 +2006,6 @@ class tx_indexedsearch extends tslib_pibase {
 
                        // Split and combine:
                $parts = preg_split('/'.$regExString.'/i', ' '.$str.' ', 20000, PREG_SPLIT_DELIM_CAPTURE);
-// debug($parts,$regExString);
                        // Constants:
                $summaryMax = 300;
                $postPreLgd = 60;
@@ -2189,10 +2177,6 @@ class tx_indexedsearch extends tslib_pibase {
                                        $file = substr(PATH_tslib,strlen(PATH_site)).'media/flags/flag_'.$flag;
                                        $imgInfo = @getimagesize(PATH_site.$file);
 
-// original
-#                                      $file = TYPO3_mainDir.'gfx/flags/'.$flag;
-#                                      $imgInfo = @getimagesize(PATH_site.$file);
-
                                        if (is_array($imgInfo)) {
                                                $output = '<img src="' . $file . '" ' . $imgInfo[3] . ' title="' . htmlspecialchars($rowDat['title']) . '" alt="' . htmlspecialchars($rowDat['title']) . '" />';
                                                return $output;
index e109b6e..e1e3326 100644 (file)
@@ -86,7 +86,7 @@ class tx_indexedsearch_mysql {
                        // Traverse searchwords and prefix them with corresponding operator
                foreach ($searchWordArray as $searchWordData) {
                                // Making the query for a single search word based on the search-type
-                       $searchWord = $searchWordData['sword']; // $GLOBALS['TSFE']->csConvObj->conv_case('utf-8', $v['sword'], 'toLower');     // lower-case all of them...
+                       $searchWord = $searchWordData['sword'];
                        $wildcard = '';
 
                        if (strstr($searchWord, ' ')) {
index 1fecd42..8e37992 100644 (file)
@@ -56,44 +56,6 @@ abstract class Tx_Install_Updates_Base {
         */
        public $versionNumber;
 
-
-
-       /**
-        *
-        * API functions
-        *
-        **/
-
-       /**
-        * second step: get user input if needed
-        *
-        * @param       string  input prefix, all names of form fields have to start with this. Append custom name in [ ... ]
-        * @return      string  HTML output
-        */
-       // public abstract function getUserInput($inputPrefix);
-
-
-       /**
-        * third step: do the updates
-        *
-        * @param       array           &$dbQueries: queries done in this update
-        * @param       mixed           &$customMessages: custom messages
-        * @return      boolean         whether it worked (TRUE) or not (FALSE)
-        */
-       // public abstract function performUpdate(&$dbQueries, &$customMessages);
-
-       /**
-        * Checks if user input is valid
-        *
-        * @param       string          pointer to output custom messages
-        * @return      boolean         TRUE if user input is correct, then the update is performed. When FALSE, return to getUserInput
-        */
-       // public abstract function checkUserInput(&$customMessages);
-
-
-
-
-
        /**
         *
         * Helper functions, getters and setters
@@ -102,7 +64,7 @@ abstract class Tx_Install_Updates_Base {
 
        /**
         * returns the title attribute
-        * 
+        *
         * @return      the title of this update wizard
         **/
        public function getTitle() {
@@ -115,7 +77,7 @@ abstract class Tx_Install_Updates_Base {
 
        /**
         * sets the title attribute
-        * 
+        *
         * @param       $title  the title of this update wizard
         * @return      void
         **/
@@ -126,7 +88,7 @@ abstract class Tx_Install_Updates_Base {
 
        /**
         * returns the identifier of this class
-        * 
+        *
         * @return      the identifier of this update wizard
         **/
        public function getIdentifier() {
@@ -135,7 +97,7 @@ abstract class Tx_Install_Updates_Base {
 
        /**
         * sets the identifier attribute
-        * 
+        *
         * @param       $identifier     the identifier of this update wizard
         * @return      void
         **/
@@ -176,7 +138,7 @@ abstract class Tx_Install_Updates_Base {
        /**
         * This method creates an instance of a connection to the Extension Manager
         * and returns it. This is used when installing an extension.
-        * 
+        *
         * @return tx_em_Connection_ExtDirectServer EM connection instance
         */
        public function getExtensionManagerConnection() {
index b39b13a..fc93223 100644 (file)
@@ -3018,7 +3018,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
         * @return string Type of compression
         */
        function _checkImageMagickGifCapability($path) {
-               if ($this->config_array['dir_typo3temp']) { //  && !$this->config_array['safemode']
+               if ($this->config_array['dir_typo3temp']) {
                        $tempPath = $this->typo3temp_path;
                        $uniqueName = md5(uniqid(microtime()));
                        $dest = $tempPath.$uniqueName.'.gif';
@@ -4560,7 +4560,6 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                $imageProc->init();
                $imageProc->tempPath = $this->typo3temp_path;
                $imageProc->dontCheckForExistingTempFile=1;
-//             $imageProc->filenamePrefix='install_'.($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5']?"v5":"");
                $imageProc->filenamePrefix='install_';
                $imageProc->dontCompress=1;
                $imageProc->alternativeOutputKey='TYPO3_INSTALL_SCRIPT';
@@ -7209,7 +7208,6 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                        foreach ($TCA as $table => $info) {
                                if (!isset($FDcomp[$table])) {
                                                // If the table was not in the FDcomp-array, the result array is loaded with that table.
-                                       //$extraArr[$table]=$info;
                                        $extraArr[$table]['whole_table']=1;
                                } else {
                                        foreach ($info['columns'] as $fieldN => $fieldC) {
index 54e41b3..a076971 100644 (file)
@@ -1,10 +1,6 @@
 <?php
-
-       // $id$
-
 define('TYPO3_REQUIREMENTS_MINIMUM_PHP', '5.2.0');
 
 define('TYPO3_REQUIREMENTS_MINIMUM_PHP_MEMORY_LIMIT', '32M');
 define('TYPO3_REQUIREMENTS_RECOMMENDED_PHP_MEMORY_LIMIT', '64M');
-
 ?>
\ No newline at end of file
index e7ceac6..6423c4a 100644 (file)
@@ -164,7 +164,6 @@ Reports problems with RTE images';
                ksort($resultArray['missingFiles']);
                ksort($resultArray['doubleFiles']);
                ksort($resultArray['lostFiles']);
-       #       print_r($resultArray);
 
                return $resultArray;
        }
index 751e36c..73f555a 100755 (executable)
@@ -352,8 +352,6 @@ class SC_mod_tools_config_index {
                        'csh' => '',
                        'shortcut' => ''
                );
-                       // CSH
-               //$buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']);
 
                        // Shortcut
                if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
index 01e7324..10a5d82 100755 (executable)
@@ -269,8 +269,6 @@ class SC_mod_tools_dbint_index {
                        'csh' => '',
                        'shortcut' => ''
                );
-                       // CSH
-               //$buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']);
 
                        // Shortcut
                if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
index 51693f3..68cdbb6 100644 (file)
@@ -49,7 +49,6 @@ class tx_recycler_helper {
                // Checking if the user has permissions? (Only working as a precaution, because the final permission check is always down in TCE. But it's good to notify the user on beforehand...)
                // First, resetting flags.
                $hasAccess = 0;
-               $deniedAccessReason = '';
 
                $calcPRec = $row;
                t3lib_BEfunc::fixVersioningPid($table,$calcPRec);
@@ -72,13 +71,6 @@ class tx_recycler_helper {
                        $hasAccess = 0;
                }
 
-               if (!$hasAccess) {
-                       $deniedAccessReason = $GLOBALS['BE_USER']->errorMsg;
-                       if ($deniedAccessReason) {
-                               //fb($deniedAccessReason);
-                       }
-               }
-
                return $hasAccess ? TRUE : FALSE;
        }
 
index 1fb23b9..6d86ccf 100644 (file)
@@ -952,8 +952,6 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
         * @deprecated since TYPO3 4.8, will be removed in TYPO3 4.10
         */
        function buildStyleSheet() {
-                       // This function will be DEPRECATED as of TYPO3 4.8 and will be removed in TYPO3 4.10
-               //t3lib_div::logDeprecatedFunction();
                        // These PageTSConfig properties are DEPRECATED as of TYPO3 4.6 and will be removed in TYPO3 4.8
                $properties = array('mainStyle_font', 'mainStyle_size', 'mainStyle_color', 'mainStyle_bgcolor', 'mainStyleOverride');
                foreach ($properties as $property) {
index 9d8bc61..68c9d72 100644 (file)
@@ -271,7 +271,6 @@ class tx_rtehtmlarea_user {
                                } else {
                                        $title = $GLOBALS['LANG']->sL($title, 1);
                                }
-                               //$lines[]='<tr><td colspan="3" class="bgColor5"><a href="'.t3lib_div::linkThisScript(array('OC_key' => ($openKeys[$openK]?'C|':'O|').$openK, 'editorNo' => $this->editorNo)).'" title="'.$GLOBALS['LANG']->getLL('expand',1).'"><img' . t3lib_iconWorks::skinImg($BACK_PATH,'gfx/ol/'.($openKeys[$openK]?'minus':'plus').'bullet.gif','width="18" height="16"').' title="'.$GLOBALS['LANG']->getLL('expand',1).'" /><strong>'.$title.'</strong></a></td></tr>';
                                $lines[] = '<tr><td colspan="3" class="bgColor5"><a href="#" title="' . $GLOBALS['LANG']->getLL('expand', 1) . '" onClick="jumpToUrl(\'?OC_key=' . ($openKeys[$openK] ? 'C|' : 'O|') . $openK .  '\');return false;"><img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/ol/' . ($openKeys[$openK] ? 'minus' : 'plus') . 'bullet.gif', 'width="18" height="16"') . ' title="' . $GLOBALS['LANG']->getLL('expand', 1) . '" /><strong>' . $title . '</strong></a></td></tr>';
                                $lines[]=$v;
                        }
index 2e8e2ec..64dfd51 100644 (file)
@@ -214,11 +214,6 @@ class user_feAdmin {
                                $this->dataArr = $this->userProcess('evalFunc', $this->dataArr);
                        }
 
-                       /*
-                       debug($this->dataArr);
-                       debug($this->failure);
-                       debug($this->preview);
-                       */
 
                                // if not preview and no failures, then set data...
                        if (!$this->failure && !$this->preview && !t3lib_div::_GP('doNotSave')) {       // doNotSave is a global var (eg a 'Cancel' submit button) that prevents the data from being processed
@@ -468,7 +463,6 @@ class user_feAdmin {
         * @see parseValues()
         */
        function processFiles($cmdParts, $theField) {
-               //debug($_FILES);
                        // First, make an array with the filename and file reference, whether the file is just uploaded or a preview
                $filesArr = array();
 
@@ -1483,14 +1477,14 @@ class user_feAdmin {
                        $this->cObj->sendNotifyEmail(
                                strip_tags($content),
                                $recipient,
-                               '',                     // ($admMail ? '' : $admin),            // If the special administration mail was not found and send, the regular is...
+                               '',
                                $this->conf['email.']['from'],
                                $this->conf['email.']['fromName']
                        );
                } else {
                        $this->sendHTMLMail($content,
                                $recipient,
-                               '',                     // ($admMail ? '' : $admin),            // If the special administration mail was not found and send, the regular is...
+                               '',
                                $this->conf['email.']['from'],
                                $this->conf['email.']['fromName']
                        );
index 5e3ae00..3b261ba 100644 (file)
@@ -191,7 +191,6 @@ GLV_restoreMenu["'.$this->WMid.'"] = "'.$this->WMactiveKey.'";
                                }
                                $GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['layerCounter']++;
                                $zIndex = 10000-$GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['layerCounter'];
-#                              $zIndex = (($key+2)*$this->menuNumber*100);
                                $divStart = '<div id="Menu'.$this->WMid.$key.'" style="z-index:'.$zIndex.';'.$exStyle.'">';
                                $divStop = '</div>';
 
index 78b33c7..e1ac4e6 100644 (file)
@@ -191,7 +191,6 @@ GLV_restoreMenu["'.$this->WMid.'"] = "'.$this->WMactiveKey.'";
                                }
                                $GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['layerCounter']++;
                                $zIndex = 10000-$GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['layerCounter'];
-#                              $zIndex = (($key+2)*$this->menuNumber*100);
                                $divStart = '<div id="Menu'.$this->WMid.$key.'" style="z-index:'.$zIndex.';'.$exStyle.'">';
                                $divStop = '</div>';
 
index b36596f..55908f7 100644 (file)
@@ -113,12 +113,6 @@ class tx_t3editor_codecompletion {
                array_pop($tsParser->config);
                array_pop($tsParser->constants);
 
-               // some of the lines are not clear to me... do we need them?
-               //$tsParser->matchAlternative[] = 'dummydummydummydummydummydummydummydummydummydummydummy';            // This is just here to make sure that at least one element is in the array so that the tsparser actually uses this array to match.
-               //$tsParser->regexMode = $this->pObj->MOD_SETTINGS["ts_browser_regexsearch"];
-               // ??
-               //$tsParser->fixedLgd=$this->pObj->MOD_SETTINGS["ts_browser_fixedLgd"];
-               //$tsParser->matchAlternative = $this->pObj->MOD_SETTINGS['tsbrowser_conditions'];
                $tsParser->linkObjects = TRUE;
                $tsParser->ext_regLinenumbers = FALSE;
                $tsParser->bType=$bType;
index 54b665b..7fd6586 100644 (file)
@@ -153,14 +153,6 @@ class tx_t3editor_TSrefLoader {
                                        }
                                }
                        }
-               } else {  // retrieve typedescription
-                       /*
-                       $descriptions = $type->getElementsByTagName('description');
-                       if($descriptions->length){
-                               $description = $descriptions->item(0)->textContent;
-
-                               return htmlspecialchars($description);
-                       }*/
                }
 
                return '';
index 790a579..33a431c 100644 (file)
@@ -58,7 +58,7 @@ div.CodeMirror-line-numbers {
        position: absolute;
        top: 0; left: 0;
        background-color: #EFEFF4;
-       z-index:190;    
+       z-index:190;
        border:2px solid silver;
        padding:0px;
 }
@@ -66,7 +66,7 @@ div.CodeMirror-line-numbers {
        list-style-type: none;
        padding:0px;
        margin:0px;
-       
+
 }
 .t3e_codeCompleteBox ul li{
        padding-left:2px;
@@ -140,7 +140,6 @@ div.CodeMirror-line-numbers {
 
 .t3e_iframe {
        display: block;
-       /* width: 100%; */
        padding: 0;
 }
 
index f121b2e..dbd538f 100644 (file)
@@ -91,7 +91,6 @@ if (TYPO3_MODE == 'BE' || (TYPO3_MODE == 'FE' && isset($GLOBALS['BE_USER']))) {
                'absDir'             => t3lib_extMgm::extPath($_EXTKEY).'icons/',
                'relDir'             => t3lib_extMgm::extRelPath($_EXTKEY).'icons/',
                'forceFileExtension' => 'gif',  // Force to look for PNG alternatives...
-#              'scaleFactor'        => 2/3,    // Scaling factor, default is 1
                'iconSizeWidth'      => 16,
                'iconSizeHeight'     => 16,
        );
index 82fa8e1..fb09d58 100644 (file)
@@ -72,10 +72,6 @@ table.typo3-dblist tr.c-headLine:hover td {
        background-color: #dedede;
 }
 
-table#typo3-versionSelector {
-       /*background-color: #abbbb4;*/
-}
-
 div#typo3-newRecordLink,
 div.typo3-newRecordLink,
 div.typo3-localizationLink,
index a85adcc..4453e11 100644 (file)
@@ -152,8 +152,6 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                        'csh' => '',
                        'shortcut' => '',
                );
-                       // CSH
-               //$buttons['csh'] = t3lib_BEfunc::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']);
 
                if (($this->id && is_array($this->pageinfo)) || ($GLOBALS['BE_USER']->user['admin'] && !$this->id)) {
                                // Shortcut
@@ -455,9 +453,6 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                                $styleTags[] = 'i';
                        break;
                }
-               if (!strcmp($styleName,'Table Contents/PRE')) {
-                       //$styleTags[]='pre'; // unused yet, but could be <pre> in the future - this is for inline code in the manuals
-               }
                return $styleTags;
        }
 
index bb192e1..1fc65a9 100644 (file)
@@ -159,7 +159,6 @@ class SC_mod_web_ts_index extends t3lib_SCbase {
 
                                // 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 {
@@ -215,7 +214,6 @@ class SC_mod_web_ts_index extends t3lib_SCbase {
 
                                // Setting up the buttons and markers for docheader
                        $docHeaderButtons = $this->getButtons();
-                       // $markers['CSH'] = $docHeaderButtons['csh'];
                        $markers['CONTENT'] = $this->content;
                }
 
index 7d377b6..d65d926 100644 (file)
@@ -98,8 +98,6 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                        $theOutput .= $this->pObj->doc->section("",$manyTemplatesMenu);
                }
 
-               //      debug($GLOBALS['tmpl']->hierarchyInfo);
-
                $GLOBALS['tmpl']->clearList_const_temp = array_flip($GLOBALS['tmpl']->clearList_const);
                $GLOBALS['tmpl']->clearList_setup_temp = array_flip($GLOBALS['tmpl']->clearList_setup);
 
index 7e91ef6..18bd275 100644 (file)
@@ -64,7 +64,6 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
        function displayExample($theOutput) {
                global $tmpl;
                if ($tmpl->helpConfig["imagetag"] || $tmpl->helpConfig["description"] || $tmpl->helpConfig["header"]) {
-       //              $theOutput.=$this->pObj->doc->divider(20);
                        $theOutput.=$this->pObj->doc->spacer(30);
                        $theOutput.=$this->pObj->doc->section($tmpl->helpConfig["header"],
                                '<div align="center">'.$tmpl->helpConfig["imagetag"].'</div><BR>'.
@@ -114,9 +113,6 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                        if (t3lib_div::_POST('submit') || (t3lib_utility_Math::canBeInterpretedAsInteger(t3lib_div::_POST('submit_x')) && t3lib_utility_Math::canBeInterpretedAsInteger(t3lib_div::_POST('submit_y')))) {
                                $tmpl->changed = 0;
                                $tmpl->ext_procesInput(t3lib_div::_POST(), $_FILES, $theConstants, $tplRow);
-               //              debug($tmpl->changed);
-               //              debug($tmpl->raw);
-               //              $tmpl->changed=0;
                                if ($tmpl->changed) {
                                                // Set the data to be saved
                                        $recData=array();
@@ -167,14 +163,6 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
 
                                        // Category and constant editor config:
                        $category = $this->pObj->MOD_SETTINGS["constant_editor_cat"];
-               /*      $TSCE_tmpl = t3lib_div::makeInstance("t3lib_tsparser_ext");     // Defined global here!
-                       $TSCE_tmpl->tt_track = 0;       // Do not log time-performance information
-                       $TSCE_tmpl->init();
-                       $TSCE_tmpl->constants=array($tplRow["constants"]);
-                       debug($tplRow);
-                       $TSCE_tmpl->generateConfig_constants();
-                       debug($TSCE_tmpl->setup);
-                       */
                        $tmpl->ext_getTSCE_config($category);
 
 # NOT WORKING:
index 6cfad09..0c2cdc6 100644 (file)
@@ -372,8 +372,6 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
 
                        $theOutput .= $this->pObj->doc->spacer(10);
 
-                       #$numberOfRows= t3lib_utility_Math::forceIntegerInRange($this->pObj->MOD_SETTINGS["ts_template_editor_TArows"],0,150);
-                       #if (!$numberOfRows)
                        $numberOfRows = 35;
 
                                // If abort pressed, nothing should be edited:
index 7feb273..0cfc16b 100644 (file)
@@ -336,7 +336,6 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                $tmpl->resourceCheck=1;
                $tmpl->uplPath = PATH_site.$tmpl->uplPath;
                $tmpl->removeFromGetFilePath = PATH_site;
-               //debug($tmpl->uplPath);
 
                if ($this->pObj->MOD_SETTINGS["ts_browser_type"]=="const") {
                        $tmpl->ext_constants_BRP=intval(t3lib_div::_GP("breakPointLN"));
index f8f46b4..6908d5a 100644 (file)
@@ -68,7 +68,6 @@ class SC_tce_db {
        var $cacheCmd;          // Cache command sent to ->clear_cacheCmd
        var $redirect;          // Redirect URL. Script will redirect to this location after performing operations (unless errors has occured)
        var $prErr;                     // Boolean. If set, errors will be printed on screen instead of redirection. Should always be used, otherwise you will see no errors if they happen.
-#      var $_disableRTE;
        var $CB;                        // Clipboard command array. May trigger changes in "cmd"
        var $vC;                        // Verification code
        var $uPT;                       // Boolean. Update Page Tree Trigger. If set and the manipulated records are pages then the update page tree signal will be set.
@@ -135,8 +134,6 @@ class SC_tce_db {
                        $this->tce->reverseOrder=1;
                }
 
-#              $this->tce->disableRTE = $this->_disableRTE;
-
                        // Clipboard?
                if (is_array($this->CB)) {
                        $this->include_once[]=PATH_t3lib.'class.t3lib_clipboard.php';
index 4f1adcd..3f34c28 100644 (file)
@@ -616,8 +616,6 @@ class template {
                                $this->pageRenderer->setTemplateFile($file);
                        }
                }
-                       // For debugging: If this outputs "QuirksMode"/"BackCompat" (IE) the browser runs in quirks-mode. Otherwise the value is "CSS1Compat"
-#              $this->JScodeArray[]='alert(document.compatMode);';
 
                        // Send HTTP header for selected charset. Added by Robert Lemke 23.10.2003
                $this->initCharset();
index 4ff4128..272be3e 100644 (file)
@@ -189,9 +189,6 @@ class SC_view_help {
                        $this->content.= $this->render_TOC();
                }
 
-                       // Print close-button:
-#              $this->content.='<br /><form action=""><input type="submit" value="'.htmlspecialchars($GLOBALS['LANG']->getLL('close')).'" onclick="self.close(); return false;" /></form><br/>';
-
                        // End page:
                $this->content.= '<br/>';
                $this->content .= $GLOBALS['TBE_TEMPLATE']->endPage();
@@ -531,9 +528,6 @@ class SC_view_help {
                                        t3lib_div::loadTCA($iP[0]);
 
                                        if (!isset($GLOBALS['TCA'][$iP[0]]) || ((!$iP[1] || is_array($GLOBALS['TCA'][$iP[0]]['columns'][$iP[1]])) && (!$this->limitAccess || ($GLOBALS['BE_USER']->check('tables_select',$iP[0]) && (!$iP[1] || !$GLOBALS['TCA'][$iP[0]]['columns'][$iP[1]]['exclude'] || $GLOBALS['BE_USER']->check('non_exclude_fields',$iP[0].':'.$iP[1]))))))       {       // Checking read access:
-
-                                                       // Load table descriptions:
-                                               #$GLOBALS['LANG']->loadSingleTableDescription($iP[0]);
                                                if (isset($GLOBALS['TCA_DESCR'][$iP[0]])) {
                                                                // Make see-also link:
                                                        $href = ($this->renderALL || ($anchorTable && $iP[0]==$anchorTable) ? '#'.implode('.',$iP) : 'view_help.php?tfID='.rawurlencode(implode('.',$iP)).'&back='.$this->tfID);