[TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/s*/
authorRoland Waldner <most.wanted@gmx.at>
Thu, 31 May 2012 16:27:28 +0000 (18:27 +0200)
committerGeorg Ringer <mail@ringerge.org>
Fri, 1 Jun 2012 13:54:24 +0000 (15:54 +0200)
There are violations against the CGL rule
"FunctionCallArgumentSpacingNoSpaceAfterComma" in /typo3/sysext/s*/.
These will be reduced by this commit.

Change-Id: I1154c44addad3a5e60c09e26234af88e80a81680
Resolves: #37649
Releases: 6.0
Reviewed-on: http://review.typo3.org/11769
Reviewed-by: Wouter Wolters
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
typo3/sysext/sv/class.tx_sv_auth.php
typo3/sysext/sv/class.tx_sv_authbase.php
typo3/sysext/sys_action/ext_tables.php
typo3/sysext/sys_action/task/class.tx_sysaction_task.php
typo3/sysext/sys_action/tca.php
typo3/sysext/sys_note/ext_tables.php

index f8c6233..6768149 100644 (file)
@@ -177,9 +177,7 @@ class tx_sv_auth extends tx_sv_authbase     {
                        if(!$OK)     {
                                        // Failed login attempt (wrong password) - write that to the log!
                                if ($this->writeAttemptLog) {
-                                       $this->writelog(255,3,3,1,
-                                               "Login-attempt from %s (%s), username '%s', password not accepted!",
-                                               Array($this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']));
+                                       $this->writelog(255, 3, 3, 1, "Login-attempt from %s (%s), username '%s', password not accepted!", Array($this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname']));
                                        t3lib_div::sysLog(
                                                sprintf( "Login-attempt from %s (%s), username '%s', password not accepted!", $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $this->login['uname'] ),
                                                'Core',
@@ -193,9 +191,7 @@ class tx_sv_auth extends tx_sv_authbase     {
                        if ($OK && $user['lockToDomain'] && $user['lockToDomain']!=$this->authInfo['HTTP_HOST']) {
                                        // Lock domain didn't match, so error:
                                if ($this->writeAttemptLog) {
-                                       $this->writelog(255,3,3,1,
-                                               "Login-attempt from %s (%s), username '%s', locked domain '%s' did not match '%s'!",
-                                               Array($this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $user[$this->db_user['username_column']], $user['lockToDomain'], $this->authInfo['HTTP_HOST']));
+                                       $this->writelog(255, 3, 3, 1, "Login-attempt from %s (%s), username '%s', locked domain '%s' did not match '%s'!", Array($this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $user[$this->db_user['username_column']], $user['lockToDomain'], $this->authInfo['HTTP_HOST']));
                                        t3lib_div::sysLog(
                                                sprintf( "Login-attempt from %s (%s), username '%s', locked domain '%s' did not match '%s'!", $this->authInfo['REMOTE_ADDR'], $this->authInfo['REMOTE_HOST'], $user[$this->db_user['username_column']], $user['lockToDomain'], $this->authInfo['HTTP_HOST'] ),
                                                'Core',
@@ -227,20 +223,20 @@ class tx_sv_auth extends tx_sv_authbase   {
                        if (is_array($user) && $user[$this->db_user['usergroup_column']]) {
                                $groupList = $user[$this->db_user['usergroup_column']];
                                $groups = array();
-                               $this->getSubGroups($groupList,'',$groups);
+                               $this->getSubGroups($groupList, '', $groups);
                        }
 
                                // ADD group-numbers if the IPmask matches.
                        if (is_array($TYPO3_CONF_VARS['FE']['IPmaskMountGroups'])) {
                                foreach($TYPO3_CONF_VARS['FE']['IPmaskMountGroups'] as $IPel) {
-                                       if ($this->authInfo['REMOTE_ADDR'] && $IPel[0] && t3lib_div::cmpIP($this->authInfo['REMOTE_ADDR'],$IPel[0]))    {$groups[]=intval($IPel[1]);}
+                                       if ($this->authInfo['REMOTE_ADDR'] && $IPel[0] && t3lib_div::cmpIP($this->authInfo['REMOTE_ADDR'], $IPel[0]))   {$groups[]=intval($IPel[1]);}
                                }
                        }
 
                        $groups = array_unique($groups);
 
                        if (count($groups)) {
-                               $list = implode(',',$groups);
+                               $list = implode(',', $groups);
 
                                if ($this->writeDevLog)         t3lib_div::devLog('Get usergroups with id: '.$list, 'tx_sv_auth');
 
@@ -294,11 +290,11 @@ class tx_sv_auth extends tx_sv_authbase   {
 
                                // Get row:
                        $row=$groupRows[$uid];
-                       if (is_array($row) && !t3lib_div::inList($idList,$uid)) {       // Must be an array and $uid should not be in the idList, because then it is somewhere previously in the grouplist
+                       if (is_array($row) && !t3lib_div::inList($idList, $uid))        {       // Must be an array and $uid should not be in the idList, because then it is somewhere previously in the grouplist
 
                                        // Include sub groups
                                if (trim($row['subgroup'])) {
-                                       $theList = implode(',',t3lib_div::intExplode(',',$row['subgroup']));    // Make integer list
+                                       $theList = implode(',',t3lib_div::intExplode(',', $row['subgroup']));   // Make integer list
                                        $this->getSubGroups($theList, $idList.','.$uid, $groups);               // Call recursively, pass along list of already processed groups so they are not recursed again.
                                }
                        }
index f217fcf..9cd0b98 100644 (file)
@@ -123,9 +123,9 @@ class tx_sv_authbase extends t3lib_svbase {
         * @return      void
         * @see t3lib_userauthgroup::writelog()
         */
-       function writelog($type,$action,$error,$details_nr,$details,$data,$tablename='',$recuid='',$recpid='') {
+       function writelog($type, $action, $error, $details_nr, $details, $data, $tablename='', $recuid='', $recpid='') {
                if($this->writeAttemptLog) {
-                       $this->pObj->writelog($type,$action,$error,$details_nr,$details,$data,$tablename,$recuid,$recpid);
+                       $this->pObj->writelog($type, $action, $error, $details_nr, $details, $data, $tablename, $recuid, $recpid);
                }
        }
 
index 7fc4d3c..c38b5ce 100755 (executable)
@@ -31,7 +31,7 @@ if (TYPO3_MODE == 'BE') {
 
        $GLOBALS['TYPO3_CONF_VARS']['typo3/backend.php']['additionalBackendItems'][] = t3lib_extMgm::extPath('sys_action') . 'toolbarmenu/registerToolbarItem.php';
 
-       t3lib_extMgm::addLLrefForTCAdescr('sys_action','EXT:sys_action/locallang_csh_sysaction.xml');
+       t3lib_extMgm::addLLrefForTCAdescr('sys_action', 'EXT:sys_action/locallang_csh_sysaction.xml');
 
        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['taskcenter']['sys_action']['tx_sysaction_task'] = array(
                'title'       => 'LLL:EXT:sys_action/locallang_tca.xml:sys_action',
index d37f645..13a4f7d 100644 (file)
@@ -722,7 +722,7 @@ class tx_sysaction_task implements tx_taskcenter_Task {
                if ($path && @is_dir($path) &&
                                $GLOBALS['TYPO3_CONF_VARS']['BE']['lockRootPath'] &&
                                t3lib_div::isFirstPartOfStr($path, $GLOBALS['TYPO3_CONF_VARS']['BE']['lockRootPath']) &&
-                               substr($path,-1) == '/'
+                               substr($path, -1) == '/'
                        ) {
                        return $path;
                }
@@ -931,7 +931,7 @@ class tx_sysaction_task implements tx_taskcenter_Task {
                require_once($GLOBALS['BACK_PATH'] . 'class.db_list_extra.inc');
 
                        // Loading current page record and checking access:
-               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id,$this->taskObject->perms_clause);
+               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id, $this->taskObject->perms_clause);
                $access = is_array($this->pageinfo) ? 1 : 0;
 
                        // If there is access to the page, then render the list contents and set up the document template object:
@@ -955,7 +955,7 @@ class tx_sysaction_task implements tx_taskcenter_Task {
 
                                // Initialize the listing object, dblist, for rendering the list:
                        $this->pointer = t3lib_utility_Math::forceIntegerInRange(t3lib_div::_GP('pointer'), 0, 100000);
-                       $dblist->start($this->id,$this->table,$this->pointer,$this->taskObject->search_field,$this->taskObject->search_levels,$this->taskObject->showLimit);
+                       $dblist->start($this->id, $this->table, $this->pointer, $this->taskObject->search_field, $this->taskObject->search_levels, $this->taskObject->showLimit);
                        $dblist->setDispFields();
 
                                // Render the list of tables:
index 5c4f854..fd75ac2 100755 (executable)
@@ -125,7 +125,7 @@ $TCA['sys_action'] = array(
                                'type' => 'select',
                                'special' => 'tables',
                                'items' => array(
-                                       array('','')
+                                       array('', '')
                                )
                        )
                ),
index 6e51fd5..f46f6ab 100755 (executable)
@@ -81,5 +81,5 @@ if (TYPO3_MODE=='BE') {
        t3lib_extMgm::allowTableOnStandardPages('sys_note');
 }
 
-t3lib_extMgm::addLLrefForTCAdescr('sys_note','EXT:sys_note/locallang_csh_sysnote.xml');
+t3lib_extMgm::addLLrefForTCAdescr('sys_note', 'EXT:sys_note/locallang_csh_sysnote.xml');
 ?>
\ No newline at end of file