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

Change-Id: Ica0fafe5bc68a8a06bfb142f474f13eaebf48e50
Resolves: #37511
Releases: 6.0
Reviewed-on: http://review.typo3.org/11651
Reviewed-by: Oliver Klee
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
typo3/sysext/em/classes/index.php
typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php

index 2cc9ba0..f1c9983 100644 (file)
@@ -1349,7 +1349,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase {
 
        /**
         * Imports an extensions from the online repository
 
        /**
         * Imports an extensions from the online repository
-        * NOTICE: in version 4.0 this changed from "importExtFromRep_old($extRepUid,$loc,$uploadFlag=0,$directInput='',$recentTranslations=0,$incManual=0,$dontDelete=0)"
+        * NOTICE: in version 4.0 this changed from "importExtFromRep_old($extRepUid, $loc, $uploadFlag=0, $directInput='', $recentTranslations=0, $incManual=0, $dontDelete=0)"
         *
         * @param       string          Extension key
         * @param       string          Version
         *
         * @param       string          Extension key
         * @param       string          Version
index 8035387..8c6ae8c 100755 (executable)
@@ -62,7 +62,7 @@ class tx_extrapagecmoptions {
         * @param       integer         UID of clicked item.
         * @return      array           Modified $menuItems array
         */
         * @param       integer         UID of clicked item.
         * @return      array           Modified $menuItems array
         */
-       function main(&$backRef,$menuItems,$table,$uid) {
+       function main(&$backRef, $menuItems, $table, $uid) {
                $localItems = array();  // Accumulation of local items.
                $subname = t3lib_div::_GP('subname');
 
                $localItems = array();  // Accumulation of local items.
                $subname = t3lib_div::_GP('subname');
 
@@ -75,18 +75,18 @@ class tx_extrapagecmoptions {
 
                                $localItems[]='spacer';
                                $localItems['moreoptions']=$backRef->linkItem(
 
                                $localItems[]='spacer';
                                $localItems['moreoptions']=$backRef->linkItem(
-                                       $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLLL('label',$LL)),
+                                       $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLLL('label', $LL)),
                                        $backRef->excludeIcon(''),
                                        "top.loadTopMenu('".t3lib_div::linkThisScript()."&cmLevel=1&subname=moreoptions');return false;",
                                        0,
                                        1
                                );
 
                                        $backRef->excludeIcon(''),
                                        "top.loadTopMenu('".t3lib_div::linkThisScript()."&cmLevel=1&subname=moreoptions');return false;",
                                        0,
                                        1
                                );
 
-                               if (!in_array('hide',$backRef->disabledItems) && is_array($GLOBALS['TCA'][$table]['ctrl']['enablecolumns']) && $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled'])
-                                               $localItems['hide'] = $backRef->DB_hideUnhide($table,$backRef->rec,$GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled']);
-                               if (!in_array('edit_access',$backRef->disabledItems) && is_array($GLOBALS['TCA'][$table]['ctrl']['enablecolumns']))
-                                               $localItems['edit_access'] = $backRef->DB_editAccess($table,$uid);
-                               if (!in_array('edit_pageproperties',$backRef->disabledItems) && $table=='pages' && $backRef->editPageIconSet)
+                               if (!in_array('hide', $backRef->disabledItems) && is_array($GLOBALS['TCA'][$table]['ctrl']['enablecolumns']) && $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled'])
+                                               $localItems['hide'] = $backRef->DB_hideUnhide($table, $backRef->rec, $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled']);
+                               if (!in_array('edit_access', $backRef->disabledItems) && is_array($GLOBALS['TCA'][$table]['ctrl']['enablecolumns']))
+                                               $localItems['edit_access'] = $backRef->DB_editAccess($table, $uid);
+                               if (!in_array('edit_pageproperties', $backRef->disabledItems) && $table=='pages' && $backRef->editPageIconSet)
                                                $localItems['edit_pageproperties'] = $backRef->DB_editPageProperties($uid);
                        }
 
                                                $localItems['edit_pageproperties'] = $backRef->DB_editPageProperties($uid);
                        }
 
@@ -95,7 +95,7 @@ class tx_extrapagecmoptions {
                        $deleteFound = FALSE;
                        foreach ($menuItems as $k => $value) {
                                $c++;
                        $deleteFound = FALSE;
                        foreach ($menuItems as $k => $value) {
                                $c++;
-                               if (!strcmp($k,'delete')) {
+                               if (!strcmp($k, 'delete')) {
                                        $deleteFound = TRUE;
                                        break;
                                }
                                        $deleteFound = TRUE;
                                        break;
                                }
@@ -112,14 +112,14 @@ class tx_extrapagecmoptions {
                                        $localItems
                                );
                        } else {        // If no delete item was found, then just merge in the items:
                                        $localItems
                                );
                        } else {        // If no delete item was found, then just merge in the items:
-                               $menuItems=array_merge($menuItems,$localItems);
+                               $menuItems=array_merge($menuItems, $localItems);
                        }
                } elseif ($subname==='moreoptions') {   // LEVEL: Secondary level of menus (activated by an item on the first level).
                        if ($backRef->editOK)   {       // If the page can be edited, then show this:
                        }
                } elseif ($subname==='moreoptions') {   // LEVEL: Secondary level of menus (activated by an item on the first level).
                        if ($backRef->editOK)   {       // If the page can be edited, then show this:
-                               if (!in_array('move_wizard',$backRef->disabledItems) && ($table=='pages' || $table=='tt_content'))      $localItems['move_wizard']=$backRef->DB_moveWizard($table,$uid,$backRef->rec);
-                               if (!in_array('new_wizard',$backRef->disabledItems) && ($table=='pages' || $table=='tt_content'))       $localItems['new_wizard']=$backRef->DB_newWizard($table,$uid,$backRef->rec);
-                               if (!in_array('perms',$backRef->disabledItems) && $table=='pages' && $GLOBALS['BE_USER']->check('modules','web_perm'))  $localItems['perms']=$backRef->DB_perms($table,$uid,$backRef->rec);
-                               if (!in_array('db_list',$backRef->disabledItems) && $GLOBALS['BE_USER']->check('modules','web_list'))   $localItems['db_list']=$backRef->DB_db_list($table,$uid,$backRef->rec);
+                               if (!in_array('move_wizard', $backRef->disabledItems) && ($table=='pages' || $table=='tt_content'))     $localItems['move_wizard']=$backRef->DB_moveWizard($table, $uid, $backRef->rec);
+                               if (!in_array('new_wizard', $backRef->disabledItems) && ($table=='pages' || $table=='tt_content'))      $localItems['new_wizard']=$backRef->DB_newWizard($table, $uid, $backRef->rec);
+                               if (!in_array('perms', $backRef->disabledItems) && $table=='pages' && $GLOBALS['BE_USER']->check('modules','web_perm')) $localItems['perms']=$backRef->DB_perms($table, $uid, $backRef->rec);
+                               if (!in_array('db_list', $backRef->disabledItems) && $GLOBALS['BE_USER']->check('modules', 'web_list')) $localItems['db_list']=$backRef->DB_db_list($table, $uid, $backRef->rec);
                        }
 
                                // Temporary mount point item:
                        }
 
                                // Temporary mount point item:
@@ -128,7 +128,7 @@ class tx_extrapagecmoptions {
                        }
 
                                // Merge the locally made items into the current menu items passed to this function.
                        }
 
                                // Merge the locally made items into the current menu items passed to this function.
-                       $menuItems = array_merge($menuItems,$localItems);
+                       $menuItems = array_merge($menuItems, $localItems);
                }
                return $menuItems;
        }
                }
                return $menuItems;
        }
@@ -139,7 +139,7 @@ class tx_extrapagecmoptions {
         * @return      array           Local lang array.
         */
        function includeLL() {
         * @return      array           Local lang array.
         */
        function includeLL() {
-               $LOCAL_LANG = $GLOBALS['LANG']->includeLLFile('EXT:extra_page_cm_options/locallang.php',FALSE);
+               $LOCAL_LANG = $GLOBALS['LANG']->includeLLFile('EXT:extra_page_cm_options/locallang.php', FALSE);
                return $LOCAL_LANG;
        }
 }
                return $LOCAL_LANG;
        }
 }