[TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in sysext
authorRoland Waldner <most.wanted@gmx.at>
Tue, 12 Jun 2012 19:33:41 +0000 (21:33 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 14 Jun 2012 20:44:04 +0000 (22:44 +0200)
Change-Id: Ib07ed4f272fde10e7f275411699c6c4f2106a9d2
Resolves: #37979
Releases: 6.0
Reviewed-on: http://review.typo3.org/12009
Reviewed-by: Oliver Klee
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/beuser/mod/index.php
typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php
typo3/sysext/felogin/ext_localconf.php
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php
typo3/sysext/form/Classes/System/Request/Request.php
typo3/sysext/func_wizards/class.tx_funcwizards_webfunc.php
typo3/sysext/perm/mod1/index.php
typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
typo3/sysext/statictemplates/media/scripts/wapversionLib.inc
typo3/sysext/sv/class.tx_sv_auth.php
typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php

index 7a8f572..28ba34d 100755 (executable)
@@ -728,7 +728,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
                                                $out[$k] = implode('<br />', $pout);
                                        break;
                                        case 'workspace_perms':
-                                               $out[$k] = implode('<br/>', explode(', ', t3lib_BEfunc::getProcessedValue('be_users','workspace_perms', $v)));
+                                               $out[$k] = implode('<br/>', explode(', ', t3lib_BEfunc::getProcessedValue('be_users', 'workspace_perms', $v)));
                                        break;
                                        case 'workspace_membership':
                                                $out[$k] = implode('<br/>', $this->ext_workspaceMembership());
@@ -796,7 +796,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
                while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                        $dat[] = array(
                                'row'=>$row,
-                               'HTML'=>t3lib_iconWorks::getSpriteIconForRecord('pages', $row,array('title'=>'['.$row['uid'].']'))
+                               'HTML'=>t3lib_iconWorks::getSpriteIconForRecord('pages', $row, array('title' => '[' . $row['uid'] . ']'))
                        );
                }
                $pp = t3lib_div::makeInstance('printAllPageTree_perms', $this);
index 8c6ae8c..787add5 100755 (executable)
@@ -111,15 +111,26 @@ class tx_extrapagecmoptions {
                                        0,
                                        $localItems
                                );
-                       } else {        // If no delete item was found, then just merge in the items:
+                               // If no delete item was found, then just merge in the items:
+                       } else {
                                $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);
+                       // LEVEL: Secondary level of menus (activated by an item on the first level).
+               } elseif ($subname === 'moreoptions') {
+                               // If the page can be edited, then show this:
+                       if ($backRef->editOK)   {
+                               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:
index d489453..2cfd310 100644 (file)
@@ -9,7 +9,7 @@ plugin.tx_felogin_pi1 {
   userFunc = tx_felogin_pi1->main
 }
 ');
-       t3lib_extMgm::addTypoScript($_EXTKEY,'setup','
+       t3lib_extMgm::addTypoScript($_EXTKEY, 'setup','
 # Setting '.$_EXTKEY.' plugin TypoScript
 '.$pluginContent);
 
index 3ac5cc2..d84dfc0 100644 (file)
@@ -728,7 +728,7 @@ class tx_felogin_pi1 extends tslib_pibase {
        protected function mergeflexFormValuesIntoConf() {
                $flex = array();
                if ($this->flexFormValue('showForgotPassword', 'sDEF')) {
-                       $flex['showForgotPassword'] = $this->flexFormValue('showForgotPassword','sDEF');
+                       $flex['showForgotPassword'] = $this->flexFormValue('showForgotPassword', 'sDEF');
                }
 
                if ($this->flexFormValue('showPermaLogin', 'sDEF')) {
@@ -791,7 +791,7 @@ class tx_felogin_pi1 extends tslib_pibase {
         * @return      string          value of var
         */
        protected function flexFormValue($var, $sheet) {
-               return $this->pi_getFFvalue($this->cObj->data['pi_flexform'], $var,$sheet);
+               return $this->pi_getFFvalue($this->cObj->data['pi_flexform'], $var, $sheet);
        }
 
        /**
index c2fe982..e22baaa 100644 (file)
@@ -266,7 +266,8 @@ class tx_form_System_Request implements t3lib_Singleton {
                        );
                } else {
                        $GLOBALS['TSFE']->fe_user->setKey(
-                               'ses',$this->prefix,
+                               'ses',
+                               $this->prefix,
                                $this->getByMethod()
                        );
                }
@@ -288,7 +289,8 @@ class tx_form_System_Request implements t3lib_Singleton {
                        );
                } else {
                        $GLOBALS['TSFE']->fe_user->setKey(
-                               'ses',$this->prefix,
+                               'ses',
+                               $this->prefix,
                                NULL
                        );
                }
index a983984..58752c9 100755 (executable)
@@ -89,7 +89,7 @@ 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']);
+               $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 = '';
index 52857f4..68ad6ad 100755 (executable)
@@ -660,8 +660,8 @@ class SC_mod_web_perm_index {
                                // Compile table row:
                        $code .= '
                                <tr>
-                                       '.implode('
-                                       ',$cells).'
+                                       ' . implode('
+                                       ', $cells) . '
                                </tr>';
                }
 
index 6907d5a..c5dee1c 100644 (file)
@@ -778,7 +778,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                                                                $title=$GLOBALS['LANG']->sL($title);
                                                        }
                                                                // Description:
-                                                       $description=$v[$k2i.'.']['description'] ? $GLOBALS['LANG']->sL($v[$k2i.'.']['description'],1).'<br />' : '';
+                                                       $description = $v[$k2i . '.']['description'] ? $GLOBALS['LANG']->sL($v[$k2i . '.']['description'], 1) . '<br />' : '';
 
                                                                // URL + onclick event:
                                                        $onClickEvent='';
index d8f9781..42537f9 100644 (file)
@@ -102,9 +102,9 @@ class user_wapversion {
                $pageRec = $GLOBALS['TSFE']->page;
                if ($GLOBALS['TSFE']->idParts[1]) {
                                // Creating content card:
-                       $xmlObj->newLevel('card',1,array(
+                       $xmlObj->newLevel('card', 1, array(
                                'id' => 'content',
-                               'title' => ($conf['preTitle']?$conf['preTitle'].': ':'').$pageRec['title']
+                               'title' => ($conf['preTitle'] ? $conf['preTitle'] . ': ' : '') . $pageRec['title']
                        ));
 
                        $cParts = $this->contentAll();
@@ -127,9 +127,9 @@ class user_wapversion {
                        $xmlObj->newLevel('card', 0);
                } else {
                                // Creating menu card:
-                       $xmlObj->newLevel('card',1,array(
+                       $xmlObj->newLevel('card', 1, array(
                                'id' => 'menu',
-                               'title' => ($conf['preTitle']?$conf['preTitle'].': ':'').$pageRec['title']
+                               'title' => ($conf['preTitle'] ? $conf['preTitle'] . ': ' : '') . $pageRec['title']
                        ));
                        $xmlObj->lines[] = $this->contentAbstract();
                        $xmlObj->lines[] = '<p><br/>'.$this->bold('Menu:').'</p>';
index e76959d..5983828 100644 (file)
@@ -294,7 +294,8 @@ class tx_sv_auth extends tx_sv_authbase     {
 
                                        // Include sub groups
                                if (trim($row['subgroup'])) {
-                                       $theList = implode(',',t3lib_div::intExplode(',', $row['subgroup']));   // Make integer list
+                                               // Make integer list
+                                       $theList = implode(',', t3lib_div::intExplode(',', $row['subgroup']));
                                        $this->getSubGroups($theList, $idList.','.$uid, $groups);               // Call recursively, pass along list of already processed groups so they are not recursed again.
                                }
                        }
index 41b5c98..492efd1 100644 (file)
@@ -434,7 +434,7 @@ class tx_tstemplateobjbrowser extends t3lib_extobjbase {
                        $menu = '<div class="tsob-menu"><label>' . $GLOBALS['LANG']->getLL('browse') . '</label>';
                        $menu .= t3lib_BEfunc::getFuncMenu($this->pObj->id, 'SET[ts_browser_type]', $bType, $this->pObj->MOD_MENU['ts_browser_type']);
                        $menu .= '<label for="ts_browser_toplevel_' . $bType . '">' . $GLOBALS['LANG']->getLL('objectList') . '</label>';
-                       $menu .= t3lib_BEfunc::getFuncMenu($this->pObj->id,'SET[ts_browser_toplevel_' . $bType . ']', $this->pObj->MOD_SETTINGS['ts_browser_toplevel_' . $bType], $this->pObj->MOD_MENU['ts_browser_toplevel_' . $bType]);
+                       $menu .= t3lib_BEfunc::getFuncMenu($this->pObj->id, 'SET[ts_browser_toplevel_' . $bType . ']', $this->pObj->MOD_SETTINGS['ts_browser_toplevel_' . $bType], $this->pObj->MOD_MENU['ts_browser_toplevel_' . $bType]);
 
                        //search
                        $menu .= '<label for="search_field">' . $GLOBALS['LANG']->getLL('search') .'</label>';