[TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/f*/
authorRoland Waldner <most.wanted@gmx.at>
Sat, 26 May 2012 19:56:42 +0000 (21:56 +0200)
committerGeorg Ringer <mail@ringerge.org>
Sun, 27 May 2012 09:20:47 +0000 (11:20 +0200)
There were violations against the CGL rule
"FunctionCallArgumentSpacingNoSpaceAfterComma" in /typo3/sysext/f*/.
These will be reduced by this commit.

Change-Id: I301a98427a558edbabc62e73e4ca05be546f3482
Resolves: #37512
Releases: 6.0
Reviewed-on: http://review.typo3.org/11652
Reviewed-by: Oliver Klee
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
typo3/sysext/feedit/view/class.tx_feedit_editpanel.php
typo3/sysext/felogin/ext_localconf.php
typo3/sysext/felogin/ext_tables.php
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.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/func_wizards/ext_tables.php

index 85f29b4..2491cec 100644 (file)
@@ -90,7 +90,7 @@ class tx_feedit_editpanel {
                                        $panel .= $GLOBALS['BE_USER']->adminPanel->ext_makeToolBar() . '<img src="clear.gif" width="2" height="1" alt="" title="" />';
                                }
                                if (isset($allow['edit'])) {
-                                       $panel .= $this->editPanelLinkWrap('<img ' . t3lib_iconWorks::skinImg(TYPO3_mainDir,'gfx/edit2.gif', 'width="11" height="12" hspace="2" border="0"') . ' title="' . $GLOBALS['BE_USER']->extGetLL('p_editRecord').'" align="top" alt="" />', $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord);
+                                       $panel .= $this->editPanelLinkWrap('<img ' . t3lib_iconWorks::skinImg(TYPO3_mainDir, 'gfx/edit2.gif', 'width="11" height="12" hspace="2" border="0"') . ' title="' . $GLOBALS['BE_USER']->extGetLL('p_editRecord').'" align="top" alt="" />', $formName, 'edit', $dataArr['_LOCALIZED_UID'] ? $table . ':' . $dataArr['_LOCALIZED_UID'] : $currentRecord);
                                }
                                        // Hiding in workspaces because implementation is incomplete
                                if (isset($allow['move']) && $sortField && $GLOBALS['BE_USER']->workspace === 0) {
@@ -117,7 +117,7 @@ class tx_feedit_editpanel {
                                        $panel .= $this->editPanelLinkWrap('<img  ' . t3lib_iconWorks::skinImg(TYPO3_mainDir, 'gfx/delete_record.gif', 'width="12" height="12" vspace="1" hspace="2" border="0" ') . ' title="' . $GLOBALS['BE_USER']->extGetLL('p_delete').'" align="top" alt="" />', $formName, 'delete', '', $GLOBALS['BE_USER']->extGetLL('p_deleteConfirm'));
                                }
                                        //      Final
-                               $labelTxt = $this->cObj->stdWrap($conf['label'],$conf['label.']);
+                               $labelTxt = $this->cObj->stdWrap($conf['label'], $conf['label.']);
 
                                foreach((array) $hiddenFields as $name => $value) {
                                        $hiddenFieldString .= '<input type="hidden" name="TSFE_EDIT[' . $name . ']" value="' . $value . '"/>' . LF;
@@ -302,17 +302,17 @@ class tx_feedit_editpanel {
                        $thick = t3lib_utility_Math::forceIntegerInRange($thick, 1, 100);
                        $color = $conf['color'] ? $conf['color'] : '#cccccc';
                        if ($conf['innerWrap']) {
-                               $content = $this->wrap($content,$conf['innerWrap']);
+                               $content = $this->wrap($content, $conf['innerWrap']);
                        }
                        if ($conf['innerWrap.']) {
-                               $content = $this->stdWrap($content,$conf['innerWrap.']);
+                               $content = $this->stdWrap($content, $conf['innerWrap.']);
                        }
                        $content = '<table class="typo3-editPanel-previewBorder" border="' . $thick . '" cellpadding="0" cellspacing="0" bordercolor="' . $color . '" width="100%" summary=""><tr><td>' . $content . '</td></tr></table>';
                        if ($conf['outerWrap']) {
-                               $content = $this->wrap($content,$conf['outerWrap']);
+                               $content = $this->wrap($content, $conf['outerWrap']);
                        }
                        if ($conf['outerWrap.']) {
-                               $content = $this->stdWrap($panel,$conf['outerWrap.']);
+                               $content = $this->stdWrap($panel, $conf['outerWrap.']);
                        }
                }
 
index d945336..d489453 100644 (file)
@@ -22,7 +22,7 @@ tt_content.login {
 }
 ';
 
-t3lib_extMgm::addTypoScript($_EXTKEY,'setup','# Setting '.$_EXTKEY.' plugin TypoScript'.$addLine.'',43);
+t3lib_extMgm::addTypoScript($_EXTKEY, 'setup', '# Setting '.$_EXTKEY.' plugin TypoScript'.$addLine.'', 43);
 
 t3lib_extMgm::addPageTSConfig('
 mod.wizards.newContentElement.wizardItems.forms {
index 8e5cbae..27e94fb 100644 (file)
@@ -88,7 +88,7 @@ $tempColumns = array(
 );
 
 t3lib_div::loadTCA('fe_users');
-t3lib_extMgm::addTCAcolumns('fe_users', $tempColumns,1);
+t3lib_extMgm::addTCAcolumns('fe_users', $tempColumns, 1);
 t3lib_extMgm::addToAllTCAtypes('fe_users', 'felogin_redirectPid;;;;1-1-1', '', 'after:TSconfig');
 
 ?>
\ No newline at end of file
index dd24c3b..3ac5cc2 100644 (file)
@@ -54,7 +54,7 @@ class tx_felogin_pi1 extends tslib_pibase {
         *
         * @return      string          The     content that is displayed on the website
         */
-       public function main($content,$conf) {
+       public function main($content, $conf) {
 
                        // Loading TypoScript array into object variable:
                $this->conf = $conf;
@@ -270,7 +270,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                        $compareHash = explode('|', $userHash);
 
                        if (!$compareHash || !$compareHash[1] || $compareHash[0] < time() || $hash[0] != $compareHash[0] || md5($hash[1]) != $compareHash[1]) {
-                               $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('change_password_notvalid_message',$this->conf['changePasswordNotValidMessage_stdWrap.']);
+                               $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('change_password_notvalid_message', $this->conf['changePasswordNotValidMessage_stdWrap.']);
                                $subpartArray['###CHANGEPASSWORD_FORM###'] = '';
                        } else {
                                        // all is fine, continue with new password
@@ -421,12 +421,12 @@ class tx_felogin_pi1 extends tslib_pibase {
                $subpart = $this->cObj->getSubpart($this->template, '###TEMPLATE_LOGOUT###');
                $subpartArray = $linkpartArray = array();
 
-               $markerArray['###STATUS_HEADER###'] = $this->getDisplayText('status_header',$this->conf['logoutHeader_stdWrap.']);
+               $markerArray['###STATUS_HEADER###'] = $this->getDisplayText('status_header', $this->conf['logoutHeader_stdWrap.']);
                $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('status_message', $this->conf['logoutMessage_stdWrap.']);
                $this->cObj->stdWrap($this->flexFormValue('message', 's_status'), $this->conf['logoutMessage_stdWrap.']);
 
                $markerArray['###LEGEND###'] = $this->pi_getLL('logout', '', 1);
-               $markerArray['###ACTION_URI###'] = $this->getPageLink('',array(),TRUE);
+               $markerArray['###ACTION_URI###'] = $this->getPageLink('', array(), TRUE);
                $markerArray['###LOGOUT_LABEL###'] = $this->pi_getLL('logout', '', 1);
                $markerArray['###NAME###'] = htmlspecialchars($GLOBALS['TSFE']->fe_user->user['name']);
                $markerArray['###STORAGE_PID###'] = $this->spid;
@@ -460,7 +460,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                if($this->logintype === 'login') {
                        if($this->userIsLoggedIn) {
                                        // login success
-                               $markerArray['###STATUS_HEADER###'] = $this->getDisplayText('success_header',$this->conf['successHeader_stdWrap.']);
+                               $markerArray['###STATUS_HEADER###'] = $this->getDisplayText('success_header', $this->conf['successHeader_stdWrap.']);
                                $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('success_message', $this->conf['successMessage_stdWrap.']);
                                $markerArray = array_merge($markerArray, $this->getUserFieldMarkers());
                                $subpartArray['###LOGIN_FORM###'] = '';
@@ -491,8 +491,8 @@ class tx_felogin_pi1 extends tslib_pibase {
                                        }
                                }
                                        // login error
-                               $markerArray['###STATUS_HEADER###'] = $this->getDisplayText('error_header',$this->conf['errorHeader_stdWrap.']);
-                               $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('error_message',$this->conf['errorMessage_stdWrap.']);
+                               $markerArray['###STATUS_HEADER###'] = $this->getDisplayText('error_header', $this->conf['errorHeader_stdWrap.']);
+                               $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('error_message', $this->conf['errorMessage_stdWrap.']);
                                $gpRedirectUrl = t3lib_div::_GP('redirect_url');
                        }
                } else {
@@ -502,8 +502,8 @@ class tx_felogin_pi1 extends tslib_pibase {
                                $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('logout_message', $this->conf['logoutMessage_stdWrap.']);
                        } else {
                                        // login form
-                               $markerArray['###STATUS_HEADER###'] = $this->getDisplayText('welcome_header',$this->conf['welcomeHeader_stdWrap.']);
-                               $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('welcome_message',$this->conf['welcomeMessage_stdWrap.']);
+                               $markerArray['###STATUS_HEADER###'] = $this->getDisplayText('welcome_header', $this->conf['welcomeHeader_stdWrap.']);
+                               $markerArray['###STATUS_MESSAGE###'] = $this->getDisplayText('welcome_message', $this->conf['welcomeMessage_stdWrap.']);
                        }
                }
 
@@ -546,7 +546,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                }
 
                        // Login form
-               $markerArray['###ACTION_URI###'] = $this->getPageLink('',array(),TRUE);
+               $markerArray['###ACTION_URI###'] = $this->getPageLink('', array(), TRUE);
                $markerArray['###EXTRA_HIDDEN###'] = $extraHidden; // used by kb_md5fepw extension...
                $markerArray['###LEGEND###'] = $this->pi_getLL('login', '', 1);
                $markerArray['###LOGIN_LABEL###'] = $this->pi_getLL('login', '', 1);
@@ -559,8 +559,8 @@ class tx_felogin_pi1 extends tslib_pibase {
                $markerArray['###PREFIXID###'] = $this->prefixId;
                $markerArray = array_merge($markerArray, $this->getUserFieldMarkers());
 
-               if ($this->flexFormValue('showForgotPassword','sDEF') || $this->conf['showForgotPasswordLink']) {
-                       $linkpartArray['###FORGOT_PASSWORD_LINK###'] = explode('|',$this->getPageLink('|',array($this->prefixId.'[forgot]'=>1)));
+               if ($this->flexFormValue('showForgotPassword', 'sDEF') || $this->conf['showForgotPasswordLink']) {
+                       $linkpartArray['###FORGOT_PASSWORD_LINK###'] = explode('|', $this->getPageLink('|', array($this->prefixId.'[forgot]'=>1)));
                        $markerArray['###FORGOT_PASSWORD###'] = $this->pi_getLL('ll_forgot_header', '', 1);
                } else {
                        $subpartArray['###FORGOTP_VALID###'] = '';
@@ -768,7 +768,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                }
 
                if ($this->flexFormValue('redirectPageLoginError', 's_redirect')) {
-                       $flex['redirectPageLoginError'] = $this->flexFormValue('redirectPageLoginError','s_redirect');
+                       $flex['redirectPageLoginError'] = $this->flexFormValue('redirectPageLoginError', 's_redirect');
                }
 
                if ($this->flexFormValue('redirectPageLogout', 's_redirect')) {
@@ -803,7 +803,7 @@ class tx_felogin_pi1 extends tslib_pibase {
         *
         * @return      string          link or url
         */
-       protected function getPageLink($label, $piVars,$returnUrl = FALSE) {
+       protected function getPageLink($label, $piVars, $returnUrl = FALSE) {
                $additionalParams = '';
 
                if (count($piVars)) {
@@ -824,7 +824,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                if ($returnUrl) {
                        return htmlspecialchars($this->cObj->typolink_url($this->conf['linkConfig.']));
                } else {
-                       return $this->cObj->typolink($label,$this->conf['linkConfig.']);
+                       return $this->cObj->typolink($label, $this->conf['linkConfig.']);
                }
        }
 
@@ -842,7 +842,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                $getVars = t3lib_div::_GET();
 
                foreach ($getVars as $key => $val) {
-                       if (stristr($key,$this->prefixId) === FALSE) {
+                       if (stristr($key, $this->prefixId) === FALSE) {
                                if (is_array($val)) {
                                        foreach ($val as $key1 => $val1) {
                                                if ($this->conf['preserveGETvars'] == 'all' || in_array($key . '[' . $key1 .']', $preserveVars)) {
@@ -850,7 +850,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                                                }
                                        }
                                } else {
-                                       if (!in_array($key, array('id','no_cache','logintype','redirect_url','cHash'))) {
+                                       if (!in_array($key, array('id', 'no_cache', 'logintype', 'redirect_url', 'cHash'))) {
                                                $params .= '&' . $key . '=' . $val;
                                        }
                                }
@@ -870,7 +870,7 @@ class tx_felogin_pi1 extends tslib_pibase {
        protected function generatePassword($len) {
                $pass = '';
                while ($len--) {
-                       $char = rand(0,35);
+                       $char = rand(0, 35);
                        if ($char < 10) {
                                $pass .= '' . $char;
                        } else {
index 5bbcea8..3614ecf 100644 (file)
@@ -40,7 +40,7 @@ require ($BACK_PATH . 'template.php');
 $LANG->includeLLFile('EXT:lang/locallang_mod_file_list.xml');
 $LANG->includeLLFile('EXT:lang/locallang_misc.xml');
 require_once ($BACK_PATH . 'class.file_list.inc');
-$BE_USER->modAccess($MCONF,1);
+$BE_USER->modAccess($MCONF, 1);
 
 
 
@@ -274,7 +274,7 @@ class SC_file_list {
                        $this->filelist->clipObj->initializeClipboard();
 
                        $CB = t3lib_div::_GET('CB');
-                       if ($this->cmd=='setCB') $CB['el'] = $this->filelist->clipObj->cleanUpCBC(array_merge(t3lib_div::_POST('CBH'),t3lib_div::_POST('CBC')),'_FILE');
+                       if ($this->cmd=='setCB') $CB['el'] = $this->filelist->clipObj->cleanUpCBC(array_merge(t3lib_div::_POST('CBH'), t3lib_div::_POST('CBC')), '_FILE');
                        if (!$this->MOD_SETTINGS['clipBoard'])  $CB['setP']='normal';
                        $this->filelist->clipObj->setCmd($CB);
                        $this->filelist->clipObj->cleanCurrent();
@@ -282,7 +282,7 @@ class SC_file_list {
 
                                // If the "cmd" was to delete files from the list (clipboard thing), do that:
                        if ($this->cmd=='delete') {
-                               $items = $this->filelist->clipObj->cleanUpCBC(t3lib_div::_POST('CBC'),'_FILE',1);
+                               $items = $this->filelist->clipObj->cleanUpCBC(t3lib_div::_POST('CBC'), '_FILE', 1);
                                if (count($items)) {
                                                // Make command array:
                                        $FILE=array();
@@ -309,7 +309,7 @@ class SC_file_list {
                        }
 
                                // Start up filelisting object, include settings.
-                       $this->pointer = t3lib_utility_Math::forceIntegerInRange($this->pointer,0,100000);
+                       $this->pointer = t3lib_utility_Math::forceIntegerInRange($this->pointer, 0, 100000);
                        $this->filelist->start($this->folderObject, $this->pointer, $this->MOD_SETTINGS['sort'], $this->MOD_SETTINGS['reverse'], $this->MOD_SETTINGS['clipBoard'], $this->MOD_SETTINGS['bigControlPanel']);
 
                                // Generate the list
@@ -461,7 +461,7 @@ class SC_file_list {
 
                        // Add shortcut
                if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
-                       $buttons['shortcut'] = $this->doc->makeShortcutIcon('pointer,id,target,table',implode(',',array_keys($this->MOD_MENU)),$this->MCONF['name']);
+                       $buttons['shortcut'] = $this->doc->makeShortcutIcon('pointer,id,target,table', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
                }
 
                        // FileList Module CSH:
index 321e59f..64f787c 100755 (executable)
@@ -41,7 +41,7 @@ require($BACK_PATH.'init.php');
 require($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:lang/locallang_mod_web_func.xml');
 
-$BE_USER->modAccess($MCONF,1);
+$BE_USER->modAccess($MCONF, 1);
 
 
 
@@ -78,7 +78,7 @@ class SC_mod_web_func_index extends t3lib_SCbase {
 
                // 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);
+               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id, $this->perms_clause);
                $access = is_array($this->pageinfo) ? 1 : 0;
 
                        // Template markers
@@ -114,9 +114,9 @@ class SC_mod_web_func_index extends t3lib_SCbase {
 
                        $this->doc->form='<form action="index.php" method="post"><input type="hidden" name="id" value="'.$this->id.'" />';
 
-                       $vContent = $this->doc->getVersionSelector($this->id,1);
+                       $vContent = $this->doc->getVersionSelector($this->id, 1);
                        if ($vContent) {
-                               $this->content.=$this->doc->section('',$vContent);
+                               $this->content.=$this->doc->section('', $vContent);
                        }
 
 
index 7f65d9b..a983984 100755 (executable)
@@ -53,9 +53,9 @@ class tx_funcwizards_webfunc extends t3lib_extobjbase {
         * @return      void
         * @see t3lib_extobjbase::handleExternalFunctionValue(), t3lib_extobjbase::init()
         */
-       function init(&$pObj,$conf) {
+       function init(&$pObj, $conf) {
                        // OK, handles ordinary init. This includes setting up the menu array with ->modMenu
-               parent::init($pObj,$conf);
+               parent::init($pObj, $conf);
 
                        // Making sure that any further external classes are added to the include_once array. Notice that inclusion happens twice in the main script because of this!!!
                $this->handleExternalFunctionValue();
@@ -74,8 +74,8 @@ class tx_funcwizards_webfunc extends t3lib_extobjbase {
                        $this->function_key => array()
                );
 
-               $modMenuAdd[$this->function_key] = $this->pObj->mergeExternalItems($this->pObj->MCONF['name'],$this->function_key,$modMenuAdd[$this->function_key]);
-               $modMenuAdd[$this->function_key] = t3lib_BEfunc::unsetMenuItems($this->pObj->modTSconfig['properties'],$modMenuAdd[$this->function_key],'menu.'.$this->function_key);
+               $modMenuAdd[$this->function_key] = $this->pObj->mergeExternalItems($this->pObj->MCONF['name'], $this->function_key, $modMenuAdd[$this->function_key]);
+               $modMenuAdd[$this->function_key] = t3lib_BEfunc::unsetMenuItems($this->pObj->modTSconfig['properties'], $modMenuAdd[$this->function_key], 'menu.'.$this->function_key);
 
                return $modMenuAdd;
        }
@@ -89,8 +89,8 @@ class tx_funcwizards_webfunc extends t3lib_extobjbase {
        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']);
-               $theOutput.=$this->pObj->doc->section('','<span class="nobr">'.$menu.'</span>');
+               $menu= $LANG->getLL('wiz_lWizards',1).': '.t3lib_BEfunc::getFuncMenu($this->pObj->id, 'SET[wiz]', $this->pObj->MOD_SETTINGS['wiz'], $this->pObj->MOD_MENU['wiz']);
+               $theOutput.=$this->pObj->doc->section('', '<span class="nobr">'.$menu.'</span>');
 
                $content = '';
                $content.=$theOutput;
index 9c7db89..5e3540b 100755 (executable)
@@ -8,6 +8,6 @@ if (TYPO3_MODE=='BE') {
                t3lib_extMgm::extPath($_EXTKEY).'class.tx_funcwizards_webfunc.php',
                'LLL:EXT:func_wizards/locallang.php:mod_wizards'
        );
-       t3lib_extMgm::addLLrefForTCAdescr('_MOD_web_func','EXT:func_wizards/locallang_csh.xml');
+       t3lib_extMgm::addLLrefForTCAdescr('_MOD_web_func', 'EXT:func_wizards/locallang_csh.xml');
 }
 ?>
\ No newline at end of file