From: Roland Waldner Date: Sat, 26 May 2012 19:43:02 +0000 (+0200) Subject: [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/e*/ X-Git-Tag: TYPO3_6-0-0alpha2~191 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/30512b3c3b3cd859a8ccfc1f6055e4f1919f659b [TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/e*/ 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 --- diff --git a/typo3/sysext/em/classes/index.php b/typo3/sysext/em/classes/index.php index 2cc9ba000535..f1c9983a82bb 100644 --- a/typo3/sysext/em/classes/index.php +++ b/typo3/sysext/em/classes/index.php @@ -1349,7 +1349,7 @@ class SC_mod_tools_em_index extends t3lib_SCbase { /** * 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 diff --git a/typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php b/typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php index 80353873857e..8c6ae8ce4124 100755 --- a/typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php +++ b/typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php @@ -62,7 +62,7 @@ class tx_extrapagecmoptions { * @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'); @@ -75,18 +75,18 @@ class tx_extrapagecmoptions { $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 ); - 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); } @@ -95,7 +95,7 @@ class tx_extrapagecmoptions { $deleteFound = FALSE; foreach ($menuItems as $k => $value) { $c++; - if (!strcmp($k,'delete')) { + if (!strcmp($k, 'delete')) { $deleteFound = TRUE; break; } @@ -112,14 +112,14 @@ class tx_extrapagecmoptions { $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: - 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: @@ -128,7 +128,7 @@ class tx_extrapagecmoptions { } // 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; } @@ -139,7 +139,7 @@ class tx_extrapagecmoptions { * @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; } }