[TASK] Whitespace CGL
authorFelix Kopp <felix-source@phorax.com>
Sat, 19 May 2012 11:19:13 +0000 (13:19 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 19 May 2012 19:17:37 +0000 (21:17 +0200)
Corrects several whitespace related issues.

Special focus lies on files
* typo3/class.db_list_extra.inc (127 violations)
* typo3/template.php (148 violations)
* EXT: rtehtmlarea/class.tx_rtehtmlarea_base.php (129 violations)

Sonar / metrics terms to be improved:

* OpeningFunctionBraceKernighanRitchieSpaceBeforeBrace
* FunctionCallArgumentSpacingSpaceBeforeComma
* FunctionCallArgumentSpacingTooMuchSpaceAfterComma
* SemicolonSpacingIncorrect

Change-Id: I18a971c64e62ad976d9da5daf6d9a4d5aa463425
Fixes: #37295
Releases: 6.0
Reviewed-on: http://review.typo3.org/11295
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
122 files changed:
t3lib/class.t3lib_ajax.php
t3lib/class.t3lib_modsettings.php
t3lib/class.t3lib_scbase.php
t3lib/extjs/dataprovider/class.extdirect_dataprovider_beusersettings.php
t3lib/thumbs.php
t3lib/tree/pagetree/class.t3lib_tree_pagetree_node.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/class.db_list_extra.inc
typo3/classes/class.modulemenu.php
typo3/db_new.php
typo3/dummy.php
typo3/file_edit.php
typo3/file_newfolder.php
typo3/file_rename.php
typo3/index.php
typo3/listframe_loader.php
typo3/login_frameset.php
typo3/logout.php
typo3/move_el.php
typo3/show_item.php
typo3/show_rechis.php
typo3/sysext/beuser/class.tx_beuser.php
typo3/sysext/beuser/mod/index.php
typo3/sysext/cms/layout/db_layout.php
typo3/sysext/cms/layout/db_new_content_el.php
typo3/sysext/cms/tslib/class.tslib_eidtools.php
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/cms/tslib/class.tslib_feuserauth.php
typo3/sysext/cms/tslib/class.tslib_gifbuilder.php
typo3/sysext/cms/tslib/class.tslib_menu.php
typo3/sysext/cms/tslib/class.tslib_pagegen.php
typo3/sysext/cms/tslib/class.tslib_pibase.php
typo3/sysext/cms/tslib/class.tslib_search.php
typo3/sysext/cms/tslib/media/scripts/gmenu_foldout.php
typo3/sysext/cms/tslib/media/scripts/gmenu_layers.php
typo3/sysext/cms/tslib/media/scripts/tmenu_layers.php
typo3/sysext/cms/tslib/showpic.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php
typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php
typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php
typo3/sysext/filelist/mod1/file_list.php
typo3/sysext/func/mod1/index.php
typo3/sysext/func_wizards/class.tx_funcwizards_webfunc.php
typo3/sysext/impexp/app/index.php
typo3/sysext/impexp/class.tx_impexp.php
typo3/sysext/impexp/class.tx_impexp_clickmenu.php
typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php
typo3/sysext/indexed_search/class.crawler.php
typo3/sysext/indexed_search/class.indexer.php
typo3/sysext/indexed_search/example/class.crawlerhook.php
typo3/sysext/indexed_search/example/class.pihook.php
typo3/sysext/indexed_search/mod/index.php
typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php
typo3/sysext/indexed_search/modfunc2/class.tx_indexedsearch_modfunc2.php
typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
typo3/sysext/indexed_search_mysql/class.tx_indexedsearch_mysql.php
typo3/sysext/info/mod1/index.php
typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php
typo3/sysext/install/mod/class.tx_install.php
typo3/sysext/install/mod/class.tx_install_ajax.php
typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php
typo3/sysext/lowlevel/class.tx_lowlevel_admin_core.php
typo3/sysext/lowlevel/class.tx_lowlevel_cleaner_core.php
typo3/sysext/lowlevel/clmods/class.cleanflexform.php
typo3/sysext/lowlevel/clmods/class.deleted.php
typo3/sysext/lowlevel/clmods/class.double_files.php
typo3/sysext/lowlevel/clmods/class.lost_files.php
typo3/sysext/lowlevel/clmods/class.missing_files.php
typo3/sysext/lowlevel/clmods/class.missing_relations.php
typo3/sysext/lowlevel/clmods/class.orphan_records.php
typo3/sysext/lowlevel/clmods/class.rte_images.php
typo3/sysext/lowlevel/clmods/class.syslog.php
typo3/sysext/lowlevel/clmods/class.versions.php
typo3/sysext/lowlevel/config/index.php
typo3/sysext/lowlevel/dbint/index.php
typo3/sysext/recordlist/mod1/index.php
typo3/sysext/recycler/classes/model/class.tx_recycler_model_deletedRecords.php
typo3/sysext/rsaauth/sv1/class.tx_rsaauth_sv1.php
typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
typo3/sysext/rtehtmlarea/extensions/TYPO3Color/class.tx_rtehtmlarea_typo3color.php
typo3/sysext/rtehtmlarea/mod3/browse_links.php
typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
typo3/sysext/rtehtmlarea/mod4/select_image.php
typo3/sysext/rtehtmlarea/mod5/class.tx_rtehtmlarea_user.php
typo3/sysext/rtehtmlarea/mod6/class.tx_rtehtmlarea_parse_html.php
typo3/sysext/setup/mod/index.php
typo3/sysext/statictemplates/media/scripts/fe_adminLib.inc
typo3/sysext/statictemplates/media/scripts/gmenu_foldout.php
typo3/sysext/statictemplates/media/scripts/gmenu_layers.php
typo3/sysext/statictemplates/media/scripts/plaintextLib.inc
typo3/sysext/statictemplates/media/scripts/tmenu_layers.php
typo3/sysext/sv/class.tx_sv_auth.php
typo3/sysext/sv/class.tx_sv_loginformhook.php
typo3/sysext/tsconfig_help/mod1/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/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php
typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php
typo3/tce_db.php
typo3/template.php
typo3/view_help.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 1e5a633..140da1b 100644 (file)
@@ -60,7 +60,7 @@ class t3lib_ajax {
        function getJScode($handlerFunction, $fallback = '', $debug = 0) {
                        // Init the XMLHTTP request object
                $code = '
-               function ajax_initObject()      {
+               function ajax_initObject() {
                        var A;
                        try     {
                                A=new ActiveXObject("Msxml2.XMLHTTP");
index 84de535..3aecbaf 100644 (file)
@@ -46,7 +46,7 @@
  *
  * ....
  *
- * function main()     {
+ * function main() {
  *      // reStore settings
  * $store = t3lib_div::makeInstance('t3lib_modSettings');
  * $store->init('tx_dam_select');
index 00fc605..6d6a255 100644 (file)
@@ -51,7 +51,7 @@
  *                      // SC_mod_prototype EXTENDS THE CLASS t3lib_SCbase with a main() and printContent() function:
  *              class SC_mod_prototype extends t3lib_SCbase {
  *                              // MAIN FUNCTION - HERE YOU CREATE THE MODULE CONTENT IN $this->content
- *                      function main()        {
+ *                      function main() {
  *                                      // TYPICALLY THE INTERNAL VAR, $this->doc is instantiated like this:
  *                              $this->doc = t3lib_div::makeInstance('mediumDoc');
  *                                      // TYPICALLY THE INTERNAL VAR, $this->backPath is set like this:
index febef33..e8f0e8f 100644 (file)
@@ -129,7 +129,7 @@ class extDirect_DataProvider_BackendUserSettings {
                if (t3lib_div::inList($list, $value)) {
                        $list = t3lib_div::trimExplode(',', $list, TRUE);
                        $list = t3lib_div::removeArrayEntryByValue($list, $value);
-                       $this->set($key, implode(',' ,$list));
+                       $this->set($key, implode(','$list));
                }
        }
 
index 4dddada..5eafdc0 100644 (file)
@@ -48,7 +48,7 @@ class SC_t3lib_thumbs {
 
        var $outdir = 'typo3temp/';             // The output directory of temporary files in PATH_site
        var $output = '';
-       var $sizeDefault='64x64';
+       var $sizeDefault = '64x64';
 
        var $imageList;         // Coming from $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext']
        /**
@@ -93,30 +93,30 @@ class SC_t3lib_thumbs {
                        $relativeFilePath = $filePathOrCombinedFileIdentifier; // We assume the FilePath to be a relative file path (as in backwards compatibility mode)
 
                                // The incoming relative path is relative to the typo3/ directory, but we need it relative to PATH_site. This is corrected here:
-                       if (substr($relativeFilePath, 0, 3)=='../') {
-                               $relativeFilePath = substr($relativeFilePath,3);
+                       if (substr($relativeFilePath, 0, 3) == '../') {
+                               $relativeFilePath = substr($relativeFilePath, 3);
                        } else {
-                               $relativeFilePath = 'typo3/'.$relativeFilePath;
+                               $relativeFilePath = 'typo3/' . $relativeFilePath;
                        }
 
                        $relativeFilePath = ltrim($relativeFilePath, '/');
                        $mTime = 0;
 
                                // Checking for backpath and double slashes + the thumbnail can be made from files which are in the PATH_site OR the lockRootPath only!
-                       if (t3lib_div::isAllowedAbsPath(PATH_site.$relativeFilePath)) {
-                               $mTime = filemtime(PATH_site.$relativeFilePath);
+                       if (t3lib_div::isAllowedAbsPath(PATH_site . $relativeFilePath)) {
+                               $mTime = filemtime(PATH_site . $relativeFilePath);
                        }
 
                        if(strstr($relativeFilePath, '../') !== FALSE) {
                                $this->errorGif('File path', 'must not contain', '"../"'); // Maybe this could be relaxed to not throw an error as long as the path is still within PATH_site
                        }
 
-                       if ($relativeFilePath && file_exists(PATH_site.$relativeFilePath)) {
+                       if ($relativeFilePath && file_exists(PATH_site . $relativeFilePath)) {
                                        // Check file extension:
                                $reg = array();
                                if (preg_match('/(.*)\.([^\.]*$)/', $relativeFilePath, $reg)) {
-                                       $ext=strtolower($reg[2]);
-                                       $ext=($ext=='jpeg') ? 'jpg' : $ext;
+                                       $ext = strtolower($reg[2]);
+                                       $ext = ($ext=='jpeg') ? 'jpg' : $ext;
                                        if (!t3lib_div::inList($this->imageList, $ext)) {
                                                $this->errorGif('Not imagefile!', $ext, basename($relativeFilePath));
                                        }
@@ -131,14 +131,14 @@ class SC_t3lib_thumbs {
                        $OK = FALSE;
                        if ($mTime) {
                                        // Always use the absolute path for this check!
-                               $check = basename($relativeFilePath).':'.$mTime.':'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
+                               $check = basename($relativeFilePath) . ':' . $mTime . ':' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
                                $md5_real = t3lib_div::shortMD5($check);
-                               if (!strcmp($md5_real,$md5sum)) {
+                               if (!strcmp($md5_real, $md5sum)) {
                                        $OK = TRUE;
                                }
                        }
 
-                       $combinedIdentifier = '0:'.$relativeFilePath;
+                       $combinedIdentifier = '0:' . $relativeFilePath;
                } else {
                        $combinedIdentifier = $filePathOrCombinedFileIdentifier;
                        $OK = FALSE;
@@ -262,7 +262,7 @@ class SC_t3lib_thumbs {
         * @param       string          Text line 3
         * @return      void
         */
-       function errorGif($l1,$l2,$l3) {
+       function errorGif($l1, $l2, $l3) {
                if (!$GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib']) {
                        throw new RuntimeException(
                                'TYPO3 Fatal Error: No gdlib. ' . $l1 . ' ' . $l2 . ' ' . $l3,
@@ -283,8 +283,8 @@ class SC_t3lib_thumbs {
                $black = imageColorAllocate($im, 0, 0, 0);
 
                        // Prints the text strings with the build-in font functions of GD
-               $x=0;
-               $font=0;
+               $x = 0;
+               $font = 0;
                if ($l1) {
                        imagefilledrectangle($im, $x, 9, 56, 16, $white);
                        imageString($im, $font, $x, 9, $l1, $black);
index a4bc3cc..c32f9b5 100644 (file)
@@ -203,7 +203,7 @@ class t3lib_tree_pagetree_Node extends t3lib_tree_extdirect_Node {
         *
         * @return bool
         */
-       protected function canRemove()  {
+       protected function canRemove() {
                if (!isset($this->cachedAccessRights['remove'])) {
                        $this->cachedAccessRights['remove'] =
                                $GLOBALS['BE_USER']->doesUserHaveAccess($this->record, 4);
index bd9d467..e71248d 100644 (file)
@@ -89,7 +89,7 @@ class clickMenu {
         *
         * @return      string          The clickmenu HTML content
         */
-       function init() {
+       function init() {
                        // Setting GPvars:
                $this->cmLevel = intval(t3lib_div::_GP('cmLevel'));
                $this->CB = t3lib_div::_GP('CB');
@@ -144,8 +144,8 @@ class clickMenu {
         *
         * @return      boolean
         */
-       function doDisplayTopFrameCM()  {
-               if($this->ajax) {
+       function doDisplayTopFrameCM() {
+               if ($this->ajax)        {
                        return FALSE;
                } else {
                        return !$GLOBALS['SOBE']->doc->isCMlayers() || !$this->dontDisplayTopFrameCM;
@@ -1526,7 +1526,7 @@ class clickMenu {
         *
         * @return      boolean
         */
-       function isCMlayers()   {
+       function isCMlayers() {
                if($this->ajax) {
                        return !$this->CB;
                } else {
@@ -1584,7 +1584,7 @@ class SC_alt_clickmenu {
         *
         * @return      void
         */
-       function init() {
+       function init() {
 
                        // Setting GPvars:
                $this->backPath = t3lib_div::_GP('backPath');
@@ -1680,7 +1680,7 @@ class SC_alt_clickmenu {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                $this->ajax = t3lib_div::_GP('ajax') ? TRUE : FALSE;
 
                        // Initialize Clipboard object:
@@ -1716,7 +1716,7 @@ class SC_alt_clickmenu {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                if (!$this->ajax)       {
                        $this->content.= $this->doc->endPage();
                        $this->content = $this->doc->insertStylesAndJS($this->content);
index ef93bce..b55cf63 100644 (file)
@@ -75,7 +75,7 @@ class SC_alt_db_navframe {
         *
         * @return      void
         */
-       function init() {
+       function init() {
 
                        // Setting backPath
                $this->backPath = $GLOBALS['BACK_PATH'];
@@ -180,7 +180,7 @@ class SC_alt_db_navframe {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // Produce browse-tree:
                $tree = $this->pagetree->getBrowsableTree();
@@ -247,7 +247,7 @@ class SC_alt_db_navframe {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -256,7 +256,7 @@ class SC_alt_db_navframe {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
                $buttons = array(
                        'csh' => '',
                        'new_page' => '',
index a684e25..22ab2ca 100644 (file)
@@ -139,7 +139,7 @@ class SC_alt_doc {
         *
         * @return      void
         */
-       function preInit()      {
+       function preInit() {
                if (t3lib_div::_GP('justLocalized'))    {
                        $this->localizationRedirect(t3lib_div::_GP('justLocalized'));
                }
@@ -201,7 +201,7 @@ class SC_alt_doc {
         *
         * @return      boolean         TRUE, then save the document (data submitted)
         */
-       function doProcessData()        {
+       function doProcessData() {
                $out = $this->doSave || isset($_POST['_savedok_x']) || isset($_POST['_saveandclosedok_x']) || isset($_POST['_savedokview_x']) || isset($_POST['_savedoknew_x']) || isset($_POST['_translation_savedok_x']) || isset($_POST['_translation_savedokclear_x']);
                return $out;
        }
@@ -212,7 +212,7 @@ class SC_alt_doc {
         *
         * @return      void
         */
-       function processData()  {
+       function processData() {
                        // GPvars specifically for processing:
                $this->data = t3lib_div::_GP('data');
                $this->cmd = t3lib_div::_GP('cmd');
@@ -368,7 +368,7 @@ class SC_alt_doc {
         *
         * @return      void
         */
-       function init() {
+       function init() {
 
                        // Setting more GPvars:
                $this->popViewId = t3lib_div::_GP('popViewId');
@@ -461,7 +461,7 @@ class SC_alt_doc {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // Begin edit:
                if (is_array($this->editconf))  {
@@ -540,7 +540,7 @@ class SC_alt_doc {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -574,7 +574,7 @@ class SC_alt_doc {
         *
         * @return      string          HTML form elements wrapped in tables
         */
-       function makeEditForm() {
+       function makeEditForm() {
 
                        // Initialize variables:
                $this->elementsData=array();
@@ -771,7 +771,7 @@ class SC_alt_doc {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
                $buttons = array(
                        'save' => '',
                        'save_view' => '',
@@ -930,7 +930,7 @@ class SC_alt_doc {
         *
         * @return      string          HTML for function menus.
         */
-       function functionMenus()        {
+       function functionMenus() {
                if ($GLOBALS['BE_USER']->getTSConfigVal('options.enableShowPalettes')) {
                        // Show palettes:
                        return '
@@ -957,7 +957,7 @@ class SC_alt_doc {
         *
         * @return      string
         */
-       function shortCutLink() {
+       function shortCutLink() {
                if ($this->returnUrl == 'close.html' || !$GLOBALS['BE_USER']->mayMakeShortcut()) {
                        return '';
                }
@@ -970,7 +970,7 @@ class SC_alt_doc {
         *
         * @return      string
         */
-       function openInNewWindowLink()  {
+       function openInNewWindowLink() {
                if ($this->returnUrl == 'close.html') {
                        return '';
                }
@@ -986,7 +986,7 @@ class SC_alt_doc {
         *
         * @return      void
         */
-       function tceformMessages()      {
+       function tceformMessages() {
                if (count($this->tceforms->commentMessages))    {
                        $tceformMessages = '
                                <!-- TCEFORM messages
@@ -1304,7 +1304,7 @@ class SC_alt_doc {
         *
         * @return      void
         */
-       function editRegularContentFromId()     {
+       function editRegularContentFromId() {
                if (t3lib_extMgm::isLoaded('cms'))      {
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                                                'uid',
@@ -1334,7 +1334,7 @@ class SC_alt_doc {
         * @return      void
         * @see makeDocSel()
         */
-       function compileStoreDat()      {
+       function compileStoreDat() {
                $this->storeArray = t3lib_div::compileSelectedGetVarsFromArray('edit,defVals,overrideVals,columnsOnly,disHelp,noView,editRegularContentFromId',$this->R_URL_getvars);
                $this->storeUrl = t3lib_div::implodeArrayForUrl('',$this->storeArray);
                $this->storeUrlMd5 = md5($this->storeUrl);
index 9509e13..cbc80ba 100644 (file)
@@ -72,7 +72,7 @@ class SC_alt_doc_nodoc {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                        // Start the template object:
                $this->doc = t3lib_div::makeInstance('mediumDoc');
                $this->doc->bodyTagMargins['x']=5;
@@ -108,7 +108,7 @@ class SC_alt_doc_nodoc {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                $msg=array();
 
                        // Add a message, telling that no documents were open...
@@ -162,7 +162,7 @@ class SC_alt_doc_nodoc {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                $this->content.= $this->doc->endPage();
                $this->content = $this->doc->insertStylesAndJS($this->content);
                echo $this->content;
index 6e3aa67..a4d2fc6 100644 (file)
@@ -74,7 +74,7 @@ class SC_alt_file_navframe {
         *
         * @return      void
         */
-       function init() {
+       function init() {
 
                        // Setting backPath
                $this->backPath = $GLOBALS['BACK_PATH'];
@@ -193,7 +193,7 @@ class SC_alt_file_navframe {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // Produce browse-tree:
                $tree = $this->foldertree->getBrowsableTree();
@@ -233,7 +233,7 @@ class SC_alt_file_navframe {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -242,7 +242,7 @@ class SC_alt_file_navframe {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
                $buttons = array(
                        'csh' => '',
                        'refresh' => '',
index 7b1fb47..9f2cdb0 100644 (file)
@@ -104,7 +104,7 @@ class SC_alt_shortcut {
         *
         * @return      void
         */
-       function preinit()      {
+       function preinit() {
                        // Setting GPvars:
                $this->isAjaxCall             = (boolean) t3lib_div::_GP('ajax');
                $this->modName                = t3lib_div::_GP('modName');
@@ -130,7 +130,7 @@ class SC_alt_shortcut {
         *
         * @return      void
         */
-       function preprocess()   {
+       function preprocess() {
                $description = '';      // Default description
                $url = urldecode($this->URL);
                $queryParts = parse_url($url);
@@ -213,7 +213,7 @@ class SC_alt_shortcut {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
                $this->doc->form='<form action="alt_shortcut.php" name="shForm" method="post">';
@@ -254,7 +254,7 @@ class SC_alt_shortcut {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // By default, 5 groups are set
                $this->groupLabels=array(
@@ -446,7 +446,7 @@ class SC_alt_shortcut {
         *
         * @return      void
         */
-       function editLoadedFunc()       {
+       function editLoadedFunc() {
                $this->editLoaded=0;
                if (is_array($this->editSC_rec) && ($this->editSC_rec['sc_group']>=0 || $GLOBALS['BE_USER']->isAdmin()))        {       // sc_group numbers below 0 requires admin to edit those. sc_group numbers above zero must always be owned by the user himself.
                        $this->editLoaded=1;
@@ -527,7 +527,7 @@ class SC_alt_shortcut {
         *
         * @return      void
         */
-       function editPageIdFunc()       {
+       function editPageIdFunc() {
                if (!t3lib_extMgm::isLoaded('cms'))     return;
 
                        // EDIT page:
@@ -579,7 +579,7 @@ class SC_alt_shortcut {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                $content = '';
 
                $this->content.= $this->doc->endPage();
@@ -640,7 +640,7 @@ class SC_alt_shortcut {
         *
         * @return      string          HTML
         */
-       function workspaceSelector()    {
+       function workspaceSelector() {
 
                        // Changing workspace and if so, reloading entire backend:
                if (strlen($this->changeWorkspace))     {
index 4a3da38..930211f 100644 (file)
@@ -191,7 +191,7 @@ class TYPO3backend {
         *
         * @return      void
         */
-       public function render()        {
+       public function render() {
                $this->executeHook('renderPreProcess');
 
                        // prepare the scaffolding, at this point extension may still add javascript and css
@@ -624,7 +624,7 @@ class TYPO3backend {
         *
         * @return      void
         */
-       protected function handlePageEditing()  {
+       protected function handlePageEditing() {
 
                if(!t3lib_extMgm::isLoaded('cms'))      {
                        return;
index cb586a9..782df1d 100644 (file)
@@ -96,7 +96,7 @@ class SC_browse_links {
         *
         * @return      void
         */
-       function init ()        {
+       function init() {
 
                        // Find "mode"
                $this->mode = t3lib_div::_GP('mode');
@@ -116,7 +116,7 @@ class SC_browse_links {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                // Clear temporary DB mounts
                $tmpMount = t3lib_div::_GET('setTempDBmount');
@@ -215,7 +215,7 @@ class SC_browse_links {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 }
index aa4948c..2409c56 100644 (file)
@@ -60,7 +60,7 @@ class SC_browser {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // Setting GPvars:
                $mode =t3lib_div::_GP('mode');
@@ -114,7 +114,7 @@ class SC_browser {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 }
index c4195ba..580deb9 100644 (file)
@@ -95,8 +95,7 @@ class TBE_browser_recordList extends localRecordList {
                        ((!$exclList || !t3lib_div::inList($exclList,'sortField')) && $this->sortField?'&sortField='.rawurlencode($this->sortField):'').
                        ((!$exclList || !t3lib_div::inList($exclList,'sortRev')) && $this->sortRev?'&sortRev='.rawurlencode($this->sortRev):'').
                                // extra:
-                       $this->ext_addP()
-                       ;
+                       $this->ext_addP();
        }
 
        /**
@@ -104,7 +103,7 @@ class TBE_browser_recordList extends localRecordList {
         *
         * @return      string
         */
-       function ext_addP()     {
+       function ext_addP() {
                $str = '&act='.$GLOBALS['SOBE']->browser->act.
                                '&mode='.$GLOBALS['SOBE']->browser->mode.
                                '&expandPage='.$GLOBALS['SOBE']->browser->expandPage.
@@ -695,7 +694,7 @@ class browse_links {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                        // Main GPvars:
                $this->pointer           = t3lib_div::_GP('pointer');
                $this->bparams           = t3lib_div::_GP('bparams');
@@ -1640,7 +1639,7 @@ class browse_links {
         *
         * @return      string          HTML content for the module
         */
-       function main_db()      {
+       function main_db() {
 
                        // Starting content:
                $content=$this->doc->startPage('TBE record selector');
@@ -1688,7 +1687,7 @@ class browse_links {
         *
         * @return      string          HTML content for the module
         */
-       function main_file()    {
+       function main_file() {
                        // include JS files and set prefs for foldertree
                $this->doc->getDragDropCode('folders');
                $this->doc->JScode .= $this->doc->wrapScriptTags('
@@ -1883,12 +1882,12 @@ class browse_links {
         *
         * @return      string          HTML output. Returns content only if the ->expandPage value is set (pointing to a page uid to show tt_content records from ...)
         */
-       function expandPage()   {
-               $out='';
+       function expandPage() {
+               $out = '';
                $expPageId = $this->expandPage;         // Set page id (if any) to expand
 
                        // If there is an anchor value (content element reference) in the element reference, then force an ID to expand:
-               if (!$this->expandPage && $this->curUrlInfo['cElement'])        {
+               if (!$this->expandPage && $this->curUrlInfo['cElement']) {
                        $expPageId = $this->curUrlInfo['pageid'];       // Set to the current link page id.
                }
 
index 370879e..cd30c12 100644 (file)
 class localRecordList extends recordList {
 
                // External:
-       var $alternateBgColors=FALSE;                   // If TRUE, table rows in the list will alternate in background colors (and have background colors at all!)
-       var $allowedNewTables=array();                  // Used to indicate which tables (values in the array) that can have a create-new-record link. If the array is empty, all tables are allowed.
-       var $deniedNewTables=array();                   // Used to indicate which tables (values in the array) that cannot have a create-new-record link. If the array is empty, all tables are allowed.
-       var $newWizards=FALSE;                                  // If TRUE, the control panel will contain links to the create-new wizards for pages and tt_content elements (normally, the link goes to just creating a new element without the wizards!).
+       var $alternateBgColors = FALSE;                 // If TRUE, table rows in the list will alternate in background colors (and have background colors at all!)
+       var $allowedNewTables = array();                        // Used to indicate which tables (values in the array) that can have a create-new-record link. If the array is empty, all tables are allowed.
+       var $deniedNewTables = array();                 // Used to indicate which tables (values in the array) that cannot have a create-new-record link. If the array is empty, all tables are allowed.
+       var $newWizards = FALSE;                                        // If TRUE, the control panel will contain links to the create-new wizards for pages and tt_content elements (normally, the link goes to just creating a new element without the wizards!).
 
-       var $dontShowClipControlPanels=FALSE;   // If TRUE, will disable the rendering of clipboard + control panels.
-       var $showClipboard=FALSE;                               // If TRUE, will show the clipboard in the field list.
+       var $dontShowClipControlPanels = FALSE; // If TRUE, will disable the rendering of clipboard + control panels.
+       var $showClipboard = FALSE;                             // If TRUE, will show the clipboard in the field list.
        var $noControlPanels = FALSE;                   // If TRUE, will DISABLE all control panels in lists. (Takes precedence)
        var $clickMenuEnabled = TRUE;                   // If TRUE, clickmenus will be rendered
 
@@ -105,7 +105,7 @@ class localRecordList extends recordList {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       public function getButtons()    {
+       public function getButtons() {
                $buttons = array(
                        'csh' => '',
                        'view' => '',
@@ -245,38 +245,45 @@ class localRecordList extends recordList {
 
                        // Cleaning rowlist for duplicates and place the $titleCol as the first column always!
                $this->fieldArray=array();
+
                        // title Column
                $this->fieldArray[] = $titleCol;        // Add title column
+
                        // Control-Panel
-               if (!t3lib_div::inList($rowlist,'_CONTROL_'))   {
+               if (!t3lib_div::inList($rowlist, '_CONTROL_')) {
                        $this->fieldArray[] = '_CONTROL_';
                        $this->fieldArray[] = '_AFTERCONTROL_';
                }
+
                        // Clipboard
-               if ($this->showClipboard)       {
+               if ($this->showClipboard) {
                        $this->fieldArray[] = '_CLIPBOARD_';
                }
+
                        // Ref
-               if (!$this->dontShowClipControlPanels)  {
+               if (!$this->dontShowClipControlPanels) {
                        $this->fieldArray[]='_REF_';
                        $this->fieldArray[]='_AFTERREF_';
                }
+
                        // Path
-               if ($this->searchLevels)        {
+               if ($this->searchLevels) {
                        $this->fieldArray[]='_PATH_';
                }
+
                        // Localization
-               if ($this->localizationView && $l10nEnabled)    {
+               if ($this->localizationView && $l10nEnabled) {
                        $this->fieldArray[] = '_LOCALIZATION_';
                        $this->fieldArray[] = '_LOCALIZATION_b';
-                       $addWhere.=' AND (
+                       $addWhere .= ' AND (
                                ' . $GLOBALS['TCA'][$table]['ctrl']['languageField'] . '<=0
                                OR
                                ' . $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] . ' = 0
                        )';
                }
+
                        // Cleaning up:
-               $this->fieldArray=array_unique(array_merge($this->fieldArray,t3lib_div::trimExplode(',',$rowlist,1)));
+               $this->fieldArray=array_unique(array_merge($this->fieldArray, t3lib_div::trimExplode(',', $rowlist, 1)));
                if ($this->noControlPanels)     {
                        $tempArray = array_flip($this->fieldArray);
                        unset($tempArray['_CONTROL_']);
@@ -289,8 +296,8 @@ class localRecordList extends recordList {
                $selectFields[] = 'uid';
                $selectFields[] = 'pid';
                if ($thumbsCol) $selectFields[] = $thumbsCol;   // adding column for thumbnails
-               if ($table=='pages')    {
-                       if (t3lib_extMgm::isLoaded('cms'))      {
+               if ($table=='pages') {
+                       if (t3lib_extMgm::isLoaded('cms')) {
                                $selectFields[] = 'module';
                                $selectFields[] = 'extendToSubpages';
                                $selectFields[] = 'nav_hide';
@@ -312,11 +319,11 @@ class localRecordList extends recordList {
                        $selectFields[] = 't3ver_wsid';
                        $selectFields[] = 't3ver_swapmode';             // Filtered out when pages in makeFieldList()
                }
-               if ($l10nEnabled)       {
+               if ($l10nEnabled) {
                        $selectFields[] = $GLOBALS['TCA'][$table]['ctrl']['languageField'];
                        $selectFields[] = $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'];
                }
-               if ($GLOBALS['TCA'][$table]['ctrl']['label_alt'])       {
+               if ($GLOBALS['TCA'][$table]['ctrl']['label_alt']) {
                        $selectFields = array_merge(
                                $selectFields,
                                t3lib_div::trimExplode(',', $GLOBALS['TCA'][$table]['ctrl']['label_alt'], 1)
@@ -404,17 +411,19 @@ class localRecordList extends recordList {
                }
 
                        // If any records was selected, render the list:
-               if ($dbCount)   {
+               if ($dbCount) {
 
                                // Half line is drawn between tables:
-                       if (!$listOnlyInSingleTableMode)        {
+                       if (!$listOnlyInSingleTableMode) {
                                $theData = Array();
                                if (!$this->table && !$rowlist) {
-                                       $theData[$titleCol] = '<img src="clear.gif" width="'.($GLOBALS['SOBE']->MOD_SETTINGS['bigControlPanel']?'230':'350').'" height="1" alt="" />';
-                                       if (in_array('_CONTROL_',$this->fieldArray))    $theData['_CONTROL_']='';
-                                       if (in_array('_CLIPBOARD_',$this->fieldArray))  $theData['_CLIPBOARD_']='';
+                                       $theData[$titleCol] = '<img src="clear.gif" width="' . ($GLOBALS['SOBE']->MOD_SETTINGS['bigControlPanel'] ? '230' : '350') . '" height="1" alt="" />';
+                                       if (in_array('_CONTROL_', $this->fieldArray))
+                                               $theData['_CONTROL_']='';
+                                       if (in_array('_CLIPBOARD_', $this->fieldArray))
+                                               $theData['_CLIPBOARD_']='';
                                }
-                               $out.=$this->addelement(0,'',$theData,'class="c-table-row-spacer"',$this->leftMargin);
+                               $out .= $this->addelement(0, '', $theData, 'class="c-table-row-spacer"', $this->leftMargin);
                        }
 
                        $tableTitle = $GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['ctrl']['title'], TRUE);
@@ -423,14 +432,13 @@ class localRecordList extends recordList {
                        }
                                // Header line is drawn
                        $theData = array();
-                       if ($this->disableSingleTableView)      {
+                       if ($this->disableSingleTableView) {
                                $theData[$titleCol] = '<span class="c-table">' .
                                                t3lib_BEfunc::wrapInHelp($table, '', $tableTitle) .
                                                '</span> (' . $this->totalItems . ')';
                        } else {
                                $theData[$titleCol] = $this->linkWrapTable($table, '<span class="c-table">' . $tableTitle . '</span> (' . $this->totalItems . ') ' .
-                                               ($this->table ? t3lib_iconWorks::getSpriteIcon('actions-view-table-collapse', array('title' => $GLOBALS['LANG']->getLL('contractView', TRUE))) : t3lib_iconWorks::getSpriteIcon('actions-view-table-expand', array('title' => $GLOBALS['LANG']->getLL('expandView', TRUE))))
-                                       );
+                                       ($this->table ? t3lib_iconWorks::getSpriteIcon('actions-view-table-collapse', array('title' => $GLOBALS['LANG']->getLL('contractView', TRUE))) : t3lib_iconWorks::getSpriteIcon('actions-view-table-expand', array('title' => $GLOBALS['LANG']->getLL('expandView', TRUE)))));
                        }
 
                        if ($listOnlyInSingleTableMode) {
@@ -506,28 +514,28 @@ class localRecordList extends recordList {
                                $iOut = '';
                                $cc = 0;
 
-                               foreach($accRows as $row)       {
+                               foreach($accRows as $row) {
                                        // Render item row if counter < limit
                                        if ($cc < $this->iLimit) {
                                                $cc++;
                                                $this->translations = FALSE;
-                                               $iOut.= $this->renderListRow($table,$row,$cc,$titleCol,$thumbsCol);
+                                               $iOut.= $this->renderListRow($table, $row, $cc, $titleCol, $thumbsCol);
 
                                                        // If localization view is enabled it means that the selected records are either default or All language and here we will not select translations which point to the main record:
-                                               if ($this->localizationView && $l10nEnabled)    {
+                                               if ($this->localizationView && $l10nEnabled) {
                                                                // For each available translation, render the record:
                                                        if (is_array($this->translations)) {
                                                                foreach ($this->translations as $lRow) {
                                                                                // $lRow isn't always what we want - if record was moved we've to work with the placeholder records otherwise the list is messed up a bit
                                                                        if ($row['_MOVE_PLH_uid'] && $row['_MOVE_PLH_pid']) {
                                                                                $tmpRow = t3lib_BEfunc::getRecordRaw($table, 't3ver_move_id="'.intval($lRow['uid']) . '" AND pid="' . $row['_MOVE_PLH_pid'] . '" AND t3ver_wsid=' . $row['t3ver_wsid'] . t3lib_beFunc::deleteClause($table), $selFieldList);
-                                                                               $lRow = is_array($tmpRow)?$tmpRow:$lRow;
+                                                                               $lRow = is_array($tmpRow) ? $tmpRow : $lRow;
                                                                        }
                                                                                // In offline workspace, look for alternative record:
                                                                        t3lib_BEfunc::workspaceOL($table, $lRow, $GLOBALS['BE_USER']->workspace, TRUE);
                                                                        if (is_array($lRow) && $GLOBALS['BE_USER']->checkLanguageAccess($lRow[$GLOBALS['TCA'][$table]['ctrl']['languageField']])) {
                                                                                $currentIdList[] = $lRow['uid'];
-                                                                               $iOut.=$this->renderListRow($table,$lRow,$cc,$titleCol,$thumbsCol,18);
+                                                                               $iOut .= $this->renderListRow($table, $lRow, $cc, $titleCol, $thumbsCol, 18);
                                                                        }
                                                                }
                                                        }
@@ -556,7 +564,7 @@ class localRecordList extends recordList {
                                }
 
                                        // The header row for the table is now created:
-                               $out .= $this->renderListHeader($table,$currentIdList);
+                               $out .= $this->renderListHeader($table, $currentIdList);
                        }
 
                                // The list of records is added after the header:
@@ -610,10 +618,10 @@ class localRecordList extends recordList {
         * @access private
         * @see getTable()
         */
-       function renderListRow($table,$row,$cc,$titleCol,$thumbsCol,$indent=0)  {
+       function renderListRow($table, $row, $cc, $titleCol, $thumbsCol, $indent = 0) {
                $iOut = '';
 
-               if (strlen($this->searchString))        {       // If in search mode, make sure the preview will show the correct page
+               if (strlen($this->searchString)) {      // If in search mode, make sure the preview will show the correct page
                        $id_orig = $this->id;
                        $this->id = $row['pid'];
                }
@@ -630,28 +638,28 @@ class localRecordList extends recordList {
 
                                // Background color, if any:
                        if ($this->alternateBgColors) {
-                               $row_bgColor = ($cc%2) ? ' class="db_list_normal'.$rowSpecial.'"' : ' class="db_list_alt'.$rowSpecial.'"';
+                               $row_bgColor = ($cc%2) ? ' class="db_list_normal' . $rowSpecial . '"' : ' class="db_list_alt' . $rowSpecial . '"';
                        } else {
-                               $row_bgColor = ' class="db_list_normal'.$rowSpecial.'"';
+                               $row_bgColor = ' class="db_list_normal' . $rowSpecial . '"';
                        }
                                // Overriding with versions background color if any:
-                       $row_bgColor = $row['_CSSCLASS'] ? ' class="'.$row['_CSSCLASS'].'"' : $row_bgColor;
+                       $row_bgColor = $row['_CSSCLASS'] ? ' class="' . $row['_CSSCLASS'] . '"' : $row_bgColor;
 
                                // Incr. counter.
                        $this->counter++;
 
                                // The icon with link
-                       $alttext = t3lib_BEfunc::getRecordIconAltText($row,$table);
+                       $alttext = t3lib_BEfunc::getRecordIconAltText($row, $table);
                        $iconImg = t3lib_iconWorks::getSpriteIconForRecord($table, $row, array('title' => htmlspecialchars($alttext), 'style' => ($indent ? ' margin-left: ' . $indent . 'px;' : '')));
 
 
-                       $theIcon = $this->clickMenuEnabled ? $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg,$table,$row['uid']) : $iconImg;
+                       $theIcon = $this->clickMenuEnabled ? $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, $table, $row['uid']) : $iconImg;
 
                                // Preparing and getting the data-array
                        $theData = Array();
                        foreach($this->fieldArray as $fCol)     {
-                               if ($fCol==$titleCol)   {
-                                       $recTitle = t3lib_BEfunc::getRecordTitle($table,$row,FALSE,TRUE);
+                               if ($fCol == $titleCol) {
+                                       $recTitle = t3lib_BEfunc::getRecordTitle($table, $row, FALSE, TRUE);
                                                // If the record is edit-locked by another user, we will show a little warning sign:
                                        if (($lockInfo = t3lib_BEfunc::isRecordLocked($table, $row['uid']))) {
                                                $warning = '<a href="#" onclick="' . htmlspecialchars('alert(' . $GLOBALS['LANG']->JScharCode($lockInfo['msg']) . '); return false;') . '" title="' . htmlspecialchars($lockInfo['msg']) . '">' .
@@ -662,7 +670,7 @@ class localRecordList extends recordList {
 
                                                // Render thumbsnails if a thumbnail column exists and there is content in it:
                                        if ($this->thumbs && trim($row[$thumbsCol])) {
-                                               $theData[$fCol] .= '<br />' . $this->thumbCode($row,$table,$thumbsCol);
+                                               $theData[$fCol] .= '<br />' . $this->thumbCode($row, $table, $thumbsCol);
                                        }
 
                                        $localizationMarkerClass = '';
@@ -673,9 +681,9 @@ class localRecordList extends recordList {
                                                $localizationMarkerClass = ' localization';
                                        }
                                } elseif ($fCol == 'pid') {
-                                       $theData[$fCol]=$row[$fCol];
+                                       $theData[$fCol] = $row[$fCol];
                                } elseif ($fCol == '_PATH_') {
-                                       $theData[$fCol]=$this->recPath($row['pid']);
+                                       $theData[$fCol] = $this->recPath($row['pid']);
                                } elseif ($fCol == '_REF_') {
                                        $theData[$fCol] = $this->createReferenceHtml($table, $row['uid']);
                                } elseif ($fCol == '_CONTROL_') {
@@ -685,9 +693,9 @@ class localRecordList extends recordList {
                                } elseif ($fCol == '_CLIPBOARD_') {
                                        $theData[$fCol]=$this->makeClip($table,$row);
                                } elseif ($fCol == '_LOCALIZATION_') {
-                                       list($lC1, $lC2) = $this->makeLocalizationPanel($table,$row);
+                                       list($lC1, $lC2) = $this->makeLocalizationPanel($table, $row);
                                        $theData[$fCol] = $lC1;
-                                       $theData[$fCol.'b'] = $lC2;
+                                       $theData[$fCol . 'b'] = $lC2;
                                } elseif ($fCol == '_LOCALIZATION_b') {
                                        // Do nothing, has been done above.
                                } else {
@@ -699,7 +707,7 @@ class localRecordList extends recordList {
                                }
                        }
 
-                       if (strlen($this->searchString))        {       // Reset the ID if it was overwritten
+                       if (strlen($this->searchString)) {      // Reset the ID if it was overwritten
                                $this->id = $id_orig;
                        }
 
@@ -720,7 +728,7 @@ class localRecordList extends recordList {
                        $this->addElement_tdCssClass['_LOCALIZATION_b'] = 'col-localizationb';
 
                                // Create element in table cells:
-                       $iOut.=$this->addelement(1,$theIcon,$theData,$row_bgColor);
+                       $iOut .= $this->addelement(1, $theIcon, $theData, $row_bgColor);
 
                                // Finally, return table row element:
                        return $iOut;
@@ -766,7 +774,7 @@ class localRecordList extends recordList {
         * @access private
         * @see getTable()
         */
-       function renderListHeader($table, $currentIdList)       {
+       function renderListHeader($table, $currentIdList) {
                        // Init:
                $theData = Array();
 
@@ -774,21 +782,21 @@ class localRecordList extends recordList {
                foreach($this->fieldArray as $fCol)     {
 
                                // Calculate users permissions to edit records in the table:
-                       $permsEdit = $this->calcPerms & ($table=='pages'?2:16);
+                       $permsEdit = $this->calcPerms & ($table=='pages' ? 2 : 16);
 
                        switch((string)$fCol)   {
                                case '_PATH_':                  // Path
                                        $theData[$fCol] = '<i>[' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels._PATH_', 1) . ']</i>';
-                               break;
+                                       break;
                                case '_REF_':                   // References
                                        $theData[$fCol] = '<i>[' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:c__REF_', 1) . ']</i>';
-                               break;
+                                       break;
                                case '_LOCALIZATION_':                  // Path
                                        $theData[$fCol] = '<i>[' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels._LOCALIZATION_', 1) . ']</i>';
-                               break;
+                                       break;
                                case '_LOCALIZATION_b':                 // Path
                                        $theData[$fCol] = $GLOBALS['LANG']->getLL('Localize', 1);
-                               break;
+                                       break;
                                case '_CLIPBOARD_':             // Clipboard:
                                        $cells=array();
 
@@ -814,10 +822,10 @@ class localRecordList extends recordList {
                                                        'setCB');
 
                                                        // The "edit marked" link:
-                                               $editIdList = implode(',',$currentIdList);
-                                               $editIdList = "'+editList('".$table."','".$editIdList."')+'";
-                                               $params='&edit['.$table.']['.$editIdList.']=edit&disHelp=1';
-                                               $cells['edit'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath, -1)) .
+                                               $editIdList = implode(',', $currentIdList);
+                                               $editIdList = "'+editList('" . $table . "','" . $editIdList . "')+'";
+                                               $params = '&edit[' . $table . '][' . $editIdList . ']=edit&disHelp=1';
+                                               $cells['edit'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1)) .
                                                                '" title="' . $GLOBALS['LANG']->getLL('clip_editMarked', TRUE) . '">' .
                                                                t3lib_iconWorks::getSpriteIcon('actions-document-open') .
                                                                '</a>';
@@ -842,94 +850,98 @@ class localRecordList extends recordList {
                                        } else {
                                                $cells['empty']='';
                                        }
+
                                        /**
                                         * @hook                        renderListHeaderActions: Allows to change the clipboard icons of the Web>List table headers
                                         * @date                        2007-11-20
                                         * @request             Bernhard Kraft  <krafbt@kraftb.at>
                                         * @usage               Above each listed table in Web>List a header row is shown. This hook allows to modify the icons responsible for the clipboard functions (shown above the clipboard checkboxes when a clipboard other than "Normal" is selected), or other "Action" functions which perform operations on the listed records.
                                         */
-                                       if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions']))     {
+
+                                       if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'])) {
                                                foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'] as $classData)    {
                                                        $hookObject = t3lib_div::getUserObj($classData);
-                                                       if(!($hookObject instanceof localRecordList_actionsHook))       {
+                                                       if (!($hookObject instanceof localRecordList_actionsHook)) {
                                                                throw new UnexpectedValueException('$hookObject must implement interface localRecordList_actionsHook', 1195567850);
                                                        }
                                                        $cells = $hookObject->renderListHeaderActions($table, $currentIdList, $cells, $this);
                                                }
                                        }
-                                       $theData[$fCol]=implode('',$cells);
-                               break;
+                                       $theData[$fCol] = implode('', $cells);
+                                       break;
                                case '_CONTROL_':               // Control panel:
                                        if (!$GLOBALS['TCA'][$table]['ctrl']['readOnly']) {
 
                                                        // If new records can be created on this page, add links:
-                                               if ($this->calcPerms&($table=='pages'?8:16) && $this->showNewRecLink($table))   {
-                                                       if ($table=="tt_content" && $this->newWizards)  {
+                                               if ($this->calcPerms & ($table == 'pages'?8:16) && $this->showNewRecLink($table)) {
+                                                       if ($table == "tt_content" && $this->newWizards) {
                                                                        //  If mod.web_list.newContentWiz.overrideWithExtension is set, use that extension's create new content wizard instead:
                                                                $tmpTSc = t3lib_BEfunc::getModTSconfig($this->pageinfo['uid'],'mod.web_list');
                                                                $tmpTSc = $tmpTSc['properties']['newContentWiz.']['overrideWithExtension'];
                                                                $newContentWizScriptPath = $this->backPath.t3lib_extMgm::isLoaded($tmpTSc) ? (t3lib_extMgm::extRelPath($tmpTSc).'mod1/db_new_content_el.php') : 'sysext/cms/layout/db_new_content_el.php';
 
-                                                               $icon = '<a href="#" onclick="' . htmlspecialchars('return jumpExt(\'' . $newContentWizScriptPath . '?id=' . $this->id . '\');') . '" title="' . $GLOBALS['LANG']->getLL('new', TRUE) . '">'.
-                                                                                                       ($table == 'pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
-                                                                                               '</a>';
+                                                               $icon = '<a href="#" onclick="' . htmlspecialchars('return jumpExt(\'' . $newContentWizScriptPath . '?id=' . $this->id . '\');') . '" title="' . $GLOBALS['LANG']->getLL('new', TRUE) . '">' .
+                                                                               ($table == 'pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
+                                                                               '</a>';
                                                        } elseif ($table=='pages' && $this->newWizards) {
                                                                $icon = '<a href="' . htmlspecialchars($this->backPath . 'db_new.php?id=' . $this->id . '&pagesOnly=1&returnUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))) . '" title="' . $GLOBALS['LANG']->getLL('new', TRUE) . '">'.
-                                                                                                       ($table=='pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
-                                                                                               '</a>';
+                                                                               ($table=='pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
+                                                                               '</a>';
 
                                                        } else {
-                                                               $params = '&edit['.$table.']['.$this->id.']=new';
+                                                               $params = '&edit[' . $table . '][' . $this->id . ']=new';
                                                                if ($table == 'pages_language_overlay') {
                                                                        $params .= '&overrideVals[pages_language_overlay][doktype]=' . (int) $this->pageRow['doktype'];
                                                                }
-                                                               $icon   = '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1)) . '" title="' . $GLOBALS['LANG']->getLL('new', TRUE) . '">'.
-                                                                                                       ($table=='pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
-                                                                                               '</a>';
+                                                               $icon   = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1)) . '" title="' . $GLOBALS['LANG']->getLL('new', TRUE) . '">' .
+                                                                               ($table == 'pages' ? t3lib_iconWorks::getSpriteIcon('actions-page-new') : t3lib_iconWorks::getSpriteIcon('actions-document-new')) .
+                                                                               '</a>';
                                                        }
                                                }
 
                                                        // If the table can be edited, add link for editing ALL SHOWN fields for all listed records:
                                                if ($permsEdit && $this->table && is_array($currentIdList))     {
-                                                       $editIdList = implode(',',$currentIdList);
-                                                       if ($this->clipNumPane()) $editIdList = "'+editList('".$table."','".$editIdList."')+'";
-                                                       $params = '&edit['.$table.']['.$editIdList.']=edit&columnsOnly='.implode(',',$this->fieldArray).'&disHelp=1';
-                                                       $icon  .= '<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1 )) . '" title="' . $GLOBALS['LANG']->getLL('editShownColumns', TRUE) . '">' .
-                                                                                               t3lib_iconWorks::getSpriteIcon('actions-document-open') .
-                                                                                       '</a>';
+                                                       $editIdList = implode(',', $currentIdList);
+                                                       if ($this->clipNumPane())
+                                                               $editIdList = "'+editList('" . $table . "','" . $editIdList . "')+'";
+                                                       $params = '&edit[' . $table . '][' . $editIdList . ']=edit&columnsOnly=' . implode(',', $this->fieldArray) . '&disHelp=1';
+                                                       $icon  .= '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1 )) . '" title="' . $GLOBALS['LANG']->getLL('editShownColumns', TRUE) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-document-open') .
+                                                                       '</a>';
                                                }
                                                        // add an empty entry, so column count fits again after moving this into $icon
                                                $theData[$fCol] = '&nbsp;';
                                        }
-                               break;
+                                       break;
                                case '_AFTERCONTROL_':  // space column
                                case '_AFTERREF_':      // space column
                                        $theData[$fCol] = '&nbsp;';
-                               break;
+                                       break;
                                default:                        // Regular fields header:
-                                       $theData[$fCol]='';
-                                       if ($this->table && is_array($currentIdList))   {
+                                       $theData[$fCol] = '';
+                                       if ($this->table && is_array($currentIdList)) {
 
                                                        // If the numeric clipboard pads are selected, show duplicate sorting link:
                                                if ($this->clipNumPane()) {
                                                        $theData[$fCol] .= '<a href="' . htmlspecialchars($this->listURL('', -1) . '&duplicateField=' . $fCol) . '" title="' . $GLOBALS['LANG']->getLL('clip_duplicates', TRUE) . '">' .
-                                                                                               t3lib_iconWorks::getSpriteIcon('actions-document-duplicates-select') .
-                                                                                       '</a>';
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-document-duplicates-select') .
+                                                                       '</a>';
                                                }
 
                                                        // If the table can be edited, add link for editing THIS field for all listed records:
                                                if (!$GLOBALS['TCA'][$table]['ctrl']['readOnly'] && $permsEdit && $GLOBALS['TCA'][$table]['columns'][$fCol]) {
-                                                       $editIdList = implode(',',$currentIdList);
-                                                       if ($this->clipNumPane()) $editIdList = "'+editList('".$table."','".$editIdList."')+'";
-                                                       $params='&edit['.$table.']['.$editIdList.']=edit&columnsOnly='.$fCol.'&disHelp=1';
+                                                       $editIdList = implode(',', $currentIdList);
+                                                       if ($this->clipNumPane())
+                                                               $editIdList = "'+editList('" . $table . "','" . $editIdList . "')+'";
+                                                       $params = '&edit[' . $table . '][' . $editIdList . ']=edit&columnsOnly=' . $fCol . '&disHelp=1';
                                                        $iTitle = sprintf($GLOBALS['LANG']->getLL('editThisColumn'), rtrim(trim($GLOBALS['LANG']->sL(t3lib_BEfunc::getItemLabel($table, $fCol))), ':'));
-                                                       $theData[$fCol].='<a href="#" onclick="'.htmlspecialchars(t3lib_BEfunc::editOnClick($params,$this->backPath,-1)).'" title="'.htmlspecialchars($iTitle).'">'.
-                                                                                               t3lib_iconWorks::getSpriteIcon('actions-document-open') .
-                                                                                       '</a>';
+                                                       $theData[$fCol] .= '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick($params, $this->backPath, -1)) . '" title="' . htmlspecialchars($iTitle) . '">' .
+                                                                       t3lib_iconWorks::getSpriteIcon('actions-document-open') .
+                                                                       '</a>';
                                                }
                                        }
                                        $theData[$fCol] .= $this->addSortLink($GLOBALS['LANG']->sL(t3lib_BEfunc::getItemLabel($table, $fCol, '<i>[|]</i>')), $fCol, $table);
-                               break;
+                                       break;
                        }
 
                }
@@ -940,10 +952,10 @@ class localRecordList extends recordList {
                 * @request             Bernhard Kraft  <krafbt@kraftb.at>
                 * @usage               Above each listed table in Web>List a header row is shown. Containing the labels of all shown fields and additional icons to create new records for this table or perform special clipboard tasks like mark and copy all listed records to clipboard, etc.
                 */
-               if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions']))     {
-                       foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'] as $classData)    {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions']))    {
+                       foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list_extra.inc']['actions'] as $classData) {
                                $hookObject = t3lib_div::getUserObj($classData);
-                               if(!($hookObject instanceof localRecordList_actionsHook))       {
+                               if (!($hookObject instanceof localRecordList_actionsHook)) {
                                        throw new UnexpectedValueException('$hookObject must implement interface localRecordList_actionsHook', 1195567855);
                                }
                                $theData = $hookObject->renderListHeader($table, $currentIdList, $theData, $this);
@@ -981,7 +993,7 @@ class localRecordList extends recordList {
 
                                $first = '<a href="' . $listURL . '&pointer=0">' .
                                        t3lib_iconWorks::getSpriteIcon('actions-view-paging-first', array('title'=> $labelFirst)) .
-                               '</a>';
+                                       '</a>';
                        } else {
                                $first = t3lib_iconWorks::getSpriteIcon('actions-view-paging-first-disabled');
                        }
@@ -1099,8 +1111,9 @@ class localRecordList extends recordList {
         * @param       array           The record for which to make the control panel.
         * @return      string          HTML table with the control panel (unless disabled)
         */
-       function makeControl($table,$row)       {
-               if ($this->dontShowClipControlPanels)   return '';
+       function makeControl($table,$row) {
+               if ($this->dontShowClipControlPanels)
+                       return '';
 
                $rowUid = $row['uid'];
                if (t3lib_extMgm::isLoaded('version') && isset($row['_ORIG_uid'])) {
@@ -1109,7 +1122,7 @@ class localRecordList extends recordList {
 
                        // Initialize:
                t3lib_div::loadTCA($table);
-               $cells=array();
+               $cells = array();
 
                        // If the listed table is 'pages' we have to request the permission settings for each page:
                if ($table=='pages')    {
index 7062042..215c5de 100644 (file)
@@ -338,7 +338,7 @@ class ModuleMenu {
         *
         * @return      string          html code snippet displaying the logout button
         */
-       public function renderLogoutButton()    {
+       public function renderLogoutButton() {
                $buttonLabel      = $GLOBALS['BE_USER']->user['ses_backuserid'] ? 'LLL:EXT:lang/locallang_core.php:buttons.exit' : 'LLL:EXT:lang/locallang_core.php:buttons.logout';
 
                $buttonForm = '
index 6f8a76d..4094a02 100644 (file)
@@ -134,7 +134,7 @@ class SC_db_new {
         *
         * @return      void
         */
-       function init() {
+       function init() {
 
                        // page-selection permission clause (reading)
                $this->perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
@@ -202,7 +202,7 @@ class SC_db_new {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // If there was a page - or if the user is admin (admins has access to the root) we proceed:
                if ($this->pageinfo['uid'] || $GLOBALS['BE_USER']->isAdmin()) {
@@ -267,7 +267,7 @@ class SC_db_new {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
                $buttons = array(
                        'csh' => '',
                        'back' => '',
@@ -350,7 +350,7 @@ class SC_db_new {
         *
         * @return      void
         */
-       function regularNew()   {
+       function regularNew() {
 
                $doNotShowFullDescr = FALSE;
                        // Initialize array for accumulating table rows:
@@ -646,7 +646,7 @@ class SC_db_new {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
index 6a99acb..87d3fa9 100644 (file)
@@ -59,7 +59,7 @@ class SC_dummy {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                        // Start page
                $this->content.=$GLOBALS['TBE_TEMPLATE']->startPage('Dummy document');
 
@@ -72,7 +72,7 @@ class SC_dummy {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 }
index ddce279..556ae5e 100644 (file)
@@ -74,7 +74,7 @@ class SC_file_edit {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                        // Setting target, which must be a file reference to a file within the mounts.
                $this->target = $this->origTarget = $fileIdentifier = t3lib_div::_GP('target');
                $this->returnUrl = t3lib_div::sanitizeLocalUrl(t3lib_div::_GP('returnUrl'));
@@ -114,7 +114,7 @@ class SC_file_edit {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                //TODO: change locallang*.php to locallang*.xml
                $docHeaderButtons = $this->getButtons();
 
@@ -208,7 +208,7 @@ class SC_file_edit {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
index df9ad5a..8486bef 100644 (file)
@@ -83,7 +83,7 @@ class SC_file_newfolder {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                        // Initialize GPvars:
                $this->number = t3lib_div::_GP('number');
                $this->target = $combinedIdentifier = t3lib_div::_GP('target');
@@ -131,7 +131,7 @@ class SC_file_newfolder {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // start content compilation
                $this->content .= $this->doc->startPage($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.pagetitle'));
@@ -253,7 +253,7 @@ class SC_file_newfolder {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 }
index d7229a0..219fd3f 100644 (file)
@@ -79,7 +79,7 @@ class SC_file_rename {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                        // Initialize GPvars:
                $this->target = t3lib_div::_GP('target');
                $this->returnUrl = t3lib_div::sanitizeLocalUrl(t3lib_div::_GP('returnUrl'));
@@ -129,7 +129,7 @@ class SC_file_rename {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                //TODO: change locallang*.php to locallang*.xml
 
                        // Make page header:
@@ -190,7 +190,7 @@ class SC_file_rename {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 }
index b3cfc49..c1f73eb 100644 (file)
@@ -92,7 +92,7 @@ class SC_index {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                        // We need a PHP session session for most login levels
                session_start();
 
@@ -148,7 +148,7 @@ class SC_index {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                        // Initialize template object:
                $GLOBALS['TBE_TEMPLATE']->bodyTagAdditions = ' onload="startUp();"';
                $GLOBALS['TBE_TEMPLATE']->moduleTemplate = $GLOBALS['TBE_TEMPLATE']->getHtmlTemplate('templates/login.html');
@@ -193,7 +193,7 @@ class SC_index {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -209,7 +209,7 @@ class SC_index {
         *
         * @return      string          HTML output
         */
-       function makeLoginForm()        {
+       function makeLoginForm() {
                $content = t3lib_parsehtml::getSubpart($GLOBALS['TBE_TEMPLATE']->moduleTemplate, '###LOGIN_FORM###');
                $markers = array(
                        'VALUE_USERNAME' => htmlspecialchars($this->u),
@@ -333,7 +333,7 @@ class SC_index {
         *
         * @return      void
         */
-       function checkRedirect()        {
+       function checkRedirect() {
                        // Do redirect:
                        // If a user is logged in AND a) if either the login is just done (isLoginInProgress) or b) a loginRefresh is done or c) the interface-selector is NOT enabled (If it is on the other hand, it should not just load an interface, because people has to choose then...)
                if ($GLOBALS['BE_USER']->user['uid'] && ($this->isLoginInProgress() || $this->loginRefresh || !$this->interfaceSelector))       {
@@ -399,7 +399,7 @@ class SC_index {
         *
         * @return      void
         */
-       function makeInterfaceSelectorBox()     {
+       function makeInterfaceSelectorBox() {
                        // Reset variables:
                $this->interfaceSelector = '';
                $this->interfaceSelector_hidden='';
@@ -453,7 +453,7 @@ class SC_index {
         *
         * @return      string          Text/Image (HTML) for copyright notice.
         */
-       function makeCopyrightNotice()  {
+       function makeCopyrightNotice() {
 
                        // Get values from TYPO3_CONF_VARS:
                $loginCopyrightWarrantyProvider = strip_tags(trim($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightWarrantyProvider']));
@@ -487,7 +487,7 @@ class SC_index {
         *
         * @return      string          HTML image tag.
         */
-       function makeLoginBoxImage()    {
+       function makeLoginBoxImage() {
                $loginboxImage = '';
                if ($GLOBALS['TBE_STYLES']['loginBoxImage_rotationFolder'])     {               // Look for rotation image folder:
                        $absPath = t3lib_div::resolveBackPath(PATH_typo3.$GLOBALS['TBE_STYLES']['loginBoxImage_rotationFolder']);
@@ -617,7 +617,7 @@ class SC_index {
         *
         * @return      string          Opening form tag string
         */
-       function startForm()    {
+       function startForm() {
                $output = '';
 
                // The form defaults to 'no login'. This prevents plain
@@ -654,7 +654,7 @@ class SC_index {
         *
         * @return      string          JavaScript code
         */
-       function getJScode()    {
+       function getJScode() {
                $JSCode = '';
                if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/index.php']['loginScriptHook'])) {
                        foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/index.php']['loginScriptHook'] as $function) {
index e2a19f7..5728767 100644 (file)
@@ -59,7 +59,7 @@ class SC_listframe_loader {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                $GLOBALS['TBE_TEMPLATE']->divClass='';
                $this->content.=$GLOBALS['TBE_TEMPLATE']->startPage('List Frame Loader');
                $this->content.=$GLOBALS['TBE_TEMPLATE']->wrapScriptTags('
index 196abee..18a4074 100644 (file)
@@ -64,7 +64,7 @@ class SC_login_frameset {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                        // Set doktype:
                $GLOBALS['TBE_TEMPLATE']->docType='xhtml_frames';
 
@@ -88,7 +88,7 @@ class SC_login_frameset {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 }
index 59e7c8d..a77bc72 100644 (file)
@@ -52,7 +52,7 @@ class SC_logout {
         *
         * @return      void
         */
-       function logout()       {
+       function logout() {
                        // Logout written to log
                $GLOBALS['BE_USER']->writelog(255, 2, 0, 1, 'User %s logged out from TYPO3 Backend', array($GLOBALS['BE_USER']->user['username']));
                t3lib_formProtection_Factory::get()->removeSessionTokenFromRegistry();
index 70ca433..f34887d 100644 (file)
@@ -221,7 +221,7 @@ class SC_move_el {
         *
         * @return      void
         */
-       function init() {
+       function init() {
 
                        // Setting internal vars:
                $this->sys_language = intval(t3lib_div::_GP('sys_language'));
@@ -251,7 +251,7 @@ class SC_move_el {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                if ($this->page_id)     {
 
                                // Get record for element:
@@ -392,7 +392,7 @@ class SC_move_el {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -401,7 +401,7 @@ class SC_move_el {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
                $buttons = array(
                        'csh' => '',
                        'back' => ''
index b7dc60b..c970f92 100644 (file)
@@ -148,7 +148,7 @@ class SC_show_item {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                        // Setting input variables.
                $this->table = t3lib_div::_GET('table');
                $this->uid = t3lib_div::_GET('uid');
@@ -220,9 +220,9 @@ class SC_show_item {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
-               if ($this->access)      {
+               if ($this->access) {
                        $returnLink =  t3lib_div::sanitizeLocalUrl(t3lib_div::_GP('returnUrl'));
                        $returnLinkTag = $returnLink ? '<a href="' . $returnLink . '" class="typo3-goBack">' : '<a href="#" onclick="window.close();">';
                                // render type by user func
@@ -270,7 +270,7 @@ class SC_show_item {
         *
         * @return      void
         */
-       function renderDBInfo() {
+       function renderDBInfo() {
 
                        // Print header, path etc:
                $code = $this->doc->getHeader($this->table,$this->row,$this->pageinfo['_thePath'],1).'<br />';
@@ -401,7 +401,7 @@ class SC_show_item {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                $this->content.= $this->doc->endPage();
                $this->content = $this->doc->insertStylesAndJS($this->content);
                echo $this->content;
index d32446e..2ec7114 100644 (file)
@@ -64,7 +64,7 @@ class SC_show_rechis {
         *
         * @return      void
         */
-       function init() {
+       function init() {
 
                        // Create internal template object:
                $this->doc = t3lib_div::makeInstance('template');
@@ -80,7 +80,7 @@ class SC_show_rechis {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // Start history object
                $historyObj = t3lib_div::makeInstance('recordHistory');
@@ -103,7 +103,7 @@ class SC_show_rechis {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                $this->content .= $this->doc->endPage();
                $this->content = $this->doc->insertStylesAndJS($this->content);
                echo $this->content;
index b5d6a1b..2fefd64 100644 (file)
@@ -86,7 +86,7 @@ class tx_beuser {
         *
         * @return      array           Local lang array.
         */
-       function includeLL()    {
+       function includeLL() {
                global $LANG;
 
                $LOCAL_LANG = $GLOBALS['LANG']->includeLLFile('EXT:extra_page_cm_options/locallang.php', FALSE);
index b8ade54..09763e9 100755 (executable)
@@ -78,7 +78,7 @@ class localPageTree extends t3lib_browseTree {
         *
         * @return      string          WHERE query part.
         */
-       function ext_permsC()   {
+       function ext_permsC() {
                return '';
        }
 
@@ -125,7 +125,7 @@ class localPageTree extends t3lib_browseTree {
         *
         * @return      void
         */
-       function initializePositionSaving()     {
+       function initializePositionSaving() {
                $this->stored=array();
        }
 }
@@ -155,7 +155,7 @@ class printAllPageTree extends localPageTree {
         *
         * @return      string          WHERE query part.
         */
-       function ext_permsC()   {
+       function ext_permsC() {
                return ' AND '.$this->BE_USER->getPagePermsClause(1);
        }
 
@@ -371,7 +371,7 @@ class localFolderTree extends t3lib_folderTree {
         *
         * @return      void
         */
-       function initializePositionSaving()     {
+       function initializePositionSaving() {
                $this->stored=array();
        }
 }
@@ -465,7 +465,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
         *
         * @return      string          HTML content showing which DB-mounts were not accessible for the user
         */
-       function ext_non_readAccessPages()      {
+       function ext_non_readAccessPages() {
                $lines=array();
 
                foreach ($this->ext_non_readAccessPageArray as $pA) {
@@ -490,7 +490,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
         *
         * @return      string
         */
-       function user_where_clause()    {
+       function user_where_clause() {
                return  'AND pid=0 ';
        }
 
@@ -775,7 +775,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
         *
         * @return      string          HTML code.
         */
-       function ext_getReadableButNonmounted() {
+       function ext_getReadableButNonmounted() {
 
                        // List of page id mounts which ARE mounted (and should therefore not be selected)
                if (!$this->ext_pageIdsFromMounts)      {
@@ -972,7 +972,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
         *
         * @return      array   with key / value pairs of available workspaces (filtered by BE_USER check)
         */
-       function ext_workspaceMembership()      {
+       function ext_workspaceMembership() {
                        // Create accessible workspace arrays:
                $options = array();
                if ($this->checkWorkspace(array('uid' => 0)))   {
@@ -1044,7 +1044,7 @@ class SC_mod_tools_be_user_index {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                $this->MCONF = $GLOBALS['MCONF'];
 
                $this->menuConfig();
@@ -1073,7 +1073,7 @@ class SC_mod_tools_be_user_index {
         *
         * @return      void
         */
-       function menuConfig()   {
+       function menuConfig() {
                // MENU-ITEMS:
                        // If array, then it's a selector box menu
                        // If empty string it's just a variable, that'll be saved.
@@ -1093,7 +1093,7 @@ class SC_mod_tools_be_user_index {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                $this->content = $this->doc->header($GLOBALS['LANG']->getLL('backendUserAdministration', TRUE));
 
                switch($this->MOD_SETTINGS['function']) {
@@ -1130,7 +1130,7 @@ class SC_mod_tools_be_user_index {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -1139,26 +1139,26 @@ class SC_mod_tools_be_user_index {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
-
+       protected function getButtons() {
                $buttons = array(
                        'add' => '',
                        'csh' => '',
                        'shortcut' => '',
                        '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)) .
+                       $buttons['add'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick('&edit[be_users][0]=new', $this->doc->backPath, -1)) .
                                '" title="' . $GLOBALS['LANG']->getLL('newUser', TRUE) . '">' . t3lib_iconWorks::getSpriteIcon('actions-document-new') . '</a>';
                }
 
                        // Shortcut
                if ($GLOBALS['BE_USER']->mayMakeShortcut())     {
-                       $buttons['shortcut'] = $this->doc->makeShortcutIcon('be_user_uid,compareFlags','function', $this->MCONF['name']);
+                       $buttons['shortcut'] = $this->doc->makeShortcutIcon('be_user_uid,compareFlags', 'function', $this->MCONF['name']);
                }
 
                return $buttons;
@@ -1442,7 +1442,7 @@ class SC_mod_tools_be_user_index {
         *
         * @return      void
         */
-       function initUsers()    {
+       function initUsers() {
                        // Initializing all users in order to generate the usergroup_cached_list
                $users = t3lib_BEfunc::getUserNames();
 
@@ -1500,7 +1500,7 @@ class SC_mod_tools_be_user_index {
        /**
         * @author Martin Kutschker
         */
-       function whoIsOnline()  {
+       function whoIsOnline() {
                $select_fields = 'ses_id, ses_tstamp, ses_iplock, u.uid,u.username, u.admin, u.realName, u.disable, u.starttime, u.endtime, u.deleted, bu.uid AS bu_uid,bu.username AS bu_username, bu.realName AS bu_realName';
                $from_table = 'be_sessions INNER JOIN be_users u ON ses_userid=u.uid LEFT OUTER JOIN be_users bu ON ses_backuserid=bu.uid';
                $where_clause = '';
index f4f797f..10da41a 100755 (executable)
@@ -200,7 +200,7 @@ class SC_db_layout {
         *
         * @return      void
         */
-       function init() {
+       function init() {
 
                        // Setting module configuration / page select clause
                $this->MCONF = $GLOBALS['MCONF'];
@@ -253,7 +253,7 @@ class SC_db_layout {
         *
         * @return      void
         */
-       function menuConfig()   {
+       function menuConfig() {
                        // MENU-ITEMS:
                $this->MOD_MENU = array(
                        'tt_content_showHidden' => '',
@@ -342,7 +342,7 @@ class SC_db_layout {
         *
         * @return      void
         */
-       function clearCache()   {
+       function clearCache() {
                if ($this->clear_cache) {
                        $tce = t3lib_div::makeInstance('t3lib_TCEmain');
                        $tce->stripslashes_values=0;
@@ -357,7 +357,7 @@ class SC_db_layout {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                // Access check...
                // The page will show only if there is a valid page and if this page may be viewed by the user
                $access = is_array($this->pageinfo) ? 1 : 0;
@@ -622,7 +622,7 @@ class SC_db_layout {
         *
         * @return      void
         */
-       function renderQuickEdit()      {
+       function renderQuickEdit() {
                        // Alternative template
                $this->doc->setModuleTemplate('templates/db_layout_quickedit.html');
 
@@ -1138,7 +1138,7 @@ class SC_db_layout {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -1275,7 +1275,7 @@ class SC_db_layout {
         *
         * @return      void
         */
-       function getNumberOfHiddenElements()    {
+       function getNumberOfHiddenElements() {
                return $GLOBALS['TYPO3_DB']->exec_SELECTcountRows(
                        'uid',
                        'tt_content',
index 0878eb9..e2dbf17 100644 (file)
@@ -149,7 +149,7 @@ class SC_db_new_content_el {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                        // Setting class files to include:
                if (is_array($GLOBALS['TBE_MODULES_EXT']['xMOD_db_new_content_el']['addElClasses'])) {
                        $this->include_once = array_merge($this->include_once, $GLOBALS['TBE_MODULES_EXT']['xMOD_db_new_content_el']['addElClasses']);
@@ -189,7 +189,7 @@ class SC_db_new_content_el {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                if ($this->id && $this->access) {
 
                                // Init position map object:
@@ -374,7 +374,7 @@ class SC_db_new_content_el {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -383,7 +383,7 @@ class SC_db_new_content_el {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
                $buttons = array(
                        'csh' => '',
                        'back' => ''
@@ -426,7 +426,7 @@ class SC_db_new_content_el {
         *
         * @return      array           Returns the content of wizardArray() function...
         */
-       function getWizardItems()       {
+       function getWizardItems() {
                return $this->wizardArray();
        }
 
@@ -436,7 +436,7 @@ class SC_db_new_content_el {
         *
         * @return      array
         */
-       function wizardArray()  {
+       function wizardArray() {
 
                if (is_array($this->config)) {
                        $wizards = $this->config['wizardItems.'];
index 814b7f6..1ade5eb 100644 (file)
@@ -52,7 +52,7 @@ final class tslib_eidtools {
         *
         * @return      object          Frontend User object (usually known as TSFE->fe_user)
         */
-       public static function initFeUser()     {
+       public static function initFeUser() {
                // Initialize the database. Do not use TSFE method as it may redirect to
                // Install tool and call hooks, which do not expect to be called from eID
                self::connectDB();
@@ -75,7 +75,7 @@ final class tslib_eidtools {
         *
         * @return      boolean         TRUE if connection was successful
         */
-       public static function connectDB()      {
+       public static function connectDB() {
                if (!$GLOBALS['TYPO3_DB']->isConnected()) {
                                // Attempt to connect to the database
                        $GLOBALS['TYPO3_DB']->connectDB();
index e183569..3aa76bf 100644 (file)
@@ -434,7 +434,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function initFEuser()   {
+       function initFEuser() {
                $this->fe_user = t3lib_div::makeInstance('tslib_feUserAuth');
 
                $this->fe_user->lockIP = $this->TYPO3_CONF_VARS['FE']['lockIP'];
@@ -524,7 +524,7 @@ class tslib_fe {
         *
         * @return      boolean         TRUE if either a login user is found (array fe_user->user) OR if the gr_list is set to something else than '0,-1' (could be done even without a user being logged in!)
         */
-       function isUserOrGroupSet()     {
+       function isUserOrGroupSet() {
                return is_array($this->fe_user->user) || $this->gr_list!=='0,-1';
        }
 
@@ -537,7 +537,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function checkAlternativeIdMethods()    {
+       function checkAlternativeIdMethods() {
                $this->siteScript = t3lib_div::getIndpEnv('TYPO3_SITE_SCRIPT');
 
                        // Call post processing function for custom URL methods.
@@ -555,7 +555,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function clear_preview()        {
+       function clear_preview() {
                $this->showHiddenPage = 0;
                $this->showHiddenRecords = 0;
                $GLOBALS['SIM_EXEC_TIME'] = $GLOBALS['EXEC_TIME'];
@@ -649,7 +649,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function determineId()  {
+       function determineId() {
 
                        // Getting ARG-v values if some
                $this->setIDfromArgV();
@@ -802,7 +802,7 @@ class tslib_fe {
         * @return      void
         * @access private
         */
-       function fetch_the_id() {
+       function fetch_the_id() {
                $GLOBALS['TT']->push('fetch_the_id initialize/', '');
 
                        // Initialize the page-select functions.
@@ -1098,7 +1098,7 @@ class tslib_fe {
         * @return      boolean
         * @access private
         */
-       function checkRootlineForIncludeSection()       {
+       function checkRootlineForIncludeSection() {
                $c=count($this->rootLine);
                $removeTheRestFlag=0;
 
@@ -1179,7 +1179,7 @@ class tslib_fe {
         *
         * @return      boolean         returns TRUE if logins are OK, otherwise FALSE (and then the login user must be unset!)
         */
-       function checkIfLoginAllowedInBranch()  {
+       function checkIfLoginAllowedInBranch() {
 
                        // Initialize:
                $c = count($this->rootLine);
@@ -1212,7 +1212,7 @@ class tslib_fe {
         *
         * @return      array           Summary of why page access was not allowed.
         */
-       function getPageAccessFailureReasons()  {
+       function getPageAccessFailureReasons() {
                $output = array();
 
                $combinedRecords = array_merge(
@@ -1244,7 +1244,7 @@ class tslib_fe {
         * @return      void
         * @access private
         */
-       function setIDfromArgV()        {
+       function setIDfromArgV() {
                if (!$this->id) {
                        list($theAlias) = explode('&', t3lib_div::getIndpEnv('QUERY_STRING'));
                        $theAlias = trim($theAlias);
@@ -1286,7 +1286,7 @@ class tslib_fe {
         * @return      void
         * @access private
         */
-       function setSysPageWhereClause()        {
+       function setSysPageWhereClause() {
                $this->sys_page->where_hid_del.=' AND pages.doktype<200';
                $this->sys_page->where_groupAccess = $this->sys_page->getMultipleGroupsWhereClause('pages.fe_group', 'pages');
        }
@@ -1347,7 +1347,7 @@ class tslib_fe {
         *
         * @return      boolean         TRUE/FALSE whether the pageUnavailable_handler should be used.
         */
-       function checkPageUnavailableHandler()  {
+       function checkPageUnavailableHandler() {
                if($this->TYPO3_CONF_VARS['FE']['pageUnavailable_handling'] &&
                        !t3lib_div::cmpIP(t3lib_div::getIndpEnv('REMOTE_ADDR'), $this->TYPO3_CONF_VARS['SYS']['devIPmask'])) {
                        $checkPageUnavailableHandler = TRUE;
@@ -1526,7 +1526,7 @@ class tslib_fe {
         * @return      void
         * @access private
         */
-       function checkAndSetAlias()     {
+       function checkAndSetAlias() {
                if ($this->id && !t3lib_utility_Math::canBeInterpretedAsInteger($this->id))     {
                        $aid = $this->sys_page->getPageIdFromAlias($this->id);
                        if ($aid)       {
@@ -1587,7 +1587,7 @@ class tslib_fe {
         * @return      void
         * @see reqCHash()
         */
-       function makeCacheHash()        {
+       function makeCacheHash() {
                // No need to test anything if caching was already disabled.
                if ($this->no_cache && !$this->TYPO3_CONF_VARS['FE']['pageNotFoundOnCHashError']) {
                        return;
@@ -1621,7 +1621,7 @@ class tslib_fe {
         * @return      void
         * @see makeCacheHash(), tslib_pibase::pi_cHashCheck()
         */
-       function reqCHash()     {
+       function reqCHash() {
                if (!$this->cHash)      {
                        if ($this->TYPO3_CONF_VARS['FE']['pageNotFoundOnCHashError']) {
                                if ($this->tempContent) { $this->clearPageCacheContent(); }
@@ -1654,7 +1654,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function initTemplate() {
+       function initTemplate() {
                $this->tmpl = t3lib_div::makeInstance('t3lib_TStemplate');
                $this->tmpl->init();
                $this->tmpl->tt_track= $this->beUserLogin ? 1 : 0;
@@ -1666,7 +1666,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function getFromCache() {
+       function getFromCache() {
                if (!$this->no_cache) {
                        $cc = $this->tmpl->getCurrentPageData();
 
@@ -1772,7 +1772,7 @@ class tslib_fe {
         *
         * @return      boolean         If shift-reload in client browser has been clicked, disable getting cached page (and regenerate it).
         */
-       function headerNoCache()        {
+       function headerNoCache() {
                $disableAcquireCacheData = FALSE;
 
                if ($this->beUserLogin) {
@@ -1801,7 +1801,7 @@ class tslib_fe {
         * @access private
         * @see getFromCache(), getLockHash()
         */
-       function getHash()      {
+       function getHash() {
                $this->hash_base = $this->createHashBase(FALSE);
                return md5($this->hash_base);
        }
@@ -1814,7 +1814,7 @@ class tslib_fe {
         * @access private
         * @see getFromCache(), getHash()
         */
-       function getLockHash()  {
+       function getLockHash() {
                $lockHash = $this->createHashBase(TRUE);
                return md5($lockHash);
        }
@@ -1864,7 +1864,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function getConfigArray()       {
+       function getConfigArray() {
                $setStatPageName = FALSE;
 
                if (!is_array($this->config) || is_array($this->config['INTincScript']) || $this->forceTemplateParsing) {       // If config is not set by the cache (which would be a major mistake somewhere) OR if INTincScripts-include-scripts have been registered, then we must parse the template in order to get it
@@ -2009,7 +2009,7 @@ class tslib_fe {
         * @return      void
         * @see includeTCA()
         */
-       function getCompressedTCarray() {
+       function getCompressedTCarray() {
                $GLOBALS['TT']->push('Get Compressed TC array');
                if (!$this->TCAloaded)  {
                                // Create hash string for storage / retrieval of cached content:
@@ -2106,7 +2106,7 @@ class tslib_fe {
         * @return      void
         * @access private
         */
-       function settingLanguage()      {
+       function settingLanguage() {
 
                if (is_array($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_fe.php']['settingLanguage_preProcess']))   {
                        $_params = array();
@@ -2226,7 +2226,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function settingLocale()        {
+       function settingLocale() {
 
                        // Setting locale
                if ($this->config['config']['locale_all'])      {
@@ -2295,7 +2295,7 @@ class tslib_fe {
         *
         * @return      string          "email" if a formmail has been sent, "" if none.
         */
-       function checkDataSubmission()  {
+       function checkDataSubmission() {
                $ret = '';
                $formtype_mail = isset($_POST['formtype_mail']) || isset($_POST['formtype_mail_x']);
                if ($formtype_mail)     {
@@ -2328,7 +2328,7 @@ class tslib_fe {
         * @see tslib_feTCE
         * @deprecated since 6.0, will be removed two versions later
         */
-       function fe_tce()       {
+       function fe_tce() {
                t3lib_div::logDeprecatedFunction();
        }
 
@@ -2356,7 +2356,7 @@ class tslib_fe {
         * @access private
         * @see checkDataSubmission()
         */
-       function sendFormmail() {
+       function sendFormmail() {
                $formmail = t3lib_div::makeInstance('t3lib_formmail');
 
                $EMAIL_VARS = t3lib_div::_POST();
@@ -2421,7 +2421,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function setExternalJumpUrl()   {
+       function setExternalJumpUrl() {
                if ($extUrl = $this->sys_page->getExtURL($this->page, $this->config['config']['disablePageExternalUrl']))       {
                        $this->jumpurl = $extUrl;
                }
@@ -2432,7 +2432,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function checkJumpUrlReferer()  {
+       function checkJumpUrlReferer() {
                if (strlen($this->jumpurl) && !$this->TYPO3_CONF_VARS['SYS']['doNotCheckReferer']) {
                        $referer = parse_url(t3lib_div::getIndpEnv('HTTP_REFERER'));
                        if (isset($referer['host']) && !($referer['host'] == t3lib_div::getIndpEnv('TYPO3_HOST_ONLY'))) {
@@ -2450,7 +2450,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function jumpUrl()      {
+       function jumpUrl() {
                if ($this->jumpurl)     {
                        if (t3lib_div::_GP('juSecure')) {
                                $locationData = (string)t3lib_div::_GP('locationData');
@@ -2516,7 +2516,7 @@ class tslib_fe {
         * @return      void
         * @access private
         */
-       function setUrlIdToken()        {
+       function setUrlIdToken() {
                if ($this->config['config']['ftu'])     {
                        $this->getMethodUrlIdToken = $this->TYPO3_CONF_VARS['FE']['get_url_id_token'];
                } else {
@@ -2634,7 +2634,7 @@ class tslib_fe {
         *
         * @return      boolean
         */
-       function isGeneratePage()       {
+       function isGeneratePage() {
                return (!$this->cacheContentFlag && !$this->jumpurl);
        }
 
@@ -2644,7 +2644,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function tempPageCacheContent() {
+       function tempPageCacheContent() {
                $this->tempContent = FALSE;
 
                if (!$this->no_cache)   {
@@ -2701,7 +2701,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function realPageCacheContent() {
+       function realPageCacheContent() {
                        // seconds until a cached page is too old
                $cacheTimeout = $this->get_cache_timeout();
                $timeOutTime = $GLOBALS['EXEC_TIME'] + $cacheTimeout;
@@ -2790,7 +2790,7 @@ class tslib_fe {
         * @return      void
         * @see tslib_cObj::lastChanged()
         */
-       function setSysLastChanged()    {
+       function setSysLastChanged() {
                if ($this->page['SYS_LASTCHANGED'] < intval($this->register['SYS_LASTCHANGED']))        {
                        $GLOBALS['TYPO3_DB']->exec_UPDATEquery('pages', 'uid='.intval($this->id), array('SYS_LASTCHANGED' => intval($this->register['SYS_LASTCHANGED'])));
                }
@@ -2895,7 +2895,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function generatePage_preProcessing()   {
+       function generatePage_preProcessing() {
                $this->newHash = $this->getHash();      // Same codeline as in getFromCache(). But $this->all has been changed by t3lib_TStemplate::start() in the meantime, so this must be called again!
                $this->config['hash_base'] = $this->hash_base;  // For cache management informational purposes.
 
@@ -2917,7 +2917,7 @@ class tslib_fe {
         *
         * @return      string          The relative filepath of "config.pageGenScript" if found and allowed
         */
-       function generatePage_whichScript()     {
+       function generatePage_whichScript() {
                if (!$this->TYPO3_CONF_VARS['FE']['noPHPscriptInclude'] && $this->config['config']['pageGenScript'])    {
                        return $this->tmpl->getFileName($this->config['config']['pageGenScript']);
                }
@@ -2929,7 +2929,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function generatePage_postProcessing()  {
+       function generatePage_postProcessing() {
                        // This is to ensure, that the page is NOT cached if the no_cache parameter was set before the page was generated. This is a safety precaution, as it could have been unset by some script.
                if ($this->no_cacheBeforePageGen) $this->set_no_cache();
 
@@ -3026,7 +3026,7 @@ class tslib_fe {
         *
         * @return      void
         */
-       function INTincScript() {
+       function INTincScript() {
                        // Deprecated stuff:
                        // @deprecated: annotation added TYPO3 4.6
                $this->additionalHeaderData = is_array($this->config['INTincScript_ext']['additionalHeaderData']) ? $this->config['INTincScript_ext']['additionalHeaderData'] : array();
@@ -3126,7 +3126,7 @@ class tslib_fe {
         * @return      void
         * @access private
         */
-       function INTincScript_loadJSCode()      {
+       function INTincScript_loadJSCode() {
                if ($this->JSImgCode)   {       // If any images added, then add them to the javascript section
                        $this->additionalHeaderData['JSImgCode']='
 <script type="text/javascript">
@@ -3167,7 +3167,7 @@ if (version == "n3") {
         *
         * @return      boolean         Returns TRUE if scripts are found (and not jumpurl)
         */
-       function isINTincScript()       {
+       function isINTincScript() {
                return  (is_array($this->config['INTincScript']) && !$this->jumpurl);
        }
 
@@ -3176,7 +3176,7 @@ if (version == "n3") {
         *
         * @return      string          Keyword: "all", "cached" or "output"
         */
-       function doXHTML_cleaning()     {
+       function doXHTML_cleaning() {
                return $this->config['config']['xhtml_cleaning'];
        }
 
@@ -3185,7 +3185,7 @@ if (version == "n3") {
         *
         * @return      string          Keyword: "all", "cached" or "output"
         */
-       function doLocalAnchorFix()     {
+       function doLocalAnchorFix() {
                return (isset($this->config['config']['prefixLocalAnchors'])) ? $this->config['config']['prefixLocalAnchors'] : NULL;
        }
 
@@ -3216,7 +3216,7 @@ if (version == "n3") {
         *
         * @return      boolean         Returns TRUE if $this->jumpurl is not set.
         */
-       function isOutputting() {
+       function isOutputting() {
 
                        // Initialize by status of jumpUrl:
                $enableOutput = (!$this->jumpurl);
@@ -3320,7 +3320,7 @@ if (version == "n3") {
         * @return      void
         * @co-author   Ole Tange, Forbrugernes Hus, Denmark
         */
-       function sendCacheHeaders()     {
+       function sendCacheHeaders() {
 
                        // Getting status whether we can send cache control headers for proxy caching:
                $doCache = $this->isStaticCacheble();
@@ -3387,7 +3387,7 @@ if (version == "n3") {
         *
         * @return      boolean
         */
-       function isStaticCacheble()     {
+       function isStaticCacheble() {
                $doCache = !$this->no_cache
                                && !$this->isINTincScript()
                                && !$this->isUserOrGroupSet();
@@ -3399,7 +3399,7 @@ if (version == "n3") {
         *
         * @return      void
         */
-       function contentStrReplace()    {
+       function contentStrReplace() {
                $search = array();
                $replace = array();
 
@@ -3451,7 +3451,7 @@ if (version == "n3") {
         * @see tslib_cObj::PHP_SCRIPT
         * @deprecated since 6.0, well be removed in two versions
         */
-       function isEXTincScript()       {
+       function isEXTincScript() {
                t3lib_div::logDeprecatedFunction();
                return FALSE;
        }
@@ -3461,7 +3461,7 @@ if (version == "n3") {
         *
         * @return      void
         */
-       function storeSessionData()     {
+       function storeSessionData() {
                $this->fe_user->storeSessionData();
        }
 
@@ -3471,7 +3471,7 @@ if (version == "n3") {
         * @return      void
         * @access private
         */
-       function setParseTime() {
+       function setParseTime() {
                // Compensates for the time consumed with Back end user initialization.
                $microtime_start            = (isset($GLOBALS['TYPO3_MISC']['microtime_start'])) ? $GLOBALS['TYPO3_MISC']['microtime_start'] : NULL;
                $microtime_end              = (isset($GLOBALS['TYPO3_MISC']['microtime_end'])) ? $GLOBALS['TYPO3_MISC']['microtime_end'] : NULL;
@@ -3489,7 +3489,7 @@ if (version == "n3") {
         * @return      boolean         TRUE if statistics are enabled (will require some more processing after charset handling is initialized)
         * @access private
         */
-       protected function statistics_init()    {
+       protected function statistics_init() {
                $setStatPageName = FALSE;
                $theLogFile = $this->TYPO3_CONF_VARS['FE']['logfile_dir'].strftime($this->config['config']['stat_apache_logfile']);
 
@@ -3523,7 +3523,7 @@ if (version == "n3") {
         * @return      void
         * @access private
         */
-       protected function statistics_init_pagename()   {
+       protected function statistics_init_pagename() {
                if (preg_match('/utf-?8/i', $this->config['config']['stat_apache_niceTitle'])) {        // Make life easier and accept variants for utf-8
                        $this->config['config']['stat_apache_niceTitle'] = 'utf-8';
                }
@@ -3695,7 +3695,7 @@ if (version == "n3") {
         *
         * @return      void
         */
-       function statistics()   {
+       function statistics() {
                if (!empty($this->config['config']['stat']) &&
                                (!strcmp('',$this->config['config']['stat_typeNumList']) || t3lib_div::inList(str_replace(' ', '', $this->config['config']['stat_typeNumList']), $this->type)) &&
                                (empty($this->config['config']['stat_excludeBEuserHits']) || !$this->beUserLogin) &&
@@ -3803,7 +3803,7 @@ if (version == "n3") {
         *
         * @return      void
         */
-       function previewInfo()  {
+       function previewInfo() {
                if ($this->fePreview !== 0) {
                        $previewInfo = '';
                        if (isset($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_fe.php']['hook_previewInfo']) && is_array($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_fe.php']['hook_previewInfo'])) {
@@ -3821,7 +3821,7 @@ if (version == "n3") {
         *
         * @return      void
         */
-       function hook_eofe()    {
+       function hook_eofe() {
 
                        // Call hook for end-of-frontend processing:
                if (isset($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_fe.php']['hook_eofe']) && is_array($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_fe.php']['hook_eofe'])) {
@@ -3837,7 +3837,7 @@ if (version == "n3") {
         *
         * @return      string          HTML, a tag for a link to the backend.
         */
-       function beLoginLinkIPList()    {
+       function beLoginLinkIPList() {
                if (!empty($this->config['config']['beLoginLinkIPList'])) {
                        if (t3lib_div::cmpIP(t3lib_div::getIndpEnv('REMOTE_ADDR'), $this->config['config']['beLoginLinkIPList']))       {
                                $label = !$this->beUserLogin ? $this->config['config']['beLoginLinkIPList_login'] : $this->config['config']['beLoginLinkIPList_logout'];
@@ -4023,7 +4023,7 @@ if (version == "n3") {
         * @return      void
         * @see pagegen.php
         */
-       function newCObj()      {
+       function newCObj() {
                $this->cObj =t3lib_div::makeInstance('tslib_cObj');
                $this->cObj->start($this->page, 'pages');
        }
@@ -4035,7 +4035,7 @@ if (version == "n3") {
         * @access private
         * @see pagegen.php, INTincScript()
         */
-       function setAbsRefPrefix()      {
+       function setAbsRefPrefix() {
                if ($this->absRefPrefix)        {
                        $this->content = str_replace('"media/', '"'.t3lib_extMgm::siteRelPath('cms').'tslib/media/', $this->content);
                        $this->content = str_replace('"typo3temp/', '"' . $this->absRefPrefix . 'typo3temp/', $this->content);
@@ -4134,7 +4134,7 @@ if (version == "n3") {
         *
         * @return      void            Works directly on $this->content
         */
-       function prefixLocalAnchorsWithScript() {
+       function prefixLocalAnchorsWithScript() {
                $scriptPath = $GLOBALS['TSFE']->absRefPrefix . substr(t3lib_div::getIndpEnv('TYPO3_REQUEST_URL'), strlen(t3lib_div::getIndpEnv('TYPO3_SITE_URL')));
                $originalContent = $this->content;
                $this->content = preg_replace('/(<(?:a|area).*?href=")(#[^"]*")/i', '${1}' . htmlspecialchars($scriptPath) . '${2}', $originalContent);
@@ -4156,7 +4156,7 @@ if (version == "n3") {
         * @return      void
         * @deprecated since TYPO3 4.7, will be removed in TYPO3 4.9 as this is part of Tx_Version now
         */
-       public function workspacePreviewInit()  {
+       public function workspacePreviewInit() {
                t3lib_div::logDeprecatedFunction();
                $previewWS = t3lib_div::_GP('ADMCMD_previewWS');
                if ($this->beUserLogin && is_object($GLOBALS['BE_USER']) && t3lib_utility_Math::canBeInterpretedAsInteger($previewWS))  {
@@ -4264,7 +4264,7 @@ if (version == "n3") {
         *
         * @return      array           Array with keys '_STORAGE_PID' and '_SITEROOT' set to the first occurances found.
         */
-       function getStorageSiterootPids()       {
+       function getStorageSiterootPids() {
                $res=array();
 
                if(!is_array($this->rootLine)) {
@@ -4283,7 +4283,7 @@ if (version == "n3") {
         *
         * @return      array
         */
-       function getPagesTSconfig()     {
+       function getPagesTSconfig() {
                if (!is_array($this->pagesTSconfig))    {
                        $TSdataArray = array();
                        $TSdataArray[] = $this->TYPO3_CONF_VARS['BE']['defaultPageTSconfig'];   // Setting default configuration:
@@ -4616,7 +4616,7 @@ if (version == "n3") {
         *
         * @return      void
         */
-       function initLLvars()   {
+       function initLLvars() {
 
                        // Setting language key and split index:
                $this->lang = $this->config['config']['language'] ? $this->config['config']['language'] : 'default';
@@ -4667,7 +4667,7 @@ if (version == "n3") {
         *
         * @return      void
         */
-       function convPOSTCharset()      {
+       function convPOSTCharset() {
                if ($this->renderCharset != $this->metaCharset && is_array($_POST) && count($_POST))    {
                        $this->csConvObj->convArray($_POST, $this->metaCharset, $this->renderCharset);
                        $GLOBALS['HTTP_POST_VARS'] = $_POST;
index c1a80a0..a62cda2 100644 (file)
@@ -225,7 +225,7 @@ class tslib_feUserAuth extends t3lib_userAuth {
         *
         * @return      integer         Returns the number of usergroups for the frontend users (if the internal user record exists and the usergroup field contains a value)
         */
-       function fetchGroupData()       {
+       function fetchGroupData() {
                $this->TSdataArray = array();
                $this->userTS = array();
                $this->userTSUpdated = 0;
@@ -321,7 +321,7 @@ class tslib_feUserAuth extends t3lib_userAuth {
         *
         * @return      array           TSconfig array for the fe_user
         */
-       function getUserTSconf()        {
+       function getUserTSconf() {
                if (!$this->userTSUpdated) {
                                // Parsing the user TS (or getting from cache)
                        $this->TSdataArray = t3lib_TSparser::checkIncludeLines_array($this->TSdataArray);
@@ -366,7 +366,7 @@ class tslib_feUserAuth extends t3lib_userAuth {
         * @access private
         * @see storeSessionData()
         */
-       function fetchSessionData()     {
+       function fetchSessionData() {
                        // Gets SesData if any AND if not already selected by session fixation check in ->isExistingSessionRecord()
                if ($this->id && !count($this->sesData)) {
                        $statement = $GLOBALS['TYPO3_DB']->prepare_SELECTquery(
@@ -392,7 +392,7 @@ class tslib_feUserAuth extends t3lib_userAuth {
         * @return      void
         * @see fetchSessionData(), getKey(), setKey()
         */
-       function storeSessionData()     {
+       function storeSessionData() {
                        // Saves UC and SesData if changed.
                if ($this->userData_change)     {
                        $this->writeUC('');
index 7053660..6c585d4 100644 (file)
@@ -331,7 +331,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @return      string          The filename for the created GIF/PNG file. The filename will be prefixed "GB_"
         * @see make(), fileName()
         */
-       function gifBuild()     {
+       function gifBuild() {
                if ($this->setup)       {
                        $gifFileName = $this->fileName('GB/');  // Relative to PATH_site
                        if (!file_exists($gifFileName)) {               // File exists
@@ -358,7 +358,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @access private
         * @see gifBuild()
         */
-       function make() {
+       function make() {
                        // Get trivial data
                $XY = $this->XY;
 
@@ -602,7 +602,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                        if ($this->nativeCharset) {
                                $conf['text'] = $this->csConvObj->substr($this->nativeCharset, $conf['text'], 0, $tlen);
                        } else {
-                               $conf['text'] = substr($conf['text'], 0 , $tlen);
+                               $conf['text'] = substr($conf['text'], 0, $tlen);
                        }
                }
                if ((string)$conf['text']!='')  {
index a4acd10..18f7dc3 100644 (file)
@@ -294,7 +294,7 @@ class tslib_menu {
         *
         * @return      void
         */
-       function makeMenu()     {
+       function makeMenu() {
                if ($this->id)  {
 
                                // Initializing showAccessRestrictedPages
@@ -1528,7 +1528,7 @@ class tslib_menu {
         * @return      void
         * @access private
         */
-       function setATagParts() {
+       function setATagParts() {
                $this->I['A1'] = '<a '.t3lib_div::implodeAttributes($this->I['linkHREF'],1).' '.$this->I['val']['ATagParams'].$this->I['accessKey']['code'].'>';
                $this->I['A2'] = '</a>';
        }
@@ -1733,7 +1733,7 @@ class tslib_tmenu extends tslib_menu {
         * @return      void
         * @see tslib_menu::procesItemStates()
         */
-       function generate()     {
+       function generate() {
                $splitCount = count($this->menuArr);
                if ($splitCount)        {
                        list($NOconf) = $this->procesItemStates($splitCount);
@@ -1752,7 +1752,7 @@ class tslib_tmenu extends tslib_menu {
         *
         * @return      string          The HTML for the menu (returns result through $this->extProc_finish(); )
         */
-       function writeMenu()    {
+       function writeMenu() {
                if (is_array($this->result) && count($this->result))    {
                        $this->WMcObj = t3lib_div::makeInstance('tslib_cObj');  // Create new tslib_cObj for our use
                        $this->WMresult = '';
@@ -1967,7 +1967,7 @@ class tslib_tmenu extends tslib_menu {
         * @access private
         * @see writeMenu()
         */
-       function addJScolorShiftFunction()      {
+       function addJScolorShiftFunction() {
                $GLOBALS['TSFE']->additionalJavaScript['TMENU:changeBGcolor()']='
                        function changeBGcolor(id,color) {      //
                                if (document.getElementById && document.getElementById(id))     {
@@ -1989,7 +1989,7 @@ class tslib_tmenu extends tslib_menu {
         * @access private
         * @see writeMenu(), tslib_tmenu_layers::extProc_init()
         */
-       function extProc_init() {
+       function extProc_init() {
        }
 
        /**
@@ -2054,7 +2054,7 @@ class tslib_tmenu extends tslib_menu {
         * @access private
         * @see writeMenu(), tslib_tmenu_layers::extProc_finish()
         */
-       function extProc_finish()       {
+       function extProc_finish() {
                        // stdWrap:
                if (is_array($this->mconf['stdWrap.'])) {
                        $this->WMresult = $this->WMcObj->stdWrap($this->WMresult, $this->mconf['stdWrap.']);
@@ -2102,7 +2102,7 @@ class tslib_gmenu extends tslib_menu {
         * @return      void
         * @see tslib_menu::procesItemStates(), makeGifs()
         */
-       function generate()     {
+       function generate() {
                $splitCount = count($this->menuArr);
                if ($splitCount)        {
                        list($NOconf,$ROconf) = $this->procesItemStates($splitCount);
@@ -2434,7 +2434,7 @@ class tslib_gmenu extends tslib_menu {
         *
         * @return      string          The HTML for the menu (returns result through $this->extProc_finish(); )
         */
-       function writeMenu()    {
+       function writeMenu() {
                if (is_array($this->menuArr) && is_array($this->result) && count($this->result) && is_array($this->result['NO']))       {
                        $this->WMcObj = t3lib_div::makeInstance('tslib_cObj');  // Create new tslib_cObj for our use
                        $this->WMresult = '';
@@ -2560,7 +2560,7 @@ class tslib_gmenu extends tslib_menu {
         * @access private
         * @see writeMenu(), tslib_gmenu_layers::extProc_init()
         */
-       function extProc_init() {
+       function extProc_init() {
        }
 
        /**
@@ -2627,7 +2627,7 @@ class tslib_gmenu extends tslib_menu {
         * @access private
         * @see writeMenu(), tslib_gmenu_layers::extProc_finish()
         */
-       function extProc_finish()       {
+       function extProc_finish() {
                        // stdWrap:
                if (is_array($this->mconf['stdWrap.'])) {
                        $this->WMresult = $this->WMcObj->stdWrap($this->WMresult, $this->mconf['stdWrap.']);
@@ -2673,7 +2673,7 @@ class tslib_imgmenu extends tslib_menu {
         * @return      void
         * @see tslib_menu::procesItemStates(), makeImageMap()
         */
-       function generate()     {
+       function generate() {
                $splitCount = count($this->menuArr);
                if ($splitCount)        {
                        list($NOconf) = $this->procesItemStates($splitCount);
@@ -2879,7 +2879,7 @@ class tslib_imgmenu extends tslib_menu {
         *
         * @return      string          The HTML for the menu
         */
-       function writeMenu()    {
+       function writeMenu() {
                if ($this->result)      {
                        $res = &$this->result;
                        $menuName = 'menu_'.t3lib_div::shortMD5($res['imgMap']);        // shortMD5 260900
@@ -2928,7 +2928,7 @@ class tslib_jsmenu extends tslib_menu {
         *
         * @return      void
         */
-       function generate()     {
+       function generate() {
        }
 
        /**
@@ -2936,7 +2936,7 @@ class tslib_jsmenu extends tslib_menu {
         *
         * @return      string          The HTML code for the menu
         */
-       function writeMenu()    {
+       function writeMenu() {
                if ($this->id)  {
                                // Making levels:
                        $levels = t3lib_utility_Math::forceIntegerInRange($this->mconf['levels'],1,5);
index b92c61c..224a606 100644 (file)
@@ -229,7 +229,7 @@ class TSpagegen {
         *
         * @return      array           Array with a) a JavaScript section with event handlers and variables set and b) an array with attributes for the body tag.
         */
-       public static function JSeventFunctions()       {
+       public static function JSeventFunctions() {
                $functions = array();
                $setEvents = array();
                $setBody = array();
index 430ec73..653297d 100644 (file)
@@ -140,7 +140,7 @@ class tslib_pibase {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
 
                        // Setting piVars:
                if ($this->prefixId)    {
@@ -166,7 +166,7 @@ class tslib_pibase {
         *
         * @return      void
         */
-       function pi_setPiVarDefaults()  {
+       function pi_setPiVarDefaults() {
                if (is_array($this->conf['_DEFAULT_PI_VARS.'])) {
                        $this->piVars = t3lib_div::array_merge_recursive_overrule($this->conf['_DEFAULT_PI_VARS.'],is_array($this->piVars)?$this->piVars:array());
                }
@@ -662,7 +662,7 @@ class tslib_pibase {
         *
         * @return      string          HTML output, a table row with a class attribute set
         */
-       function pi_list_header()       {
+       function pi_list_header() {
                return '<tr'.$this->pi_classParam('listrow-header').'><td><p>[dummy header row]</p></td></tr>';
        }
 
index 5d271d8..8c8a1a4 100644 (file)
@@ -329,7 +329,7 @@ class tslib_search {
         * @return      string          Part of where class limiting result to the those having the search word.
         * @access private
         */
-       function build_search_query_for_searchwords()   {
+       function build_search_query_for_searchwords() {
 
                if (is_array($this->sword_array))       {
                        $main_query_part = array();
@@ -419,7 +419,7 @@ class tslib_search {
         *
         * @return      string          URL-parameters with the searchwords
         */
-       function get_searchwords()      {
+       function get_searchwords() {
                $SWORD_PARAMS = '';
                if (is_array($this->sword_array))       {
                        foreach($this->sword_array as $key => $val)     {
@@ -434,7 +434,7 @@ class tslib_search {
         *
         * @return      array           IF the internal sword_array contained search words it will return these, otherwise "void"
         */
-       function get_searchwordsArray() {
+       function get_searchwordsArray() {
                if (is_array($this->sword_array))       {
                        foreach($this->sword_array as $key => $val)     {
                                $swords[] = $val['sword'];
index bd9c8da..15a60e3 100755 (executable)
@@ -76,7 +76,7 @@ class tslib_gmenu_foldout extends tslib_gmenu {
         *
         * @return      void
         */
-       function extProc_init() {
+       function extProc_init() {
                $this->WMarrowNO='';
                $this->WMarrowACT='';
                $this->WMimagesFlag=0;
@@ -140,7 +140,7 @@ class tslib_gmenu_foldout extends tslib_gmenu {
         *
         * @return      string          Empty string! (Since $GLOBALS['TSFE']->divSection is set with the <div>-sections used in the menu)
         */
-       function extProc_finish()       {
+       function extProc_finish() {
                $bHeight = t3lib_utility_Math::forceIntegerInRange(($this->mconf['bottomHeight']?$this->mconf['bottomHeight']:100) ,0,3000);
                $bottomContent = $this->mconf['bottomContent'] ? $GLOBALS['TSFE']->cObj->cObjGetSingle($this->mconf['bottomContent'],$this->mconf['bottomContent.'], '/GMENU_FOLDOUT/.bottomContent') : '';
                $adjustTopHeights = intval($this->mconf['adjustItemsH']);
index 2b64271..fd3d0cc 100644 (file)
@@ -92,7 +92,7 @@ class tslib_gmenu_layers extends tslib_gmenu {
         *
         * @return      void
         */
-       function extProc_init() {
+       function extProc_init() {
                $this->WMid = trim($this->mconf['layer_menu_id']) ? trim($this->mconf['layer_menu_id']) . 'x' : substr(md5('gl' . serialize($this->mconf)), 0, 6);
 
                $GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['WMid'][]=$this->WMid;
@@ -238,7 +238,7 @@ GLV_restoreMenu["'.$this->WMid.'"] = "'.$this->WMactiveKey.'";
         *
         * @return      mixed           Returns the value of a call to the parent function, parent::extProc_finish();
         */
-       function extProc_finish ()      {
+       function extProc_finish () {
                $dirL = $this->mconf['directionLeft'] ? '-GL_getObj(id).width' : '';
                $dirU = $this->mconf['directionUp'] ? '-GL_getObj(id).height' : '';
 
index 37c814f..90da662 100644 (file)
@@ -92,7 +92,7 @@ class tslib_tmenu_layers extends tslib_tmenu {
         *
         * @return      void
         */
-       function extProc_init() {
+       function extProc_init() {
                $this->WMid = trim($this->mconf['layer_menu_id']) ? trim($this->mconf['layer_menu_id']) . 'x' : substr(md5('gl' . serialize($this->mconf)), 0, 6);
 
                $GLOBALS['TSFE']->applicationData['GMENU_LAYERS']['WMid'][]=$this->WMid;
@@ -238,7 +238,7 @@ GLV_restoreMenu["'.$this->WMid.'"] = "'.$this->WMactiveKey.'";
         *
         * @return      mixed           Returns the value of a call to the parent function, parent::extProc_finish();
         */
-       function extProc_finish ()      {
+       function extProc_finish () {
                $dirL = $this->mconf['directionLeft'] ? '-GL_getObj(id).width' : '';
                $dirU = $this->mconf['directionUp'] ? '-GL_getObj(id).height' : '';
 
index 1a04964..29dd285 100644 (file)
@@ -70,7 +70,7 @@ class SC_tslib_showpic {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                        // Loading internal vars with the GET/POST parameters from outside:
                $this->file = t3lib_div::_GP('file');
                $parametersArray = t3lib_div::_GP('parameters');
@@ -124,7 +124,7 @@ class SC_tslib_showpic {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // Creating stdGraphic object, initialize it and make image:
                $img = t3lib_div::makeInstance('t3lib_stdGraphic');
@@ -177,7 +177,7 @@ class SC_tslib_showpic {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 }
index 8c82aaf..210318a 100644 (file)
@@ -50,7 +50,7 @@ class tx_cms_webinfo_page extends t3lib_extobjbase {
         *
         * @return      array
         */
-       function modMenu()      {
+       function modMenu() {
                global $LANG;
                return array (
                        'pages' => array (
@@ -78,7 +78,7 @@ class tx_cms_webinfo_page extends t3lib_extobjbase {
         *
         * @return      string          Output HTML for the module.
         */
-       function main() {
+       function main() {
                global $BACK_PATH,$LANG,$SOBE;
 
                $dblist = t3lib_div::makeInstance('tx_cms_layout');
index 2c11b80..839bc3c 100644 (file)
@@ -43,7 +43,7 @@ class tx_cms_webinfo_lang extends t3lib_extobjbase {
         *
         * @return      array
         */
-       function modMenu()      {
+       function modMenu() {
                global $LANG;
 
                $menuArray = array (
@@ -73,7 +73,7 @@ class tx_cms_webinfo_lang extends t3lib_extobjbase {
         *
         * @return      string          Output HTML for the module.
         */
-       function main() {
+       function main() {
                global $BACK_PATH,$LANG,$SOBE;
 
                $theOutput = $this->pObj->doc->header($GLOBALS['LANG']->getLL('lang_title'));
@@ -298,7 +298,7 @@ class tx_cms_webinfo_lang extends t3lib_extobjbase {
         *
         * @return      array           System language records in an array.
         */
-       function getSystemLanguages()   {
+       function getSystemLanguages() {
                if (!$GLOBALS['BE_USER']->user['admin'] &&
                        strlen($GLOBALS['BE_USER']->groupData['allowed_languages'])) {
 
index d73ec9e..5b87322 100755 (executable)
@@ -824,7 +824,7 @@ class tx_cssstyledcontent_pi1 extends tslib_pibase {
                if ($rowCount == 1)     { $separateRows = 0; }
 
                if ($accessibilityMode) {
-                       $imagesInColumns = round(($imgCount / ($rowCount * $colCount)), 0 , PHP_ROUND_HALF_UP);
+                       $imagesInColumns = round(($imgCount / ($rowCount * $colCount)), 0, PHP_ROUND_HALF_UP);
 
                                // Apply optionSplit to the list of classes that we want to add to each column
                        $addClassesCol = $conf['addClassesCol'];
index e180496..68871f7 100644 (file)
@@ -256,7 +256,7 @@ class tx_em_Connection_ExtDirectServer {
                        }
                        return $update ? $update : $GLOBALS['LANG']->sL('LLL:EXT:em/language/locallang.xml:ext_details_dbUpToDate');
                } else {
-                       return sprintf($GLOBALS['LANG']->sL('LLL:EXT:em/language/locallang.xml:msg_extNotInstalled') ,htmlspecialchars($extKey));
+                       return sprintf($GLOBALS['LANG']->sL('LLL:EXT:em/language/locallang.xml:msg_extNotInstalled')htmlspecialchars($extKey));
                }
        }
 
index 55301ce..b967cc9 100755 (executable)
@@ -138,7 +138,7 @@ class tx_extrapagecmoptions {
         *
         * @return      array           Local lang array.
         */
-       function includeLL()    {
+       function includeLL() {
                $LOCAL_LANG = $GLOBALS['LANG']->includeLLFile('EXT:extra_page_cm_options/locallang.php',FALSE);
                return $LOCAL_LANG;
        }
index bbc9f89..47d32f9 100644 (file)
@@ -144,7 +144,7 @@ class SC_file_list {
         *
         * @return      void
         */
-       function menuConfig()   {
+       function menuConfig() {
                        // MENU-ITEMS:
                        // If array, then it's a selector box menu
                        // If empty string it's just a variable, that'll be saved.
@@ -166,7 +166,7 @@ class SC_file_list {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                        // Initialize the template object
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
@@ -442,7 +442,7 @@ class SC_file_list {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
index da8f03d..d2df734 100755 (executable)
@@ -73,7 +73,7 @@ class SC_mod_web_func_index extends t3lib_SCbase {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                global $LANG,$BACK_PATH;
 
                // Access check...
@@ -156,7 +156,7 @@ class SC_mod_web_func_index extends t3lib_SCbase {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -165,7 +165,7 @@ class SC_mod_web_func_index extends t3lib_SCbase {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
                global $BACK_PATH;
 
                $buttons = array(
index c642d7d..3476911 100755 (executable)
@@ -67,7 +67,7 @@ class tx_funcwizards_webfunc extends t3lib_extobjbase {
         * @return      array           Items merged with the parent objects.
         * @see t3lib_extobjbase::init()
         */
-       function modMenu()      {
+       function modMenu() {
                global $LANG;
 
                $modMenuAdd = array(
@@ -86,7 +86,7 @@ class tx_funcwizards_webfunc extends t3lib_extobjbase {
         * @return      string          The content
         * @see t3lib_extobjbase::extObjContent()
         */
-       function main() {
+       function main() {
                global $SOBE,$LANG;
 
                $menu= $LANG->getLL('wiz_lWizards',1).': '.t3lib_BEfunc::getFuncMenu($this->pObj->id,'SET[wiz]',$this->pObj->MOD_SETTINGS['wiz'],$this->pObj->MOD_MENU['wiz']);
index 02e62e9..1db593e 100755 (executable)
@@ -132,7 +132,7 @@ class localPageTree extends t3lib_browseTree {
         *
         * @return      string          SQL where clause
         */
-       function permsC()       {
+       function permsC() {
                return $this->BE_USER->getPagePermsClause(1);
        }
 
@@ -233,7 +233,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                        // Start document template object:
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
@@ -310,7 +310,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -1522,7 +1522,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
         *
         * @return      string          Absolute path to first "_temp_" folder of the current user, otherwise blank.
         */
-       function userTempFolder()       {
+       function userTempFolder() {
                global $FILEMOUNTS;
 
                foreach($FILEMOUNTS as $filePathInfo)   {
@@ -1538,7 +1538,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
         *
         * @return      string          Absolute path to folder where export files can be saved.
         */
-       function userSaveFolder()       {
+       function userSaveFolder() {
                global $FILEMOUNTS;
 
                reset($FILEMOUNTS);
@@ -1561,7 +1561,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
         *
         * @return      void
         */
-       function checkUpload()  {
+       function checkUpload() {
                $file = t3lib_div::_GP('file');
 
                        // Initializing:
index 4873a0c..4d06c56 100755 (executable)
@@ -172,7 +172,7 @@ class tx_impexp {
         *
         * @return      void
         */
-       function setHeaderBasics()      {
+       function setHeaderBasics() {
 
                        // Initializing:
                if (is_array($this->softrefCfg))        {
@@ -543,7 +543,7 @@ class tx_impexp {
         * @return      void
         * @see export_addDBRelations()
         */
-       function export_addFilesFromRelations() {
+       function export_addFilesFromRelations() {
 
                        // Traverse all "rels" registered for "records"
                if (is_array($this->dat['records']))    {
@@ -885,7 +885,7 @@ class tx_impexp {
         *
         * @return      string          XML content
         */
-       function createXML()    {
+       function createXML() {
 
                        // Options:
                $options = array(
@@ -977,7 +977,7 @@ class tx_impexp {
         *
         * @return      boolean         TRUE if compression is possible AND requested.
         */
-       function doOutputCompress()     {
+       function doOutputCompress() {
                return $this->compress && !$this->dontCompress;
        }
 
@@ -1364,7 +1364,7 @@ class tx_impexp {
         *
         * @return      object          $TCE object
         */
-       function getNewTCE()    {
+       function getNewTCE() {
                $tce = t3lib_div::makeInstance('t3lib_TCEmain');
                $tce->stripslashes_values = 0;
                $tce->dontProcessTransformations = 1;
@@ -1379,7 +1379,7 @@ class tx_impexp {
         *
         * @return      void
         */
-       function unlinkTempFiles()      {
+       function unlinkTempFiles() {
                foreach($this->unlinkFiles as $fileName)        {
                        if (t3lib_div::isFirstPartOfStr($fileName, PATH_site.'typo3temp/'))     {
                                t3lib_div::unlink_tempfile($fileName);
@@ -1417,7 +1417,7 @@ class tx_impexp {
         * @return      void
         * @see setFlexFormRelations()
         */
-       function setRelations() {
+       function setRelations() {
                $updateData = array();
 
                        // import_newId contains a register of all records that was in the import memorys "records" key
@@ -1525,7 +1525,7 @@ class tx_impexp {
         * @return      void
         * @see setRelations()
         */
-       function setFlexFormRelations() {
+       function setFlexFormRelations() {
                $updateData = array();
                        // import_newId contains a register of all records that was in the import memorys "records" key
                foreach ($this->import_newId as $nId => $dat) {
@@ -1647,7 +1647,7 @@ class tx_impexp {
         *
         * @return      void
         */
-       function processSoftReferences()        {
+       function processSoftReferences() {
 
                        // Initialize:
                $inData = array();
@@ -2223,7 +2223,7 @@ class tx_impexp {
         *
         * @return      void
         */
-       function loadInit()     {
+       function loadInit() {
                $this->relStaticTables = (array)$this->dat['header']['relStaticTables'];
                $this->excludeMap = (array)$this->dat['header']['excludeMap'];
 
@@ -2239,7 +2239,7 @@ class tx_impexp {
         * @return      void
         * @see loadInit()
         */
-       function fixCharsets()  {
+       function fixCharsets() {
                global $LANG;
 
                $importCharset = $this->dat['header']['charset'];
@@ -2294,7 +2294,7 @@ class tx_impexp {
         *
         * @return      string          HTML content
         */
-       function displayContentOverview()       {
+       function displayContentOverview() {
                global $LANG;
 
                        // Check extension dependencies:
@@ -3210,7 +3210,7 @@ class tx_impexp {
         *
         * @return      string          HTML print of error log
         */
-       function printErrorLog()        {
+       function printErrorLog() {
                return count($this->errorLog) ? t3lib_utility_Debug::viewArray($this->errorLog) : '';
        }
 }
index bfd1f6e..8ec4f29 100755 (executable)
@@ -104,7 +104,7 @@ class tx_impexp_clickmenu {
         *
         * @return      array           Local lang array
         */
-       function includeLL()    {
+       function includeLL() {
                global $LANG;
 
                return $LANG->includeLLFile('EXT:impexp/app/locallang.php',FALSE);
index ac445de..3b45cc9 100755 (executable)
@@ -50,7 +50,7 @@ class tx_impexp_modfunc1 extends mod_user_task {
         * @param       object          Parent object
         * @return      string          HTML for the task center overview listing.
         */
-       function overview_main()        {
+       function overview_main() {
                global $LANG;
                        // Create preset links:
                $presets = $this->getPresets();
@@ -170,7 +170,7 @@ class tx_impexp_modfunc1 extends mod_user_task {
         *
         * @return      array           Array of preset records
         */
-       function getPresets()   {
+       function getPresets() {
                $presets = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
                                '*',
                                'tx_impexp_presets',
@@ -187,7 +187,7 @@ class tx_impexp_modfunc1 extends mod_user_task {
         *
         * @return      string          Absolute path to first "_temp_" folder of the current user, otherwise blank.
         */
-       function userTempFolder()       {
+       function userTempFolder() {
                global $FILEMOUNTS;
 
                foreach($FILEMOUNTS as $filePathInfo)   {
index 0beb14e..75e5fdc 100755 (executable)
@@ -502,7 +502,7 @@ class tx_indexedsearch_crawler {
         *
         * @return      void
         */
-       function cleanUpOldRunningConfigurations()      {
+       function cleanUpOldRunningConfigurations() {
 
                        // Lookup running index configurations:
                $runningIndexingConfigurations = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
@@ -694,7 +694,7 @@ class tx_indexedsearch_crawler {
         *
         * @return      void
         */
-       function loadIndexerClass()     {
+       function loadIndexerClass() {
                global $TYPO3_CONF_VARS;
                require_once(t3lib_extMgm::extPath('indexed_search').'class.indexer.php');
        }
@@ -953,7 +953,7 @@ class tx_indexedsearch_files {
         *
         * @return      void
         */
-       function loadIndexerClass()     {
+       function loadIndexerClass() {
                global $TYPO3_CONF_VARS;
                require_once(t3lib_extMgm::extPath('indexed_search').'class.indexer.php');
        }
index 75712f9..dede7eb 100755 (executable)
@@ -335,7 +335,7 @@ class tx_indexedsearch_indexer {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                global $TYPO3_CONF_VARS;
 
                        // Initializing:
@@ -393,7 +393,7 @@ class tx_indexedsearch_indexer {
         * @access private
         * @see init()
         */
-       function initializeExternalParsers()    {
+       function initializeExternalParsers() {
                global $TYPO3_CONF_VARS;
 
                if (is_array($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['external_parsers']))        {
@@ -434,7 +434,7 @@ class tx_indexedsearch_indexer {
         *
         * @return      void
         */
-       function indexTypo3PageContent()        {
+       function indexTypo3PageContent() {
 
                $check = $this->checkMtimeTstamp($this->conf['mtime'], $this->hash['phash']);
                $is_grlist = $this->is_grlist_set($this->hash['phash']);
@@ -1431,7 +1431,7 @@ class tx_indexedsearch_indexer {
         *
         * @return      void
         */
-       function submitPage()   {
+       function submitPage() {
 
                        // Remove any current data for this phash:
                $this->removeOldIndexedPages($this->hash['phash']);
@@ -1798,7 +1798,7 @@ class tx_indexedsearch_indexer {
         *
         * @return      mixed           Returns TRUE if the page needs to be indexed (that is, there was no result), otherwise the phash value (in an array) of the phash record to which the grlist_record should be related!
         */
-       function checkContentHash()     {
+       function checkContentHash() {
                        // With this query the page will only be indexed if it's content is different from the same "phash_grouping" -page.
                $result = TRUE;
                if (tx_indexedsearch_util::isTableUsed('index_phash')) {
@@ -1950,7 +1950,7 @@ class tx_indexedsearch_indexer {
         *
         * @return      void
         */
-       function removeLoginpagesWithContentHash()      {
+       function removeLoginpagesWithContentHash() {
                if (tx_indexedsearch_util::isTableUsed('index_phash') && tx_indexedsearch_util::isTableUsed('index_grlist')) {
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('A.phash', 'index_phash A,index_grlist B', '
                                        A.phash=B.phash
@@ -1970,7 +1970,7 @@ class tx_indexedsearch_indexer {
         *
         * @return      void
         */
-       function includeCrawlerClass()  {
+       function includeCrawlerClass() {
                t3lib_div::requireOnce(t3lib_extMgm::extPath('crawler') . 'class.tx_crawler_lib.php');
        }
 
@@ -2092,7 +2092,7 @@ class tx_indexedsearch_indexer {
         *
         * @return      void
         */
-       function setT3Hashes()  {
+       function setT3Hashes() {
 
                        //  Set main array:
                $hArray = array(
@@ -2157,7 +2157,7 @@ class tx_indexedsearch_indexer {
         *
         * @return      void
         */
-       function log_pull()     {
+       function log_pull() {
                if (is_object($GLOBALS['TT']))          $GLOBALS['TT']->pull();
        }
 
index 7ed8c63..fbaf64f 100755 (executable)
@@ -46,7 +46,7 @@ class tx_indexedsearch_crawlerhook {
         *
         * @return      string          Return a text string for the first, initiating queue entry for the crawler.
         */
-       function initMessage()  {
+       function initMessage() {
                return 'Start of Custom Example Indexing session!';
        }
 
index 3c0af7c..3570afb 100755 (executable)
@@ -54,7 +54,7 @@ class tx_indexedsearch_pihook {
         *
         * @return      void
         */
-       function initialize_postProc()  {
+       function initialize_postProc() {
                $this->pObj->optValues['order'] = array_reverse($this->pObj->optValues['order']);
        }
 
index f2c7bb5..20d8137 100755 (executable)
@@ -70,7 +70,7 @@ class SC_mod_tools_isearch_index {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                $this->MCONF = $GLOBALS['MCONF'];
 
                $this->menuConfig();
@@ -105,7 +105,7 @@ class SC_mod_tools_isearch_index {
         *
         * @return      void
         */
-       function menuConfig()   {
+       function menuConfig() {
                $this->MOD_MENU = array(
                        'function' => array(
                                'stat'         => 'General statistics',
@@ -123,7 +123,7 @@ class SC_mod_tools_isearch_index {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                $this->content  = $this->doc->header('Indexing Engine Statistics');
                $this->content .= $this->doc->spacer(5);
 
@@ -162,7 +162,7 @@ class SC_mod_tools_isearch_index {
         *
         * @return void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -200,7 +200,7 @@ class SC_mod_tools_isearch_index {
        /**
         * @return      [type]          ...
         */
-       function getRecordsNumbers()    {
+       function getRecordsNumbers() {
                $tables=explode(",","index_phash,index_words,index_rel,index_grlist,index_section,index_fulltext");
                $recList=array();
                foreach ($tables as $t) {
@@ -227,7 +227,7 @@ class SC_mod_tools_isearch_index {
         *
         * @return      [type]          ...
         */
-       function getPhashStat() {
+       function getPhashStat() {
                $recList = array();
 
                        // TYPO3 pages, unique
@@ -264,7 +264,7 @@ class SC_mod_tools_isearch_index {
         *
         * @return      [type]          ...
         */
-       function getPhashT3pages()      {
+       function getPhashT3pages() {
                $recList[]=array(
                        $this->tableHead("id/type"),
                        $this->tableHead("Title"),
@@ -333,7 +333,7 @@ class SC_mod_tools_isearch_index {
         *
         * @return      [type]          ...
         */
-       function getPhashExternalDocs() {
+       function getPhashExternalDocs() {
                $recList[]=array(
                        $this->tableHead("Filename"),
                        $this->tableHead("Size"),
@@ -478,7 +478,7 @@ class SC_mod_tools_isearch_index {
         *
         * @return      [type]          ...
         */
-       function getPhashTypes()        {
+       function getPhashTypes() {
                $recList=array();
 
                // Types:
index c500644..16c772d 100755 (executable)
@@ -60,7 +60,7 @@ class tx_indexedsearch_modfunc1 extends t3lib_extobjbase {
         *
         * @return      void
         */
-       function modMenu()      {
+       function modMenu() {
                global $LANG;
 
                return array (
@@ -84,7 +84,7 @@ class tx_indexedsearch_modfunc1 extends t3lib_extobjbase {
         *
         * @return      string          HTML output
         */
-       function main() {
+       function main() {
                        // Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
                global $LANG,$TYPO3_CONF_VARS;
 
@@ -195,7 +195,7 @@ class tx_indexedsearch_modfunc1 extends t3lib_extobjbase {
         *
         * @return      string          HTML output
         */
-       function drawTableOfIndexedPages()      {
+       function drawTableOfIndexedPages() {
                global $BACK_PATH;
 
                        // Drawing tree:
@@ -482,7 +482,7 @@ class tx_indexedsearch_modfunc1 extends t3lib_extobjbase {
         *
         * @return      string          HTML string (table row)
         */
-       function printPhashRowHeader()  {
+       function printPhashRowHeader() {
                $lines = array();
 
                switch($this->pObj->MOD_SETTINGS['type'])       {
@@ -537,7 +537,7 @@ class tx_indexedsearch_modfunc1 extends t3lib_extobjbase {
         *
         * @return      integer         Number of columns in list:
         */
-       function returnNumberOfColumns()        {
+       function returnNumberOfColumns() {
                switch($this->pObj->MOD_SETTINGS['type'])       {
                        case 1:
                                return 18;
@@ -1000,7 +1000,7 @@ class tx_indexedsearch_modfunc1 extends t3lib_extobjbase {
         *
         * @return      string          Link back to list
         */
-       function linkList()     {
+       function linkList() {
                return '<br /><a href="index.php?id=' . $this->pObj->id . '">Back to list.</a><br />';
        }
 
index 5339f23..834d474 100644 (file)
@@ -42,7 +42,7 @@ class tx_indexedsearch_modfunc2 extends t3lib_extobjbase {
         *
         * @return      string          html table with results from showStats()
         */
-       function main() {
+       function main() {
                        // Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
                $theOutput = $this->pObj->doc->header($GLOBALS['LANG']->getLL('title'));
                $theOutput .= $this->pObj->doc->section('', $this->showStats(), 0, 1);
index 9353c04..2f0b41d 100755 (executable)
@@ -133,7 +133,7 @@ class tx_indexedsearch extends tslib_pibase {
         *
         * @return      void
         */
-       function initialize()   {
+       function initialize() {
                global $TYPO3_CONF_VARS;
 
                        // Indexer configuration from Extension Manager interface:
@@ -958,7 +958,7 @@ class tx_indexedsearch extends tslib_pibase {
         *
         * @return      string          AND clause for selection of section in database.
         */
-       function sectionTableWhere()    {
+       function sectionTableWhere() {
                $out = ($this->wholeSiteIdList < 0) ? '' : ' AND ISEC.rl0 IN (' . $this->wholeSiteIdList . ')';
 
                $match = '';
@@ -1005,7 +1005,7 @@ class tx_indexedsearch extends tslib_pibase {
         *
         * @return      string          AND statement for selection of media type
         */
-       function mediaTypeWhere()       {
+       function mediaTypeWhere() {
 
                switch((string)$this->piVars['media'])  {
                        case '0':               // '0' => 'Kun TYPO3 sider',
@@ -1029,7 +1029,7 @@ class tx_indexedsearch extends tslib_pibase {
         *
         * @return      string          AND statement for selection of langauge
         */
-       function languageWhere()        {
+       function languageWhere() {
                if ($this->piVars['lang']>=0)   {       // -1 is the same as ALL language.
                        return 'AND IP.sys_language_uid='.intval($this->piVars['lang']);
                }
@@ -1495,7 +1495,7 @@ class tx_indexedsearch extends tslib_pibase {
         *
         * @return      string          Rules for the search
         */
-       function printRules()   {
+       function printRules() {
                if ($this->conf['show.']['rules'])      {
 
                        $html = $this->cObj->getSubpart($this->templateCode, '###RULES###');
@@ -1514,7 +1514,7 @@ class tx_indexedsearch extends tslib_pibase {
         *
         * @return      string
         */
-       function printResultSectionLinks()      {
+       function printResultSectionLinks() {
                if (count($this->resultSections))       {
                        $lines = array();
 
index 68796ca..e109b6e 100644 (file)
@@ -58,7 +58,7 @@ class tx_indexedsearch_mysql {
                if ($searchData) {
                                // Do the search:
                        $GLOBALS['TT']->push('execFinalQuery');
-                       $resource = $this->execFinalQuery_fulltext($searchData ,$freeIndexUid);
+                       $resource = $this->execFinalQuery_fulltext($searchData$freeIndexUid);
                        $GLOBALS['TT']->pull();
                }
                return $resource;
index 96d19a1..e21dca5 100755 (executable)
@@ -71,7 +71,7 @@ class SC_mod_web_info_index extends t3lib_SCbase {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                // Access check...
                // The page will show only if there is a valid page and if this page may be viewed by the user
                $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id,$this->perms_clause);
@@ -151,7 +151,7 @@ class SC_mod_web_info_index extends t3lib_SCbase {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                $this->content = $this->doc->insertStylesAndJS($this->content);
                echo $this->content;
        }
@@ -161,7 +161,7 @@ class SC_mod_web_info_index extends t3lib_SCbase {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
                $buttons = array(
                        'csh' => '',
                        'view' => '',
index 76f890e..6f92542 100755 (executable)
@@ -47,7 +47,7 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
         *
         * @return      array           Menu array
         */
-       function modMenu()      {
+       function modMenu() {
                global $LANG;
 
                $modMenuAdd = array(
@@ -80,7 +80,7 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
         *
         * @return      string          HTML output
         */
-       function main() {
+       function main() {
                global $LANG;
 
                $menu = t3lib_BEfunc::getFuncMenu($this->pObj->id,'SET[tsconf_parts]',$this->pObj->MOD_SETTINGS['tsconf_parts'],$this->pObj->MOD_MENU['tsconf_parts']);
index 32b58ca..0b2b3b0 100644 (file)
@@ -3713,26 +3713,29 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                switch((string)$key) {
                                                        case 'typo_db_username':
                                                                if (strlen($value)<50) {
-                                                                       if (strcmp(TYPO3_db_username, $value))          $this->setValueInLocalconfFile($lines, '$typo_db_username', trim($value));
+                                                                       if (strcmp(TYPO3_db_username, $value))
+                                                                               $this->setValueInLocalconfFile($lines, '$typo_db_username', trim($value));
                                                                } else {
                                                                        $this->errorMessages[] = '
                                                                                Username \'' . $value . '\' was longer
                                                                                than 50 chars (...not saved)
                                                                        ';
                                                                }
-                                                       break;
+                                                               break;
                                                        case 'typo_db_password':
                                                                if (strlen($value)<50) {
-                                                                       if (strcmp(TYPO3_db_password, $value))          $this->setValueInLocalconfFile($lines, '$typo_db_password',  trim($value));
+                                                                       if (strcmp(TYPO3_db_password, $value))
+                                                                               $this->setValueInLocalconfFile($lines, '$typo_db_password', trim($value));
                                                                } else {
                                                                        $this->errorMessages[] = '
                                                                                Password was longer than 50 chars (...not saved)
                                                                        ';
                                                                }
-                                                       break;
+                                                               break;
                                                        case 'typo_db_host':
                                                                if (preg_match('/^[a-zA-Z0-9_\.-]+(:.+)?$/', $value) && strlen($value)<50) {
-                                                                       if (strcmp(TYPO3_db_host, $value))              $this->setValueInLocalconfFile($lines, '$typo_db_host', $value);
+                                                                       if (strcmp(TYPO3_db_host, $value))
+                                                                               $this->setValueInLocalconfFile($lines, '$typo_db_host', $value);
                                                                } else {
                                                                        $this->errorMessages[] = '
                                                                                Host \'' . $value . '\' was not
@@ -3740,39 +3743,45 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                                                longer than 50 chars (...not saved)
                                                                        ';
                                                                }
-                                                       break;
+                                                               break;
                                                        case 'typo_db':
                                                                if (strlen($value)<50) {
-                                                                       if (strcmp(TYPO3_db, $value))           $this->setValueInLocalconfFile($lines, '$typo_db',  trim($value));
+                                                                       if (strcmp(TYPO3_db, $value))
+                                                                               $this->setValueInLocalconfFile($lines, '$typo_db', trim($value));
                                                                } else {
                                                                        $this->errorMessages[] = '
                                                                                Database name \'' . $value . '\' was
                                                                                longer than 50 chars (...not saved)
                                                                        ';
                                                                }
-                                                       break;
+                                                               break;
                                                        case 'disable_exec_function':
-                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['BE']['disable_exec_function'], $value)) $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'BE\'][\'disable_exec_function\']', $value?1:0);
-                                                       break;
+                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['BE']['disable_exec_function'], $value))
+                                                                       $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'BE\'][\'disable_exec_function\']', $value ? 1 : 0);
+                                                               break;
                                                        case 'sitename':
-                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'], $value))     $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'SYS\'][\'sitename\']', $value);
-                                                       break;
+                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'], $value))
+                                                                       $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'SYS\'][\'sitename\']', $value);
+                                                               break;
                                                        case 'encryptionKey':
-                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], $value))        $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'SYS\'][\'encryptionKey\']', $value);
-                                                       break;
+                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'], $value))
+                                                                       $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'SYS\'][\'encryptionKey\']', $value);
+                                                               break;
                                                        case 'compat_version':
-                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['SYS']['compat_version'], $value))       $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'SYS\'][\'compat_version\']', $value);
-                                                       break;
+                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['SYS']['compat_version'], $value))
+                                                                       $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'SYS\'][\'compat_version\']', $value);
+                                                               break;
                                                        case 'im_combine_filename':
-                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_combine_filename'], $value))  $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'im_combine_filename\']', $value);
-                                                       break;
+                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_combine_filename'], $value))
+                                                                       $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'im_combine_filename\']', $value);
+                                                               break;
                                                        case 'gdlib':
                                                        case 'gdlib_png':
                                                        case 'im':
                                                                if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX'][$key], $value)) {
                                                                        $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'' . $key . '\']', ($value ? 1 : 0));
                                                                }
-                                                       break;
+                                                               break;
                                                        case 'im_path':
                                                                list($value, $version) = explode('|', $value);
                                                                if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX'][$key], $value)) {
@@ -3788,16 +3797,17 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                                if (strcmp(strtolower($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5']), $value_ext)) {
                                                                        $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'im_version_5\']', $value_ext);
                                                                }
-                                                       break;
+                                                               break;
                                                        case 'im_path_lzw':
                                                                list($value) = explode('|', $value);
                                                                if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX'][$key], $value)) {
                                                                        $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'' . $key . '\']', $value);
                                                                }
-                                                       break;
+                                                               break;
                                                        case 'TTFdpi':
-                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX']['TTFdpi'], $value))       $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'TTFdpi\']', $value);
-                                                       break;
+                                                               if (strcmp($GLOBALS['TYPO3_CONF_VARS']['GFX']['TTFdpi'], $value))
+                                                                       $this->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'GFX\'][\'TTFdpi\']', $value);
+                                                               break;
                                                }
                                        }
 
@@ -5592,10 +5602,9 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                $tblFileContent = t3lib_div::getUrl($actionParts[1]);
                                        }
 
-
                                        foreach ($hookObjects as $hookObject) {
                                                /** @var $hookObject Tx_Install_Interfaces_CheckTheDatabaseHook **/
-                                               $appendableTableDefinitions = $hookObject->appendGlobalTableDefinitions($tblFileContent, $this->sqlHandler,  $this);
+                                               $appendableTableDefinitions = $hookObject->appendGlobalTableDefinitions($tblFileContent, $this->sqlHandler, $this);
                                                if ($appendableTableDefinitions) {
                                                        $tblFileContent .= $appendableTableDefinitions;
                                                        break;
index c872d6b..a332ba9 100644 (file)
@@ -53,7 +53,7 @@ class tx_install_ajax {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                $this->cmd = t3lib_div::_GP('cmd');
        }
 
@@ -63,7 +63,7 @@ class tx_install_ajax {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                        // Create output:
                switch ($this->cmd) {
                        case 'encryptionKey':
@@ -79,7 +79,7 @@ class tx_install_ajax {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                if (!headers_sent()) {
                        header('Content-Length: ' . strlen($this->content));
                }
index c991104..ea505f1 100644 (file)
@@ -206,7 +206,7 @@ class tx_coreupdates_compatversion extends Tx_Install_Updates_Base {
         *
         * @return      boolean         TRUE if compat version is equal the current version
         */
-       function compatVersionIsCurrent()       {
+       function compatVersionIsCurrent() {
                global $TYPO3_CONF_VARS;
                if (TYPO3_branch != $TYPO3_CONF_VARS['SYS']['compat_version'])  {
                        return 0;
index 5939a89..4f8d251 100644 (file)
@@ -49,7 +49,7 @@ class tx_lowlevel_admin_core extends t3lib_cli {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
 
                        // Running parent class constructor
                parent::__construct();
index 58ee9b6..63e40ec 100644 (file)
@@ -59,7 +59,7 @@ class tx_lowlevel_cleaner_core extends t3lib_cli {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
 
                        // Running parent class constructor
                parent::__construct();
@@ -162,7 +162,7 @@ class tx_lowlevel_cleaner_core extends t3lib_cli {
         *
         * @return      boolean         TRUE if reference index was OK (either OK, updated or ignored)
         */
-       function cli_referenceIndexCheck()      {
+       function cli_referenceIndexCheck() {
 
                        // Reference index option:
                $refIndexMode = isset($this->cli_args['--refindex']) ? $this->cli_args['--refindex'][0] : 'check';
index 40d96c0..6184e30 100644 (file)
@@ -46,7 +46,7 @@ class tx_lowlevel_cleanflexform extends tx_lowlevel_cleaner_core {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                        // Setting up help:
index 9793a04..7bcf67b 100644 (file)
@@ -46,7 +46,7 @@ class tx_lowlevel_deleted extends tx_lowlevel_cleaner_core {
         *
         * @return      [type]          ...
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                        // Setting up help:
index 6674624..233687f 100644 (file)
@@ -46,7 +46,7 @@ class tx_lowlevel_double_files extends tx_lowlevel_cleaner_core {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                        // Setting up help:
index a8d9668..0b12a4e 100644 (file)
@@ -48,7 +48,7 @@ class tx_lowlevel_lost_files extends tx_lowlevel_cleaner_core {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                $this->cli_options[] = array('--excludePath [path-list]', 'Comma separated list of paths to exclude. Example: "uploads/[path1],uploads/[path2],..."');
index c95b77d..1302012 100644 (file)
@@ -48,7 +48,7 @@ class tx_lowlevel_missing_files extends tx_lowlevel_cleaner_core {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                        // Setting up help:
index c36abfb..3d7f8ba 100644 (file)
@@ -48,7 +48,7 @@ class tx_lowlevel_missing_relations extends tx_lowlevel_cleaner_core {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                        // Setting up help:
index f87ab46..7775d20 100644 (file)
@@ -46,7 +46,7 @@ class tx_lowlevel_orphan_records extends tx_lowlevel_cleaner_core {
         *
         * @return      [type]          ...
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                        // Setting up help:
index af3a052..0115cb0 100644 (file)
@@ -46,7 +46,7 @@ class tx_lowlevel_rte_images extends tx_lowlevel_cleaner_core {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                        // Setting up help:
index ffb1653..87b89f1 100644 (file)
@@ -46,7 +46,7 @@ class tx_lowlevel_syslog extends tx_lowlevel_cleaner_core {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                $this->cli_help['name'] = 'syslog -- Show entries from syslog';
index 73e0fab..c8ef92a 100644 (file)
@@ -46,7 +46,7 @@ class tx_lowlevel_versions extends tx_lowlevel_cleaner_core {
         *
         * @return      void
         */
-       function __construct()  {
+       function __construct() {
                parent::__construct();
 
                        // Setting up help:
index 59db294..294df29 100755 (executable)
@@ -76,7 +76,7 @@ class SC_mod_tools_config_index {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                global $BACK_PATH;
 
                $this->MCONF = $GLOBALS['MCONF'];
@@ -105,7 +105,7 @@ class SC_mod_tools_config_index {
         *
         * @return      void
         */
-       function menuConfig()   {
+       function menuConfig() {
                global $TYPO3_CONF_VARS;
 
                        // MENU-ITEMS:
@@ -138,7 +138,7 @@ class SC_mod_tools_config_index {
         *
         * @return      [type]          ...
         */
-       function main() {
+       function main() {
 
                $arrayBrowser = t3lib_div::makeInstance('t3lib_arrayBrowser');
 
@@ -337,7 +337,7 @@ class SC_mod_tools_config_index {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -346,7 +346,7 @@ class SC_mod_tools_config_index {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
 
                $buttons = array(
                        'csh' => '',
index bc3cbe9..624cc58 100755 (executable)
@@ -78,7 +78,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      void
         */
-       function init() {
+       function init() {
                global $LANG,$BACK_PATH;
                $this->MCONF = $GLOBALS['MCONF'];
 
@@ -118,7 +118,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      void
         */
-       function menuConfig()   {
+       function menuConfig() {
                global $LANG;
 
                // MENU-ITEMS:
@@ -204,7 +204,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      void
         */
-       function main() {
+       function main() {
 
                        // Content creation
                if (!$GLOBALS['BE_USER']->userTS['mod.']['dbint.']['disableTopMenu'])   {
@@ -254,7 +254,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 
@@ -263,7 +263,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      array   all available buttons as an assoc. array
         */
-       protected function getButtons() {
+       protected function getButtons() {
 
                $buttons = array(
                        'csh' => '',
@@ -340,7 +340,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      void
         */
-       function func_refindex()        {
+       function func_refindex() {
                $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('manageRefIndex', TRUE));
 
                if (t3lib_div::_GP('_update') || t3lib_div::_GP('_check'))      {
@@ -377,7 +377,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      void
         */
-       function func_search()  {
+       function func_search() {
                global $LANG;
 
                $fullsearch = t3lib_div::makeInstance('t3lib_fullsearch');
@@ -420,7 +420,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      void
         */
-       function func_records() {
+       function func_records() {
                /** @var $admin t3lib_admin */
                $admin = t3lib_div::makeInstance('t3lib_admin');
                $admin->genTree_makeHTML = 0;
@@ -533,7 +533,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      void
         */
-       function func_relations()       {
+       function func_relations() {
                global $LANG,$BACK_PATH;
 
                $this->content.= $this->doc->header($GLOBALS['LANG']->getLL('relations'));
@@ -586,7 +586,7 @@ class SC_mod_tools_dbint_index {
         *
         * @return      void
         */
-       function func_filesearch()      {
+       function func_filesearch() {
                $pattern = t3lib_div::_GP('pattern');
                $pcontent = $GLOBALS['LANG']->getLL('enterRegexPattern') . ' <input type="text" name="pattern" value="' . htmlspecialchars($pattern ? $pattern : $GLOBALS['TYPO3_CONF_VARS']['BE']['fileDenyPattern']) . '"> <input type="submit" name="' . $GLOBALS['LANG']->getLL('SearchButton') . '">';
                $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('findFilename'));
index 054e4a8..8aa4509 100644 (file)
@@ -103,7 +103,7 @@ class SC_db_list {
         *
         * @return      void
         */
-       function init() {
+       function init() {
 
                        // Setting module configuration / page select clause
                $this->MCONF = $GLOBALS['MCONF'];
@@ -137,7 +137,7 @@ class SC_db_list {
         *
         * @return      void
         */
-       function menuConfig()   {
+       function menuConfig() {
 
                        // MENU-ITEMS:
                $this->MOD_MENU = array(
@@ -158,7 +158,7 @@ class SC_db_list {
         *
         * @return      void
         */
-       function clearCache()   {
+       function clearCache() {
                if ($this->clear_cache) {
                        $tce = t3lib_div::makeInstance('t3lib_TCEmain');
                        $tce->stripslashes_values=0;
@@ -172,7 +172,7 @@ class SC_db_list {
         *
         * @return      void
         */
-       function main() {
+       function main() {
                        // Start document template object:
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $GLOBALS['BACK_PATH'];
@@ -476,7 +476,7 @@ class SC_db_list {
         *
         * @return      void
         */
-       function printContent() {
+       function printContent() {
                echo $this->content;
        }
 }
index bde68ab..c9c1402 100644 (file)
@@ -250,7 +250,7 @@ class tx_recycler_model_deletedRecords {
                                        $table,
                                        $deletedField,
                                        '1',
-                                       ' AND pid = ' . $id . $filterWhere ,
+                                       ' AND pid = ' . $id . $filterWhere,
                                        '',
                                        '',
                                        $limit,
index 46c619a..fef0465 100644 (file)
@@ -115,7 +115,7 @@ class tx_rsaauth_sv1 extends tx_sv_auth  {
         *
         * @return      boolean
         */
-       public function init()  {
+       public function init() {
                $available = parent::init();
                if ($available) {
                        // Get the backend
index e88ef89..65f109d 100644 (file)
@@ -149,7 +149,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
         *
         * @return      boolean         TRUE if this RTE object offers an RTE in the current browser environment
         */
-       function isAvailable()  {
+       function isAvailable() {
 
                $this->client = $this->clientInfo();
                $this->errorLog = array();
@@ -259,9 +259,9 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                        $this->hostURL = $this->siteURL . TYPO3_mainDir;
                                // Element ID + pid
                        $this->elementId = $PA['itemFormElName']; // Form element name
-                       $this->elementParts = explode('][',preg_replace('/\]$/','',preg_replace('/^(TSFE_EDIT\[data\]\[|data\[)/','',$this->elementId)));
+                       $this->elementParts = explode('][', preg_replace('/\]$/', '', preg_replace('/^(TSFE_EDIT\[data\]\[|data\[)/', '', $this->elementId)));
                                // Find the page PIDs:
-                       list($this->tscPID,$this->thePid) = t3lib_BEfunc::getTSCpid(trim($this->elementParts[0]),trim($this->elementParts[1]),$thePidValue);
+                       list($this->tscPID, $this->thePid) = t3lib_BEfunc::getTSCpid(trim($this->elementParts[0]), trim($this->elementParts[1]), $thePidValue);
 
                                // Record "types" field value:
                        $this->typeVal = $RTEtypeVal; // TCA "types" value for record
@@ -291,7 +291,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
 
                                // Languages: interface and content
                        $this->language = $LANG->lang;
-                       if ($this->language == 'default' || !$this->language)   {
+                       if ($this->language == 'default' || !$this->language) {
                                $this->language = 'en';
                        }
                        $this->contentTypo3Language = ($this->language == 'en') ? 'default' : $this->language;
@@ -392,11 +392,11 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                         */
 
                                // Transform value:
-                       $value = $this->transformContent('rte',$PA['itemFormElValue'],$table,$field,$row,$specConf,$thisConfig,$RTErelPath,$thePidValue);
+                       $value = $this->transformContent('rte', $PA['itemFormElValue'], $table, $field, $row, $specConf, $thisConfig, $RTErelPath, $thePidValue);
 
                                // Further content transformation by registered plugins
                        foreach ($this->registeredPlugins as $pluginId => $plugin) {
-                               if ($this->isPluginEnabled($pluginId) && method_exists($plugin, "transformContent")) {
+                               if ($this->isPluginEnabled($pluginId) && method_exists($plugin, 'transformContent')) {
                                        $value = $plugin->transformContent($value);
                                }
                        }
@@ -521,8 +521,10 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
 
                        // Merge the list of enabled plugins with the lists from the previous RTE editing areas on the same form
                $this->pluginEnabledCumulativeArray[$this->TCEform->RTEcounter] = $this->pluginEnabledArray;
-               if ($this->TCEform->RTEcounter > 1 && isset($this->pluginEnabledCumulativeArray[$this->TCEform->RTEcounter-1]) && is_array($this->pluginEnabledCumulativeArray[$this->TCEform->RTEcounter-1])) {
-                       $this->pluginEnabledCumulativeArray[$this->TCEform->RTEcounter] = array_unique(array_values(array_merge($this->pluginEnabledArray,$this->pluginEnabledCumulativeArray[$this->TCEform->RTEcounter-1])));
+               if ($this->TCEform->RTEcounter > 1 && isset($this->pluginEnabledCumulativeArray[$this->TCEform->RTEcounter - 1]) && is_array($this->pluginEnabledCumulativeArray[$this->TCEform->RTEcounter - 1])) {
+                       $this->pluginEnabledCumulativeArray[$this->TCEform->RTEcounter] = array_unique(
+                               array_values(array_merge($this->pluginEnabledArray, $this->pluginEnabledCumulativeArray[$this->TCEform->RTEcounter - 1]))
+                       );
                }
        }
 
@@ -532,7 +534,8 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
         */
        function enableRegisteredPlugins() {
                global $TYPO3_CONF_VARS;
-                                       // Traverse registered plugins
+
+                       // Traverse registered plugins
                if (is_array($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['plugins'])) {
                        foreach($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['plugins'] as $pluginId => $pluginObjectConfiguration) {
                                $plugin = FALSE;
@@ -545,12 +548,12 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                                                        // Override buttons from previously registered plugins
                                                $pluginButtons = t3lib_div::trimExplode(',', $plugin->getPluginButtons(), 1);
                                                foreach ($this->pluginButton as $previousPluginId => $buttonList) {
-                                                       $this->pluginButton[$previousPluginId] = implode(',',array_diff(t3lib_div::trimExplode(',', $this->pluginButton[$previousPluginId], 1), $pluginButtons));
+                                                       $this->pluginButton[$previousPluginId] = implode(',', array_diff(t3lib_div::trimExplode(',', $this->pluginButton[$previousPluginId], 1), $pluginButtons));
                                                }
                                                $this->pluginButton[$pluginId] = $plugin->getPluginButtons();
                                                $pluginLabels = t3lib_div::trimExplode(',', $plugin->getPluginLabels(), 1);
                                                foreach ($this->pluginLabel as $previousPluginId => $labelList) {
-                                                       $this->pluginLabel[$previousPluginId] = implode(',',array_diff(t3lib_div::trimExplode(',', $this->pluginLabel[$previousPluginId], 1), $pluginLabels));
+                                                       $this->pluginLabel[$previousPluginId] = implode(',', array_diff(t3lib_div::trimExplode(',', $this->pluginLabel[$previousPluginId], 1), $pluginLabels));
                                                }
                                                $this->pluginLabel[$pluginId] = $plugin->getPluginLabels();
                                                $this->pluginEnabledArray[] = $pluginId;
@@ -603,12 +606,12 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                $toolbarOrder = array_unique(array_values($this->toolbarOrderArray));
 
                        // Fetching specConf for field from backend
-               $pList = is_array($this->specConf['richtext']['parameters']) ? implode(',',$this->specConf['richtext']['parameters']) : '';
+               $pList = is_array($this->specConf['richtext']['parameters']) ? implode(',', $this->specConf['richtext']['parameters']) : '';
                if ($pList != '*') {    // If not all
                        $show = is_array($this->specConf['richtext']['parameters']) ? $this->specConf['richtext']['parameters'] : array();
                        if ($this->thisConfig['showButtons'])   {
-                               if (!t3lib_div::inList($this->thisConfig['showButtons'],'*')) {
-                                       $show = array_unique(array_merge($show,t3lib_div::trimExplode(',',$this->thisConfig['showButtons'],1)));
+                               if (!t3lib_div::inList($this->thisConfig['showButtons'], '*')) {
+                                       $show = array_unique(array_merge($show,t3lib_div::trimExplode(',', $this->thisConfig['showButtons'], 1)));
                                } else {
                                        $show = array_unique(array_merge($show, $toolbarOrder));
                                }
@@ -627,7 +630,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                if(is_object($GLOBALS['BE_USER'])) {
                        $RTEkeyList = isset($GLOBALS['BE_USER']->userTS['options.']['RTEkeyList']) ? $GLOBALS['BE_USER']->userTS['options.']['RTEkeyList'] : '*';
                        if ($RTEkeyList != '*') {       // If not all
-                               $show = array_intersect($show, t3lib_div::trimExplode(',',$RTEkeyList,1));
+                               $show = array_intersect($show, t3lib_div::trimExplode(',', $RTEkeyList, 1));
                        }
                }
 
@@ -650,7 +653,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                }
 
                        // Hiding buttons
-               $show = array_diff($show, $this->conf_toolbar_hide, t3lib_div::trimExplode(',',$this->thisConfig['hideButtons'],1));
+               $show = array_diff($show, $this->conf_toolbar_hide, t3lib_div::trimExplode(',', $this->thisConfig['hideButtons'], 1));
 
                        // Apply toolbar constraints from registered plugins
                foreach ($this->registeredPlugins as $pluginId => $plugin) {
@@ -739,7 +742,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                $this->pageRenderer->addJsFile($this->getFullFileName('EXT:' . $this->ID . '/htmlarea/htmlarea.js'));
                foreach ($this->pluginEnabledCumulativeArray[$RTEcounter] as $pluginId) {
                        $extensionKey = is_object($this->registeredPlugins[$pluginId]) ? $this->registeredPlugins[$pluginId]->getExtensionKey() : $this->ID;
-                       $this->pageRenderer->addJsFile($this->getFullFileName('EXT:' . $extensionKey . '/htmlarea/plugins/' . $pluginId . '/' . strtolower(preg_replace('/([a-z])([A-Z])([a-z])/', "$1".'-'."$2"."$3", $pluginId)) . '.js'));
+                       $this->pageRenderer->addJsFile($this->getFullFileName('EXT:' . $extensionKey . '/htmlarea/plugins/' . $pluginId . '/' . strtolower(preg_replace('/([a-z])([A-Z])([a-z])/', "$1" . '-' . "$2" . "$3", $pluginId)) . '.js'));
                }
        }
        /**
@@ -786,7 +789,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
         *
         * @return      string          the Javascript code for configuring the RTE
         */
-       function registerRTEinJS($RTEcounter, $table='', $uid='', $field='', $textAreaId = '') {
+       function registerRTEinJS($RTEcounter, $table = '', $uid = '', $field = '', $textAreaId = '') {
                $configureRTEInJavascriptString = '
                        if (typeof(configureEditorInstance) == "undefined") {
                                configureEditorInstance = new Object();
@@ -968,7 +971,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                        $mainStyle_font = $this->thisConfig['mainStyle_font'] ? $this->thisConfig['mainStyle_font']: 'Verdana,sans-serif';
                        $mainElements = array();
                        $mainElements['P'] = $this->thisConfig['mainStyleOverride_add.']['P'];
-                       $elList = explode(',','H1,H2,H3,H4,H5,H6,PRE');
+                       $elList = explode(',', 'H1,H2,H3,H4,H5,H6,PRE');
                        foreach ($elList as $elListName) {
                                if ($this->thisConfig['mainStyleOverride_add.'][$elListName]) {
                                        $mainElements[$elListName] = $this->thisConfig['mainStyleOverride_add.'][$elListName];
@@ -1016,7 +1019,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                $classesTagList = 'classesCharacter, classesParagraph, classesImage, classesTable, classesLinks, classesTD';
                $classesTagConvert = array('classesCharacter' => 'span', 'classesParagraph' => 'div', 'classesImage' => 'img', 'classesTable' => 'table', 'classesLinks' => 'a', 'classesTD' => 'td');
                $classesUseInstead = array('classesCharacter' => 'buttons.textstyle.tags.span.allowedClasses', 'classesParagraph' => 'buttons.blockstyle.tags.div.allowedClasses', 'classesImage' => 'buttons.image.properties.class.allowedClasses', 'classesTable' => 'buttons.blockstyle.tags.table.allowedClasses', 'classesLinks' => 'buttons.link.properties.class.allowedClasses', 'classesTD' => 'buttons.blockstyle.tags.td.allowedClasses');
<