[TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/t*/
authorRoland Waldner <most.wanted@gmx.at>
Thu, 31 May 2012 16:42:55 +0000 (18:42 +0200)
committerGeorg Ringer <mail@ringerge.org>
Fri, 1 Jun 2012 13:48:33 +0000 (15:48 +0200)
There are violations against the CGL rule
"FunctionCallArgumentSpacingNoSpaceAfterComma" in /typo3/sysext/t*/.

These will be reduced by this commit.

Change-Id: Ic710ba752280508baf97827b1c26110df5b42ef4
Resolves: #37650
Releases: 6.0
Reviewed-on: http://review.typo3.org/11770
Reviewed-by: Wouter Wolters
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
typo3/sysext/t3editor/classes/class.tx_t3editor.php
typo3/sysext/t3skin/ext_tables.php
typo3/sysext/taskcenter/ext_tables.php
typo3/sysext/taskcenter/task/index.php
typo3/sysext/tsconfig_help/ext_tables.php
typo3/sysext/tsconfig_help/mod1/index.php
typo3/sysext/tstemplate/ext_tables.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

index 46a8185..0fa36d2 100644 (file)
@@ -470,7 +470,7 @@ class tx_t3editor implements t3lib_Singleton {
                                        'ajaxObj' => &$ajaxObj,
                                );
                                foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/t3editor/classes/class.tx_t3editor.php']['ajaxSaveCode'] as $key => $_funcRef) {
-                                       $savingsuccess = t3lib_div::callUserFunction($_funcRef,$_params,$this) || $savingsuccess;
+                                       $savingsuccess = t3lib_div::callUserFunction($_funcRef, $_params, $this) || $savingsuccess;
                                }
                        }
 
index dbd538f..dd07b13 100644 (file)
@@ -138,40 +138,40 @@ if (TYPO3_MODE == 'BE' || (TYPO3_MODE == 'FE' && isset($GLOBALS['BE_USER']))) {
 
                // Manual setting up of alternative icons. This is mainly for module icons which has a special prefix:
        $TBE_STYLES['skinImg'] = array_merge($presetSkinImgs, array (
-               'gfx/ol/blank.gif'                         => array('clear.gif','width="18" height="16"'),
-               'MOD:web/website.gif'                      => array($temp_eP.'icons/module_web.gif','width="24" height="24"'),
-               'MOD:web_layout/layout.gif'                => array($temp_eP.'icons/module_web_layout.gif','width="24" height="24"'),
-               'MOD:web_view/view.gif'                    => array($temp_eP.'icons/module_web_view.png','width="24" height="24"'),
-               'MOD:web_list/list.gif'                    => array($temp_eP.'icons/module_web_list.gif','width="24" height="24"'),
-               'MOD:web_info/info.gif'                    => array($temp_eP.'icons/module_web_info.png','width="24" height="24"'),
-               'MOD:web_perm/perm.gif'                    => array($temp_eP.'icons/module_web_perms.png','width="24" height="24"'),
-               'MOD:web_func/func.gif'                    => array($temp_eP.'icons/module_web_func.png','width="24" height="24"'),
-               'MOD:web_ts/ts1.gif'                       => array($temp_eP.'icons/module_web_ts.gif','width="24" height="24"'),
-               'MOD:web_modules/modules.gif'              => array($temp_eP.'icons/module_web_modules.gif','width="24" height="24"'),
-               'MOD:web_txversionM1/cm_icon.gif'          => array($temp_eP.'icons/module_web_version.gif','width="24" height="24"'),
-               'MOD:file/file.gif'                        => array($temp_eP.'icons/module_file.gif','width="22" height="24"'),
-               'MOD:file_list/list.gif'                   => array($temp_eP.'icons/module_file_list.gif','width="22" height="24"'),
-               'MOD:file_images/images.gif'               => array($temp_eP.'icons/module_file_images.gif','width="22" height="22"'),
-               'MOD:user/user.gif'                        => array($temp_eP.'icons/module_user.gif','width="22" height="22"'),
-               'MOD:user_task/task.gif'                   => array($temp_eP.'icons/module_user_taskcenter.gif','width="22" height="22"'),
-               'MOD:user_setup/setup.gif'                 => array($temp_eP.'icons/module_user_setup.gif','width="22" height="22"'),
-               'MOD:user_doc/document.gif'                => array($temp_eP.'icons/module_doc.gif','width="22" height="22"'),
-               'MOD:user_ws/sys_workspace.gif'            => array($temp_eP.'icons/module_user_ws.gif','width="22" height="22"'),
-               'MOD:tools/tool.gif'                       => array($temp_eP.'icons/module_tools.gif','width="25" height="24"'),
-               'MOD:tools_beuser/beuser.gif'              => array($temp_eP.'icons/module_tools_user.gif','width="24" height="24"'),
-               'MOD:tools_em/em.gif'                      => array($temp_eP.'icons/module_tools_em.png','width="24" height="24"'),
-               'MOD:tools_em/install.gif'                 => array($temp_eP.'icons/module_tools_em.gif','width="24" height="24"'),
-               'MOD:tools_dbint/db.gif'                   => array($temp_eP.'icons/module_tools_dbint.gif','width="25" height="24"'),
-               'MOD:tools_config/config.gif'              => array($temp_eP.'icons/module_tools_config.gif','width="24" height="24"'),
-               'MOD:tools_install/install.gif'            => array($temp_eP.'icons/module_tools_install.gif','width="24" height="24"'),
-               'MOD:tools_log/log.gif'                    => array($temp_eP.'icons/module_tools_log.gif','width="24" height="24"'),
-               'MOD:tools_txphpmyadmin/thirdparty_db.gif' => array($temp_eP.'icons/module_tools_phpmyadmin.gif','width="24" height="24"'),
-               'MOD:tools_isearch/isearch.gif'            => array($temp_eP.'icons/module_tools_isearch.gif','width="24" height="24"'),
-               'MOD:help/help.gif'                        => array($temp_eP.'icons/module_help.gif','width="23" height="24"'),
-               'MOD:help_about/info.gif'                  => array($temp_eP.'icons/module_help_about.gif','width="25" height="24"'),
-               'MOD:help_aboutmodules/aboutmodules.gif'   => array($temp_eP.'icons/module_help_aboutmodules.gif','width="24" height="24"'),
-               'MOD:help_cshmanual/about.gif'         => array($temp_eP.'icons/module_help_cshmanual.gif','width="25" height="24"'),
-               'MOD:help_txtsconfighelpM1/moduleicon.gif' => array($temp_eP.'icons/module_help_ts.gif','width="25" height="24"'),
+               'gfx/ol/blank.gif'                         => array('clear.gif', 'width="18" height="16"'),
+               'MOD:web/website.gif'                      => array($temp_eP.'icons/module_web.gif', 'width="24" height="24"'),
+               'MOD:web_layout/layout.gif'                => array($temp_eP.'icons/module_web_layout.gif', 'width="24" height="24"'),
+               'MOD:web_view/view.gif'                    => array($temp_eP.'icons/module_web_view.png', 'width="24" height="24"'),
+               'MOD:web_list/list.gif'                    => array($temp_eP.'icons/module_web_list.gif', 'width="24" height="24"'),
+               'MOD:web_info/info.gif'                    => array($temp_eP.'icons/module_web_info.png', 'width="24" height="24"'),
+               'MOD:web_perm/perm.gif'                    => array($temp_eP.'icons/module_web_perms.png', 'width="24" height="24"'),
+               'MOD:web_func/func.gif'                    => array($temp_eP.'icons/module_web_func.png', 'width="24" height="24"'),
+               'MOD:web_ts/ts1.gif'                       => array($temp_eP.'icons/module_web_ts.gif', 'width="24" height="24"'),
+               'MOD:web_modules/modules.gif'              => array($temp_eP.'icons/module_web_modules.gif', 'width="24" height="24"'),
+               'MOD:web_txversionM1/cm_icon.gif'          => array($temp_eP.'icons/module_web_version.gif', 'width="24" height="24"'),
+               'MOD:file/file.gif'                        => array($temp_eP.'icons/module_file.gif', 'width="22" height="24"'),
+               'MOD:file_list/list.gif'                   => array($temp_eP.'icons/module_file_list.gif', 'width="22" height="24"'),
+               'MOD:file_images/images.gif'               => array($temp_eP.'icons/module_file_images.gif', 'width="22" height="22"'),
+               'MOD:user/user.gif'                        => array($temp_eP.'icons/module_user.gif', 'width="22" height="22"'),
+               'MOD:user_task/task.gif'                   => array($temp_eP.'icons/module_user_taskcenter.gif', 'width="22" height="22"'),
+               'MOD:user_setup/setup.gif'                 => array($temp_eP.'icons/module_user_setup.gif', 'width="22" height="22"'),
+               'MOD:user_doc/document.gif'                => array($temp_eP.'icons/module_doc.gif', 'width="22" height="22"'),
+               'MOD:user_ws/sys_workspace.gif'            => array($temp_eP.'icons/module_user_ws.gif', 'width="22" height="22"'),
+               'MOD:tools/tool.gif'                       => array($temp_eP.'icons/module_tools.gif', 'width="25" height="24"'),
+               'MOD:tools_beuser/beuser.gif'              => array($temp_eP.'icons/module_tools_user.gif', 'width="24" height="24"'),
+               'MOD:tools_em/em.gif'                      => array($temp_eP.'icons/module_tools_em.png', 'width="24" height="24"'),
+               'MOD:tools_em/install.gif'                 => array($temp_eP.'icons/module_tools_em.gif', 'width="24" height="24"'),
+               'MOD:tools_dbint/db.gif'                   => array($temp_eP.'icons/module_tools_dbint.gif', 'width="25" height="24"'),
+               'MOD:tools_config/config.gif'              => array($temp_eP.'icons/module_tools_config.gif', 'width="24" height="24"'),
+               'MOD:tools_install/install.gif'            => array($temp_eP.'icons/module_tools_install.gif', 'width="24" height="24"'),
+               'MOD:tools_log/log.gif'                    => array($temp_eP.'icons/module_tools_log.gif', 'width="24" height="24"'),
+               'MOD:tools_txphpmyadmin/thirdparty_db.gif' => array($temp_eP.'icons/module_tools_phpmyadmin.gif', 'width="24" height="24"'),
+               'MOD:tools_isearch/isearch.gif'            => array($temp_eP.'icons/module_tools_isearch.gif', 'width="24" height="24"'),
+               'MOD:help/help.gif'                        => array($temp_eP.'icons/module_help.gif', 'width="23" height="24"'),
+               'MOD:help_about/info.gif'                  => array($temp_eP.'icons/module_help_about.gif', 'width="25" height="24"'),
+               'MOD:help_aboutmodules/aboutmodules.gif'   => array($temp_eP.'icons/module_help_aboutmodules.gif', 'width="24" height="24"'),
+               'MOD:help_cshmanual/about.gif'         => array($temp_eP.'icons/module_help_cshmanual.gif', 'width="25" height="24"'),
+               'MOD:help_txtsconfighelpM1/moduleicon.gif' => array($temp_eP.'icons/module_help_ts.gif', 'width="25" height="24"'),
        ));
 
                // Logo at login screen
index bdae044..15d94fb 100755 (executable)
@@ -5,7 +5,7 @@ if (!defined ('TYPO3_MODE')) {
 
 if (TYPO3_MODE == 'BE') {
        t3lib_extMgm::addModulePath('tools_txtaskcenterM1', t3lib_extMgm::extPath($_EXTKEY) . 'task/');
-       t3lib_extMgm::addModule('user','task', 'top', t3lib_extMgm::extPath($_EXTKEY) . 'task/');
+       t3lib_extMgm::addModule('user', 'task', 'top', t3lib_extMgm::extPath($_EXTKEY) . 'task/');
 
        $GLOBALS['TYPO3_CONF_VARS']['BE']['AJAX']['Taskcenter::saveCollapseState']      = 'EXT:taskcenter/classes/class.tx_taskcenter_status.php:tx_taskcenter_status->saveCollapseState';
        $GLOBALS['TYPO3_CONF_VARS']['BE']['AJAX']['Taskcenter::saveSortingState']       = 'EXT:taskcenter/classes/class.tx_taskcenter_status.php:tx_taskcenter_status->saveSortingState';
index 90899b9..bb8e20b 100755 (executable)
@@ -506,7 +506,7 @@ class SC_mod_user_task_index extends t3lib_SCbase {
                $url = t3lib_div::getIndpEnv('TYPO3_REQUEST_SCRIPT');
                $onClick = "devlogWin=window.open('" . $url . "','taskcenter','width=790,status=0,menubar=1,resizable=1,location=0,scrollbars=1,toolbar=0');return false;";
                $content = '<a href="#" onclick="' . htmlspecialchars($onClick).'">' .
-                                       '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/open_in_new_window.gif', 'width="19" height="14"') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.openInNewWindow', 1) . '" class="absmiddle" alt="" />' .
+                                       '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/open_in_new_window.gif', 'width="19" height="14"') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.openInNewWindow', 1) . '" class="absmiddle" alt="" />' .
                                        '</a>';
                return $content;
        }
index 2a19ff9..ad59402 100644 (file)
@@ -3,6 +3,6 @@ if (!defined ('TYPO3_MODE'))    die ('Access denied.');
 
 if (TYPO3_MODE == 'BE') {
 
-       t3lib_extMgm::addModule('help','txtsconfighelpM1','',t3lib_extMgm::extPath($_EXTKEY).'mod1/');
+       t3lib_extMgm::addModule('help', 'txtsconfighelpM1', '', t3lib_extMgm::extPath($_EXTKEY).'mod1/');
 }
 ?>
\ No newline at end of file
index 4453e11..3268c1d 100644 (file)
@@ -30,7 +30,7 @@ require_once($BACK_PATH.'init.php');
 require_once($BACK_PATH.'template.php');
 
 $LANG->includeLLFile('EXT:tsconfig_help/mod1/locallang.xml');
-$BE_USER->modAccess($MCONF,1); // This checks permissions and exits if the users has no permission for entry.
+$BE_USER->modAccess($MCONF, 1);        // This checks permissions and exits if the users has no permission for entry.
 // DEFAULT initialization of a module [END]
 
 
@@ -114,7 +114,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
 
                        $this->content .= $this->doc->spacer(10);
 
-                       $markers['FUNC_MENU'] = t3lib_BEfunc::getFuncMenu($this->id,'SET[function]',$this->MOD_SETTINGS['function'],$this->MOD_MENU['function']);
+                       $markers['FUNC_MENU'] = t3lib_BEfunc::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']);
                } else {
                        $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('title'));
                        $markers['FUNC_MENU'] = '';
@@ -172,7 +172,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                        case 1:
                                $content = '<div align="left"><strong>' . $GLOBALS['LANG']->getLL('referenceExplanation') . '</strong></div>';
                                $content .= '<p>' . $GLOBALS['LANG']->getLL('referenceExplanationDetailed') . '</p><br />';
-                               $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('displayReferences'),$content,0,1);
+                               $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('displayReferences'), $content, 0, 1);
                                $this->content .= '<a href="#" onclick="vHWin=window.open(\'' . $GLOBALS['BACK_PATH'] . 'wizard_tsconfig.php?mode=tsref&amp;P[formName]=editForm\',\'popUp\',\'height=500,width=780,status=0,menubar=0,scrollbars=1\');vHWin.focus();return false;" title="TSref reference">' . t3lib_iconWorks::getSpriteIcon('actions-system-typoscript-documentation-open') . 'TSREF</a><br />';
                                $this->content .= '<a href="#" onclick="vHWin=window.open(\'' . $GLOBALS['BACK_PATH'] . 'wizard_tsconfig.php?mode=beuser&amp;P[formName]=editForm\',\'popUp\',\'height=500,width=780,status=0,menubar=0,scrollbars=1\');vHWin.focus();return false;" title="TSref reference">' . t3lib_iconWorks::getSpriteIcon('actions-system-typoscript-documentation-open') . 'USER TSCONFIG</a><br />';
                                $this->content .= '<a href="#" onclick="vHWin=window.open(\'' . $GLOBALS['BACK_PATH'] . 'wizard_tsconfig.php?mode=page&amp;P[formName]=editForm\',\'popUp\',\'height=500,width=780,status=0,menubar=0,scrollbars=1\');vHWin.focus();return false;" title="TSref reference">' . t3lib_iconWorks::getSpriteIcon('actions-system-typoscript-documentation-open') . 'PAGE TSCONFIG</a><br />';
@@ -244,7 +244,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                                                        $warnings .= '<p class="typo3-red">'.$GLOBALS['LANG']->getLL('warning_duplicateMarkers').'<br />'.$duplicateWarnings.'</p>';
                                                }
                                                if (!empty($warnings)) {
-                                                       $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('updateWarnings'),'<div>'.$warnings.'</div>',0,1);
+                                                       $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('updateWarnings'), '<div>'.$warnings.'</div>', 0, 1);
                                                }
                                        }
 
@@ -326,7 +326,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                                                case 'STYLE:STYLE':
                                                        $currentStyleName = $node['attributes']['STYLE:NAME'];
 
-                                                       if (array_key_exists('STYLE:PARENT-STYLE-NAME',$node['attributes'])) {
+                                                       if (array_key_exists('STYLE:PARENT-STYLE-NAME', $node['attributes'])) {
                                                                $parentStyleName = $node['attributes']['STYLE:PARENT-STYLE-NAME'];
                                                                $style[$currentStyleName]['parents'][] = $parentStyleName; // keep trace of parents in the style array
                                                        } else {
@@ -343,10 +343,10 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                                case 'complete':
                                        switch ($node['tag']) {
                                                case 'STYLE:PROPERTIES':
-                                                       if (is_array($node['attributes']) && array_key_exists('FO:FONT-WEIGHT',$node['attributes'])) {
+                                                       if (is_array($node['attributes']) && array_key_exists('FO:FONT-WEIGHT', $node['attributes'])) {
                                                                $style[$currentStyleName]['font-weight'] = $node['attributes']['FO:FONT-WEIGHT'];       // bold for example
                                                        }
-                                                       if (is_array($node['attributes']) && array_key_exists('FO:FONT-STYLE',$node['attributes'])) {
+                                                       if (is_array($node['attributes']) && array_key_exists('FO:FONT-STYLE', $node['attributes'])) {
                                                                $style[$currentStyleName]['font-style'] = $node['attributes']['FO:FONT-STYLE']; // italic for example
                                                        }
                                                break;
@@ -388,7 +388,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                }
 
                if (is_array($Styles[$child])  // the child is a documented style
-                       && array_key_exists('parents',$Styles[$child])  // it has some parents
+                       && array_key_exists('parents', $Styles[$child])  // it has some parents
                        && (array_search($parent, $Styles[$child]['parents']) !== FALSE))       { // and the parent appears amongst its ancestors
                        return TRUE;
                }
@@ -486,7 +486,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
        function HSCtext($text) {
                global $LANG;
 
-               if (strcmp($text,''))   { // there is some content in the text field
+               if (strcmp($text, ''))  { // there is some content in the text field
                        $cleantext = stripslashes(htmlspecialchars($text, ENT_QUOTES)); // stripslashes required as it could confuse unserialize
                        return $LANG->csConvObj->utf8_to_entities($cleantext, $LANG->charSet);
                } else { // there is no text, it's empty
@@ -568,7 +568,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                                                case 'TEXT:P':
                                                        if ($sectionCell)       { // make sure we are in a cell
                                                                $sectionP++;
-                                                               $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($node),'') . $newLineRequired.$this->HSCtext($node['value']);
+                                                               $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired.$this->HSCtext($node['value']);
                                                                $newLineRequired = ''; // no newline required after this
                                                                $latestTEXTPopen = $node;
                                                        }
@@ -580,14 +580,14 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                                        switch ($node['tag']) {
                                                case 'TEXT:P':
                                                        if ($sectionCell)       { // make sure we are in a cell
-                                                               $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($node),'') . $newLineRequired.$this->HSCtext($node['value']).$this->styleHTML($this->styleTags($node),'/');
+                                                               $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired.$this->HSCtext($node['value']).$this->styleHTML($this->styleTags($node), '/');
                                                                $newLineRequired = '<br>'; // after a paragraph, require a new-line
                                                        }
                                                break;
 
                                                case 'TEXT:SPAN':
                                                        if ($sectionCell)       { // make sure we are in a cell
-                                                               $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($node),'').$newLineRequired.$this->HSCtext($node['value']).$this->styleHTML($this->styleTags($node),'/');
+                                                               $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($node), '').$newLineRequired.$this->HSCtext($node['value']).$this->styleHTML($this->styleTags($node), '/');
                                                                $newLineRequired = ''; // no newline required after this
                                                        }
                                                break;
@@ -607,7 +607,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                                        switch ($node['tag']) {
                                                case 'TEXT:P':
                                                        if ($sectionCell)       { // make sure we are in a cell
-                                                               $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($node),'') . $newLineRequired.$this->HSCtext($node['value']).$this->styleHTML($this->styleTags($node),'/');
+                                                               $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired.$this->HSCtext($node['value']).$this->styleHTML($this->styleTags($node), '/');
                                                                $newLineRequired = ''; // no newline required after this
                                                        }
                                                break;
@@ -635,7 +635,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                                                case 'TEXT:P':
                                                        $sectionP--;
                                                        $newLineRequired = '<br>'; // after a paragraph, require a new-line
-                                                       $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($latestTEXTPopen),'/');
+                                                       $table[$rowID-1][$cellID-1] .= $this->styleHTML($this->styleTags($latestTEXTPopen), '/');
                                                break;
                                        }
                                break;
@@ -692,7 +692,7 @@ class tx_tsconfighelp_module1 extends t3lib_SCbase {
                }
                $md5hash = md5($obj_string);
                $description = ''; // unused
-               $guide = hexdec(substr(md5($extension),6,6));  // try to find a way to uniquely identify the source extension and place the identified into the "guide" column
+               $guide = hexdec(substr(md5($extension), 6, 6));  // try to find a way to uniquely identify the source extension and place the identified into the "guide" column
                $title = ''; // unused
 
                $insertFields = array(
index d3e8e88..1d8c247 100644 (file)
@@ -1,5 +1,5 @@
 <?php
 if (!defined ('TYPO3_MODE'))   die ('Access denied.');
 
-if (TYPO3_MODE=='BE')  t3lib_extMgm::addModule('web','ts','',t3lib_extMgm::extPath($_EXTKEY).'ts/');
+if (TYPO3_MODE=='BE')  t3lib_extMgm::addModule('web', 'ts', '', t3lib_extMgm::extPath($_EXTKEY).'ts/');
 ?>
\ No newline at end of file
index d65d926..2af1b53 100644 (file)
@@ -31,8 +31,8 @@
 $GLOBALS['LANG']->includeLLFile('EXT:tstemplate_analyzer/locallang.xml');
 
 class tx_tstemplateanalyzer extends t3lib_extobjbase {
-       function init(&$pObj,$conf) {
-               parent::init($pObj,$conf);
+       function init(&$pObj, $conf) {
+               parent::init($pObj, $conf);
 
                $this->pObj->modMenu_setDefaultList.= ',ts_analyzer_checkLinenum,ts_analyzer_checkSyntax';
        }
@@ -48,7 +48,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                );
        }
 
-       function initialize_editor($pageId,$template_uid=0) {
+       function initialize_editor($pageId, $template_uid=0) {
                        // Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
 
                $GLOBALS['tmpl'] = t3lib_div::makeInstance("t3lib_tsparser_ext");
@@ -63,7 +63,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                $GLOBALS['tmpl']->runThroughTemplates($GLOBALS['rootLine'], $template_uid);
 
                        // Get the row of the first VISIBLE template of the page. whereclause like the frontend.
-               $GLOBALS['tplRow'] = $GLOBALS['tmpl']->ext_getFirstTemplate($pageId,$template_uid);
+               $GLOBALS['tplRow'] = $GLOBALS['tmpl']->ext_getFirstTemplate($pageId, $template_uid);
                if (is_array($GLOBALS['tplRow'])) {
                                // IF there was a template...
                        return 1;
@@ -87,7 +87,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                // **************************
 
                // BUGBUG: Should we check if the uset may at all read and write template-records???
-               $existTemplate = $this->initialize_editor($this->pObj->id,$template_uid);               // initialize
+               $existTemplate = $this->initialize_editor($this->pObj->id, $template_uid);              // initialize
                if ($existTemplate) {
                        $theOutput .= $this->pObj->doc->section($GLOBALS['LANG']->getLL('currentTemplate', TRUE),
                                t3lib_iconWorks::getSpriteIconForRecord('sys_template', $GLOBALS['tplRow']) . '<strong>' .
@@ -95,7 +95,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                                htmlspecialchars(trim($GLOBALS['tplRow']["sitetitle"]) ? ' (' . $GLOBALS['tplRow']["sitetitle"] . ')' : ''));
                }
                if ($manyTemplatesMenu) {
-                       $theOutput .= $this->pObj->doc->section("",$manyTemplatesMenu);
+                       $theOutput .= $this->pObj->doc->section("", $manyTemplatesMenu);
                }
 
                $GLOBALS['tmpl']->clearList_const_temp = array_flip($GLOBALS['tmpl']->clearList_const);
index 18bd275..ab0c0b9 100644 (file)
@@ -38,7 +38,7 @@
 $GLOBALS['LANG']->includeLLFile('EXT:tstemplate_ceditor/locallang.xml');
 
 class tx_tstemplateceditor extends t3lib_extobjbase {
-       function initialize_editor($pageId,$template_uid=0) {
+       function initialize_editor($pageId, $template_uid=0) {
                        // Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
                global $tmpl,$tplRow,$theConstants;
 
@@ -49,12 +49,12 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                $tmpl->ext_localGfxPrefix=t3lib_extMgm::extPath("tstemplate_ceditor");
                $tmpl->ext_localWebGfxPrefix=$GLOBALS["BACK_PATH"].t3lib_extMgm::extRelPath("tstemplate_ceditor");
 
-               $tplRow = $tmpl->ext_getFirstTemplate($pageId,$template_uid);   // Get the row of the first VISIBLE template of the page. whereclause like the frontend.
+               $tplRow = $tmpl->ext_getFirstTemplate($pageId, $template_uid);  // Get the row of the first VISIBLE template of the page. whereclause like the frontend.
                if (is_array($tplRow))  {       // IF there was a template...
                                // Gets the rootLine
                        $sys_page = t3lib_div::makeInstance("t3lib_pageSelect");
                        $rootLine = $sys_page->getRootLine($pageId);
-                       $tmpl->runThroughTemplates($rootLine,$template_uid);    // This generates the constants/config + hierarchy info for the template.
+                       $tmpl->runThroughTemplates($rootLine, $template_uid);   // This generates the constants/config + hierarchy info for the template.
                        $theConstants = $tmpl->generateConfig_constants();      // The editable constants are returned in an array.
                        $tmpl->ext_categorizeEditableConstants($theConstants);  // The returned constants are sorted in categories, that goes into the $tmpl->categories array
                        $tmpl->ext_regObjectPositions($tplRow["constants"]);            // This array will contain key=[expanded constantname], value=linenumber in template. (after edit_divider, if any)
@@ -67,8 +67,8 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                        $theOutput.=$this->pObj->doc->spacer(30);
                        $theOutput.=$this->pObj->doc->section($tmpl->helpConfig["header"],
                                '<div align="center">'.$tmpl->helpConfig["imagetag"].'</div><BR>'.
-                               ($tmpl->helpConfig["description"] ? implode(explode("//",$tmpl->helpConfig["description"]),"<BR>")."<BR>" : "").
-                               ($tmpl->helpConfig["bulletlist"] ? "<ul><li>".implode(explode("//",$tmpl->helpConfig["bulletlist"]),"<li>")."</ul>" : "<BR>")
+                               ($tmpl->helpConfig["description"] ? implode(explode("//", $tmpl->helpConfig["description"]), "<BR>")."<BR>" : "").
+                               ($tmpl->helpConfig["bulletlist"] ? "<ul><li>".implode(explode("//", $tmpl->helpConfig["bulletlist"]), "<li>")."</ul>" : "<BR>")
                                );
                }
                return $theOutput;
@@ -116,7 +116,7 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                                if ($tmpl->changed) {
                                                // Set the data to be saved
                                        $recData=array();
-                                       $recData["sys_template"][$saveId]["constants"] = implode($tmpl->raw,LF);
+                                       $recData["sys_template"][$saveId]["constants"] = implode($tmpl->raw, LF);
                                                // Create new  tce-object
                                        $tce = t3lib_div::makeInstance("t3lib_TCEmain");
                                        $tce->stripslashes_values = 0;
@@ -170,9 +170,9 @@ class tx_tstemplateceditor extends t3lib_extobjbase {
                                $theOutput=$this->displayExample($theOutput);
                        }
 
-                       $printFields = trim($tmpl->ext_printFields($theConstants,$category));
+                       $printFields = trim($tmpl->ext_printFields($theConstants, $category));
                        if ($printFields) {
-                               $theOutput.=$this->pObj->doc->section("",$printFields);
+                               $theOutput.=$this->pObj->doc->section("", $printFields);
                        }
 
                        if ($BE_USER_modOptions["properties"]["constantEditor."]["example"]!="top") {
index 0c2cdc6..310dbfc 100644 (file)
@@ -71,8 +71,8 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                $functions .= '<td' . $bgcol . ' nowrap="nowrap">' . $GLOBALS['LANG']->getLL('toTop') . ' <input type="checkbox" name="data[totop_resource][' . $k . ']" value="' . htmlspecialchars($v) . '" /></td>';
                                $functions .= '<td' . $bgcol . ' nowrap="nowrap">';
                                $fI = t3lib_div::split_fileref($v);
-                               if (t3lib_div::inList($this->pObj->textExtensions,$fI['fileext'])) {
-                                       $functions.= '<a href="index.php?id='.$this->pObj->id.'&e[file]='.rawurlencode($v).'">'.t3lib_iconWorks::getSpriteIcon('actions-document-open',array('title'=> $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:editFile', TRUE))) . '</a>';
+                               if (t3lib_div::inList($this->pObj->textExtensions, $fI['fileext'])) {
+                                       $functions.= '<a href="index.php?id='.$this->pObj->id.'&e[file]='.rawurlencode($v).'">'.t3lib_iconWorks::getSpriteIcon('actions-document-open', array('title'=> $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:editFile', TRUE))) . '</a>';
                                }
                                $functions.= '</td>';
                        }
@@ -107,7 +107,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                $theResources = t3lib_div::trimExplode(',', $tmpl->resources, 1);
                foreach ($theResources as $k => $v) {
                        $fI = pathinfo($v);
-                       if (t3lib_div::inList($this->pObj->textExtensions,strtolower($fI['extension']))) {
+                       if (t3lib_div::inList($this->pObj->textExtensions, strtolower($fI['extension']))) {
                                $path = PATH_site.$GLOBALS['TCA']['sys_template']['columns']['resources']['config']['uploadfolder'].'/'.$v;
                                $thumb = t3lib_BEfunc::thumbCode(array('resources' => $v), 'sys_template', 'resources', $GLOBALS['BACK_PATH'], '');
                                $out .= '<tr><td' . $bgcol . ' nowrap="nowrap">' . $v . '&nbsp;&nbsp;</td><td' . $bgcol . ' nowrap="nowrap">&nbsp;' . t3lib_div::formatSize(@filesize($path)) . '&nbsp;</td><td' . $bgcol . '>' . trim($thumb) . '</td><td><input type="Checkbox" name="data[makecopy_resource][' . $k . ']" value="' . htmlspecialchars($v) . '"></td></tr>';
@@ -481,7 +481,7 @@ class tx_tstemplateinfo extends t3lib_extobjbase {
                                }
                        }
                        if ($e['config']) {
-                               $outCode='<textarea name="data[config]" rows="'.$numberOfRows.'" wrap="off" class="fixed-font enable-tab"'.$this->pObj->doc->formWidthText(48,"width:98%;height:70%","off").' class="fixed-font">'.t3lib_div::formatForTextarea($tplRow["config"]).'</textarea>';
+                               $outCode='<textarea name="data[config]" rows="'.$numberOfRows.'" wrap="off" class="fixed-font enable-tab"'.$this->pObj->doc->formWidthText(48, "width:98%;height:70%", "off").' class="fixed-font">'.t3lib_div::formatForTextarea($tplRow["config"]).'</textarea>';
                                $outCode.= '<input type="Hidden" name="e[config]" value="1">';
 
                                        // Display "Include TypoScript file content?" checkbox
index 0cfc16b..41b5c98 100644 (file)
@@ -36,8 +36,8 @@ $GLOBALS['LANG']->includeLLFile('EXT:tstemplate_objbrowser/locallang.xml');
  */
 class tx_tstemplateobjbrowser extends t3lib_extobjbase {
 
-       function init(&$pObj,$conf) {
-               parent::init($pObj,$conf);
+       function init(&$pObj, $conf) {
+               parent::init($pObj, $conf);
 
                $this->pObj->modMenu_dontValidateList.= ',ts_browser_toplevel_setup,ts_browser_toplevel_const,ts_browser_TLKeys_setup,ts_browser_TLKeys_const';
                $this->pObj->modMenu_setDefaultList.= ',ts_browser_fixedLgd,ts_browser_showComments';
@@ -70,7 +70,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                        'ts_browser_alphaSort' => '1',
                );
 
-               foreach(array('setup','const') as $bType) {
+               foreach(array('setup', 'const') as $bType) {
                        $addKey = t3lib_div::_GET('addKey');
                        if (is_array($addKey))  {               // If any plus-signs were clicked, it's registred.
                                reset($addKey);
@@ -79,7 +79,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                                } else {
                                        unset($this->pObj->MOD_SETTINGS['ts_browser_TLKeys_'.$bType][key($addKey)]);
                                }
-                               $GLOBALS['BE_USER']->pushModuleData($this->pObj->MCONF['name'],$this->pObj->MOD_SETTINGS);
+                               $GLOBALS['BE_USER']->pushModuleData($this->pObj->MCONF['name'], $this->pObj->MOD_SETTINGS);
                        }
 
                        if (count($this->pObj->MOD_SETTINGS['ts_browser_TLKeys_'.$bType])) {
@@ -99,7 +99,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
         * @param       [type]          $parentValue: ...
         * @return      [type]          ...
         */
-       function verify_TSobjects($propertyArray,$parentType,$parentValue) {
+       function verify_TSobjects($propertyArray, $parentType, $parentValue) {
                $TSobjTable = array(
                        "PAGE" => array(
                                "prop" => array (
@@ -132,7 +132,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                );
 
                if ($parentType) {
-                       if (isset($TSobjDataTypes[$parentType]) && (!$TSobjDataTypes[$parentType] || t3lib_div::inlist($TSobjDataTypes[$parentType],$parentValue))) {
+                       if (isset($TSobjDataTypes[$parentType]) && (!$TSobjDataTypes[$parentType] || t3lib_div::inlist($TSobjDataTypes[$parentType], $parentValue))) {
                                $ObjectKind = $parentValue;
                        } else {
                                $ObjectKind = "";       // Object kind is "" if it should be known.
@@ -163,7 +163,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
         * @param       [type]          $template_uid: ...
         * @return      [type]          ...
         */
-       function initialize_editor($pageId,$template_uid=0) {
+       function initialize_editor($pageId, $template_uid=0) {
                        // Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
                global $tmpl,$tplRow,$theConstants;
 
@@ -174,9 +174,9 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                                // Gets the rootLine
                $sys_page = t3lib_div::makeInstance("t3lib_pageSelect");
                $rootLine = $sys_page->getRootLine($pageId);
-               $tmpl->runThroughTemplates($rootLine,$template_uid);    // This generates the constants/config + hierarchy info for the template.
+               $tmpl->runThroughTemplates($rootLine, $template_uid);   // This generates the constants/config + hierarchy info for the template.
 
-               $tplRow = $tmpl->ext_getFirstTemplate($pageId,$template_uid);   // Get the row of the first VISIBLE template of the page. whereclause like the frontend.
+               $tplRow = $tmpl->ext_getFirstTemplate($pageId, $template_uid);  // Get the row of the first VISIBLE template of the page. whereclause like the frontend.
                if (is_array($tplRow))  {       // IF there was a template...
                        return 1;
                }
@@ -212,7 +212,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
 
                // BUGBUG: Should we check if the uset may at all read and write template-records???
                $bType= $this->pObj->MOD_SETTINGS["ts_browser_type"];
-               $existTemplate = $this->initialize_editor($this->pObj->id,$template_uid);               // initialize
+               $existTemplate = $this->initialize_editor($this->pObj->id, $template_uid);              // initialize
                if ($existTemplate) {
                        $theOutput .= $this->pObj->doc->section(
                                $GLOBALS['LANG']->getLL('currentTemplate'),
@@ -295,14 +295,14 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                                        $tce = t3lib_div::makeInstance("t3lib_TCEmain");
                                        $tce->stripslashes_values=0;
                                                // Initialize
-                                       $tce->start($recData,Array());
+                                       $tce->start($recData, Array());
                                                // Saved the stuff
                                        $tce->process_datamap();
                                                // Clear the cache (note: currently only admin-users can clear the cache in tce_main.php)
                                        $tce->clear_cacheCmd("all");
 
                                                // re-read the template ...
-                                       $this->initialize_editor($this->pObj->id,$template_uid);
+                                       $this->initialize_editor($this->pObj->id, $template_uid);
                                }
                        }
                }
@@ -318,7 +318,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                        $this->pObj->MOD_SETTINGS["tsbrowser_conditions"] = $POST["conditions"];
                        $update=1;
                }
-               if ($update)    { $GLOBALS["BE_USER"]->pushModuleData($this->pObj->MCONF["name"],$this->pObj->MOD_SETTINGS); }
+               if ($update)    { $GLOBALS["BE_USER"]->pushModuleData($this->pObj->MCONF["name"], $this->pObj->MOD_SETTINGS); }
 
 
                $tmpl->matchAlternative = $this->pObj->MOD_SETTINGS['tsbrowser_conditions'];
@@ -352,7 +352,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
 
                        // EDIT A VALUE:
                if ($this->pObj->sObj) {
-                       list($theSetup,$theSetupValue) = $tmpl->ext_getSetup($theSetup, ($this->pObj->sObj?$this->pObj->sObj:""));
+                       list($theSetup, $theSetupValue) = $tmpl->ext_getSetup($theSetup, ($this->pObj->sObj?$this->pObj->sObj:""));
 
                        if ($existTemplate) {
                                        // Value
@@ -415,14 +415,14 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                        }
                        if ($out) {
                                $theOutput.=$this->pObj->doc->divider(5);
-                               $theOutput.=$this->pObj->doc->section("",$out);
+                               $theOutput.=$this->pObj->doc->section("", $out);
                        }
 
                                // back
                        $out = $GLOBALS['LANG']->getLL('back');
                        $out = '<a href="index.php?id='.$this->pObj->id.'"><strong>'.$out.'</strong></a>';
                        $theOutput.=$this->pObj->doc->divider(5);
-                       $theOutput.=$this->pObj->doc->section("",$out);
+                       $theOutput.=$this->pObj->doc->section("", $out);
 
                } else {
                        $tmpl->tsbrowser_depthKeys=$this->pObj->MOD_SETTINGS["tsbrowser_depthKeys_".$bType];
@@ -446,7 +446,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
 
                        $theOutput .= $this->pObj->doc->section('', '<nobr>' . $menu . '</nobr>');
                        $theKey=$this->pObj->MOD_SETTINGS["ts_browser_toplevel_".$bType];
-                       if (!$theKey || !str_replace("-","",$theKey))   {$theKey="";}
+                       if (!$theKey || !str_replace("-", "", $theKey)) {$theKey="";}
                        list($theSetup,$theSetupValue) = $tmpl->ext_getSetup($theSetup, ($this->pObj->MOD_SETTINGS['ts_browser_toplevel_'.$bType]?$this->pObj->MOD_SETTINGS['ts_browser_toplevel_'.$bType]:''));
                        $tree = $tmpl->ext_getObjTree($theSetup, $theKey, '', '', $theSetupValue, $this->pObj->MOD_SETTINGS['ts_browser_alphaSort']);
                        $tree = $tmpl->substituteCMarkers($tree);