[BUGFIX] Reduce spacing CGL violations in /typo3/sysext/
authorRoland Waldner <most.wanted@gmx.at>
Sun, 20 May 2012 05:52:33 +0000 (07:52 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sun, 20 May 2012 09:59:37 +0000 (11:59 +0200)
There were a lot spacing CGL violations in /typo3/sysext/.
These will be reduced by this commit.

Change-Id: Iae4dc7bfbca79f5e71446d850eebfceeb20e4a18
Resolves: #37310
Releases: 6.0
Reviewed-on: http://review.typo3.org/11311
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
136 files changed:
typo3/sysext/beuser/class.tx_beuser.php
typo3/sysext/beuser/class.tx_beuser_switchbackuser.php
typo3/sysext/beuser/ext_tables.php
typo3/sysext/beuser/mod/index.php
typo3/sysext/cms/layout/db_layout.php
typo3/sysext/cms/layout/db_new_content_el.php
typo3/sysext/cms/layout/wizard_backend_layout.php
typo3/sysext/cms/tslib/class.tslib_feuserauth.php
typo3/sysext/cms/tslib/class.tslib_gifbuilder.php
typo3/sysext/cms/tslib/class.tslib_pagegen.php
typo3/sysext/cms/tslib/class.tslib_pibase.php
typo3/sysext/cms/tslib/class.tslib_search.php
typo3/sysext/cms/tslib/content/class.tslib_content_content.php
typo3/sysext/cms/tslib/index_ts.php
typo3/sysext/cms/tslib/media/scripts/example_callfunction.php
typo3/sysext/cms/tslib/media/scripts/example_itemArrayProcFunc.php
typo3/sysext/cms/tslib/media/scripts/example_keepRollover.php
typo3/sysext/cms/tslib/media/scripts/example_languageMenu.php
typo3/sysext/cms/tslib/media/scripts/example_typolinkpop.php
typo3/sysext/cms/tslib/media/scripts/fe_adminLib.inc
typo3/sysext/cms/tslib/media/scripts/gmenu_foldout.php
typo3/sysext/cms/tslib/media/scripts/gmenu_layers.php
typo3/sysext/cms/tslib/media/scripts/plaintextLib.inc
typo3/sysext/cms/tslib/media/scripts/postit.inc
typo3/sysext/cms/tslib/media/scripts/testscript_EXT.php
typo3/sysext/cms/tslib/media/scripts/tmenu_layers.php
typo3/sysext/cms/tslib/media/scripts/wapversionLib.inc
typo3/sysext/cms/tslib/media/scripts/xmlversionLib.inc
typo3/sysext/cms/tslib/showpic.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php
typo3/sysext/css_styled_content/ext_localconf.php
typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php
typo3/sysext/extra_page_cm_options/ext_tables.php
typo3/sysext/feedit/view/class.tx_feedit_editpanel.php
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php
typo3/sysext/filelist/mod1/file_list.php
typo3/sysext/form/Classes/Domain/Factory/Typoscript.php
typo3/sysext/form/Classes/Domain/Factory/TyposcriptToJson.php
typo3/sysext/form/Classes/Domain/Model/JSON/Checkboxgroup.php
typo3/sysext/form/Classes/Domain/Model/JSON/Name.php
typo3/sysext/form/Classes/Domain/Model/JSON/Radiogroup.php
typo3/sysext/form/Classes/Domain/Model/JSON/Select.php
typo3/sysext/form/Classes/View/Wizard/Wizard.php
typo3/sysext/func/mod1/index.php
typo3/sysext/func_wizards/class.tx_funcwizards_webfunc.php
typo3/sysext/func_wizards/ext_tables.php
typo3/sysext/impexp/app/index.php
typo3/sysext/impexp/class.tx_impexp_clickmenu.php
typo3/sysext/impexp/ext_tables.php
typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php
typo3/sysext/indexed_search/class.crawler.php
typo3/sysext/indexed_search/class.external_parser.php
typo3/sysext/indexed_search/class.indexer.php
typo3/sysext/indexed_search/class.lexer.php
typo3/sysext/indexed_search/example/class.crawlerhook.php
typo3/sysext/indexed_search/example/class.pihook.php
typo3/sysext/indexed_search/hooks/class.tx_indexedsearch_tslib_fe_hook.php
typo3/sysext/indexed_search/mod/index.php
typo3/sysext/indexed_search/modfunc1/class.tx_indexedsearch_modfunc1.php
typo3/sysext/indexed_search/modfunc2/class.tx_indexedsearch_modfunc2.php
typo3/sysext/indexed_search/pi/class.tx_indexedsearch.php
typo3/sysext/info/mod1/index.php
typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php
typo3/sysext/info_pagetsconfig/ext_tables.php
typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php
typo3/sysext/install/updates/class.tx_coreupdates_imagescols.php
typo3/sysext/install/updates/class.tx_coreupdates_mergeadvanced.php
typo3/sysext/install/updates/class.tx_coreupdates_notinmenu.php
typo3/sysext/install/updates/class.tx_coreupdates_t3skin.php
typo3/sysext/lowlevel/class.tx_lowlevel_admin_core.php
typo3/sysext/lowlevel/class.tx_lowlevel_cleaner_core.php
typo3/sysext/lowlevel/clmods/class.cleanflexform.php
typo3/sysext/lowlevel/clmods/class.deleted.php
typo3/sysext/lowlevel/clmods/class.double_files.php
typo3/sysext/lowlevel/clmods/class.lost_files.php
typo3/sysext/lowlevel/clmods/class.missing_files.php
typo3/sysext/lowlevel/clmods/class.missing_relations.php
typo3/sysext/lowlevel/clmods/class.orphan_records.php
typo3/sysext/lowlevel/clmods/class.rte_images.php
typo3/sysext/lowlevel/clmods/class.syslog.php
typo3/sysext/lowlevel/clmods/class.versions.php
typo3/sysext/lowlevel/config/index.php
typo3/sysext/lowlevel/dbint/cli/refindex_cli.php
typo3/sysext/lowlevel/dbint/index.php
typo3/sysext/lowlevel/ext_localconf.php
typo3/sysext/lowlevel/ext_tables.php
typo3/sysext/perm/mod1/index.php
typo3/sysext/recordlist/mod1/index.php
typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
typo3/sysext/rtehtmlarea/hooks/softref/class.tx_rtehtmlarea_softrefproc.php
typo3/sysext/rtehtmlarea/mod3/browse_links.php
typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php
typo3/sysext/rtehtmlarea/mod5/class.tx_rtehtmlarea_user.php
typo3/sysext/rtehtmlarea/mod6/class.tx_rtehtmlarea_parse_html.php
typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
typo3/sysext/scheduler/class.tx_scheduler_module.php
typo3/sysext/setup/ext_tables.php
typo3/sysext/setup/mod/index.php
typo3/sysext/statictemplates/media/scripts/example_callfunction.php
typo3/sysext/statictemplates/media/scripts/example_itemArrayProcFunc.php
typo3/sysext/statictemplates/media/scripts/example_keepRollover.php
typo3/sysext/statictemplates/media/scripts/example_languageMenu.php
typo3/sysext/statictemplates/media/scripts/example_typolinkpop.php
typo3/sysext/statictemplates/media/scripts/fe_adminLib.inc
typo3/sysext/statictemplates/media/scripts/gmenu_foldout.php
typo3/sysext/statictemplates/media/scripts/gmenu_layers.php
typo3/sysext/statictemplates/media/scripts/plaintextLib.inc
typo3/sysext/statictemplates/media/scripts/postit.inc
typo3/sysext/statictemplates/media/scripts/testscript_EXT.php
typo3/sysext/statictemplates/media/scripts/tmenu_layers.php
typo3/sysext/statictemplates/media/scripts/wapversionLib.inc
typo3/sysext/statictemplates/media/scripts/xmlversionLib.inc
typo3/sysext/sv/class.tx_sv_auth.php
typo3/sysext/sv/class.tx_sv_authbase.php
typo3/sysext/sv/class.tx_sv_loginformhook.php
typo3/sysext/sys_action/ext_tables.php
typo3/sysext/sys_note/ext_tables.php
typo3/sysext/t3editor/classes/class.tx_t3editor.php
typo3/sysext/t3editor/classes/class.tx_t3editor_hooks_tstemplateinfo.php
typo3/sysext/tsconfig_help/ext_tables.php
typo3/sysext/tsconfig_help/mod1/index.php
typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php
typo3/sysext/tstemplate_analyzer/ext_tables.php
typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php
typo3/sysext/tstemplate_ceditor/ext_tables.php
typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php
typo3/sysext/tstemplate_info/ext_tables.php
typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php
typo3/sysext/tstemplate_objbrowser/ext_tables.php
typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php
typo3/sysext/wizard_crpages/ext_tables.php
typo3/sysext/wizard_sortpages/class.tx_wizardsortpages_webfunc_2.php
typo3/sysext/wizard_sortpages/ext_tables.php

index 2fefd64..ed57eef 100644 (file)
@@ -60,7 +60,7 @@ class tx_beuser {
         * @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.
 
                        // Detecting menu level
index 00e95f6..1bc3c6a 100644 (file)
@@ -27,7 +27,7 @@
  * @author     Sebastian Kurf├╝rst <sebastian@garbage-group.de>
  */
 class tx_beuser_switchbackuser {
-       function switchBack($params, $that)     {
+       function switchBack($params, $that) {
                if($that->session_table == 'be_sessions' && $that->user['uid'] && $that->user['ses_backuserid']) {
                        $updateData = array(
                                'ses_userid' => $that->user['ses_backuserid'],
index c846648..9866ffe 100755 (executable)
@@ -1,7 +1,7 @@
 <?php
 if (!defined ('TYPO3_MODE'))   die ('Access denied.');
 
-if (TYPO3_MODE=='BE')  {
+if (TYPO3_MODE=='BE') {
        t3lib_extMgm::addModule('tools','beuser','top',t3lib_extMgm::extPath($_EXTKEY).'mod/');
 
        $GLOBALS['TBE_MODULES_EXT']['xMOD_alt_clickmenu']['extendCMclasses'][] = array(
index 09763e9..ece4955 100755 (executable)
@@ -64,7 +64,7 @@ class localPageTree extends t3lib_browseTree {
         * @param       array           Webmounts for the backend user.
         * @return      void
         */
-       function __construct($BE_USER,$WEBMOUNTS='')    {
+       function __construct($BE_USER,$WEBMOUNTS='') {
                $this->init();
 
                $this->BE_USER = $BE_USER;
@@ -89,7 +89,7 @@ class localPageTree extends t3lib_browseTree {
         * @param       array           [See parent]
         * @return      string
         */
-       function wrapTitle($str,$row)   {
+       function wrapTitle($str,$row) {
                return $str;
        }
 
@@ -101,7 +101,7 @@ class localPageTree extends t3lib_browseTree {
         * @param       string          [See parent]
         * @return      string
         */
-       function PM_ATagWrap($icon,$cmd,$bMark='')      {
+       function PM_ATagWrap($icon,$cmd,$bMark='') {
                return '';
        }
 
@@ -112,7 +112,7 @@ class localPageTree extends t3lib_browseTree {
         * @param       array           Row.
         * @return      string          Icon with title attribute added.
         */
-       function wrapIcon($icon,$row)   {
+       function wrapIcon($icon,$row) {
                        // Add title attribute to input icon tag
                $title = '['.$row['uid'].'] '.t3lib_BEfunc::getRecordPath($row['uid'],'',15);
                $theIcon = $this->addTagAttributes($icon,($this->titleAttrib ? $this->titleAttrib.'="'.htmlspecialchars($title).'"' : '').' border="0"');
@@ -167,7 +167,7 @@ class printAllPageTree extends localPageTree {
         * @param       string          [See parent]
         * @return      string
         */
-       function PM_ATagWrap($icon,$cmd,$bMark='')      {
+       function PM_ATagWrap($icon,$cmd,$bMark='') {
                return $icon;
        }
 
@@ -178,7 +178,7 @@ class printAllPageTree extends localPageTree {
         * @param       array           Row.
         * @return      string          Icon with title attribute added.
         */
-       function wrapIcon($icon,$row)   {
+       function wrapIcon($icon,$row) {
                        // Add title attribute to input icon tag
                $title = '['.$row['uid'].']';
                $theIcon = $this->addTagAttributes($icon,($this->titleAttrib ? $this->titleAttrib.'="'.htmlspecialchars($title).'"' : '').' border="0"');
@@ -212,7 +212,7 @@ class printAllPageTree_perms extends printAllPageTree {
         * @param       boolean         If set, the path of the pages in the tree is printed (only done for pages outside of mounts).
         * @return      string          HTML content.
         */
-       function printTree($treeArr='',$printPath=0)    {
+       function printTree($treeArr='',$printPath=0) {
                $titleLen=intval($this->BE_USER->uc['titleLen']);
 
                $be_user_Array = t3lib_BEfunc::getUserNames();
@@ -256,7 +256,7 @@ class printAllPageTree_perms extends printAllPageTree {
         * @param       integer         The permissions integer.
         * @return      string          HTML formatted.
         */
-       function ext_printPerms($int)   {
+       function ext_printPerms($int) {
                $str='';
                $str.= (($int&1)?'*':'<font color="red">x</font>');
                $str.= (($int&16)?'*':'<font color="red">x</font>');
@@ -274,10 +274,10 @@ class printAllPageTree_perms extends printAllPageTree {
         * @param       array           First-group record.
         * @return      integer         Permissions.
         */
-       function ext_groupPerms($row,$firstGroup)       {
-               if (is_array($row))     {
+       function ext_groupPerms($row,$firstGroup) {
+               if (is_array($row)) {
                        $out=intval($row['perms_everybody']);
-                       if ($row['perms_groupid'] && $firstGroup['uid']==$row['perms_groupid']) {
+                       if ($row['perms_groupid'] && $firstGroup['uid']==$row['perms_groupid']) {
                                $out|= intval($row['perms_group']);
                        }
                        return $out;
@@ -335,7 +335,7 @@ class localFolderTree extends t3lib_folderTree {
         * @param       array           [See parent]
         * @return      string
         */
-       function wrapTitle($str,$row)   {
+       function wrapTitle($str,$row) {
                return $str;
        }
 
@@ -347,7 +347,7 @@ class localFolderTree extends t3lib_folderTree {
         * @param       string          [See parent]
         * @return      string
         */
-       function PM_ATagWrap($icon,$cmd,$bMark='')      {
+       function PM_ATagWrap($icon,$cmd,$bMark='') {
                return '';
        }
 
@@ -407,7 +407,7 @@ class printAllFolderTree extends localFolderTree {
         * @param       string          [See parent]
         * @return      string
         */
-       function PM_ATagWrap($icon,$cmd,$bMark='')      {
+       function PM_ATagWrap($icon,$cmd,$bMark='') {
                return $icon;
        }
 }
@@ -441,7 +441,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
         * @param       string          alternative select clause (default is getPagePermsClause(1)). For instance to make sure that ALL webmounts are selected regardless of whether the user has read access or not, you can set this to "1=1".
         * @return      array           Webmounts id's
         */
-       function returnWebmounts($pClause='')   {
+       function returnWebmounts($pClause='') {
 
                        // Get array of webmounts:
                $webmounts = (string)($this->groupData['webmounts'])!='' ? explode(',',$this->groupData['webmounts']) : Array();
@@ -450,9 +450,9 @@ class local_beUserAuth extends t3lib_beUserAuth {
                $pClause=$pClause?$pClause:$this->getPagePermsClause(1);
 
                        // Traverse mounts, check if they are readable:
-               foreach ($webmounts as $k => $id)       {
+               foreach ($webmounts as $k => $id) {
                        $rec=t3lib_BEfunc::getRecord('pages',$id,'*',' AND '.$pClause);
-                       if (!is_array($rec))    {
+                       if (!is_array($rec)) {
                                $this->ext_non_readAccessPageArray[$id]=t3lib_BEfunc::getRecord('pages',$id);
                                unset($webmounts[$k]);
                        }
@@ -502,7 +502,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
         * @param       boolean         If set, the full trees of pages/folders are printed.
         * @return      array           Array with accumulated HTML content.
         */
-       function ext_printOverview($uInfo,$compareFlags,$printTrees=0)  {
+       function ext_printOverview($uInfo,$compareFlags,$printTrees=0) {
                        // Prepare for file storages and db-mount
                if ($printTrees)        {       // ... this is if we see the detailed view for a user:
                                // Page tree object:
@@ -549,9 +549,9 @@ class local_beUserAuth extends t3lib_beUserAuth {
 
                        // Traverse the enabled analysis topics:
                $out=array();
-               foreach ($uInfo as $k => $v)    {
-                       if ($compareFlags[$k])  {
-                               switch($k)      {
+               foreach ($uInfo as $k => $v) {
+                       if ($compareFlags[$k]) {
+                               switch($k) {
                                        case 'filemounts':
                                        case 'filestorages':
                                                $out[$k] = $foldertree->getBrowsableTree();
@@ -592,12 +592,12 @@ class local_beUserAuth extends t3lib_beUserAuth {
                                                foreach ($nef as $vv) {
                                                        if ($vv) {
                                                                list($thisTable,$field) = explode(':',$vv);
-                                                               if ($thisTable!=$table) {
+                                                               if ($thisTable!=$table) {
                                                                        $table=$thisTable;
                                                                        t3lib_div::loadTCA($table);
                                                                        $pout[]='<span class="nobr">'.t3lib_iconWorks::getSpriteIconForRecord($table,array()).$GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['ctrl']['title']).'</span>';
                                                                }
-                                                               if ($GLOBALS['TCA'][$table]['columns'][$field]) {
+                                                               if ($GLOBALS['TCA'][$table]['columns'][$field]) {
                                                                        $pout[]='<span class="nobr"> - '.rtrim($GLOBALS['LANG']->sL($GLOBALS['TCA'][$table]['columns'][$field]['label']), ':').'</span>';
                                                                }
                                                        }
@@ -627,11 +627,11 @@ class local_beUserAuth extends t3lib_beUserAuth {
                                                foreach ($mods as $vv) {
                                                        if ($vv) {
                                                                list($thisMod,$subMod) = explode('_',$vv);
-                                                               if ($thisMod!=$mainMod) {
+                                                               if ($thisMod!=$mainMod) {
                                                                        $mainMod=$thisMod;
                                                                        $pout[]='<span class="nobr">'.($modNames[$mainMod]?$modNames[$mainMod]:$mainMod).'</span>';
                                                                }
-                                                               if ($subMod)    {
+                                                               if ($subMod) {
                                                                        $pout[]='<span class="nobr"> - '.($modNames[$mainMod.'_'.$subMod]?$modNames[$mainMod.'_'.$subMod]:$mainMod.'_'.$subMod).'</span>';
                                                                }
                                                        }
@@ -670,13 +670,13 @@ class local_beUserAuth extends t3lib_beUserAuth {
                                                );
 
                                                        // Traverse types:
-                                               foreach ($theTypes as $tableFieldKey => $theTypeArrays) {
-                                                       if (is_array($theTypeArrays['items']))  {
+                                               foreach ($theTypes as $tableFieldKey => $theTypeArrays) {
+                                                       if (is_array($theTypeArrays['items'])) {
                                                                $pout[] = '<strong>'.$theTypeArrays['tableFieldLabel'].'</strong>';
                                                                        // Traverse options for this field:
-                                                               foreach ($theTypeArrays['items'] as $itemValue => $itemContent) {
+                                                               foreach ($theTypeArrays['items'] as $itemValue => $itemContent) {
                                                                        $v = $tableFieldKey.':'.$itemValue.':'.$itemContent[0];
-                                                                       if (isset($nef[$v]))    {
+                                                                       if (isset($nef[$v])) {
                                                                                unset($nef[$v]);
                                                                                $pout[] = $icons[$itemContent[0]].'['.$itemContent[2].'] '.$itemContent[1];
                                                                        } else {
@@ -688,7 +688,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
                                                }
 
                                                        // Add remaining:
-                                               if (count($nef))        {
+                                               if (count($nef)) {
                                                        $pout = array_merge($pout, array_keys($nef));
                                                }
 
@@ -705,12 +705,12 @@ class local_beUserAuth extends t3lib_beUserAuth {
                                                $items = t3lib_BEfunc::getSystemLanguages();
 
                                                        // Traverse values:
-                                               foreach ($items as $iCfg)       {
-                                                       if (isset($nef[$iCfg[1]]))      {
+                                               foreach ($items as $iCfg) {
+                                                       if (isset($nef[$iCfg[1]])) {
                                                                unset($nef[$iCfg[1]]);
                                                                if (strpos($iCfg[2], '.gif') === FALSE) {
                                                                        $icon = t3lib_iconWorks::getSpriteIcon($iCfg[2]) . '&nbsp;';
-                                                               } elseif (strlen($iCfg[2]))     {
+                                                               } elseif (strlen($iCfg[2])) {
                                                                        $icon = '<img '.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/'.$iCfg[2]).' class="absmiddle" style="margin-right: 5px;" alt="" />';
                                                                } else {
                                                                        $icon = '';
@@ -720,7 +720,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
                                                }
 
                                                        // Add remaining:
-                                               if (count($nef))        {
+                                               if (count($nef)) {
                                                        $pout = array_merge($pout, array_keys($nef));
                                                }
 
@@ -741,13 +741,13 @@ class local_beUserAuth extends t3lib_beUserAuth {
 
                                                        // Initialize:
                                                $customOptions = $GLOBALS['TYPO3_CONF_VARS']['BE']['customPermOptions'];
-                                               if (is_array($customOptions))   {
+                                               if (is_array($customOptions)) {
                                                        foreach ($customOptions as $coKey => $coValue) {
-                                                               if (is_array($coValue['items']))        {
+                                                               if (is_array($coValue['items'])) {
                                                                                // Traverse items:
-                                                                       foreach ($coValue['items'] as $itemKey => $itemCfg)     {
+                                                                       foreach ($coValue['items'] as $itemKey => $itemCfg) {
                                                                                $v = $coKey.':'.$itemKey;
-                                                                               if (isset($nef[$v]))    {
+                                                                               if (isset($nef[$v])) {
                                                                                        unset($nef[$v]);
                                                                                        $pout[] = $GLOBALS['LANG']->sl($coValue['header']).' / '.$GLOBALS['LANG']->sl($itemCfg[0]);
                                                                                }
@@ -757,7 +757,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
                                                }
 
                                                        // Add remaining:
-                                               if (count($nef))        {
+                                               if (count($nef)) {
                                                        $pout = array_merge($pout, array_keys($nef));
                                                }
 
@@ -778,7 +778,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
        function ext_getReadableButNonmounted() {
 
                        // List of page id mounts which ARE mounted (and should therefore not be selected)
-               if (!$this->ext_pageIdsFromMounts)      {
+               if (!$this->ext_pageIdsFromMounts) {
                        $this->ext_pageIdsFromMounts=0;
                }
 
@@ -793,7 +793,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
                                                'uid NOT IN ('.$this->ext_pageIdsFromMounts.') AND '.$this->getPagePermsClause(1).t3lib_BEfunc::deleteClause('pages')
                                        );
                $dat = array();
-               while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))       {
+               while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                        $dat[] = array(
                                'row'=>$row,
                                'HTML'=>t3lib_iconWorks::getSpriteIconForRecord('pages',$row,array('title'=>'['.$row['uid'].']'))
@@ -809,7 +809,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
         * @param       integer         The permissions integer.
         * @return      string          HTML formatted.
         */
-       function ext_printPerms($int)   {
+       function ext_printPerms($int) {
                $str='';
                $str.= (($int&1)?'*':'<font color="red">x</font>');
                $str.= (($int&16)?'*':'<font color="red">x</font>');
@@ -827,10 +827,10 @@ class local_beUserAuth extends t3lib_beUserAuth {
         * @param       array           First-group record.
         * @return      integer         Permissions.
         */
-       function ext_groupPerms($row,$firstGroup)       {
-               if (is_array($row))     {
+       function ext_groupPerms($row,$firstGroup) {
+               if (is_array($row)) {
                        $out=intval($row['perms_everybody']);
-                       if ($row['perms_groupid'] && $firstGroup['uid']==$row['perms_groupid']) {
+                       if ($row['perms_groupid'] && $firstGroup['uid']==$row['perms_groupid']) {
                                $out|= intval($row['perms_group']);
                        }
                        return $out;
@@ -843,94 +843,94 @@ class local_beUserAuth extends t3lib_beUserAuth {
         * @param       array           Might contain array where keys/values indicate whether to render a certain value
         * @return      array           Array with the information of the user for each analysis topic.
         */
-       function ext_compileUserInfoForHash($filter=NULL)       {
+       function ext_compileUserInfoForHash($filter=NULL) {
                $uInfo=array();
                $renderAll = !is_array($filter);
 
                        // Filemounts:
-               if ($renderAll || $filter['filemounts'])        {
+               if ($renderAll || $filter['filemounts']) {
                        $uInfo['filemounts'] = $this->ext_uniqueAndSortList(implode(',',array_keys($this->groupData['filemounts'])));
                }
 
                        // DBmounts:
-               if ($renderAll || $filter['webmounts']) {
+               if ($renderAll || $filter['webmounts']) {
                        $uInfo['webmounts'] = $this->ext_uniqueAndSortList($this->groupData['webmounts']);
                }
 
                        // Sharing Upload Folder
-               if ($renderAll || $filter['tempPath'])  {
+               if ($renderAll || $filter['tempPath']) {
                        $fileProcessor = t3lib_div::makeInstance('t3lib_basicFileFunctions');
                        $fileProcessor->init($this->groupData['filemounts'], $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
                        $uInfo['tempPath'] = $fileProcessor->findTempFolder();  // The closest TEMP-path is found
                }
 
                        // First Main Group:
-               if ($renderAll || $filter['firstMainGroup'])    {
+               if ($renderAll || $filter['firstMainGroup']) {
                        $uInfo['firstMainGroup'] = $this->firstMainGroup;
                }
 
                        // Group List:
-               if ($renderAll || $filter['groupList']) {
+               if ($renderAll || $filter['groupList']) {
                        $uInfo['groupList'] = $this->groupList; // This gives a list that shows in which order the groups are processed. This may result in a list of groups which is similar to that of another user regarding which group but not the order of groups. For now, I believe it's most usefull to let separate orders of groups appear as different group settings for a user.
                }
 
                        // Page Types:
-               if ($renderAll || $filter['pagetypes_select'])  {
+               if ($renderAll || $filter['pagetypes_select']) {
                        $uInfo['pagetypes_select'] = $this->ext_uniqueAndSortList($this->groupData['pagetypes_select']);
                }
 
                        // Tables select:
-               if ($renderAll || $filter['tables_select'])     {
+               if ($renderAll || $filter['tables_select']) {
                        $uInfo['tables_select'] = $this->ext_uniqueAndSortList($this->groupData['tables_select'].','.$this->groupData['tables_modify']);
                }
 
                        // Tables modify:
-               if ($renderAll || $filter['tables_modify'])     {
+               if ($renderAll || $filter['tables_modify']) {
                        $uInfo['tables_modify'] = $this->ext_uniqueAndSortList($this->groupData['tables_modify']);
                }
 
                        // Non-exclude fields:
-               if ($renderAll || $filter['non_exclude_fields'])        {
+               if ($renderAll || $filter['non_exclude_fields']) {
                        $uInfo['non_exclude_fields'] = $this->ext_uniqueAndSortList($this->groupData['non_exclude_fields']);
                }
 
                        // Explicit Allow/Deny:
-               if ($renderAll || $filter['explicit_allowdeny'])        {
+               if ($renderAll || $filter['explicit_allowdeny']) {
                        $uInfo['explicit_allowdeny'] = $this->ext_uniqueAndSortList($this->groupData['explicit_allowdeny']);
                }
 
                        // Limit to languages:
-               if ($renderAll || $filter['allowed_languages']) {
+               if ($renderAll || $filter['allowed_languages']) {
                        $uInfo['allowed_languages'] = $this->ext_uniqueAndSortList($this->groupData['allowed_languages']);
                }
 
                        // Workspace permissions
-               if ($renderAll || $filter['workspace_perms'])   {
+               if ($renderAll || $filter['workspace_perms']) {
                        $uInfo['workspace_perms'] = $this->ext_uniqueAndSortList($this->groupData['workspace_perms']);
                }
 
                        // Workspace membership
-               if ($renderAll || $filter['workspace_membership'])      {
+               if ($renderAll || $filter['workspace_membership']) {
                        $uInfo['workspace_membership'] = $this->ext_workspaceMembership();
                }
 
                        // Custom options:
-               if ($renderAll || $filter['custom_options'])    {
+               if ($renderAll || $filter['custom_options']) {
                        $uInfo['custom_options'] = $this->ext_uniqueAndSortList($this->groupData['custom_options']);
                }
 
                        // Modules:
-               if ($renderAll || $filter['modules'])   {
+               if ($renderAll || $filter['modules']) {
                        $uInfo['modules'] = $this->ext_uniqueAndSortList($this->groupData['modules']);
                }
 
                        // User TS:
                $this->ext_ksortArrayRecursive($this->userTS);
-               if ($renderAll || $filter['userTS'])    {
+               if ($renderAll || $filter['userTS']) {
                        $uInfo['userTS'] = $this->userTS;
                }
 
-               if ($renderAll || $filter['userTS_hl']) {
+               if ($renderAll || $filter['userTS_hl']) {
                        $uInfo['userTS_hl'] = $this->userTS_text;
                }
 
@@ -943,7 +943,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
         * @param       string          Commalist.
         * @return      string          Sorted, unique commalist.
         */
-       function ext_uniqueAndSortList($list)   {
+       function ext_uniqueAndSortList($list) {
                $uList=t3lib_div::trimExplode(',',$list,1);
                sort($uList);
                $uList=array_unique($uList);
@@ -957,7 +957,7 @@ class local_beUserAuth extends t3lib_beUserAuth {
         * @param       array           Multidimensional array (value by reference!)
         * @return      void
         */
-       function ext_ksortArrayRecursive(&$arr) {
+       function ext_ksortArrayRecursive(&$arr) {
                krsort($arr);
                foreach ($arr as &$v) {
                        if (is_array($v)) {
@@ -975,23 +975,23 @@ class local_beUserAuth extends t3lib_beUserAuth {
        function ext_workspaceMembership() {
                        // Create accessible workspace arrays:
                $options = array();
-               if ($this->checkWorkspace(array('uid' => 0)))   {
+               if ($this->checkWorkspace(array('uid' => 0))) {
                        $options[0] = '0: ' . $GLOBALS['LANG']->getLL('live', TRUE);
                }
 
                        // Add custom workspaces (selecting all, filtering by BE_USER check):
                if (t3lib_extMgm::isLoaded('workspaces')) {
                        $workspaces = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid,title,adminusers,members,reviewers,db_mountpoints','sys_workspace','pid=0'.t3lib_BEfunc::deleteClause('sys_workspace'),'','title');
-                       if (count($workspaces)) {
-                               foreach ($workspaces as $rec)   {
-                                       if ($this->checkWorkspace($rec))        {
+                       if (count($workspaces)) {
+                               foreach ($workspaces as $rec) {
+                                       if ($this->checkWorkspace($rec)) {
                                                $options[$rec['uid']] = $rec['uid'].': '.htmlspecialchars($rec['title']);
 
                                                        // Check if all mount points are accessible, otherwise show error:
-                                               if (trim($rec['db_mountpoints'])!=='')  {
+                                               if (trim($rec['db_mountpoints'])!=='') {
                                                        $mountPoints = t3lib_div::intExplode(',',$this->workspaceRec['db_mountpoints'],1);
-                                                       foreach ($mountPoints as $mpId) {
-                                                               if (!$this->isInWebMount($mpId,'1=1'))  {
+                                                       foreach ($mountPoints as $mpId) {
+                                                               if (!$this->isInWebMount($mpId,'1=1')) {
                                                                        $options[$rec['uid']].= '<br> \- ' . $GLOBALS['LANG']->getLL('notAccessible', TRUE) . ' ' . $mpId;
                                                                }
                                                        }
@@ -1096,9 +1096,9 @@ class SC_mod_tools_be_user_index {
        function main() {
                $this->content = $this->doc->header($GLOBALS['LANG']->getLL('backendUserAdministration', TRUE));
 
-               switch($this->MOD_SETTINGS['function']) {
+               switch($this->MOD_SETTINGS['function']) {
                        case 'compare':
-                               if (t3lib_div::_GP('ads'))      {
+                               if (t3lib_div::_GP('ads')) {
                                        $compareFlags = t3lib_div::_GP('compareFlags');
                                        $GLOBALS['BE_USER']->pushModuleData('tools_beuser/index.php/compare',$compareFlags);
                                } else {
@@ -1157,7 +1157,7 @@ class SC_mod_tools_be_user_index {
                }
 
                        // Shortcut
-               if ($GLOBALS['BE_USER']->mayMakeShortcut())     {
+               if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
                        $buttons['shortcut'] = $this->doc->makeShortcutIcon('be_user_uid,compareFlags', 'function', $this->MCONF['name']);
                }
 
@@ -1180,7 +1180,7 @@ class SC_mod_tools_be_user_index {
         * @param       array           options that should be taking into account to compare the users
         * @return      string          the content
         */
-       function compareUsers($compareFlags)    {
+       function compareUsers($compareFlags) {
                        // Menu:
                $options = array(
                        'filemounts' => $GLOBALS['LANG']->getLL('filemounts', TRUE),
@@ -1203,7 +1203,7 @@ class SC_mod_tools_be_user_index {
                );
 
                $be_user_uid = t3lib_div::_GP('be_user_uid');
-               if ($be_user_uid)       {
+               if ($be_user_uid) {
                                // This is used to test with other users. Development ONLY!
                        $tempBE_USER = t3lib_div::makeInstance('local_beUserAuth');     // New backend user object
                        $tempBE_USER->userTS_dontGetCached=1;
@@ -1221,7 +1221,7 @@ class SC_mod_tools_be_user_index {
                                        <td>'.$uInfo_dat[$kk].'&nbsp;</td>
                                </tr>';
 
-                               if ($kk=='webmounts' && !$tempBE_USER->isAdmin())       {
+                               if ($kk=='webmounts' && !$tempBE_USER->isAdmin()) {
                                        $lines[]='<tr class="bgColor4">
                                                <td nowrap="nowrap" valign="top">' . $GLOBALS['LANG']->getLL('nonMountedReadablePages', TRUE) . '&nbsp;&nbsp;</td>
                                                <td>'.$tempBE_USER->ext_getReadableButNonmounted().'&nbsp;</td>
@@ -1244,7 +1244,7 @@ class SC_mod_tools_be_user_index {
                        $columnCounter = 0;
                        $itemsPerColumn = ceil(count($options) / 3);
                        foreach ($options as $kk => $vv) {
-                               if ($rowCounter == $itemsPerColumn)     {
+                               if ($rowCounter == $itemsPerColumn) {
                                        $rowCounter = 0;
                                        $columnCounter++;
                                        $menu[$columnCounter] = array();
@@ -1254,7 +1254,7 @@ class SC_mod_tools_be_user_index {
                        }
                        $outCode = '<p>' . $GLOBALS['LANG']->getLL('groupBy', TRUE) . '</p>';
                        $outCode .= '<table border="0" cellpadding="3" cellspacing="1" class="compare-checklist valign-top"><tr>';
-                       foreach ($menu as $column)      {
+                       foreach ($menu as $column) {
                                $outCode .= '<td>' . implode('<br />', $column) . '</td>';
                        }
                        $outCode .= '</tr></table>';
@@ -1272,7 +1272,7 @@ class SC_mod_tools_be_user_index {
                        $tooManyUsers='';
 
                        foreach ($users as $r) {
-                               if ($counter>=$offset)  {
+                               if ($counter>=$offset) {
                                                // This is used to test with other users. Development ONLY!
                                        $tempBE_USER = t3lib_div::makeInstance('local_beUserAuth');     // New backend user object
                                        /* @var $tempBE_USER local_beUserAuth */
@@ -1285,13 +1285,13 @@ class SC_mod_tools_be_user_index {
                                        $menu=array();
                                        $uInfo = $tempBE_USER->ext_compileUserInfoForHash((array)$compareFlags);
                                        foreach ($options as $kk => $vv) {
-                                               if ($compareFlags[$kk]) {
+                                               if ($compareFlags[$kk]) {
                                                        $md5pre.=serialize($uInfo[$kk]).'|';
                                                }
                                        }
                                                // setting md5:
                                        $md5=md5($md5pre);
-                                       if (!isset($comparation[$md5])) {
+                                       if (!isset($comparation[$md5])) {
                                                $comparation[$md5]=$tempBE_USER->ext_printOverview($uInfo,$compareFlags);
                                                $comparation[$md5]['users']=array();
                                        }
@@ -1313,7 +1313,7 @@ class SC_mod_tools_be_user_index {
                        $allCells['USERS'] = '<table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td><strong>' . $GLOBALS['LANG']->getLL('usernames', TRUE) . '</strong></td></table>';
 
                        foreach ($options as $kk => $vv) {
-                               if ($compareFlags[$kk]) {
+                               if ($compareFlags[$kk]) {
                                        $allCells[$kk] = '<strong>'.$vv.':</strong>';
                                }
                        }
@@ -1343,7 +1343,7 @@ class SC_mod_tools_be_user_index {
                                $allCells['USERS'] = '<table border="0" cellspacing="0" cellpadding="0" width="100%">'.implode('',$uListArr).'</table>';
 
                                foreach ($options as $kk => $vv) {
-                                       if ($compareFlags[$kk]) {
+                                       if ($compareFlags[$kk]) {
                                                $allCells[$kk] = $dat[$kk];
                                        }
                                }
@@ -1389,7 +1389,7 @@ class SC_mod_tools_be_user_index {
         * @param       array           the BE user record to link
         * @return      string          the HTML anchor
         */
-       function linkUser($str,$rec)    {
+       function linkUser($str,$rec) {
                return '<a href="'.htmlspecialchars($this->MCONF['_']).'&be_user_uid='.$rec['uid'].'">' . htmlspecialchars($str) . '</a>';
        }
 
@@ -1401,7 +1401,7 @@ class SC_mod_tools_be_user_index {
         * @param       array           the BE user record to use
         * @return      string          a HTML formatted list of the link
         */
-       function elementLinks($table,$row)      {
+       function elementLinks($table,$row) {
                        // Info:
                $cells[]='<a href="#" onclick="top.launchView(\'' . $table . '\', \'' . $row['uid'] . '\',\'' . $GLOBALS['BACK_PATH'] . '\'); return false;" title="' . $GLOBALS['LANG']->getLL('showInformation', TRUE) . '">' .
                                t3lib_iconWorks::getSpriteIcon('actions-document-info') .
@@ -1415,7 +1415,7 @@ class SC_mod_tools_be_user_index {
 
                        // Hide:
                $hiddenField = $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled'];
-               if ($row[$hiddenField]) {
+               if ($row[$hiddenField]) {
                        $params='&data[' . $table . '][' . $row['uid'] . '][' . $hiddenField . ']=0';
                        $cells[]='<a href="' . $this->doc->issueCommand($params) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:enable', TRUE) . '">' .
                                t3lib_iconWorks::getSpriteIcon('actions-edit-unhide') .
@@ -1462,8 +1462,8 @@ class SC_mod_tools_be_user_index {
         * @param       string          the path that will be checked
         * @return      string          the local path
         */
-       function localPath($str)        {
-               if (substr($str,0,strlen(PATH_site))==PATH_site)        {
+       function localPath($str) {
+               if (substr($str,0,strlen(PATH_site))==PATH_site) {
                        return substr($str,strlen(PATH_site));
                } else {
                        return $str;
@@ -1476,12 +1476,12 @@ class SC_mod_tools_be_user_index {
         * @param       array           BE-user record that will be switched to
         * @return      void
         */
-       function switchUser($switchUser)        {
+       function switchUser($switchUser) {
                $uRec=t3lib_BEfunc::getRecord('be_users',$switchUser);
-               if (is_array($uRec) && $GLOBALS['BE_USER']->isAdmin())  {
+               if (is_array($uRec) && $GLOBALS['BE_USER']->isAdmin()) {
                        $updateData['ses_userid'] = $uRec['uid'];
                                // user switchback
-                       if (t3lib_div::_GP('switchBackUser'))   {
+                       if (t3lib_div::_GP('switchBackUser')) {
                                $updateData['ses_backuserid'] = intval($GLOBALS['BE_USER']->user['uid']);
                        }
                        $GLOBALS['TYPO3_DB']->exec_UPDATEquery('be_sessions', 'ses_id=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($GLOBALS['BE_USER']->id, 'be_sessions') . ' AND ses_name=' . $GLOBALS['TYPO3_DB']->fullQuoteStr(t3lib_beUserAuth::getCookieName(), 'be_sessions') . ' AND ses_userid=' . intval($GLOBALS['BE_USER']->user['uid']), $updateData);
index 10da41a..a208f49 100755 (executable)
@@ -79,7 +79,7 @@ class ext_posMap extends t3lib_positionMap {
         * @param       array           The record row.
         * @return      string          Wrapped title string.
         */
-       function wrapRecordTitle($str,$row)     {
+       function wrapRecordTitle($str,$row) {
                $aOnClick = 'jumpToUrl(\''.$GLOBALS['SOBE']->local_linkThisScript(array('edit_record'=>'tt_content:'.$row['uid'])).'\');return false;';
                return '<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$str.'</a>';
        }
@@ -92,7 +92,7 @@ class ext_posMap extends t3lib_positionMap {
         * @return      string
         * @see printRecordMap()
         */
-       function wrapColumnHeader($str,$vv)     {
+       function wrapColumnHeader($str,$vv) {
                $aOnClick = 'jumpToUrl(\''.$GLOBALS['SOBE']->local_linkThisScript(array('edit_record'=>'_EDIT_COL:'.$vv)).'\');return false;';
                return '<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$str.'</a>';
        }
@@ -108,7 +108,7 @@ class ext_posMap extends t3lib_positionMap {
         * @return string
         */
        function onClickInsertRecord($row, $vv, $moveUid, $pid, $sys_lang = 0) {
-               if (is_array($row))     {
+               if (is_array($row)) {
                        $location=$GLOBALS['SOBE']->local_linkThisScript(array('edit_record'=>'tt_content:new/-'.$row['uid'].'/'.$row['colPos']));
                } else {
                        $location=$GLOBALS['SOBE']->local_linkThisScript(array('edit_record'=>'tt_content:new/'.$pid.'/'.$vv));
@@ -123,8 +123,8 @@ class ext_posMap extends t3lib_positionMap {
         * @param       array           Record array.
         * @return      string          HTML content
         */
-       function wrapRecordHeader($str,$row)    {
-               if ($row['uid']==$this->moveUid)        {
+       function wrapRecordHeader($str,$row) {
+               if ($row['uid']==$this->moveUid) {
                        return '<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/content_client.gif','width="7" height="10"').' alt="" />'.$str;
                } else return $str;
        }
@@ -232,7 +232,7 @@ class SC_db_layout {
                $this->current_sys_language=intval($this->MOD_SETTINGS['language']);
 
                        // Include scripts: QuickEdit
-               if ($this->MOD_SETTINGS['function']==0) {
+               if ($this->MOD_SETTINGS['function']==0) {
                        $this->include_once[]=PATH_t3lib.'class.t3lib_tceforms.php';
                        $this->include_once[]=PATH_t3lib.'class.t3lib_clipboard.php';
                        $this->include_once[]=PATH_t3lib.'class.t3lib_loaddbgroup.php';
@@ -240,7 +240,7 @@ class SC_db_layout {
                }
 
                        // Include scripts: Clear-cache cmd.
-               if ($this->clear_cache) {
+               if ($this->clear_cache) {
                        $this->include_once[]=PATH_t3lib.'class.t3lib_tcemain.php';
                }
 
@@ -292,8 +292,8 @@ class SC_db_layout {
 
                        // First, select all pages_language_overlay records on the current page. Each represents a possibility for a language on the page. Add these to language selector.
                $res = $this->exec_languageQuery($this->id);
-               while($lrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
-                       if ($GLOBALS['BE_USER']->checkLanguageAccess($lrow['uid']))     {
+               while($lrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
+                       if ($GLOBALS['BE_USER']->checkLanguageAccess($lrow['uid'])) {
                                $this->MOD_MENU['language'][$lrow['uid']]=($lrow['hidden']?'('.$lrow['title'].')':$lrow['title']);
                        }
                }
@@ -324,7 +324,7 @@ class SC_db_layout {
                }
 
                        // Setting alternative default label:
-               if (($this->modSharedTSconfig['properties']['defaultLanguageLabel'] || $this->modTSconfig['properties']['defaultLanguageLabel']) && isset($this->MOD_MENU['language'][0]))      {
+               if (($this->modSharedTSconfig['properties']['defaultLanguageLabel'] || $this->modTSconfig['properties']['defaultLanguageLabel']) && isset($this->MOD_MENU['language'][0])) {
                        $this->MOD_MENU['language'][0] = $this->modTSconfig['properties']['defaultLanguageLabel'] ? $this->modSharedTSconfig['properties']['defaultLanguageLabel'] : $this->modSharedTSconfig['properties']['defaultLanguageLabel'];
                }
 
@@ -343,7 +343,7 @@ class SC_db_layout {
         * @return      void
         */
        function clearCache() {
-               if ($this->clear_cache) {
+               if ($this->clear_cache) {
                        $tce = t3lib_div::makeInstance('t3lib_TCEmain');
                        $tce->stripslashes_values=0;
                        $tce->start(Array(),Array());
@@ -361,7 +361,7 @@ class SC_db_layout {
                // Access check...
                // The page will show only if there is a valid page and if this page may be viewed by the user
                $access = is_array($this->pageinfo) ? 1 : 0;
-               if ($this->id && $access)       {
+               if ($this->id && $access) {
 
                                // Initialize permission settings:
                        $this->CALC_PERMS = $GLOBALS['BE_USER']->calcPerms($this->pageinfo);
@@ -410,9 +410,9 @@ class SC_db_layout {
 
                                function DTM_activate(idBase,index,doToogle)    {       //
                                                // Hiding all:
-                                       if (DTM_array[idBase])  {
-                                               for(cnt = 0; cnt < DTM_array[idBase].length ; cnt++)    {
-                                                       if (DTM_array[idBase][cnt] != idBase+"-"+index) {
+                                       if (DTM_array[idBase]) {
+                                               for(cnt = 0; cnt < DTM_array[idBase].length ; cnt++) {
+                                                       if (DTM_array[idBase][cnt] != idBase+"-"+index) {
                                                                document.getElementById(DTM_array[idBase][cnt]+"-DIV").style.display = "none";
                                                                document.getElementById(DTM_array[idBase][cnt]+"-MENU").attributes.getNamedItem("class").nodeValue = "tab";
                                                        }
@@ -420,8 +420,8 @@ class SC_db_layout {
                                        }
 
                                                // Showing one:
-                                       if (document.getElementById(idBase+"-"+index+"-DIV"))   {
-                                               if (doToogle && document.getElementById(idBase+"-"+index+"-DIV").style.display == "block")      {
+                                       if (document.getElementById(idBase+"-"+index+"-DIV")) {
+                                               if (doToogle && document.getElementById(idBase+"-"+index+"-DIV").style.display == "block") {
                                                        document.getElementById(idBase+"-"+index+"-DIV").style.display = "none";
                                                        if(DTM_origClass=="") {
                                                                document.getElementById(idBase+"-"+index+"-MENU").attributes.getNamedItem("class").nodeValue = "tab";
@@ -442,8 +442,8 @@ class SC_db_layout {
                                }
                                function DTM_toggle(idBase,index,isInit)        {       //
                                                // Showing one:
-                                       if (document.getElementById(idBase+"-"+index+"-DIV"))   {
-                                               if (document.getElementById(idBase+"-"+index+"-DIV").style.display == "block")  {
+                                       if (document.getElementById(idBase+"-"+index+"-DIV")) {
+                                               if (document.getElementById(idBase+"-"+index+"-DIV").style.display == "block") {
                                                        document.getElementById(idBase+"-"+index+"-DIV").style.display = "none";
                                                        if(isInit) {
                                                                document.getElementById(idBase+"-"+index+"-MENU").attributes.getNamedItem("class").nodeValue = "tab";
@@ -497,7 +497,7 @@ class SC_db_layout {
                        $this->colPosList = implode(',', array_unique(t3lib_div::intExplode(',',$this->colPosList)));           // Removing duplicates, if any
 
                                // Render the primary module content:
-                       if ($this->MOD_SETTINGS['function']==0) {
+                       if ($this->MOD_SETTINGS['function']==0) {
                                $body = $this->renderQuickEdit();       // QuickEdit
                        } else {
                                $body = $this->renderListContent();     // All other listings
@@ -638,7 +638,7 @@ class SC_db_layout {
                $edit_record = $this->edit_record;
 
                        // If a command to edit all records in a column is issue, then select all those elements, and redirect to alt_doc.php:
-               if (substr($edit_record,0,9)=='_EDIT_COL')      {
+               if (substr($edit_record,0,9)=='_EDIT_COL') {
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                                                '*',
                                                'tt_content',
@@ -650,7 +650,7 @@ class SC_db_layout {
                                                'sorting'
                                        );
                        $idListA = array();
-                       while($cRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
+                       while($cRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                                $idListA[] = $cRow['uid'];
                        }
 
@@ -660,14 +660,14 @@ class SC_db_layout {
                }
 
                        // If the former record edited was the creation of a NEW record, this will look up the created records uid:
-               if ($this->new_unique_uid)      {
+               if ($this->new_unique_uid) {
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                                '*',
                                'sys_log',
                                'userid=' . intval($GLOBALS['BE_USER']->user['uid']) . ' AND NEWid=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->new_unique_uid, 'sys_log')
                        );
                        $sys_log_row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-                       if (is_array($sys_log_row))     {
+                       if (is_array($sys_log_row)) {
                                $edit_record=$sys_log_row['tablename'].':'.$sys_log_row['recuid'];
                        }
                }
@@ -677,10 +677,10 @@ class SC_db_layout {
                $opt=array();
                $is_selected=0;
                $languageOverlayRecord='';
-               if ($this->current_sys_language)        {
+               if ($this->current_sys_language) {
                        list($languageOverlayRecord) = t3lib_BEfunc::getRecordsByField('pages_language_overlay','pid',$this->id,'AND sys_language_uid='.intval($this->current_sys_language));
                }
-               if (is_array($languageOverlayRecord))   {
+               if (is_array($languageOverlayRecord)) {
                        $inValue = 'pages_language_overlay:'.$languageOverlayRecord['uid'];
                        $is_selected+=intval($edit_record==$inValue);
                        $opt[] = '<option value="' . $inValue . '"' . ($edit_record == $inValue ? ' selected="selected"' : '') . '>[ ' . $GLOBALS['LANG']->getLL('editLanguageHeader', 1) . ' ]</option>';
@@ -704,17 +704,17 @@ class SC_db_layout {
                $colPos='';
                $first=1;
                $prev=$this->id;        // Page is the pid if no record to put this after.
-               while($cRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
+               while($cRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                        t3lib_BEfunc::workspaceOL('tt_content', $cRow);
 
                        if (is_array($cRow))    {
-                               if ($first)     {
-                                       if (!$edit_record)      {
+                               if ($first) {
+                                       if (!$edit_record) {
                                                $edit_record='tt_content:'.$cRow['uid'];
                                        }
                                        $first = 0;
                                }
-                               if (strcmp($cRow['colPos'],$colPos))    {
+                               if (strcmp($cRow['colPos'],$colPos)) {
                                        $colPos=$cRow['colPos'];
                                        $opt[]='<option value=""></option>';
                                        $opt[] = '<option value="_EDIT_COL:' . $colPos . '">__' . $GLOBALS['LANG']->sL(t3lib_BEfunc::getLabelFromItemlist('tt_content', 'colPos', $colPos), 1) . ':__</option>';
@@ -734,7 +734,7 @@ class SC_db_layout {
                }
 
                        // If edit_record is not set (meaning, no content elements was found for this language) we simply set it to create a new element:
-               if (!$edit_record)      {
+               if (!$edit_record) {
                        $edit_record='tt_content:new/'.$prev.'/'.$colPos;
 
                        $inValue = 'tt_content:new/'.$prev.'/'.$colPos;
@@ -743,7 +743,7 @@ class SC_db_layout {
                }
 
                        // If none is yet selected...
-               if (!$is_selected)      {
+               if (!$is_selected) {
                        $opt[]='<option value=""></option>';
                        $opt[] = '<option value="' . $edit_record . '"  selected="selected">[ ' . $GLOBALS['LANG']->getLL('newLabel', 1) . ' ]</option>';
                }
@@ -760,7 +760,7 @@ class SC_db_layout {
                        // If undo-button should be rendered (depends on available items in sys_history)
                $this->undoButton=0;
                $undoRes = $GLOBALS['TYPO3_DB']->exec_SELECTquery('tstamp', 'sys_history', 'tablename='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->eRParts[0], 'sys_history').' AND recuid='.intval($this->eRParts[1]), '', 'tstamp DESC', '1');
-               if ($this->undoButtonR = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($undoRes))       {
+               if ($this->undoButtonR = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($undoRes)) {
                        $this->undoButton=1;
                }
 
@@ -779,7 +779,7 @@ class SC_db_layout {
                if ($GLOBALS['BE_USER']->uc['condensedMode']) {
                        $this->closeUrl = $GLOBALS['BACK_PATH'] . 'alt_db_navframe.php';
                }
-               if ($this->returnUrl)   {
+               if ($this->returnUrl) {
                        $this->closeUrl = $this->returnUrl;
                }
                        // Return-url for JavaScript:
@@ -796,8 +796,8 @@ class SC_db_layout {
                        list($uidVal,$ex_pid,$ex_colPos) = explode('/',$this->eRParts[1]);
 
                                // Convert $uidVal to workspace version if any:
-                       if ($uidVal!='new')     {
-                               if ($draftRecord = t3lib_BEfunc::getWorkspaceVersionOfRecord($GLOBALS['BE_USER']->workspace, $this->eRParts[0], $uidVal, 'uid'))        {
+                       if ($uidVal!='new') {
+                               if ($draftRecord = t3lib_BEfunc::getWorkspaceVersionOfRecord($GLOBALS['BE_USER']->workspace, $this->eRParts[0], $uidVal, 'uid')) {
                                        $uidVal = $draftRecord['uid'];
                                }
                        }
@@ -816,7 +816,7 @@ class SC_db_layout {
                                // Getting/Making the record:
                        reset($trData->regTableItems_data);
                        $rec = current($trData->regTableItems_data);
-                       if ($uidVal=='new')     {
+                       if ($uidVal=='new') {
                                $new_unique_uid = uniqid('NEW');
                                $rec['uid'] = $new_unique_uid;
                                $rec['pid'] = intval($ex_pid)?intval($ex_pid):$this->id;
@@ -828,7 +828,7 @@ class SC_db_layout {
                                $recordAccess = $GLOBALS['BE_USER']->recordEditAccessInternals($this->eRParts[0], $uidVal);
                        }
 
-                       if (!$recordAccess)     {
+                       if (!$recordAccess) {
                                        // If no edit access, print error message:
                                $content .= $this->doc->section($GLOBALS['LANG']->getLL('noAccess'), $GLOBALS['LANG']->getLL('noAccess_msg') . '<br /><br />' .
                                                        ($GLOBALS['BE_USER']->errorMsg ? 'Reason: ' . $GLOBALS['BE_USER']->errorMsg . '<br /><br />' : ''), 0, 1);
@@ -859,7 +859,7 @@ class SC_db_layout {
 
                                        // Add hidden fields:
                                $theCode=$panel;
-                               if ($uidVal=='new')     {
+                               if ($uidVal=='new') {
                                        $theCode.='<input type="hidden" name="data['.$this->eRParts[0].']['.$rec['uid'].'][pid]" value="'.$rec['pid'].'" />';
                                }
                                $theCode.='
@@ -921,7 +921,7 @@ class SC_db_layout {
 
 
                        // Select element matrix:
-               if ($this->eRParts[0]=='tt_content' && t3lib_utility_Math::canBeInterpretedAsInteger($this->eRParts[1]))        {
+               if ($this->eRParts[0]=='tt_content' && t3lib_utility_Math::canBeInterpretedAsInteger($this->eRParts[1])) {
                        $posMap = t3lib_div::makeInstance('ext_posMap');
                        $posMap->backPath = $GLOBALS['BACK_PATH'];
                        $posMap->cur_sys_language=$this->current_sys_language;
@@ -939,7 +939,7 @@ class SC_db_layout {
                }
 
                        // Finally, if comments were generated in TCEforms object, print these as a HTML comment:
-               if (count($tceforms->commentMessages))  {
+               if (count($tceforms->commentMessages)) {
                        $content.='
        <!-- TCEFORM messages
        '.htmlspecialchars(implode(LF,$tceforms->commentMessages)).'
@@ -995,7 +995,7 @@ class SC_db_layout {
                                // Load full table definitions:
                        t3lib_div::loadTCA($table);
 
-                       if (!isset($dblist->externalTables[$table]))    {
+                       if (!isset($dblist->externalTables[$table])) {
                                $q_count = $this->getNumberOfHiddenElements();
                                $h_func_b = t3lib_BEfunc::getFuncCheck(
                                        $this->id,
@@ -1020,13 +1020,13 @@ class SC_db_layout {
                                if (is_array($GLOBALS['TCA']['tt_content']['columns']['colPos']['config']['items'])) {
                                        $colList = array();
                                        $tcaItems = t3lib_div::callUserFunction( 'EXT:cms/classes/class.tx_cms_backendlayout.php:tx_cms_BackendLayout->getColPosListItemsParsed' , $this->id, $this );
-                                       foreach($tcaItems as $temp)     {
+                                       foreach($tcaItems as $temp) {
                                                $colList[] = $temp[1];
                                        }
                                } else {        // ... should be impossible that colPos has no array. But this is the fallback should it make any sense:
                                        $colList = array('1','0','2','3');
                                }
-                               if (strcmp($this->colPosList,''))       {
+                               if (strcmp($this->colPosList,'')) {
                                        $colList = array_intersect(t3lib_div::intExplode(',',$this->colPosList),$colList);
                                }
 
@@ -1040,7 +1040,7 @@ class SC_db_layout {
                                $dblist->tt_contentConfig['sys_language_uid'] = intval($this->current_sys_language);
 
                                        // If the function menu is set to "Language":
-                               if ($this->MOD_SETTINGS['function']==2) {
+                               if ($this->MOD_SETTINGS['function']==2) {
                                        $dblist->tt_contentConfig['single'] = 0;
                                        $dblist->tt_contentConfig['languageMode'] = 1;
                                        $dblist->tt_contentConfig['languageCols'] = $this->MOD_MENU['language'];
@@ -1099,14 +1099,14 @@ class SC_db_layout {
                } else {
 
                                // Add the content for each table we have rendered (traversing $tableOutput variable)
-                       foreach ($tableOutput as $table => $output)     {
+                       foreach ($tableOutput as $table => $output) {
                                $content .= $this->doc->section('', $output, TRUE, TRUE, 0, TRUE);
                                $content .= $this->doc->spacer(15);
                                $content .= $this->doc->sectionEnd();
                        }
 
                                // Making search form:
-                       if (!$this->modTSconfig['properties']['disableSearchBox'] && count($tableOutput))       {
+                       if (!$this->modTSconfig['properties']['disableSearchBox'] && count($tableOutput)) {
                                $sectionTitle = t3lib_BEfunc::wrapInHelp('xMOD_csh_corebe', 'list_searchbox', $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.search', TRUE));
                                $content .= $this->doc->section(
                                        $sectionTitle,
@@ -1118,7 +1118,7 @@ class SC_db_layout {
                                // Making display of Sys-notes (from extension "sys_note")
                        $dblist->id=$this->id;
                        $sysNotes = $dblist->showSysNotesForPage();
-                       if ($sysNotes)  {
+                       if ($sysNotes) {
                                $content.=$this->doc->spacer(10);
                                $content.=$this->doc->section($GLOBALS['LANG']->getLL('internalNotes'), $sysNotes, 0, 1);
                        }
@@ -1210,7 +1210,7 @@ class SC_db_layout {
                                                '</a>';
                        }
                                // Edit page properties
-                       if ($this->CALC_PERMS&2)        {
+                       if ($this->CALC_PERMS&2) {
                                $params='&edit[pages][' . $this->id . ']=edit';
                                $buttons['edit_page'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick($params, $GLOBALS['BACK_PATH'])) . '" title="' . $GLOBALS['LANG']->getLL('editPageProperties', TRUE) . '">' .
                                                        t3lib_iconWorks::getSpriteIcon('actions-page-open') .
@@ -1294,7 +1294,7 @@ class SC_db_layout {
         * @param       array           Parameters array, merged with global GET vars.
         * @return      string          URL
         */
-       function local_linkThisScript($params)  {
+       function local_linkThisScript($params) {
                $params['popView']='';
                $params['new_unique_uid']='';
                return t3lib_div::linkThisScript($params);
@@ -1306,8 +1306,8 @@ class SC_db_layout {
         * @param       integer         Page id: If zero, the query will select all sys_language records from root level which are NOT hidden. If set to another value, the query will select all sys_language records that has a pages_language_overlay record on that page (and is not hidden, unless you are admin user)
         * @return      string          Return query string.
         */
-       function exec_languageQuery($id)        {
-               if ($id)        {
+       function exec_languageQuery($id) {
+               if ($id) {
                        $exQ = t3lib_BEfunc::deleteClause('pages_language_overlay') . ($GLOBALS['BE_USER']->isAdmin()?'':' AND sys_language.hidden=0');
                        return $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                                                        'sys_language.*',
index e2dbf17..0a7e2fb 100644 (file)
@@ -76,7 +76,7 @@ class ext_posMap extends t3lib_positionMap {
         * @param       array           The record row.
         * @return      string          Wrapped title string.
         */
-       function wrapRecordTitle($str,$row)     {
+       function wrapRecordTitle($str,$row) {
                return $str;
        }
 
@@ -190,7 +190,7 @@ class SC_db_new_content_el {
         * @return      void
         */
        function main() {
-               if ($this->id && $this->access) {
+               if ($this->id && $this->access) {
 
                                // Init position map object:
                        $posMap = t3lib_div::makeInstance('ext_posMap');
@@ -198,7 +198,7 @@ class SC_db_new_content_el {
                        $posMap->backPath = $GLOBALS['BACK_PATH'];
 
                        if ((string)$this->colPos!='')  {       // If a column is pre-set:
-                               if ($this->uid_pid<0)   {
+                               if ($this->uid_pid<0) {
                                        $row=array();
                                        $row['uid']=abs($this->uid_pid);
                                } else {
@@ -266,8 +266,8 @@ class SC_db_new_content_el {
                                // An item is either a header or an item rendered with a radio button and title/description and icon:
                        $cc = $key = 0;
                        $menuItems = array();
-                       foreach ($wizardItems as $k => $wInfo)  {
-                               if ($wInfo['header'])   {
+                       foreach ($wizardItems as $k => $wInfo) {
+                               if ($wInfo['header']) {
                                        $menuItems[] = array(
                                                        'label'   => htmlspecialchars($wInfo['header']),
                                                        'content' => $this->elementWrapper['section'][0]
@@ -390,12 +390,12 @@ class SC_db_new_content_el {
                );
 
 
-               if ($this->id && $this->access) {
+               if ($this->id && $this->access) {
                                // CSH
                        $buttons['csh'] = t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'new_ce', $GLOBALS['BACK_PATH'], '', TRUE);
 
                                // Back
-                       if ($this->R_URI)       {
+                       if ($this->R_URI) {
                                $buttons['back'] = '<a href="' . htmlspecialchars($this->R_URI) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->getLL('goBack', TRUE) . '">' .
                                                t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
                                        '</a>';
@@ -525,7 +525,7 @@ class SC_db_new_content_el {
         * @param       array           Wizard items, passed by reference
         * @return      void
         */
-       function removeInvalidElements(&$wizardItems)   {
+       function removeInvalidElements(&$wizardItems) {
 
                        // Load full table definition:
                t3lib_div::loadTCA('tt_content');
@@ -538,14 +538,14 @@ class SC_db_new_content_el {
 
                $headersUsed = Array();
                        // Traverse wizard items:
-               foreach($wizardItems as $key => $cfg)   {
+               foreach($wizardItems as $key => $cfg) {
 
                                // Exploding parameter string, if any (old style)
-                       if ($wizardItems[$key]['params'])       {
+                       if ($wizardItems[$key]['params']) {
                                        // Explode GET vars recursively
                                $tempGetVars = t3lib_div::explodeUrl2Array($wizardItems[$key]['params'],TRUE);
                                        // If tt_content values are set, merge them into the tt_content_defValues array, unset them from $tempGetVars and re-implode $tempGetVars into the param string (in case remaining parameters are around).
-                               if (is_array($tempGetVars['defVals']['tt_content']))    {
+                               if (is_array($tempGetVars['defVals']['tt_content'])) {
                                        $wizardItems[$key]['tt_content_defValues'] = array_merge(is_array($wizardItems[$key]['tt_content_defValues']) ? $wizardItems[$key]['tt_content_defValues'] : array(), $tempGetVars['defVals']['tt_content']);
                                        unset($tempGetVars['defVals']['tt_content']);
                                        $wizardItems[$key]['params'] = t3lib_div::implodeArrayForUrl('',$tempGetVars);
@@ -553,10 +553,10 @@ class SC_db_new_content_el {
                        }
 
                                // If tt_content_defValues are defined...:
-                       if (is_array($wizardItems[$key]['tt_content_defValues']))       {
+                       if (is_array($wizardItems[$key]['tt_content_defValues'])) {
 
                                        // Traverse field values:
-                               foreach($wizardItems[$key]['tt_content_defValues'] as $fN => $fV)       {
+                               foreach($wizardItems[$key]['tt_content_defValues'] as $fN => $fV) {
                                        if (is_array($GLOBALS['TCA']['tt_content']['columns'][$fN])) {
                                                        // Get information about if the field value is OK:
                                                $config = &$GLOBALS['TCA']['tt_content']['columns'][$fN]['config'];
@@ -578,9 +578,9 @@ class SC_db_new_content_el {
                        }
                }
                        // remove headers without elements
-               foreach ($wizardItems as $key => $cfg)  {
+               foreach ($wizardItems as $key => $cfg) {
                        $tmp = explode('_',$key);
-                       if ($tmp[0] && !$tmp[1] && !in_array($tmp[0], $headersUsed))    {
+                       if ($tmp[0] && !$tmp[1] && !in_array($tmp[0], $headersUsed)) {
                                unset($wizardItems[$key]);
                        }
                }
index 74ea3b8..1114e21 100644 (file)
@@ -78,8 +78,8 @@ class SC_wizard_backend_layout {
                $pageRenderer = $this->doc->getPageRenderer();
                $pageRenderer->addJsFile($GLOBALS['BACK_PATH'] . TYPO3_MOD_PATH . 'res/grideditor.js');
                $pageRenderer->addJsInlineCode('storeData', '
-                       function storeData(data)        {
-                               if (parent.opener && parent.opener.document && parent.opener.document.' . $this->formName . ' && parent.opener.document.' . $this->formName . '["' . $this->fieldName . '"])    {
+                       function storeData(data) {
+                               if (parent.opener && parent.opener.document && parent.opener.document.' . $this->formName . ' && parent.opener.document.' . $this->formName . '["' . $this->fieldName . '"]) {
                                        parent.opener.document.' . $this->formName . '["' . $this->fieldName . '"].value = data;
                                        parent.opener.TBE_EDITOR.fieldChanged("backend_layout","' . $uid . '","config","data[backend_layout][' . $uid . '][config]");
                                }
index a62cda2..8d62161 100644 (file)
@@ -142,7 +142,7 @@ class tslib_feUserAuth extends t3lib_userAuth {
         * @see t3lib_userAuth::start()
         */
        function start() {
-               if (intval($this->auth_timeout_field)>0 && intval($this->auth_timeout_field) < $this->lifetime) {
+               if (intval($this->auth_timeout_field)>0 && intval($this->auth_timeout_field) < $this->lifetime) {
                                // If server session timeout is non-zero but less than client session timeout: Copy this value instead.
                        $this->auth_timeout_field = $this->lifetime;
                }
@@ -197,7 +197,7 @@ class tslib_feUserAuth extends t3lib_userAuth {
        function getLoginFormData() {
                $loginData = parent::getLoginFormData();
                if($GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 0 || $GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 1) {
-                       if ($this->getMethodEnabled)    {
+                       if ($this->getMethodEnabled) {
                                $isPermanent = t3lib_div::_GP($this->formfield_permanent);
                        } else {
                                $isPermanent = t3lib_div::_POST($this->formfield_permanent);
@@ -242,7 +242,7 @@ class tslib_feUserAuth extends t3lib_userAuth {
                $authInfo = $this->getAuthInfoArray();
 
                if ($this->writeDevLog)         {
-                       if (is_array($this->user))      {
+                       if (is_array($this->user)) {
                                t3lib_div::devLog('Get usergroups for user: '.t3lib_div::arrayToLogString($this->user, array($this->userid_column,$this->username_column)), 'tslib_feUserAuth');
                        } else {
                                t3lib_div::devLog('Get usergroups for "anonymous" user', 'tslib_feUserAuth');
@@ -254,12 +254,12 @@ class tslib_feUserAuth extends t3lib_userAuth {
                        // use 'auth' service to find the groups for the user
                $serviceChain='';
                $subType = 'getGroups'.$this->loginType;
-               while (is_object($serviceObj = t3lib_div::makeInstanceService('auth', $subType, $serviceChain)))        {
+               while (is_object($serviceObj = t3lib_div::makeInstanceService('auth', $subType, $serviceChain))) {
                        $serviceChain.=','.$serviceObj->getServiceKey();
                        $serviceObj->initAuth($subType, array(), $authInfo, $this);
 
                        $groupData = $serviceObj->getGroups($this->user, $groupDataArr);
-                       if (is_array($groupData) && count($groupData))  {
+                       if (is_array($groupData) && count($groupData)) {
                                $groupDataArr = t3lib_div::array_merge($groupDataArr, $groupData);      // Keys in $groupData should be unique ids of the groups (like "uid") so this function will override groups.
                        }
                        unset($serviceObj);
@@ -270,7 +270,7 @@ class tslib_feUserAuth extends t3lib_userAuth {
 
 
                        // use 'auth' service to check the usergroups if they are really valid
-               foreach ($groupDataArr as $groupData)   {
+               foreach ($groupDataArr as $groupData) {
                                // by default a group is valid
                        $validGroup = TRUE;
 
@@ -298,9 +298,9 @@ class tslib_feUserAuth extends t3lib_userAuth {
                        }
                }
 
-               if (count($this->groupData) && count($this->groupData['TSconfig']))     {
+               if (count($this->groupData) && count($this->groupData['TSconfig'])) {
                                // TSconfig: collect it in the order it was collected
-                       foreach($this->groupData['TSconfig'] as $TSdata)        {
+                       foreach($this->groupData['TSconfig'] as $TSdata) {
                                $this->TSdataArray[]=$TSdata;
                        }
 
@@ -394,11 +394,11 @@ class tslib_feUserAuth extends t3lib_userAuth {
         */
        function storeSessionData() {
                        // Saves UC and SesData if changed.
-               if ($this->userData_change)     {
+               if ($this->userData_change) {
                        $this->writeUC('');
                }
 
-               if ($this->sesData_change && $this->id) {
+               if ($this->sesData_change && $this->id) {
                        if ($this->sessionDataTimestamp === NULL) {
                                        // Write new session-data
                                $insertFields = array(
@@ -454,8 +454,8 @@ class tslib_feUserAuth extends t3lib_userAuth {
         * @see setKey()
         */
        function getKey($type,$key) {
-               if ($key)       {
-                       switch($type)   {
+               if ($key) {
+                       switch($type) {
                                case 'user':
                                        return $this->uc[$key];
                                break;
@@ -478,11 +478,11 @@ class tslib_feUserAuth extends t3lib_userAuth {
         * @return      void
         * @see setKey(), storeSessionData(), record_registration()
         */
-       function setKey($type,$key,$data)       {
-               if ($key)       {
-                       switch($type)   {
+       function setKey($type,$key,$data) {
+               if ($key) {
+                       switch($type) {
                                case 'user':
-                                       if ($this->user['uid']) {
+                                       if ($this->user['uid']) {
                                                $this->uc[$key]=$data;
                                                $this->userData_change=1;
                                        }
@@ -529,28 +529,28 @@ class tslib_feUserAuth extends t3lib_userAuth {
         * @param       integer         The maximum size of stored session data. If zero, no limit is applied and even confirmation of cookie session is discarded.
         * @return      void
         */
-       function record_registration($recs,$maxSizeOfSessionData=0)     {
+       function record_registration($recs,$maxSizeOfSessionData=0) {
 
                        // Storing value ONLY if there is a confirmed cookie set (->cookieID),
                        // otherwise a shellscript could easily be spamming the fe_sessions table
                        // with bogus content and thus bloat the database
                if (!$maxSizeOfSessionData || $this->cookieId) {
-                       if ($recs['clear_all']) {
+                       if ($recs['clear_all']) {
                                $this->setKey('ses', 'recs', array());
                        }
                        $change=0;
                        $recs_array=$this->getKey('ses','recs');
                        foreach ($recs as $table => $data) {
-                               if (is_array($data))    {
+                               if (is_array($data)) {
                                        foreach ($data as $rec_id => $value) {
-                                               if ($value != $recs_array[$table][$rec_id])     {
+                                               if ($value != $recs_array[$table][$rec_id]) {
                                                        $recs_array[$table][$rec_id] = $value;
                                                        $change=1;
                                                }
                                        }
                                }
                        }
-                       if ($change && (!$maxSizeOfSessionData || strlen(serialize($recs_array))<$maxSizeOfSessionData))        {
+                       if ($change && (!$maxSizeOfSessionData || strlen(serialize($recs_array))<$maxSizeOfSessionData)) {
                                $this->setKey('ses','recs',$recs_array);
                        }
                }
index 6c585d4..98ad95e 100644 (file)
@@ -65,7 +65,7 @@
  * $gifCreator = t3lib_div::makeInstance('tslib_gifbuilder');
  * $gifCreator->init();
  * $theImage='';
- * if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib'])    {
+ * if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib']) {
  * $gifCreator->start($fileArray,$this->data);
  * $theImage = $gifCreator->gifBuild();
  * }
@@ -102,9 +102,9 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @return      void
         * @see tslib_cObj::getImgResource(), tslib_gmenu::makeGifs(), tslib_gmenu::findLargestDims()
         */
-       function start($conf,$data)     {
+       function start($conf,$data) {
 
-               if (is_array($conf))    {
+               if (is_array($conf)) {
                        $this->setup = $conf;
                        $this->data = $data;
                        $this->cObj =t3lib_div::makeInstance('tslib_cObj');
@@ -128,9 +128,9 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
 
                                // Initializing global Char Range Map
                        $this->charRangeMap = array();
-                       if (is_array($GLOBALS['TSFE']->tmpl->setup['_GIFBUILDER.']['charRangeMap.']))   {
-                               foreach($GLOBALS['TSFE']->tmpl->setup['_GIFBUILDER.']['charRangeMap.'] as $cRMcfgkey => $cRMcfg)        {
-                                       if (is_array($cRMcfg))  {
+                       if (is_array($GLOBALS['TSFE']->tmpl->setup['_GIFBUILDER.']['charRangeMap.'])) {
+                               foreach($GLOBALS['TSFE']->tmpl->setup['_GIFBUILDER.']['charRangeMap.'] as $cRMcfgkey => $cRMcfg) {
+                                       if (is_array($cRMcfg)) {
 
                                                        // Initializing:
                                                $cRMkey = $GLOBALS['TSFE']->tmpl->setup['_GIFBUILDER.']['charRangeMap.'][substr($cRMcfgkey,0,-1)];
@@ -147,14 +147,14 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                        $sKeyArray=t3lib_TStemplate::sortedKeyList($this->setup);
 
                                // Setting the background color, passing it through stdWrap
-                       if ($conf['backColor.'] || $conf['backColor'])  {
+                       if ($conf['backColor.'] || $conf['backColor']) {
                                $this->setup['backColor'] = isset($this->setup['backColor.'])
                                        ? trim($this->cObj->stdWrap($this->setup['backColor'], $this->setup['backColor.']))
                                        : $this->setup['backColor'];
                        }
                        if (!$this->setup['backColor']) { $this->setup['backColor']='white'; }
 
-                       if ($conf['transparentColor.'] || $conf['transparentColor'])    {
+                       if ($conf['transparentColor.'] || $conf['transparentColor']) {
                                $this->setup['transparentColor_array'] = isset($this->setup['transparentColor.'])
                                        ? explode('|', trim($this->cObj->stdWrap($this->setup['transparentColor'], $this->setup['transparentColor.'])))
                                        : explode('|', trim($this->setup['transparentColor']));
@@ -179,17 +179,17 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                        foreach($sKeyArray as $theKey) {
                                $theValue = $this->setup[$theKey];
 
-                               if (intval($theKey) && $conf=$this->setup[$theKey.'.']) {
+                               if (intval($theKey) && $conf=$this->setup[$theKey.'.']) {
                                                // Swipes through TEXT and IMAGE-objects
-                                       switch($theValue)       {
+                                       switch($theValue) {
                                                case 'TEXT':
-                                                       if ($this->setup[$theKey.'.'] = $this->checkTextObj($conf))     {
+                                                       if ($this->setup[$theKey.'.'] = $this->checkTextObj($conf)) {
 
                                                                        // Adjust font width if max size is set:
                                                                $maxWidth = isset($this->setup[$theKey.'.']['maxWidth.'])
                                                                        ? $this->cObj->stdWrap($this->setup[$theKey.'.']['maxWidth'], $this->setup[$theKey.'.']['maxWidth.'])
                                                                        : $this->setup[$theKey.'.']['maxWidth'];
-                                                               if ($maxWidth)  {
+                                                               if ($maxWidth) {
                                                                        $this->setup[$theKey.'.']['fontSize'] = $this->fontResize($this->setup[$theKey.'.']); //RTF - this has to be done before calcBBox
                                                                }
 
@@ -202,14 +202,14 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                break;
                                                case 'IMAGE':
                                                        $fileInfo = $this->getResource($conf['file'],$conf['file.']);
-                                                       if ($fileInfo)  {
+                                                       if ($fileInfo) {
                                                                $this->combinedFileNames[] = preg_replace('/\.[[:alnum:]]+$/','',basename($fileInfo[3]));
                                                                $this->setup[$theKey.'.']['file'] = $fileInfo[3];
                                                                $this->setup[$theKey.'.']['BBOX'] = $fileInfo;
                                                                $this->objBB[$theKey] = $fileInfo;
-                                                               if ($conf['mask'])      {
+                                                               if ($conf['mask']) {
                                                                        $maskInfo = $this->getResource($conf['mask'],$conf['mask.']);
-                                                                       if ($maskInfo)  {
+                                                                       if ($maskInfo) {
                                                                                $this->setup[$theKey.'.']['mask'] = $maskInfo[3];
                                                                        } else {
                                                                                $this->setup[$theKey.'.']['mask'] = '';
@@ -221,11 +221,11 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                break;
                                        }
                                                // Checks if disabled is set... (this is also done in menu.php / imgmenu!!)
-                                       if ($conf['if.'])       {
+                                       if ($conf['if.']) {
                                                $cObj =t3lib_div::makeInstance('tslib_cObj');
                                                $cObj->start($this->data);
 
-                                               if (!$cObj->checkIf($conf['if.']))      {
+                                               if (!$cObj->checkIf($conf['if.'])) {
                                                        unset($this->setup[$theKey]);
                                                        unset($this->setup[$theKey.'.']);
                                                }
@@ -249,14 +249,14 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                        foreach ($sKeyArray as $theKey) {
                                $theValue=$this->setup[$theKey];
 
-                               if (intval($theKey) && $conf=$this->setup[$theKey.'.']) {
-                                       switch($theValue)       {
+                               if (intval($theKey) && $conf=$this->setup[$theKey.'.']) {
+                                       switch($theValue) {
                                                case 'TEXT':
                                                case 'IMAGE':
                                                        if(isset($this->setup[$theKey.'.']['offset.'])) {
                                                                $this->setup[$theKey.'.']['offset'] = $this->cObj->stdWrap($this->setup[$theKey.'.']['offset'], $this->setup[$theKey.'.']['offset.']);
                                                        }
-                                                       if ($this->setup[$theKey.'.']['offset'])        {
+                                                       if ($this->setup[$theKey.'.']['offset']) {
                                                                $this->setup[$theKey.'.']['offset'] = $this->calcOffset($this->setup[$theKey.'.']['offset']);
                                                        }
                                                break;
@@ -265,7 +265,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                        if(isset($this->setup[$theKey.'.']['dimensions.'])) {
                                                                $this->setup[$theKey.'.']['dimensions'] = $this->cObj->stdWrap($this->setup[$theKey.'.']['dimensions'], $this->setup[$theKey.'.']['dimensions.']);
                                                        }
-                                                       if ($this->setup[$theKey.'.']['dimensions'])    {
+                                                       if ($this->setup[$theKey.'.']['dimensions']) {
                                                                $this->setup[$theKey.'.']['dimensions'] = $this->calcOffset($this->setup[$theKey.'.']['dimensions']);
                                                        }
                                                break;
@@ -273,7 +273,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                        if(isset($this->setup[$theKey.'.']['set.'])) {
                                                                $this->setup[$theKey.'.']['set'] = $this->cObj->stdWrap($this->setup[$theKey.'.']['set'], $this->setup[$theKey.'.']['set.']);
                                                        }
-                                                       if ($this->setup[$theKey.'.']['set'])   {
+                                                       if ($this->setup[$theKey.'.']['set']) {
                                                                $this->setup[$theKey.'.']['set'] = $this->calcOffset($this->setup[$theKey.'.']['set']);
                                                        }
                                                break;
@@ -281,7 +281,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                        if(isset($this->setup[$theKey.'.']['crop.'])) {
                                                                $this->setup[$theKey.'.']['crop'] = $this->cObj->stdWrap($this->setup[$theKey.'.']['crop'], $this->setup[$theKey.'.']['crop.']);
                                                        }
-                                                       if ($this->setup[$theKey.'.']['crop'])  {
+                                                       if ($this->setup[$theKey.'.']['crop']) {
                                                                $this->setup[$theKey.'.']['crop'] = $this->calcOffset($this->setup[$theKey.'.']['crop']);
                                                        }
                                                break;
@@ -289,13 +289,13 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                        if(isset($this->setup[$theKey.'.']['width.'])) {
                                                                $this->setup[$theKey.'.']['width'] = $this->cObj->stdWrap($this->setup[$theKey.'.']['width'], $this->setup[$theKey.'.']['width.']);
                                                        }
-                                                       if ($this->setup[$theKey.'.']['width']) {
+                                                       if ($this->setup[$theKey.'.']['width']) {
                                                                $this->setup[$theKey.'.']['width'] = $this->calcOffset($this->setup[$theKey.'.']['width']);
                                                        }
                                                        if(isset($this->setup[$theKey.'.']['height.'])) {
                                                                $this->setup[$theKey.'.']['height'] = $this->cObj->stdWrap($this->setup[$theKey.'.']['height'], $this->setup[$theKey.'.']['height.']);
                                                        }
-                                                       if ($this->setup[$theKey.'.']['height'])        {
+                                                       if ($this->setup[$theKey.'.']['height']) {
                                                                $this->setup[$theKey.'.']['height'] = $this->calcOffset($this->setup[$theKey.'.']['height']);
                                                        }
                                                break;
@@ -332,7 +332,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @see make(), fileName()
         */
        function gifBuild() {
-               if ($this->setup)       {
+               if ($this->setup) {
                        $gifFileName = $this->fileName('GB/');  // Relative to PATH_site
                        if (!file_exists($gifFileName)) {               // File exists
 
@@ -398,11 +398,11 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                }
 
                        // Traverse the GIFBUILDER objects an render each one:
-               if (is_array($this->setup))     {
+               if (is_array($this->setup)) {
                        $sKeyArray=t3lib_TStemplate::sortedKeyList($this->setup);
-                       foreach($sKeyArray as $theKey)  {
+                       foreach($sKeyArray as $theKey) {
                                $theValue=$this->setup[$theKey];
-                               if (intval($theKey) && $conf=$this->setup[$theKey.'.']) {
+                               if (intval($theKey) && $conf=$this->setup[$theKey.'.']) {
                                        $isStdWrapped = array();
                                        foreach($conf as $key => $value) {
                                                $parameter = rtrim($key,'.');
@@ -411,10 +411,10 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                        $isStdWrapped[$parameter] = 1;
                                                }
                                        }
-                                       switch($theValue)       {
+                                       switch($theValue) {
                                                        // Images
                                                case 'IMAGE':
-                                                       if ($conf['mask'])      {
+                                                       if ($conf['mask']) {
                                                                $this->maskImageOntoImage($this->im,$conf,$this->workArea);
                                                        } else {
                                                                $this->copyImageOntoImage($this->im,$conf,$this->workArea);
@@ -423,8 +423,8 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
 
                                                        // Text
                                                case 'TEXT':
-                                                       if (!$conf['hide'])     {
-                                                               if (is_array($conf['shadow.'])) {
+                                                       if (!$conf['hide']) {
+                                                               if (is_array($conf['shadow.'])) {
                                                                        $isStdWrapped = array();
                                                                        foreach($conf['shadow.'] as $key => $value) {
                                                                                $parameter = rtrim($key,'.');
@@ -435,7 +435,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                                        }
                                                                        $this->makeShadow($this->im,$conf['shadow.'],$this->workArea,$conf);
                                                                }
-                                                               if (is_array($conf['emboss.'])) {
+                                                               if (is_array($conf['emboss.'])) {
                                                                        $isStdWrapped = array();
                                                                        foreach($conf['emboss.'] as $key => $value) {
                                                                                $parameter = rtrim($key,'.');
@@ -446,7 +446,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                                        }
                                                                        $this->makeEmboss($this->im,$conf['emboss.'],$this->workArea,$conf);
                                                                }
-                                                               if (is_array($conf['outline.']))        {
+                                                               if (is_array($conf['outline.'])) {
                                                                        $isStdWrapped = array();
                                                                        foreach($conf['outline.'] as $key => $value) {
                                                                                $parameter = rtrim($key,'.');
@@ -464,17 +464,17 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
 
                                                        // Text effects:
                                                case 'OUTLINE':
-                                                       if ($this->setup[$conf['textObjNum']]=='TEXT' && $txtConf=$this->checkTextObj($this->setup[$conf['textObjNum'].'.']))   {
+                                                       if ($this->setup[$conf['textObjNum']]=='TEXT' && $txtConf=$this->checkTextObj($this->setup[$conf['textObjNum'].'.'])) {
                                                                $this->makeOutline($this->im,$conf,$this->workArea,$txtConf);
                                                        }
                                                break;
                                                case 'EMBOSS':
-                                                       if ($this->setup[$conf['textObjNum']]=='TEXT' && $txtConf=$this->checkTextObj($this->setup[$conf['textObjNum'].'.']))   {
+                                                       if ($this->setup[$conf['textObjNum']]=='TEXT' && $txtConf=$this->checkTextObj($this->setup[$conf['textObjNum'].'.'])) {
                                                                $this->makeEmboss($this->im,$conf,$this->workArea,$txtConf);
                                                        }
                                                break;
                                                case 'SHADOW':
-                                                       if ($this->setup[$conf['textObjNum']]=='TEXT' && $txtConf=$this->checkTextObj($this->setup[$conf['textObjNum'].'.']))   {
+                                                       if ($this->setup[$conf['textObjNum']]=='TEXT' && $txtConf=$this->checkTextObj($this->setup[$conf['textObjNum'].'.'])) {
                                                                $this->makeShadow($this->im,$conf,$this->workArea,$txtConf);
                                                        }
                                                break;
@@ -496,10 +496,10 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                        $this->scale($this->im,$conf);
                                                break;
                                                case 'WORKAREA':
-                                                       if ($conf['set'])       {
+                                                       if ($conf['set']) {
                                                                $this->setWorkArea($conf['set']);       // this sets the workArea
                                                        }
-                                                       if (isset($conf['clear']))      {
+                                                       if (isset($conf['clear'])) {
                                                                $this->workArea = $this->defaultWorkArea;       // this sets the current to the default;
                                                        }
                                                break;
@@ -568,7 +568,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @return      array           Modified $conf array IF the "text" property is not blank
         * @access private
         */
-       function checkTextObj($conf)    {
+       function checkTextObj($conf) {
                $cObj = t3lib_div::makeInstance('tslib_cObj');
                $cObj->start($this->data);
 
@@ -591,7 +591,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
 
                $conf['fontColor'] = trim($conf['fontColor']);
                        // Strip HTML
-               if (!$conf['doNotStripHTML'])   {
+               if (!$conf['doNotStripHTML']) {
                        $conf['text'] = strip_tags($conf['text']);
                }
                $this->combinedTextStrings[] = strip_tags($conf['text']);
@@ -605,14 +605,14 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                $conf['text'] = substr($conf['text'], 0, $tlen);
                        }
                }
-               if ((string)$conf['text']!='')  {
+               if ((string)$conf['text']!='') {
 
                                // Char range map thingie:
                        $fontBaseName = basename($conf['fontFile']);
-                       if (is_array($this->charRangeMap[$fontBaseName]))       {
+                       if (is_array($this->charRangeMap[$fontBaseName])) {
 
                                        // Initialize splitRendering array:
-                               if (!is_array($conf['splitRendering.']))        {
+                               if (!is_array($conf['splitRendering.'])) {
                                        $conf['splitRendering.'] = array();
                                }
 
@@ -623,24 +623,24 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                        $conf['splitRendering.'][$cfgK.'.'] = $this->charRangeMap[$fontBaseName]['charMapConfig'];
 
                                                // multiplicator of fontsize:
-                                       if ($this->charRangeMap[$fontBaseName]['multiplicator'])        {
+                                       if ($this->charRangeMap[$fontBaseName]['multiplicator']) {
                                                $conf['splitRendering.'][$cfgK.'.']['fontSize'] = round($conf['fontSize'] * $this->charRangeMap[$fontBaseName]['multiplicator']);
                                        }
                                                // multiplicator of pixelSpace:
-                                       if ($this->charRangeMap[$fontBaseName]['pixelSpace'])   {
+                                       if ($this->charRangeMap[$fontBaseName]['pixelSpace']) {
                                                $travKeys = array('xSpaceBefore','xSpaceAfter','ySpaceBefore','ySpaceAfter');
-                                               foreach($travKeys as $pxKey)    {
-                                                       if (isset($conf['splitRendering.'][$cfgK.'.'][$pxKey])) {
+                                               foreach($travKeys as $pxKey) {
+                                                       if (isset($conf['splitRendering.'][$cfgK.'.'][$pxKey])) {
                                                                $conf['splitRendering.'][$cfgK.'.'][$pxKey] = round($conf['splitRendering.'][$cfgK.'.'][$pxKey] * ($conf['fontSize'] / $this->charRangeMap[$fontBaseName]['pixelSpace']));
                                                        }
                                                }
                                        }
                                }
                        }
-                       if (is_array($conf['splitRendering.'])) {
-                               foreach($conf['splitRendering.'] as $key => $value)     {
-                                       if (is_array($conf['splitRendering.'][$key]))   {
-                                               if (isset($conf['splitRendering.'][$key]['fontFile']))  {
+                       if (is_array($conf['splitRendering.'])) {
+                               foreach($conf['splitRendering.'] as $key => $value) {
+                                       if (is_array($conf['splitRendering.'][$key])) {
+                                               if (isset($conf['splitRendering.'][$key]['fontFile'])) {
                                                        $conf['splitRendering.'][$key]['fontFile'] = $this->checkFile($conf['splitRendering.'][$key]['fontFile']);
                                                }
                                        }
@@ -662,7 +662,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @return      string          The resolved string with each part (separated by comma) returned separated by comma
         * @access private
         */
-       function calcOffset($string)    {
+       function calcOffset($string) {
                $value = array();
                $numbers = t3lib_div::trimExplode(',', $this->calculateFunctions($string));
 
@@ -687,8 +687,8 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @access private
         * @see tslib_cObj::getImgResource()
         */
-       function getResource($file,$fileArray)  {
-               if (!t3lib_div::inList($this->imageFileExt, $fileArray['ext'])) {
+       function getResource($file,$fileArray) {
+               if (!t3lib_div::inList($this->imageFileExt, $fileArray['ext'])) {
                        $fileArray['ext'] = $this->gifExtension;
                }
                $cObj =t3lib_div::makeInstance('tslib_cObj');
@@ -704,7 +704,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @access private
         * @see t3lib_TStemplate::getFileName()
         */
-       function checkFile($file)       {
+       function checkFile($file) {
                return $GLOBALS['TSFE']->tmpl->getFileName($file);
        }
 
@@ -715,7 +715,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @return string The relative filepath (relative to PATH_site)
         * @access private
         */
-       function fileName($pre) {
+       function fileName($pre) {
 
                $meaningfulPrefix = '';
 
@@ -751,7 +751,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
         * @access private
         */
        function extension() {
-               switch(strtolower($this->setup['format']))      {
+               switch(strtolower($this->setup['format'])) {
                        case 'jpg':
                        case 'jpeg':
                                return 'jpg';
index 224a606..255a665 100644 (file)
@@ -70,7 +70,7 @@ class TSpagegen {
         * @return      void
         */
        public static function pagegenInit() {
-               if ($GLOBALS['TSFE']->page['content_from_pid']>0)       {
+               if ($GLOBALS['TSFE']->page['content_from_pid']>0) {
                        $temp_copy_TSFE = clone($GLOBALS['TSFE']);      // make REAL copy of TSFE object - not reference!
                        $temp_copy_TSFE->id = $GLOBALS['TSFE']->page['content_from_pid'];       // Set ->id to the content_from_pid value - we are going to evaluate this pid as was it a given id for a page-display!
                        $temp_copy_TSFE->MP = '';
@@ -78,7 +78,7 @@ class TSpagegen {
                        $GLOBALS['TSFE']->contentPid = intval($temp_copy_TSFE->id);
                        unset($temp_copy_TSFE);
                }
-               if ($GLOBALS['TSFE']->config['config']['MP_defaults'])  {
+               if ($GLOBALS['TSFE']->config['config']['MP_defaults']) {
                        $temp_parts = t3lib_div::trimExplode('|',$GLOBALS['TSFE']->config['config']['MP_defaults'],1);
                        foreach ($temp_parts as $temp_p) {
                                list($temp_idP,$temp_MPp) = explode(':',$temp_p,2);
@@ -111,7 +111,7 @@ class TSpagegen {
 
                $GLOBALS['TSFE']->absRefPrefix = ($GLOBALS['TSFE']->config['config']['absRefPrefix'] ? trim($GLOBALS['TSFE']->config['config']['absRefPrefix']) : '');
 
-               if ($GLOBALS['TSFE']->type && $GLOBALS['TSFE']->config['config']['frameReloadIfNotInFrameset']) {
+               if ($GLOBALS['TSFE']->type && $GLOBALS['TSFE']->config['config']['frameReloadIfNotInFrameset']) {
                        $tdlLD = $GLOBALS['TSFE']->tmpl->linkData($GLOBALS['TSFE']->page,'_top',$GLOBALS['TSFE']->no_cache,'');
                        $GLOBALS['TSFE']->JSCode = 'if(!parent.'.trim($GLOBALS['TSFE']->sPre).' && !parent.view_frame) top.location.href="'.$GLOBALS['TSFE']->baseUrlWrap($tdlLD['totalURL']).'"';
                }
@@ -127,7 +127,7 @@ class TSpagegen {
 
                $GLOBALS['TSFE']->sWordRegEx='';
                $GLOBALS['TSFE']->sWordList = t3lib_div::_GP('sword_list');
-               if (is_array($GLOBALS['TSFE']->sWordList))      {
+               if (is_array($GLOBALS['TSFE']->sWordList)) {
                        $space = (!empty($GLOBALS['TSFE']->config['config']['sword_standAlone'])) ? '[[:space:]]' : '';
 
                        foreach ($GLOBALS['TSFE']->sWordList as $val) {
@@ -155,15 +155,15 @@ class TSpagegen {
                }
 
                        // Setting XHTML-doctype from doctype
-               if (!$GLOBALS['TSFE']->config['config']['xhtmlDoctype'])        {
+               if (!$GLOBALS['TSFE']->config['config']['xhtmlDoctype']) {
                        $GLOBALS['TSFE']->config['config']['xhtmlDoctype'] = $GLOBALS['TSFE']->config['config']['doctype'];
                }
 
-               if ($GLOBALS['TSFE']->config['config']['xhtmlDoctype']) {
+               if ($GLOBALS['TSFE']->config['config']['xhtmlDoctype']) {
                        $GLOBALS['TSFE']->xhtmlDoctype = $GLOBALS['TSFE']->config['config']['xhtmlDoctype'];
 
                                // Checking XHTML-docytpe
-                       switch((string)$GLOBALS['TSFE']->config['config']['xhtmlDoctype'])      {
+                       switch((string)$GLOBALS['TSFE']->config['config']['xhtmlDoctype']) {
                                case 'xhtml_trans':
                                case 'xhtml_strict':
                                case 'xhtml_frames':
@@ -198,9 +198,9 @@ class TSpagegen {
                $incFilesArray = array();
                        // Get files from config.includeLibrary
                $includeLibrary = trim(''.$GLOBALS['TSFE']->config['config']['includeLibrary']);
-               if ($includeLibrary)    {
+               if ($includeLibrary) {
                        $incFile=$GLOBALS['TSFE']->tmpl->getFileName($includeLibrary);
-                       if ($incFile)   {
+                       if ($incFile) {
                                $incFilesArray[] = $incFile;
                        }
                }
@@ -214,9 +214,9 @@ class TSpagegen {
                                // toplevel 'includeLibs' is added to the PAGE.includeLibs. In that way, PAGE-libs get first priority, because if the key already exist, it's not altered. (Due to investigation by me)
                        $incLibs += $GLOBALS['TSFE']->tmpl->setup['includeLibs.'];
                }
-               if (count($incLibs))    {
+               if (count($incLibs)) {
                        foreach ($incLibs as $theLib) {
-                               if (!is_array($theLib) && $incFile=$GLOBALS['TSFE']->tmpl->getFileName($theLib))        {
+                               if (!is_array($theLib) && $incFile=$GLOBALS['TSFE']->tmpl->getFileName($theLib)) {
                                        $incFilesArray[] = $incFile;
                                }
                        }
@@ -234,11 +234,11 @@ class TSpagegen {
                $setEvents = array();
                $setBody = array();
 
-               foreach ($GLOBALS['TSFE']->JSeventFuncCalls as $event => $handlers)     {
-                       if (count($handlers))   {
+               foreach ($GLOBALS['TSFE']->JSeventFuncCalls as $event => $handlers) {
+                       if (count($handlers)) {
                                $functions[] = '        function T3_'.$event.'Wrapper(e)        {       '.implode('   ',$handlers).'    }';
                                $setEvents[] = '        document.'.$event.'=T3_'.$event.'Wrapper;';
-                               if ($event == 'onload') {
+                               if ($event == 'onload') {
                                        $setBody[]='onload="T3_onloadWrapper();"';      // dubiuos double setting breaks on some browser - do we need it?
                                }
                        }
@@ -264,7 +264,7 @@ class TSpagegen {
                        // PAGE HEADER (after content - maybe JS is inserted!
 
                        // if 'disableAllHeaderCode' is set, all the header-code is discarded!
-               if ($GLOBALS['TSFE']->config['config']['disableAllHeaderCode']) {
+               if ($GLOBALS['TSFE']->config['config']['disableAllHeaderCode']) {
                        $GLOBALS['TSFE']->content = $pageContent;
                } else {
                        TSpagegen::renderContentWithHeader($pageContent);
@@ -827,26 +827,26 @@ class TSpagegen {
                if ($GLOBALS['TSFE']->spamProtectEmailAddresses && $GLOBALS['TSFE']->spamProtectEmailAddresses !== 'ascii') {
                        $scriptJsCode .= '
                        // decrypt helper function
-               function decryptCharcode(n,start,end,offset)    {
+               function decryptCharcode(n,start,end,offset) {
                        n = n + offset;
-                       if (offset > 0 && n > end)      {
+                       if (offset > 0 && n > end) {
                                n = start + (n - end - 1);
-                       } else if (offset < 0 && n < start)     {
+                       } else if (offset < 0 && n < start) {
                                n = end - (start - n - 1);
                        }
                        return String.fromCharCode(n);
                }
                        // decrypt string
-               function decryptString(enc,offset)      {
+               function decryptString(enc,offset) {
                        var dec = "";
                        var len = enc.length;
-                       for(var i=0; i < len; i++)      {
+                       for(var i=0; i < len; i++) {
                                var n = enc.charCodeAt(i);
-                               if (n >= 0x2B && n <= 0x3A)     {
+                               if (n >= 0x2B && n <= 0x3A) {
                                        dec += decryptCharcode(n,0x2B,0x3A,offset);     // 0-9 . , - + / :
-                               } else if (n >= 0x40 && n <= 0x5A)      {
+                               } else if (n >= 0x40 && n <= 0x5A) {
                                        dec += decryptCharcode(n,0x40,0x5A,offset);     // A-Z @
-                               } else if (n >= 0x61 && n <= 0x7A)      {
+                               } else if (n >= 0x61 && n <= 0x7A) {
                                        dec += decryptCharcode(n,0x61,0x7A,offset);     // a-z
                                } else {
                                        dec += enc.charAt(i);
@@ -855,7 +855,7 @@ class TSpagegen {
                        return dec;
                }
                        // decrypt spam-protected emails
-               function linkTo_UnCryptMailto(s)        {
+               function linkTo_UnCryptMailto(s) {
                        location.href = decryptString(s,' . ($GLOBALS['TSFE']->spamProtectEmailAddresses * - 1) . ');
                }
                ';
@@ -1122,21 +1122,21 @@ class TSpagegen {
 
                if ($needle=='int' || $needle=='integer')       {       // Integer
 
-                       if (t3lib_utility_Math::canBeInterpretedAsInteger($haystack))   {
+                       if (t3lib_utility_Math::canBeInterpretedAsInteger($haystack)) {
                                $OK = TRUE;
                        }
 
                } elseif (preg_match('/^\/.+\/[imsxeADSUXu]*$/', $needle))      {       // Regular expression, only "//" is allowed as delimiter
 
-                       if (@preg_match($needle, $haystack))    {
+                       if (@preg_match($needle, $haystack)) {
                                $OK = TRUE;
                        }
 
                } elseif (strstr($needle,'-'))  {       // Range
 
-                       if (t3lib_utility_Math::canBeInterpretedAsInteger($haystack))   {
+                       if (t3lib_utility_Math::canBeInterpretedAsInteger($haystack)) {
                                $range = explode('-',$needle);
-                               if ($range[0] <= $haystack && $range[1] >= $haystack)   {
+                               if ($range[0] <= $haystack && $range[1] >= $haystack) {
                                        $OK = TRUE;
                                }
                        }
@@ -1144,7 +1144,7 @@ class TSpagegen {
                } elseif (strstr($needle,'|'))  {       // List
 
                        $haystack = str_replace(' ','',$haystack);      // Trim the input
-                       if (strstr('|'.$needle.'|', '|'.$haystack.'|')) {
+                       if (strstr('|'.$needle.'|', '|'.$haystack.'|')) {
                                $OK = TRUE;
                        }
 
index 653297d..ab65eb9 100644 (file)
@@ -143,13 +143,13 @@ class tslib_pibase {
        function __construct() {
 
                        // Setting piVars:
-               if ($this->prefixId)    {
+               if ($this->prefixId) {
                        $this->piVars = t3lib_div::_GPmerged($this->prefixId);
 
                                // cHash mode check
                                // IMPORTANT FOR CACHED PLUGINS (USER cObject): As soon as you generate cached plugin output which depends on parameters (eg. seeing the details of a news item) you MUST check if a cHash value is set.
                                // Background: The function call will check if a cHash parameter was sent with the URL because only if it was the page may be cached. If no cHash was found the function will simply disable caching to avoid unpredictable caching behaviour. In any case your plugin can generate the expected output and the only risk is that the content may not be cached. A missing cHash value is considered a mistake in the URL resulting from either URL manipulation, "realurl" "grayzones" etc. The problem is rare (more frequent with "realurl") but when it occurs it is very puzzling!
-                       if ($this->pi_checkCHash && count($this->piVars))       {
+                       if ($this->pi_checkCHash && count($this->piVars)) {
                                $GLOBALS['TSFE']->reqCHash();
                        }
                }
@@ -167,7 +167,7 @@ class tslib_pibase {
         * @return      void
         */
        function pi_setPiVarDefaults() {
-               if (is_array($this->conf['_DEFAULT_PI_VARS.'])) {
+               if (is_array($this->conf['_DEFAULT_PI_VARS.'])) {
                        $this->piVars = t3lib_div::array_merge_recursive_overrule($this->conf['_DEFAULT_PI_VARS.'],is_array($this->piVars)?$this->piVars:array());
                }
        }
@@ -203,7 +203,7 @@ class tslib_pibase {
         * @return      string          The resulting URL
         * @see pi_linkToPage()
         */
-       function pi_getPageLink($id,$target='',$urlParameters=array())  {
+       function pi_getPageLink($id,$target='',$urlParameters=array()) {
                return $this->cObj->getTypoLink_URL($id,$urlParameters,$target);        // ?$target:$GLOBALS['TSFE']->sPre
        }
 
@@ -219,7 +219,7 @@ class tslib_pibase {
         * @return      string          The input string wrapped in <a> tags with the URL and target set.
         * @see pi_getPageLink(), tslib_cObj::getTypoLink()
         */
-       function pi_linkToPage($str,$id,$target='',$urlParameters=array())      {
+       function pi_linkToPage($str,$id,$target='',$urlParameters=array()) {
                return $this->cObj->getTypoLink($str,$id,$urlParameters,$target);       // ?$target:$GLOBALS['TSFE']->sPre
        }
 
@@ -234,7 +234,7 @@ class tslib_pibase {
         * @return      string          The input string wrapped in <a> tags
         * @see pi_linkTP_keepPIvars(), tslib_cObj::typoLink()
         */
-       function pi_linkTP($str,$urlParameters=array(),$cache=0,$altPageId=0)   {
+       function pi_linkTP($str,$urlParameters=array(),$cache=0,$altPageId=0) {
                $conf=array();
                $conf['useCacheHash'] = $this->pi_USER_INT_obj ? 0 : $cache;
                $conf['no_cache'] = $this->pi_USER_INT_obj ? 0 : !$cache;
@@ -257,12 +257,12 @@ class tslib_pibase {
         * @return      string          The input string wrapped in <a> tags
         * @see pi_linkTP()
         */
-       function pi_linkTP_keepPIvars($str,$overrulePIvars=array(),$cache=0,$clearAnyway=0,$altPageId=0)        {
-               if (is_array($this->piVars) && is_array($overrulePIvars) && !$clearAnyway)      {
+       function pi_linkTP_keepPIvars($str,$overrulePIvars=array(),$cache=0,$clearAnyway=0,$altPageId=0) {
+               if (is_array($this->piVars) && is_array($overrulePIvars) && !$clearAnyway) {
                        $piVars = $this->piVars;
                        unset($piVars['DATA']);
                        $overrulePIvars = t3lib_div::array_merge_recursive_overrule($piVars,$overrulePIvars);
-                       if ($this->pi_autoCacheEn)      {
+                       if ($this->pi_autoCacheEn) {
                                $cache = $this->pi_autoCache($overrulePIvars);
                        }
                }
@@ -281,7 +281,7 @@ class tslib_pibase {
         * @return      string          The URL ($this->cObj->lastTypoLinkUrl)
         * @see pi_linkTP_keepPIvars()
         */
-       function pi_linkTP_keepPIvars_url($overrulePIvars=array(),$cache=0,$clearAnyway=0,$altPageId=0) {
+       function pi_linkTP_keepPIvars_url($overrulePIvars=array(),$cache=0,$clearAnyway=0,$altPageId=0) {
                $this->pi_linkTP_keepPIvars('|',$overrulePIvars,$cache,$clearAnyway,$altPageId);
                return $this->cObj->lastTypoLinkUrl;
        }
@@ -299,9 +299,9 @@ class tslib_pibase {
         * @return      string          The input string wrapped in <a> tags
         * @see pi_linkTP(), pi_linkTP_keepPIvars()
         */
-       function pi_list_linkSingle($str,$uid,$cache=FALSE,$mergeArr=array(),$urlOnly=FALSE,$altPageId=0)       {
-               if ($this->prefixId)    {
-                       if ($cache)     {
+       function pi_list_linkSingle($str,$uid,$cache=FALSE,$mergeArr=array(),$urlOnly=FALSE,$altPageId=0) {
+               if ($this->prefixId) {
+                       if ($cache) {
                                $overrulePIvars=$uid?array('showUid'=>$uid):Array();
                                $overrulePIvars=array_merge($overrulePIvars,(array)$mergeArr);
                                $str = $this->pi_linkTP($str,Array($this->prefixId=>$overrulePIvars),$cache,$altPageId);
@@ -312,7 +312,7 @@ class tslib_pibase {
                        }
 
                                // If urlOnly flag, return only URL as it has recently be generated.
-                       if ($urlOnly)   {
+                       if ($urlOnly) {
                                $str = $this->cObj->lastTypoLinkUrl;
                        }
                }
@@ -327,8 +327,8 @@ class tslib_pibase {
         * @param       string          Window parameters, see the default list for inspiration
         * @return      string          The processed input string, modified IF a <a> tag was found
         */
-       function pi_openAtagHrefInJSwindow($str,$winName='',$winParams='width=670,height=500,status=0,menubar=0,scrollbars=1,resizable=1')      {
-               if (preg_match('/(.*)(<a[^>]*>)(.*)/i',$str,$match))    {
+       function pi_openAtagHrefInJSwindow($str,$winName='',$winParams='width=670,height=500,status=0,menubar=0,scrollbars=1,resizable=1') {
+               if (preg_match('/(.*)(<a[^>]*>)(.*)/i',$str,$match)) {
                        $aTagContent = t3lib_div::get_tag_attributes($match[2]);
                        $match[2]='<a href="#" onclick="'.
                                htmlspecialchars('vHWin=window.open(\''.$GLOBALS['TSFE']->baseUrlWrap($aTagContent['href']).'\',\''.($winName?$winName:md5($aTagContent['href'])).'\',\''.$winParams.'\');vHWin.focus();return false;').
@@ -458,16 +458,16 @@ class tslib_pibase {
 
                                // Make browse-table/links:
                        if ($showFirstLast) { // Link to first page
-                               if ($pointer>0) {
+                               if ($pointer>0) {
                                        $links[]=$this->cObj->wrap($this->pi_linkTP_keepPIvars($this->pi_getLL('pi_list_browseresults_first','<< First',$hscText),array($pointerName => NULL),$pi_isOnlyFields),$wrapper['inactiveLinkWrap']);
                                } else {
                                        $links[]=$this->cObj->wrap($this->pi_getLL('pi_list_browseresults_first','<< First',$hscText),$wrapper['disabledLinkWrap']);
                                }
                        }
                        if ($alwaysPrev>=0)     { // Link to previous page
-                               if ($pointer>0) {
+                               if ($pointer>0) {
                                        $links[]=$this->cObj->wrap($this->pi_linkTP_keepPIvars($this->pi_getLL('pi_list_browseresults_prev','< Previous',$hscText),array($pointerName => ($pointer-1?$pointer-1:'')),$pi_isOnlyFields),$wrapper['inactiveLinkWrap']);
-                               } elseif ($alwaysPrev)  {
+                               } elseif ($alwaysPrev) {
                                        $links[]=$this->cObj->wrap($this->pi_getLL('pi_list_browseresults_prev','< Previous',$hscText),$wrapper['disabledLinkWrap']);
                                }
                        }
@@ -487,7 +487,7 @@ class tslib_pibase {
                                        $links[] = $this->cObj->wrap($this->pi_linkTP_keepPIvars($pageText,array($pointerName => ($a?$a:'')),$pi_isOnlyFields),$wrapper['inactiveLinkWrap']);
                                }
                        }
-                       if ($pointer<$totalPages-1 || $showFirstLast)   {
+                       if ($pointer<$totalPages-1 || $showFirstLast) {
                                if ($pointer>=$totalPages-1) { // Link to next page
                                        $links[]=$this->cObj->wrap($this->pi_getLL('pi_list_browseresults_next','Next >',$hscText),$wrapper['disabledLinkWrap']);
                                } else {
@@ -547,7 +547,7 @@ class tslib_pibase {
         * @param       string          Attributes for the table tag which is wrapped around the table cells containing the search box
         * @return      string          Output HTML, wrapped in <div>-tags with a class attribute
         */
-       function pi_list_searchBox($tableParams='')     {
+       function pi_list_searchBox($tableParams='') {
                        // Search box design:
                $sTables = '
 
@@ -578,7 +578,7 @@ class tslib_pibase {
         * @param       string          Attributes for the table tag which is wrapped around the table cells containing the menu
         * @return      string          Output HTML, wrapped in <div>-tags with a class attribute
         */
-       function pi_list_modeSelector($items=array(),$tableParams='')   {
+       function pi_list_modeSelector($items=array(),$tableParams='') {
                $cells=array();
                foreach ($items as $k => $v) {
                        $cells[]='
@@ -615,7 +615,7 @@ class tslib_pibase {
         * @return      string          Output HTML, wrapped in <div>-tags with a class attribute
         * @see pi_list_row(), pi_list_header()
         */
-       function pi_list_makelist($res,$tableParams='') {
+       function pi_list_makelist($res,$tableParams='') {
                        // Make list table header:
                $tRows=array();
                $this->internal['currentRow']='';
@@ -623,7 +623,7 @@ class tslib_pibase {
 
                        // Make list table rows
                $c=0;
-               while($this->internal['currentRow'] = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
+               while($this->internal['currentRow'] = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                        $tRows[] = $this->pi_list_row($c);
                        $c++;
                }
@@ -650,7 +650,7 @@ class tslib_pibase {
         * @param       integer         Row counting. Starts at 0 (zero). Used for alternating class values in the output rows.
         * @return      string          HTML output, a table row with a class attribute set (alternative based on odd/even rows)
         */
-       function pi_list_row($c)        {
+       function pi_list_row($c) {
                // Dummy
                return '<tr'.($c%2 ? $this->pi_classParam('listrow-odd') : '').'><td><p>[dummy row]</p></td></tr>';
        }
@@ -693,7 +693,7 @@ class tslib_pibase {
         * @param       string          The class name (or the END of it since it will be prefixed by $this->prefixId.'-')
         * @return      string          The combined class name (with the correct prefix)
         */
-       function pi_getClassName($class)        {
+       function pi_getClassName($class) {
                return str_replace('_','-',$this->prefixId).($this->prefixId?'-':'').$class;
        }
 
@@ -706,12 +706,12 @@ class tslib_pibase {
         * @return      string          A "class" attribute with value and a single space char before it.
         * @see pi_getClassName()
         */
-       function pi_classParam($class, $addClasses='')  {
+       function pi_classParam($class, $addClasses='') {
                $output = '';
-               foreach (t3lib_div::trimExplode(',',$class) as $v)      {
+               foreach (t3lib_div::trimExplode(',',$class) as $v) {
                        $output.= ' '.$this->pi_getClassName($v);
                }
-               foreach (t3lib_div::trimExplode(',',$addClasses) as $v) {
+               foreach (t3lib_div::trimExplode(',',$addClasses) as $v) {
                        $output.= ' '.$v;
                }
                return ' class="'.trim($output).'"';
@@ -724,13 +724,13 @@ class tslib_pibase {
         * @param       string          HTML content to wrap in the div-tags with the "main class" of the plugin
         * @return      string          HTML content wrapped, ready to return to the parent object.
         */
-       function pi_wrapInBaseClass($str)       {
+       function pi_wrapInBaseClass($str) {
                $content = '<div class="'.str_replace('_','-',$this->prefixId).'">
                '.$str.'
        </div>
        ';
 
-               if(!$GLOBALS['TSFE']->config['config']['disablePrefixComment']) {
+               if(!$GLOBALS['TSFE']->config['config']['disablePrefixComment']) {
                        $content = '
 
 
@@ -780,16 +780,16 @@ class tslib_pibase {
         * @return      string          Returns FALSE/blank if no BE User login and of course if the panel is not shown for other reasons. Otherwise the HTML for the panel (a table).
         * @see tslib_cObj::EDITPANEL()
         */
-       function pi_getEditPanel($row='',$tablename='',$label='',$conf=Array()) {
+       function pi_getEditPanel($row='',$tablename='',$label='',$conf=Array()) {
                $panel='';
-               if (!$row || !$tablename)       {
+               if (!$row || !$tablename) {
                        $row = $this->internal['currentRow'];
                        $tablename = $this->internal['currentTable'];
                }
 
-               if ($GLOBALS['TSFE']->beUserLogin)      {
+               if ($GLOBALS['TSFE']->beUserLogin) {
                                // Create local cObj if not set:
-                       if (!is_object($this->pi_EPtemp_cObj))  {
+                       if (!is_object($this->pi_EPtemp_cObj)) {
                                $this->pi_EPtemp_cObj = t3lib_div::makeInstance('tslib_cObj');
                                $this->pi_EPtemp_cObj->setParent($this->cObj->data,$this->cObj->currentRecord);
                        }
@@ -802,8 +802,8 @@ class tslib_pibase {
                        $panel = $this->pi_EPtemp_cObj->cObjGetSingle('EDITPANEL',$conf,'editpanel');
                }
 
-               if ($panel)     {
-                       if ($label)     {
+               if ($panel) {
+                       if ($label) {
                                return '<!-- BEGIN: EDIT PANEL --><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr><td valign="top">'.$label.'</td><td valign="top" align="right">'.$panel.'</td></tr></table><!-- END: EDIT PANEL -->';
                        } else return '<!-- BEGIN: EDIT PANEL -->'.$panel.'<!-- END: EDIT PANEL -->';
                } else return $label;
@@ -822,9 +822,9 @@ class tslib_pibase {
         * @return      string          The processed content
         * @see tslib_cObj::editIcons()
         */
-       function pi_getEditIcon($content,$fields,$title='',$row='',$tablename='',$oConf=array())        {
+       function pi_getEditIcon($content,$fields,$title='',$row='',$tablename='',$oConf=array()) {
                if ($GLOBALS['TSFE']->beUserLogin){
-                       if (!$row || !$tablename)       {
+                       if (!$row || !$tablename) {
                                $row = $this->internal['currentRow'];
                                $tablename = $this->internal['currentTable'];
                        }
@@ -939,7 +939,7 @@ class tslib_pibase {
                                        if (is_array($languageArray) && is_array($this->LOCAL_LANG[$languageKey])) {
                                                        // Remove the dot after the language key
                                                foreach ($languageArray as $labelKey => $labelValue) {
-                                                       if (!is_array($labelValue))     {
+                                                       if (!is_array($labelValue)) {
                                                                $this->LOCAL_LANG[$languageKey][$labelKey][0]['target'] = $labelValue;
                                                                $this->LOCAL_LANG_charset[$languageKey][$labelKey] = 'utf-8';
                                                        }
@@ -1072,7 +1072,7 @@ class tslib_pibase {
         * @param       boolean         If $checkPage is set, it's required that the page on which the record resides is accessible
         * @return      array           If record is found, an array. Otherwise FALSE.
         */
-       function pi_getRecord($table,$uid,$checkPage=0) {
+       function pi_getRecord($table,$uid,$checkPage=0) {
                return $GLOBALS['TSFE']->sys_page->checkRecord($table,$uid,$checkPage);
        }
 
@@ -1113,7 +1113,7 @@ class tslib_pibase {
         * @param       string          List of fields where each element will be prepended with the table name given.
         * @return      string          List of fields processed.
         */
-       function pi_prependFieldsWithTable($table,$fieldList)   {
+       function pi_prependFieldsWithTable($table,$fieldList) {
                $list=t3lib_div::trimExplode(',',$fieldList,1);
                $return=array();
                foreach ($list as $listItem) {
@@ -1133,7 +1133,7 @@ class tslib_pibase {
         * @param       string          Optional LIMIT value ([begin,]max), if none, supply blank string.
         * @return      array           The array with the category records in.
         */
-       function pi_getCategoryTableContents($table,$pid,$whereClause='',$groupBy='',$orderBy='',$limit='')     {
+       function pi_getCategoryTableContents($table,$pid,$whereClause='',$groupBy='',$orderBy='',$limit='') {
                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                                        '*',
                                        $table,
@@ -1145,7 +1145,7 @@ class tslib_pibase {
                                        $limit
                                );
                $outArr = array();
-               while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))       {
+               while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                        $outArr[$row['uid']] = $row;
                }
                $GLOBALS['TYPO3_DB']->sql_free_result($res);
@@ -1177,7 +1177,7 @@ class tslib_pibase {
         * @param       integer         Limit for the values.
         * @return      boolean         Returns TRUE (1) if conditions are met.
         */
-       function pi_isOnlyFields($fList,$lowerThan=-1)  {
+       function pi_isOnlyFields($fList,$lowerThan=-1) {
                $lowerThan = $lowerThan==-1 ? $this->pi_lowerThan : $lowerThan;
 
                $fList = t3lib_div::trimExplode(',',$fList,1);
@@ -1197,19 +1197,19 @@ class tslib_pibase {
         * @return      boolean         Returns TRUE (1) if conditions are met.
         * @see pi_linkTP_keepPIvars()
         */
-       function pi_autoCache($inArray) {
-               if (is_array($inArray)) {
+       function pi_autoCache($inArray) {
+               if (is_array($inArray)) {
                        foreach ($inArray as $fN => $fV) {
-                               if (!strcmp($inArray[$fN],''))  {
+                               if (!strcmp($inArray[$fN],'')) {
                                        unset($inArray[$fN]);
-                               } elseif (is_array($this->pi_autoCacheFields[$fN]))     {
+                               } elseif (is_array($this->pi_autoCacheFields[$fN])) {
                                        if (is_array($this->pi_autoCacheFields[$fN]['range'])
                                                        && intval($inArray[$fN])>=intval($this->pi_autoCacheFields[$fN]['range'][0])
-                                                       && intval($inArray[$fN])<=intval($this->pi_autoCacheFields[$fN]['range'][1]))   {
+                                                       && intval($inArray[$fN])<=intval($this->pi_autoCacheFields[$fN]['range'][1])) {
                                                                unset($inArray[$fN]);
                                        }
                                        if (is_array($this->pi_autoCacheFields[$fN]['list'])
-                                                       && in_array($inArray[$fN],$this->pi_autoCacheFields[$fN]['list']))      {
+                                                       && in_array($inArray[$fN],$this->pi_autoCacheFields[$fN]['list'])) {
                                                                unset($inArray[$fN]);
                                        }
                                }
@@ -1227,7 +1227,7 @@ class tslib_pibase {
         * @return      string          The processed string
         * @see tslib_cObj::parseFunc()
         */
-       function pi_RTEcssText($str)    {
+       function pi_RTEcssText($str) {
                $parseFunc = $GLOBALS['TSFE']->tmpl->setup['lib.']['parseFunc_RTE.'];
                if (is_array($parseFunc))       $str = $this->cObj->parseFunc($str, $parseFunc);
                return $str;
@@ -1249,9 +1249,9 @@ class tslib_pibase {
         * @param       string          Field name to convert
         * @return      void
         */
-       function pi_initPIflexForm($field='pi_flexform')        {
+       function pi_initPIflexForm($field='pi_flexform') {
                        // Converting flexform data into array:
-               if (!is_array($this->cObj->data[$field]) && $this->cObj->data[$field])  {
+               if (!is_array($this->cObj->data[$field]) && $this->cObj->data[$field]) {
                        $this->cObj->data[$field] = t3lib_div::xml2array($this->cObj->data[$field]);
                        if (!is_array($this->cObj->data[$field]))       $this->cObj->data[$field]=array();
                }
@@ -1267,9 +1267,9 @@ class tslib_pibase {
         * @param       string          Value pointer, eg. "vDEF"
         * @return      string          The content.
         */
-       function pi_getFFvalue($T3FlexForm_array,$fieldName,$sheet='sDEF',$lang='lDEF',$value='vDEF')   {
+       function pi_getFFvalue($T3FlexForm_array,$fieldName,$sheet='sDEF',$lang='lDEF',$value='vDEF') {
                $sheetArray = is_array($T3FlexForm_array) ? $T3FlexForm_array['data'][$sheet][$lang] : '';
-               if (is_array($sheetArray))      {
+               if (is_array($sheetArray)) {
                        return $this->pi_getFFvalueFromSheetArray($sheetArray,explode('/',$fieldName),$value);
                }
        }
@@ -1284,15 +1284,15 @@ class tslib_pibase {
         * @access private
         * @see pi_getFFvalue()
         */
-       function pi_getFFvalueFromSheetArray($sheetArray,$fieldNameArr,$value)  {
+       function pi_getFFvalueFromSheetArray($sheetArray,$fieldNameArr,$value) {
 
                $tempArr=$sheetArray;
-               foreach($fieldNameArr as $k => $v)      {
-                       if (t3lib_utility_Math::canBeInterpretedAsInteger($v))  {
-                               if (is_array($tempArr)) {
+               foreach($fieldNameArr as $k => $v) {
+                       if (t3lib_utility_Math::canBeInterpretedAsInteger($v)) {
+                               if (is_array($tempArr)) {
                                        $c=0;
-                                       foreach($tempArr as $values)    {
-                                               if ($c==$v)     {
+                                       foreach($tempArr as $values) {
+                                               if ($c==$v) {
                                                        #debug($values);
                                                        $tempArr=$values;
                                                        break;
index 8c8a1a4..d782419 100644 (file)
@@ -100,13 +100,13 @@ class tslib_search {
         * @param       string          $allowedCols: is the list of columns, that MAY be searched. All allowed cols are set as result-fields. All requested cols MUST be in the allowed-fields list.
         * @return      void
         */
-       function register_tables_and_columns($requestedCols,$allowedCols)       {
+       function register_tables_and_columns($requestedCols,$allowedCols) {
                $rCols=$this->explodeCols($requestedCols);
                $aCols=$this->explodeCols($allowedCols);
 
-               foreach ($rCols as $k => $v)    {
+               foreach ($rCols as $k => $v) {
                        $rCols[$k]=trim($v);
-                       if (in_array($rCols[$k], $aCols))       {
+                       if (in_array($rCols[$k], $aCols)) {
                                $parts = explode('.',$rCols[$k]);
                                $this->tables[$parts[0]]['searchfields'][] = $parts[1];
                        }
@@ -115,7 +115,7 @@ class tslib_search {
                $this->tables['pages']['resultfields'][] = 'uid';
                unset($this->tables['pages']['fkey']);
 
-               foreach ($aCols as $k => $v)    {
+               foreach ($aCols as $k => $v) {
                        $aCols[$k]=trim($v);
                        $parts = explode('.',$aCols[$k]);
                        $this->tables[$parts[0]]['resultfields'][] = $parts[1].' AS '.str_replace('.','_',$aCols[$k]);
@@ -123,9 +123,9 @@ class tslib_search {
                }
 
                $this->fTable='';
-               foreach ($this->tables as $t => $v)     {
-                       if ($t!='pages')        {
-                               if (!$this->fTable)     {
+               foreach ($this->tables as $t => $v) {
+                       if ($t!='pages') {
+                               if (!$this->fTable) {
                                        $this->fTable = $t;
                                } else {
                                        unset($this->tables[$t]);
@@ -141,13 +141,13 @@ class tslib_search {
         * @return      array           An array where the values is "[table].[field]" strings to search
         * @see register_tables_and_columns()
         */
-       function explodeCols($in)       {
+       function explodeCols($in) {
                $theArray = explode(':',$in);
                $out = Array();
                foreach ($theArray as $val) {
                        $val=trim($val);
                        $parts = explode('.',$val);
-                       if ($parts[0] && $parts[1])     {
+                       if ($parts[0] && $parts[1]) {
                                $subparts = explode('-',$parts[1]);
                                foreach ($subparts as $piece) {
                                        $piece=trim($piece);
@@ -166,17 +166,17 @@ class tslib_search {
         * @param       string          The input search-word string.
         * @return      void
         */
-       function register_and_explode_search_string($sword)     {
+       function register_and_explode_search_string($sword) {
                $sword = trim($sword);
-               if ($sword)     {
+               if ($sword) {
                        $components = $this->split($sword);
                        $s_sword = '';   // the searchword is stored here during the loop
-                       if (is_array($components))      {
+                       if (is_array($components)) {
                                $i=0;
                                $lastoper = '';
                                foreach ($components as $key => $val) {
                                        $operator=$this->get_operator($val);
-                                       if ($operator)  {
+                                       if ($operator) {
                                                $lastoper = $operator;
                                        } elseif (strlen($val)>1) {             // A searchword MUST be at least two characters long!
                                                $this->sword_array[$i]['sword'] = $val;
@@ -198,12 +198,12 @@ class tslib_search {
         * @param       string          Special chars which are deleted if the append the searchword (+-., is default)
         * @return      mixed           Returns an ARRAY if there were search words, othervise the return value may be unset.
         */
-       function split($origSword, $specchars='+-', $delchars='+.,-')   {
+       function split($origSword, $specchars='+-', $delchars='+.,-') {
                $sword = $origSword;
                $specs = '[' . preg_quote($specchars, '/') . ']';
 
                        // As long as $sword is TRUE (that means $sword MUST be reduced little by little until its empty inside the loop!)
-               while ($sword)  {
+               while ($sword) {
                        if (preg_match('/^"/',$sword))  {               // There was a double-quote and we will then look for the ending quote.
                                $sword = preg_replace('/^"/','',$sword);                // Removes first double-quote
                                preg_match('/^[^"]*/',$sword,$reg);  // Removes everything till next double-quote
@@ -245,12 +245,12 @@ class tslib_search {
         */
        function build_search_query($endClause) {
 
-               if (is_array($this->tables))    {
+               if (is_array($this->tables)) {
                        $tables = $this->tables;
                        $primary_table = '';
 
                                // Primary key table is found.
-                       foreach($tables as $key => $val)        {
+                       foreach($tables as $key => $val) {
                                if ($tables[$key]['primary_key'])       {$primary_table = $key;}
                        }
 
@@ -269,11 +269,11 @@ class tslib_search {
                                        // Find tables / field names to select:
                                $fieldArray = array();
                                $tableArray = array();
-                               foreach($tables as $key => $val)        {
+                               foreach($tables as $key => $val) {
                                        $tableArray[] = $key;
                                        $resultfields = $tables[$key]['resultfields'];
-                                       if (is_array($resultfields))    {
-                                               foreach($resultfields as $key2 => $val2)        {
+                                       if (is_array($resultfields)) {
+                                               foreach($resultfields as $key2 => $val2) {
                                                        $fieldArray[] = $key.'.'.$val2;
                                                }
                                        }
@@ -286,24 +286,24 @@ class tslib_search {
 
                                $primary_table_and_key = $primary_table.'.'.$tables[$primary_table]['primary_key'];
                                $primKeys = Array();
-                               foreach($tables as $key => $val)        {
+                               foreach($tables as $key => $val) {
                                        $fkey = $tables[$key]['fkey'];
-                                       if ($fkey)      {
+                                       if ($fkey) {
                                                $primKeys[] = $key.'.'.$fkey.'='.$primary_table_and_key;
                                        }
                                }
-                               if (count($primKeys))   {
+                               if (count($primKeys)) {
                                        $whereArray[] = '('.implode(' OR ',$primKeys).')';
                                }
 
                                        // Additional where clause:
-                               if (trim($endClause))   {
+                               if (trim($endClause)) {
                                        $whereArray[] = trim($endClause);
                                }
 
                                        // Add search word where clause:
                                $query_part = $this->build_search_query_for_searchwords();
-                               if (!$query_part)       {
+                               if (!$query_part) {
                                        $query_part = '(0!=0)';
                                }
                                $whereArray[] = '('.$query_part.')';
@@ -312,8 +312,8 @@ class tslib_search {
                                $this->queryParts['WHERE'] = implode(' AND ',$whereArray);
 
                                        // Group by settings:
-                               if ($this->group_by)    {
-                                       if ($this->group_by == 'PRIMARY_KEY')   {
+                               if ($this->group_by) {
+                                       if ($this->group_by == 'PRIMARY_KEY') {
                                                $this->queryParts['GROUPBY'] = $primary_table_and_key;
                                        } else {
                                                $this->queryParts['GROUPBY'] = $this->group_by;
@@ -331,33 +331,33 @@ class tslib_search {
         */
        function build_search_query_for_searchwords() {
 
-               if (is_array($this->sword_array))       {
+               if (is_array($this->sword_array)) {
                        $main_query_part = array();
 
-                       foreach($this->sword_array as $key => $val)     {
+                       foreach($this->sword_array as $key => $val) {
                                $s_sword = $this->sword_array[$key]['sword'];
 
                                        // Get subQueryPart
                                $sub_query_part = array();
 
                                $this->listOfSearchFields='';
-                               foreach($this->tables as $key3 => $val3)        {
+                               foreach($this->tables as $key3 => $val3) {
                                        $searchfields = $this->tables[$key3]['searchfields'];
-                                       if (is_array($searchfields))    {
-                                               foreach($searchfields as $key2 => $val2)        {
+                                       if (is_array($searchfields)) {
+                                               foreach($searchfields as $key2 => $val2) {
                                                        $this->listOfSearchFields.= $key3.'.'.$val2.',';
                                                        $sub_query_part[] = $key3.'.'.$val2.' LIKE \'%'.$GLOBALS['TYPO3_DB']->quoteStr($s_sword, $key3).'%\'';
                                                }
                                        }
                                }
 
-                               if (count($sub_query_part))     {
+                               if (count($sub_query_part)) {
                                        $main_query_part[] = $this->sword_array[$key]['oper'];
                                        $main_query_part[] = '('.implode(' OR ',$sub_query_part).')';
                                }
                        }
 
-                       if (count($main_query_part))    {
+                       if (count($main_query_part)) {
                                unset($main_query_part[0]);     // Remove first part anyways.
                                return implode(' ',$main_query_part);
                        }
@@ -371,18 +371,18 @@ class tslib_search {
         * @return      string          If found, the SQL operator for the localized input operator.
         * @access private
         */
-       function get_operator($operator)        {
+       function get_operator($operator) {
                $operator = trim($operator);
                $op_array = $this->operator_translate_table;
-               if ($this->operator_translate_table_caseinsensitive)    {
+               if ($this->operator_translate_table_caseinsensitive) {
                        $operator = strtolower($operator);      // case-conversion is charset insensitive, but it doesn't spoil anything if input string AND operator table is already converted
                }
                foreach ($op_array as $key => $val) {
                        $item = $op_array[$key][0];
-                       if ($this->operator_translate_table_caseinsensitive)    {
+                       if ($this->operator_translate_table_caseinsensitive) {
                                $item = strtolower($item);      // See note above.
                        }
-                       if ($operator==$item)   {
+                       if ($operator==$item) {
                                return $op_array[$key][1];
                        }
                }
@@ -394,7 +394,7 @@ class tslib_search {
         * @return      boolean         TRUE, if $this->query was found
         */
        function count_query() {
-               if (is_array($this->queryParts))        {
+               if (is_array($this->queryParts)) {
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery($this->queryParts['SELECT'], $this->queryParts['FROM'], $this->queryParts['WHERE'], $this->queryParts['GROUPBY']);
                        $this->res_count = $GLOBALS['TYPO3_DB']->sql_num_rows($res);
                        return TRUE;
@@ -407,7 +407,7 @@ class tslib_search {
         * @return      boolean         TRUE, if $this->query was set and query performed
         */
        function execute_query() {
-               if (is_array($this->queryParts))        {
+               if (is_array($this->queryParts)) {
                        $this->result = $GLOBALS['TYPO3_DB']->exec_SELECT_queryArray($this->queryParts);
                        return TRUE;
                }
@@ -421,8 +421,8 @@ class tslib_search {
         */
        function get_searchwords() {
                $SWORD_PARAMS = '';
-               if (is_array($this->sword_array))       {
-                       foreach($this->sword_array as $key => $val)     {
+               if (is_array($this->sword_array)) {
+                       foreach($this->sword_array as $key => $val) {
                                $SWORD_PARAMS.= '&sword_list[]='.rawurlencode($val['sword']);
                        }
                }
@@ -435,8 +435,8 @@ class tslib_search {
         * @return      array           IF the internal sword_array contained search words it will return these, otherwise "void"
         */
        function get_searchwordsArray() {
-               if (is_array($this->sword_array))       {
-                       foreach($this->sword_array as $key => $val)     {
+               if (is_array($this->sword_array)) {
+                       foreach($this->sword_array as $key => $val) {
                                $swords[] = $val['sword'];
                        }
                }
index 7e86e24..24e02a9 100644 (file)
@@ -125,8 +125,8 @@ class tslib_content_Content extends tslib_content_Abstract {
 
                                                if (is_array($row)) { // Might be unset in the sys_language_contentOL
                                                                // Call hook for possible manipulation of database row for cObj->data
-                                                       if (is_array($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content_content.php']['modifyDBRow']))     {
-                                                               foreach($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content_content.php']['modifyDBRow'] as $_classRef)     {
+                                                       if (is_array($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content_content.php']['modifyDBRow'])) {
+                                                               foreach($this->TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content_content.php']['modifyDBRow'] as $_classRef) {
                                                                        $_procObj = t3lib_div::getUserObj($_classRef);
                                                                        $_procObj->modifyDBRow($row, $conf['table']);
                                                                }
index ec70e02..23e78cb 100644 (file)
@@ -89,8 +89,8 @@ if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/index_ts.php']['preprocessReq
 // *********************
 // Look for extension ID which will launch alternative output engine
 // *********************
-if ($temp_extId = t3lib_div::_GP('eID'))       {
-       if ($classPath = t3lib_div::getFileAbsFileName($TYPO3_CONF_VARS['FE']['eID_include'][$temp_extId]))     {
+if ($temp_extId = t3lib_div::_GP('eID')) {
+       if ($classPath = t3lib_div::getFileAbsFileName($TYPO3_CONF_VARS['FE']['eID_include'][$temp_extId])) {
                // Remove any output produced until now
                ob_clean();
 
@@ -132,7 +132,7 @@ $TSFE->sendRedirect();
 // *******************
 // Remove any output produced until now
 ob_clean();
-if ($TYPO3_CONF_VARS['FE']['compressionLevel'] && extension_loaded('zlib'))    {
+if ($TYPO3_CONF_VARS['FE']['compressionLevel'] && extension_loaded('zlib')) {
        if (t3lib_utility_Math::canBeInterpretedAsInteger($TYPO3_CONF_VARS['FE']['compressionLevel'])) {
                // Prevent errors if ini_set() is unavailable (safe mode)
                @ini_set('zlib.output_compression_level', $TYPO3_CONF_VARS['FE']['compressionLevel']);
@@ -255,7 +255,7 @@ $TSFE->checkJumpUrlReferer();
 // Check Submission of data.
 // This is done at this point, because we need the config values
 // *******************************
-switch($TSFE->checkDataSubmission())   {
+switch($TSFE->checkDataSubmission()) {
        case 'email':
                $TSFE->sendFormmail();
        break;
@@ -303,7 +303,7 @@ if ($TSFE->isINTincScript())                {
 // Output content
 // ***************
 $sendTSFEContent = FALSE;
-if ($TSFE->isOutputting())     {
+if ($TSFE->isOutputting()) {
        $TT->push('Print Content','');
        $TSFE->processOutput();
        $sendTSFEContent = TRUE;
index 4f18887..7bed71a 100755 (executable)
@@ -61,9 +61,9 @@
  * @param      array           TypoScript properties passed on to this function.
  * @return     string          The input string reversed. If the TypoScript property "uppercase" was set it will also be in uppercase.
  */
-function user_reverseString($content,$conf)    {
+function user_reverseString($content,$conf) {
        $content = strrev($content);
-       if ($conf['uppercase']) {
+       if ($conf['uppercase']) {
                $content=strtoupper($content);
        }
        return $content;
@@ -86,7 +86,7 @@ function user_reverseString($content,$conf)   {
  * @param      array           TypoScript configuration
  * @return     string          HTML output, showing the current server time.
  */
-function user_printTime($content,$conf)        {
+function user_printTime($content,$conf) {
        return '<font color="red">Dynamic time: '.date('H:i:s').'</font><br />';
 }
 
@@ -107,12 +107,12 @@ class user_various        {
         * @return      string          The input string reversed. If the TypoScript property "uppercase" was set it will also be in uppercase. May also be linked.
         * @see user_reverseString()
         */
-       function reverseString($content,$conf)  {
+       function reverseString($content,$conf) {
                $content = strrev($content);
-               if ($conf['uppercase']) {
+               if ($conf['uppercase']) {
                        $content=$this->cObj->caseshift($content,'upper');
                }
-               if ($conf['typolink'])  {
+               if ($conf['typolink']) {
                        $content=$this->cObj->getTypoLink($content,$conf['typolink']);
                }
                return $content;
@@ -136,7 +136,7 @@ class user_various  {
         * @param       array           TypoScript configuration
         * @return      string          HTML output, showing content elements (in reverse order if configured.)
         */
-       function listContentRecordsOnPage($content,$conf)       {
+       function listContentRecordsOnPage($content,$conf) {
                $query = $GLOBALS['TYPO3_DB']->SELECTquery(
                                                'header',
                                                'tt_content',
@@ -155,10 +155,10 @@ class user_various        {
         * @return      string          The header field values of the content elements imploded by a <br /> tag
         * @access private
         */
-       function selectThem($query)     {
+       function selectThem($query) {
                $res = $GLOBALS['TYPO3_DB']->sql_query($query);
                $output=array();
-               while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))       {
+               while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                        $output[]=$row['header'];
                }
                return implode($output,'<br />');
index 40de075..3a36b7b 100755 (executable)
@@ -70,7 +70,7 @@
  * @param      array           TypoScript configuration for the function. Notice that the property "parentObj" is a reference to the parent (calling) object (the tslib_Xmenu class instantiated)
  * @return     array           The modified $menuArr array
  */
-function user_itemArrayProcFuncTest($menuArr,$conf)    {
+function user_itemArrayProcFuncTest($menuArr,$conf) {
        if ($conf['demoItemStates'])    {               // Used in the example of item states
                $c=0;
                $teststates=explode(',','NO,ACT,IFSUB,CUR,USR,SPC,USERDEF1,USERDEF2');
@@ -99,7 +99,7 @@ function user_itemArrayProcFuncTest($menuArr,$conf)   {
  * @return     array           The processed $I array returned (and stored in $this->I of the parent object again)
  * @see tslib_menu::userProcess(), tslib_tmenu::writeMenu(), tslib_gmenu::writeMenu()
  */
-function user_IProcFuncTest($I,$conf)  {
+function user_IProcFuncTest($I,$conf) {
        $itemRow = $conf['parentObj']->menuArr[$I['key']];
 
                // Setting the document status content to the value of the page title on mouse over
@@ -109,7 +109,7 @@ function user_IProcFuncTest($I,$conf)       {
        $I = $conf['parentObj']->I;
        if ($I['parts']['ATag_begin'])  $I['parts']['ATag_begin']=$I['A1'];
 
-       if ($conf['debug'])     {
+       if ($conf['debug']) {
                        // Outputting for debug example:
                echo 'ITEM: <h2>'.htmlspecialchars($itemRow['uid'].': '.$itemRow['title']).'</h2>';
                t3lib_utility_Debug::debug($itemRow);
index b5f21b6..bc73b0e 100755 (executable)
  * @return     array           The processed $I array returned (and stored in $this->I of the parent object again)
  * @see tslib_menu::userProcess(), tslib_tmenu::writeMenu(), tslib_gmenu::writeMenu()
  */
-function user_keepRolloverAtOnClick($I,$conf)  {
+function user_keepRolloverAtOnClick($I,$conf) {
        $itemRow = $conf['parentObj']->menuArr[$I['key']];
 
                // Setting the document status content to the value of the page title on mouse over
-       if (!$I['linkHREF']['TARGET'])  {
+       if (!$I['linkHREF']['TARGET']) {
                $I['linkHREF']['HREF']='#';
                $I['linkHREF']['onClick'].='ARO_setLocation'.($conf['setLocation']).'('.$itemRow['uid'].',\''.$I['theName'].'\'); return false;';
        } else {
@@ -61,7 +61,7 @@ function user_keepRolloverAtOnClick($I,$conf) {
        if ($I['linkHREF']['onMouseover'])      $I['linkHREF']['onMouseover']='ARO_'.$I['linkHREF']['onMouseover'];
        if ($I['linkHREF']['onMouseout'])       $I['linkHREF']['onMouseout']='ARO_'.$I['linkHREF']['onMouseout'];
 
-       if ($conf['parentObj']->isActive($itemRow['uid']))      {
+       if ($conf['parentObj']->isActive($itemRow['uid'])) {
                $conf['parentObj']->WMextraScript.='
 <script type="text/javascript">
        /*<![CDATA[*/
@@ -79,7 +79,7 @@ function user_keepRolloverAtOnClick($I,$conf) {
        $I['parts']['ATag_begin']=$I['A1'];     // Setting the ATag_begin to the value of this $I
 
                // Debug:
-       if ($conf['debug'])     {
+       if ($conf['debug']) {
                        // Outputting for debug example:
                echo 'ITEM: <h2>'.htmlspecialchars($itemRow['uid'].': '.$itemRow['title']).'</h2>';
                t3lib_utility_Debug::debug($itemRow);
index b760dbd..0dd798d 100755 (executable)
@@ -46,7 +46,7 @@ if (!is_object($this)) die ('Error: No parent object present.');
 $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'pages_language_overlay', 'pid='.intval($GLOBALS['TSFE']->id).$GLOBALS['TSFE']->sys_page->enableFields('pages_language_overlay'), 'sys_language_uid');
 
 $langArr = array();
-while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
+while($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
        $langArr[$row['sys_language_uid']] = $row['title'];
 }
 
index a0669ae..6440cb2 100755 (executable)
@@ -66,7 +66,7 @@
  * @return     string          Return the new <a> tag
  * @see tslib_cObj::typoLink()
  */
-function user_typoLinkPopUp($content,$conf)    {
+function user_typoLinkPopUp($content,$conf) {
        $aOnClick = 'openPic(\''.$GLOBALS['TSFE']->baseUrlWrap($content['url']).'\',\'popupwin\',\'width=400,height=500,status=0,menubar=0\'); return false;';
        $TAG =  '<a href="#" onclick="'.htmlspecialchars($aOnClick).'"'.$content['aTagParams'].'>';
        return $TAG;
index 106399f..ec42fc4 100755 (executable)
@@ -88,7 +88,7 @@ class user_feAdmin    {
         * @param       array           TypoScript properties following the USER_INT object which uses this library
         * @return      string          HTML content
         */
-       function init($content,$conf)   {
+       function init($content,$conf) {
                $this->conf = $conf;
 
                        // template file is fetched.
@@ -100,7 +100,7 @@ class user_feAdmin  {
                $this->preview = (string)t3lib_div::_GP('preview');
                        // backURL is a given URL to return to when login is performed
                $this->backURL = t3lib_div::_GP('backURL');
-               if (strstr($this->backURL, '"') || strstr($this->backURL, "'") || preg_match('/(javascript|vbscript):/i', $this->backURL) || stristr($this->backURL, "fromcharcode") || strstr($this->backURL, "<") || strstr($this->backURL, ">"))     {
+               if (strstr($this->backURL, '"') || strstr($this->backURL, "'") || preg_match('/(javascript|vbscript):/i', $this->backURL) || stristr($this->backURL, "fromcharcode") || strstr($this->backURL, "<") || strstr($this->backURL, ">")) {
                        $this->backURL = '';    // Clear backURL if it seems to contain XSS code - only URLs are allowed
                }
                        // Remove host from URL: Make sure that $this->backURL maps to the current site
@@ -132,7 +132,7 @@ class user_feAdmin  {
                if (intval($this->conf['no_cache']) && !isset($linkConf['no_cache']))   {       // needed for backwards compatibility
                        $linkConf['no_cache'] = 1;
                }
-               if(!$linkConf['parameter'])     {
+               if(!$linkConf['parameter']) {
                        $linkConf['parameter'] = $GLOBALS['TSFE']->id;
                }
                if(!$linkConf['additionalParams'])      {       // needed for backwards compatibility
@@ -165,7 +165,7 @@ class user_feAdmin  {
 
 
                        // Setting cmdKey which is either 'edit' or 'create'
-               switch($this->cmd)      {
+               switch($this->cmd) {
                        case 'edit':
                                $this->cmdKey='edit';
                        break;
@@ -184,12 +184,12 @@ class user_feAdmin        {
                $this->dataArr = $fe[$this->theTable];  // Incoming data.
 
                        // Checking template file and table value
-               if (!$this->templateCode)       {
+               if (!$this->templateCode) {
                        $content = 'No template file found: '.$this->conf['templateFile'];
                        return $content;
                }
 
-               if (!$this->theTable || !$this->fieldList)      {
+               if (!$this->theTable || !$this->fieldList) {
                        $content = 'Wrong table: '.$this->theTable;
                        return $content;                // Not listed or editable table!
                }
@@ -201,12 +201,12 @@ class user_feAdmin        {
                        $this->deleteRecord();
                }
                        // If incoming data is seen...
-               if (is_array($this->dataArr))   {
+               if (is_array($this->dataArr)) {
                                // Evaluation of data:
                        $this->parseValues();
                        $this->overrideValues();
                        $this->evalValues();
-                       if ($this->conf['evalFunc'])    {
+                       if ($this->conf['evalFunc']) {
                                $this->dataArr = $this->userProcess('evalFunc',$this->dataArr);
                        }
 
@@ -237,7 +237,7 @@ class user_feAdmin  {
                        $this->clearCacheIfSet();
 
                                // Displaying the page here that says, the record has been saved. You're able to include the saved values by markers.
-                       switch($this->cmd)      {
+                       switch($this->cmd) {
                                case 'delete':
                                        $key='DELETE';
                                break;
@@ -268,11 +268,11 @@ class user_feAdmin        {
                        $content = $this->cObj->substituteMarkerArray($templateCode, $this->markerArray);
                } else {
                                // Finally, if there has been no attempt to save. That is either preview or just displaying and empty or not correctly filled form:
-                       if (!$this->cmd)        {
+                       if (!$this->cmd) {
                                $this->cmd=$this->conf['defaultCmd'];
                        }
                        if ($this->conf['debug'])               debug('Display form: '.$this->cmd,1);
-                       switch($this->cmd)      {
+                       switch($this->cmd) {
                                case 'setfixed':
                                        $content = $this->procesSetFixed();
                                break;
@@ -292,7 +292,7 @@ class user_feAdmin  {
                }
 
                        // Delete temp files:
-               foreach($this->unlinkTempFiles as $tempFileName)        {
+               foreach($this->unlinkTempFiles as $tempFileName) {
                        t3lib_div::unlink_tempfile($tempFileName);
                }
 
@@ -337,14 +337,14 @@ class user_feAdmin        {
         * @return      void
         * @see init()
         */
-       function parseValues()  {
-               if (is_array($this->conf['parseValues.']))      {
+       function parseValues() {
+               if (is_array($this->conf['parseValues.'])) {
                        foreach ($this->conf['parseValues.'] as $theField => $theValue) {
                                $listOfCommands = t3lib_div::trimExplode(',',$theValue,1);
                                foreach ($listOfCommands as $cmd) {
                                        $cmdParts = preg_split('/\[|\]/', $cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
                                        $theCmd=trim($cmdParts[0]);
-                                       switch($theCmd) {
+                                       switch($theCmd) {
                                                case 'int':
                                                        $this->dataArr[$theField]=intval($this->dataArr[$theField]);
                                                break;
@@ -374,27 +374,27 @@ class user_feAdmin        {
                                                        $this->dataArr[$theField] = substr(md5(uniqid(microtime(),1)),0,intval($cmdParts[1]));
                                                break;
                                                case 'files':
-                                                       if ($this->cmdKey=='create' && !t3lib_div::_GP('doNotSave'))    {
+                                                       if ($this->cmdKey=='create' && !t3lib_div::_GP('doNotSave')) {
                                                                $this->processFiles($cmdParts,$theField);
                                                        } else unset($this->dataArr[$theField]);        // Fields with files cannot be edited - only created.
                                                break;
                                                case 'setEmptyIfAbsent':
-                                                       if (!isset($this->dataArr[$theField]))  {
+                                                       if (!isset($this->dataArr[$theField])) {
                                                                $this->dataArr[$theField]='';
                                                        }
                                                break;
                                                case 'multiple':
-                                                       if (is_array($this->dataArr[$theField]))        {
+                                                       if (is_array($this->dataArr[$theField])) {
                                                                $this->dataArr[$theField] = implode(',',$this->dataArr[$theField]);
                                                        }
                                                break;
                                                case 'checkArray':
-                                                       if (is_array($this->dataArr[$theField]))        {
+                                                       if (is_array($this->dataArr[$theField])) {
                                                                $val = 0;
                                                                foreach ($this->dataArr[$theField] as $kk => $vv) {
                                                                        $kk = t3lib_utility_Math::forceIntegerInRange($kk,0);
-                                                                       if ($kk<=30)    {
-                                                                               if ($vv)        {
+                                                                       if ($kk<=30) {
+                                                                               if ($vv) {
                                                                                        $val|=pow(2,$kk);
                                                                                }
                                                                        }
@@ -430,7 +430,7 @@ class user_feAdmin  {
         * @access private
         * @see parseValues()
         */
-       function processFiles($cmdParts,$theField)      {
+       function processFiles($cmdParts,$theField) {
 //debug($_FILES);
                        // First, make an array with the filename and file reference, whether the file is just uploaded or a preview
                $filesArr = array();
@@ -446,9 +446,9 @@ class user_feAdmin  {
                        }
                } elseif (is_array($_FILES['FE'][$this->theTable][$theField]['name']))  {       // Files from upload
                        foreach ($_FILES['FE'][$this->theTable][$theField]['name'] as $kk => $vv) {
-                               if ($vv)        {
+                               if ($vv) {
                                        $tmpFile = t3lib_div::upload_to_tempfile($_FILES['FE'][$this->theTable][$theField]['tmp_name'][$kk]);
-                                       if ($tmpFile)   {
+                                       if ($tmpFile) {
                                                $this->unlinkTempFiles[]=$tmpFile;
                                                $filesArr[] = array (
                                                        'name'=>$vv,
@@ -459,9 +459,9 @@ class user_feAdmin  {
                        }
                } elseif (is_array($_FILES['FE']['name'][$this->theTable][$theField]))  {       // Files from upload
                        foreach ($_FILES['FE']['name'][$this->theTable][$theField] as $kk => $vv) {
-                               if ($vv)        {
+                               if ($vv) {
                                        $tmpFile = t3lib_div::upload_to_tempfile($_FILES['FE']['tmp_name'][$this->theTable][$theField][$kk]);
-                                       if ($tmpFile)   {
+                                       if ($tmpFile) {
                                                $this->unlinkTempFiles[]=$tmpFile;
                                                $filesArr[] = array (
                                                        'name'=>$vv,
@@ -475,16 +475,16 @@ class user_feAdmin        {
                        // Then verify the files in that array; check existence, extension and size
                $this->dataArr[$theField]='';
                $finalFilesArr=array();
-               if (count($filesArr))   {
+               if (count($filesArr)) {
                        $extArray = t3lib_div::trimExplode(';',strtolower($cmdParts[1]),1);
                        $maxSize = intval($cmdParts[3]);
                        foreach ($filesArr as $infoArr) {
                                $fI = pathinfo($infoArr['name']);
-                               if (t3lib_div::verifyFilenameAgainstDenyPattern($fI['name']))   {
-                                       if (!count($extArray) || in_array(strtolower($fI['extension']), $extArray))     {
+                               if (t3lib_div::verifyFilenameAgainstDenyPattern($fI['name'])) {
+                                       if (!count($extArray) || in_array(strtolower($fI['extension']), $extArray)) {
                                                $tmpFile = $infoArr['tmp_name'];
-                                               if (@is_file($tmpFile)) {
-                                                       if (!$maxSize || filesize($tmpFile)<$maxSize*1024)      {
+                                               if (@is_file($tmpFile)) {
+                                                       if (!$maxSize || filesize($tmpFile)<$maxSize*1024) {
                                                                $finalFilesArr[]=$infoArr;
                                                        } elseif ($this->conf['debug']) {debug('Size is beyond '.$maxSize.' kb ('.filesize($tmpFile).' bytes) and the file cannot be saved.');}
                                                } elseif ($this->conf['debug']) {debug('Surprisingly there was no file for '.$vv.' in '.$tmpFile);}
@@ -508,10 +508,10 @@ class user_feAdmin        {
                                $this->createFileFuncObj();
                                $GLOBALS['TSFE']->includeTCA();
                                t3lib_div::loadTCA($this->theTable);
-                               if (is_array($GLOBALS['TCA'][$this->theTable]['columns'][$theField]))   {
+                               if (is_array($GLOBALS['TCA'][$this->theTable]['columns'][$theField])) {
                                        $uploadPath = $GLOBALS['TCA'][$this->theTable]['columns'][$theField]['config']['uploadfolder'];
                                }
-                               if ($uploadPath)        {
+                               if ($uploadPath) {
                                        $theDestFile = $this->fileFunc->getUniqueName($this->fileFunc->cleanFileName($infoArr['name']), PATH_site.$uploadPath);
                                        t3lib_div::upload_copy_move($infoArr['tmp_name'],$theDestFile);
                                                // Setting the filename in the list
@@ -531,9 +531,9 @@ class user_feAdmin  {
         * @return      void
         * @see init()
         */
-       function overrideValues()       {
+       function overrideValues() {
                // Addition of overriding values
-               if (is_array($this->conf[$this->cmdKey.'.']['overrideValues.']))        {
+               if (is_array($this->conf[$this->cmdKey.'.']['overrideValues.'])) {
                        foreach ($this->conf[$this->cmdKey.'.']['overrideValues.'] as $theField => $theValue) {
                                $this->dataArr[$theField] = $theValue;
                        }
@@ -546,9 +546,9 @@ class user_feAdmin  {
         * @return      void
         * @see init()
         */
-       function defaultValues()        {
+       function defaultValues() {
                        // Addition of default values
-               if (is_array($this->conf[$this->cmdKey.'.']['defaultValues.'])) {
+               if (is_array($this->conf[$this->cmdKey.'.']['defaultValues.'])) {
                        foreach ($this->conf[$this->cmdKey.'.']['defaultValues.'] as $theField => $theValue) {
                                $this->dataArr[$theField] = $theValue;
                        }
@@ -564,19 +564,19 @@ class user_feAdmin        {
         * @return      void
         * @see init(), parseValues()
         */
-       function evalValues()   {
+       function evalValues() {
                // Check required, set failure if not ok.
                $tempArr=array();
                foreach ($this->requiredArr as $theField) {
-                       if (!trim($this->dataArr[$theField]))   {
+                       if (!trim($this->dataArr[$theField])) {
                                $tempArr[]=$theField;
                        }
                }
 
                // Evaluate: This evaluates for more advanced things than 'required' does. But it returns the same error code, so you must let the required-message tell, if further evaluation has failed!
                $recExist=0;
-               if (is_array($this->conf[$this->cmdKey.'.']['evalValues.']))    {
-                       switch($this->cmd)      {
+               if (is_array($this->conf[$this->cmdKey.'.']['evalValues.'])) {
+                       switch($this->cmd) {
                                case 'edit':
                                        if (isset($this->dataArr['pid']))       {                       // This may be tricked if the input has the pid-field set but the edit-field list does NOT allow the pid to be edited. Then the pid may be false.
                                                $recordTestPid = intval($this->dataArr['pid']);
@@ -596,9 +596,9 @@ class user_feAdmin  {
                                foreach ($listOfCommands as $cmd) {
                                        $cmdParts = preg_split('/\[|\]/', $cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
                                        $theCmd = trim($cmdParts[0]);
-                                       switch($theCmd) {
+                                       switch($theCmd) {
                                                case 'uniqueGlobal':
-                                                       if ($DBrows = $GLOBALS['TSFE']->sys_page->getRecordsByField($this->theTable,$theField,$this->dataArr[$theField],'','','','1'))  {
+                                                       if ($DBrows = $GLOBALS['TSFE']->sys_page->getRecordsByField($this->theTable,$theField,$this->dataArr[$theField],'','','','1')) {
                                                                if (!$recExist || $DBrows[0]['uid']!=$this->dataArr['uid'])     {       // Only issue an error if the record is not existing (if new...) and if the record with the false value selected was not our self.
                                                                        $tempArr[]=$theField;
                                                                        $this->failureMsg[$theField][] = $this->getFailure($theField, $theCmd, 'The value existed already. Enter a new value.');
@@ -606,7 +606,7 @@ class user_feAdmin  {
                                                        }
                                                break;
                                                case 'uniqueLocal':
-                                                       if ($DBrows = $GLOBALS['TSFE']->sys_page->getRecordsByField($this->theTable,$theField,$this->dataArr[$theField], 'AND pid IN ('.$recordTestPid.')','','','1'))  {
+                                                       if ($DBrows = $GLOBALS['TSFE']->sys_page->getRecordsByField($this->theTable,$theField,$this->dataArr[$theField], 'AND pid IN ('.$recordTestPid.')','','','1')) {
                                                                if (!$recExist || $DBrows[0]['uid']!=$this->dataArr['uid'])     {       // Only issue an error if the record is not existing (if new...) and if the record with the false value selected was not our self.
                                                                        $tempArr[]=$theField;
                                                                        $this->failureMsg[$theField][] = $this->getFailure($theField, $theCmd, 'The value existed already. Enter a new value.');
@@ -614,53 +614,53 @@ class user_feAdmin        {
                                                        }
                                                break;
                                                case 'twice':
-                                                       if (strcmp($this->dataArr[$theField], $this->dataArr[$theField.'_again']))      {
+                                                       if (strcmp($this->dataArr[$theField], $this->dataArr[$theField.'_again'])) {
                                                                $tempArr[]=$theField;
                                                                $this->failureMsg[$theField][] = $this->getFailure($theField, $theCmd, 'You must enter the same value twice');
                                                        }
                                                break;
                                                case 'email':
-                                                       if (!t3lib_div::validEmail($this->dataArr[$theField]))  {
+                                                       if (!t3lib_div::validEmail($this->dataArr[$theField])) {
                                                                $tempArr[]=$theField;
                                                                $this->failureMsg[$theField][] = $this->getFailure($theField, $theCmd, 'You must enter a valid email address');
                                                        }
                                                break;
                                                case 'required':
-                                                       if (!trim($this->dataArr[$theField]))   {
+                                                       if (!trim($this->dataArr[$theField])) {
                                                                $tempArr[]=$theField;
                                                                $this->failureMsg[$theField][] = $this->getFailure($theField, $theCmd, 'You must enter a value!');
                                                        }
                                                break;
                                                case 'atLeast':
                                                        $chars=intval($cmdParts[1]);
-                                                       if (strlen($this->dataArr[$theField])<$chars)   {
+                                                       if (strlen($this->dataArr[$theField])<$chars) {
                                                                $tempArr[]=$theField;
                                                                $this->failureMsg[$theField][] = sprintf($this->getFailure($theField, $theCmd, 'You must enter at least %s characters!'), $chars);
                                                        }
                                                break;
                                                case 'atMost':
                                                        $chars=intval($cmdParts[1]);
-                                                       if (strlen($this->dataArr[$theField])>$chars)   {
+                                                       if (strlen($this->dataArr[$theField])>$chars) {
                                                                $tempArr[]=$theField;
                                                                $this->failureMsg[$theField][] = sprintf($this->getFailure($theField, $theCmd, 'You must enter at most %s characters!'), $chars);
                                                        }
                                                break;
                                                case 'inBranch':
                                                        $pars = explode(';',$cmdParts[1]);
-                                                       if (intval($pars[0]))   {
+                                                       if (intval($pars[0])) {
                                                                $pid_list = $this->cObj->getTreeList(
                                                                        intval($pars[0]),
                                                                        intval($pars[1]) ? intval($pars[1]) : 999,
                                                                        intval($pars[2])
                                                                );
-                                                               if (!$pid_list || !t3lib_div::inList($pid_list,$this->dataArr[$theField]))      {
+                                                               if (!$pid_list || !t3lib_div::inList($pid_list,$this->dataArr[$theField])) {
                                                                        $tempArr[]=$theField;
                                                                        $this->failureMsg[$theField][] = sprintf($this->getFailure($theField, $theCmd, 'The value was not a valid valud from this list: %s'), $pid_list);
                                                                }
                                                        }
                                                break;
                                                case 'unsetEmpty':
-                                                       if (!$this->dataArr[$theField]) {
+                                                       if (!$this->dataArr[$theField]) {
                                                                $hash = array_flip($tempArr);
                                                                unset($hash[$theField]);
                                                                $tempArr = array_keys($hash);
@@ -684,8 +684,8 @@ class user_feAdmin  {
         * @return      array           The processed $passVar ($this->dataArr)
         * @see init(), evalValues()
         */
-       function userProcess($mConfKey,$passVar)        {
-               if ($this->conf[$mConfKey])     {
+       function userProcess($mConfKey,$passVar) {
+               if ($this->conf[$mConfKey]) {
                        $funcConf = $this->conf[$mConfKey.'.'];
                        $funcConf['parentObj'] = $this;
                        $passVar = $GLOBALS['TSFE']->cObj->callUserFunction($this->conf[$mConfKey], $funcConf, $passVar);
@@ -702,8 +702,8 @@ class user_feAdmin  {
         * @return      mixed           Processed input variable, $passVar
         * @see userProcess(), save(), modifyDataArrForFormUpdate()
         */
-       function userProcess_alt($confVal,$confArr,$passVar)    {
-               if ($confVal)   {
+       function userProcess_alt($confVal,$confArr,$passVar) {
+               if ($confVal) {
                        $funcConf = $confArr;
                        $funcConf['parentObj'] = $this;
                        $passVar = $GLOBALS['TSFE']->cObj->callUserFunction($confVal, $funcConf, $passVar);
@@ -744,14 +744,14 @@ class user_feAdmin        {
         * @return      void
         * @see init()
         */
-       function save() {
-               switch($this->cmd)      {
+       function save() {
+               switch($this->cmd) {
                        case 'edit':
                                $theUid = $this->dataArr['uid'];
                                $origArr = $GLOBALS['TSFE']->sys_page->getRawRecord($this->theTable,$theUid);           // Fetches the original record to check permissions
                                if ($this->conf['edit'] && ($GLOBALS['TSFE']->loginUser || $this->aCAuth($origArr)))    {       // Must be logged in in order to edit  (OR be validated by email)
                                        $newFieldList = implode(',',array_intersect(explode(',',$this->fieldList),t3lib_div::trimExplode(',',$this->conf['edit.']['fields'],1)));
-                                       if ($this->aCAuth($origArr) || $this->cObj->DBmayFEUserEdit($this->theTable,$origArr,$GLOBALS['TSFE']->fe_user->user,$this->conf['allowedGroups'],$this->conf['fe_userEditSelf']))      {
+                                       if ($this->aCAuth($origArr) || $this->cObj->DBmayFEUserEdit($this->theTable,$origArr,$GLOBALS['TSFE']->fe_user->user,$this->conf['allowedGroups'],$this->conf['fe_userEditSelf'])) {
                                                $this->cObj->DBgetUpdate($this->theTable, $theUid, $this->dataArr, $newFieldList, TRUE);
                                                $this->currentArr = $GLOBALS['TSFE']->sys_page->getRawRecord($this->theTable,$theUid);
                                                $this->userProcess_alt($this->conf['edit.']['userFunc_afterSave'],$this->conf['edit.']['userFunc_afterSave.'],array('rec'=>$this->currentArr, 'origRec'=>$origArr));
@@ -762,7 +762,7 @@ class user_feAdmin  {
                                }
                        break;
                        default:
-                               if ($this->conf['create'])      {
+                               if ($this->conf['create']) {
                                        $newFieldList = implode(',',array_intersect(explode(',',$this->fieldList),t3lib_div::trimExplode(',',$this->conf['create.']['fields'],1)));
                                        $this->cObj->DBgetInsert($this->theTable, $this->thePid, $this->dataArr, $newFieldList, TRUE);
                                        $newId = $GLOBALS['TYPO3_DB']->sql_insert_id();
@@ -775,13 +775,13 @@ class user_feAdmin        {
                                                        $dataArr[$field]=$newId;
                                                        $extraList.=','.$field;
                                                }
-                                               if ($GLOBALS['TCA'][$this->theTable]['ctrl']['fe_crgroup_id'])  {
+                                               if ($GLOBALS['TCA'][$this->theTable]['ctrl']['fe_crgroup_id']) {
                                                        $field=$GLOBALS['TCA'][$this->theTable]['ctrl']['fe_crgroup_id'];
                                                        list($dataArr[$field])=explode(',',$this->dataArr['usergroup']);
                                                        $dataArr[$field]=intval($dataArr[$field]);
                                                        $extraList.=','.$field;
                                                }
-                                               if (count($dataArr))    {
+                                               if (count($dataArr)) {
                                                        $this->cObj->DBgetUpdate($this->theTable, $newId, $dataArr, $extraList, TRUE);
                                                }
                                        }
@@ -802,12 +802,12 @@ class user_feAdmin        {
         * @return      string          void
         * @see init()
         */
-       function deleteRecord() {
+       function deleteRecord() {
                if ($this->conf['delete'])      {       // If deleting is enabled
                        $origArr = $GLOBALS['TSFE']->sys_page->getRawRecord($this->theTable,  $this->recUid);
                        if ($GLOBALS['TSFE']->loginUser || $this->aCAuth($origArr))     {       // Must be logged in OR be authenticated by the aC code in order to delete
                                        // If the recUid selects a record.... (no check here)
-                               if (is_array($origArr)) {
+                               if (is_array($origArr)) {
                                        if ($this->aCAuth($origArr) || $this->cObj->DBmayFEUserEdit($this->theTable,$origArr, $GLOBALS['TSFE']->fe_user->user,$this->conf['allowedGroups'],$this->conf['fe_userEditSelf']))     {       // Display the form, if access granted.
                                                if (!$GLOBALS['TCA'][$this->theTable]['ctrl']['delete'])        {       // If the record is fully deleted... then remove the image (or any file) attached.
                                                        $this->deleteFilesFromRecord($this->recUid);
@@ -832,7 +832,7 @@ class user_feAdmin  {
         * @access private
         * @see deleteRecord()
         */
-       function deleteFilesFromRecord($uid)    {
+       function deleteFilesFromRecord($uid) {
                $table = $this->theTable;
                $rec = $GLOBALS['TSFE']->sys_page->getRawRecord($table,$uid);
 
@@ -840,13 +840,13 @@ class user_feAdmin        {
                t3lib_div::loadTCA($table);
                $iFields=array();
                foreach ($GLOBALS['TCA'][$table]['columns'] as $field => $conf) {
-                       if ($conf['config']['type']=='group' && $conf['config']['internal_type']=='file')       {
+                       if ($conf['config']['type']=='group' && $conf['config']['internal_type']=='file') {
 
                                $GLOBALS['TYPO3_DB']->exec_UPDATEquery($table, 'uid='.intval($uid), array($field => ''));
 
                                $delFileArr = explode(',',$rec[$field]);
                                foreach ($delFileArr as $n) {
-                                       if ($n) {
+                                       if ($n) {
                                                $fpath = $conf['config']['uploadfolder'].'/'.$n;
                                                unlink($fpath);
                                        }
@@ -887,12 +887,12 @@ class user_feAdmin        {
         * @return      string          HTML content
         * @see init()
         */
-       function displayDeleteScreen()  {
+       function displayDeleteScreen() {
                if ($this->conf['delete'])      {       // If deleting is enabled
                        $origArr = $GLOBALS['TSFE']->sys_page->getRawRecord($this->theTable,  $this->recUid);
                        if ($GLOBALS['TSFE']->loginUser || $this->aCAuth($origArr))     {       // Must be logged in OR be authenticated by the aC code in order to delete
                                        // If the recUid selects a record.... (no check here)
-                               if (is_array($origArr)) {
+                               if (is_array($origArr)) {
                                        if ($this->aCAuth($origArr) || $this->cObj->DBmayFEUserEdit($this->theTable,$origArr, $GLOBALS['TSFE']->fe_user->user,$this->conf['allowedGroups'],$this->conf['fe_userEditSelf']))     {       // Display the form, if access granted.
                                                $this->markerArray['###HIDDENFIELDS###'].= '<input type="hidden" name="rU" value="'.$this->recUid.'" />';
                                                $content = $this->getPlainTemplate('###TEMPLATE_DELETE_PREVIEW###', $origArr);
@@ -915,8 +915,8 @@ class user_feAdmin  {
         * @return      string          HTML content
         * @see init()
         */
-       function displayCreateScreen()  {
-               if ($this->conf['create'])      {
+       function displayCreateScreen() {
+               if ($this->conf['create']) {
                        $templateCode = $this->cObj->getSubpart($this->templateCode, ((!$GLOBALS['TSFE']->loginUser || $this->conf['create.']['noSpecialLoginForm'])?'###TEMPLATE_CREATE'.$this->previewLabel.'###':'###TEMPLATE_CREATE_LOGIN'.$this->previewLabel.'###'));
                        $failure = t3lib_div::_GP('noWarnings')?'':$this->failure;
                        if (!$failure)  $templateCode = $this->cObj->substituteSubpart($templateCode, '###SUB_REQUIRED_FIELDS_WARNING###', '');
@@ -942,13 +942,13 @@ class user_feAdmin        {
         * @return      string          HTML content
         * @see init()
         */
-       function displayEditScreen()    {
+       function displayEditScreen() {
                if ($this->conf['edit'])        {       // If editing is enabled
                        $origArr = $GLOBALS['TSFE']->sys_page->getRawRecord($this->theTable,  $this->dataArr['uid']?$this->dataArr['uid']:$this->recUid);
 
                        if ($GLOBALS['TSFE']->loginUser || $this->aCAuth($origArr))     {       // Must be logged in OR be authenticated by the aC code in order to edit
                                        // If the recUid selects a record.... (no check here)
-                               if (is_array($origArr)) {
+                               if (is_array($origArr)) {
                                        if ($this->aCAuth($origArr) || $this->cObj->DBmayFEUserEdit($this->theTable,$origArr, $GLOBALS['TSFE']->fe_user->user,$this->conf['allowedGroups'],$this->conf['fe_userEditSelf']))     {       // Display the form, if access granted.
                                                $content=$this->displayEditForm($origArr);
                                        } else {        // Else display error, that you could not edit that particular record...
@@ -963,7 +963,7 @@ class user_feAdmin  {
                                                $templateCode = $this->getPlainTemplate('###TEMPLATE_EDITMENU###');
                                                $out='';
                                                $itemCode = $this->cObj->getSubpart($templateCode, '###ITEM###');
-                                               while($menuRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))   {
+                                               while($menuRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                                                        $markerArray = $this->cObj->fillInMarkerArray(array(), $menuRow, '', TRUE, 'FIELD_', $this->recInMarkersHSC);
                                                        $markerArray = $this->setCObjects($itemCode,$menuRow,$markerArray,'ITEM_');
                                                        $out.= $this->cObj->substituteMarkerArray($itemCode, $markerArray);
@@ -993,7 +993,7 @@ class user_feAdmin  {
         * @access private
         * @see displayEditScreen()
         */
-       function displayEditForm($origArr)      {
+       function displayEditForm($origArr) {
                $currentArr = is_array($this->dataArr) ? $this->dataArr+$origArr : $origArr;
 
                if ($this->conf['debug'])       debug('displayEditForm(): '.'###TEMPLATE_EDIT'.$this->previewLabel.'###',1);
@@ -1021,24 +1021,24 @@ class user_feAdmin      {
         *
         * @return      string          HTML content displaying the status of the action
         */
-       function procesSetFixed()       {
-               if ($this->conf['setfixed'])    {
+       function procesSetFixed() {
+               if ($this->conf['setfixed']) {
                        $theUid = intval($this->recUid);
                        $origArr = $GLOBALS['TSFE']->sys_page->getRawRecord($this->theTable,  $theUid);
                        $fD = t3lib_div::_GP('fD');
                        $sFK = t3lib_div::_GP('sFK');
 
                        $fieldArr=array();
-                       if (is_array($fD) || $sFK=='DELETE')    {
-                               if (is_array($fD))      {
+                       if (is_array($fD) || $sFK=='DELETE') {
+                               if (is_array($fD)) {
                                        foreach ($fD as $field => $value) {
                                                $origArr[$field]=$value;
                                                $fieldArr[]=$field;
                                        }
                                }
                                $theCode = $this->setfixedHash($origArr,$origArr['_FIELDLIST']);
-                               if (!strcmp($this->authCode,$theCode))  {
-                                       if ($sFK=='DELETE')     {
+                               if (!strcmp($this->authCode,$theCode)) {
+                                       if ($sFK=='DELETE') {
                                                $this->cObj->DBgetDelete($this->theTable, $theUid, TRUE);
                                        } else {
                                                $newFieldList = implode(',',array_intersect(t3lib_div::trimExplode(',',$this->fieldList),t3lib_div::trimExplode(',',implode($fieldArr,','),1)));
@@ -1109,9 +1109,9 @@ class user_feAdmin        {
         * @param       string          Comma list of fields which has errors (and therefore should not be removed)
         * @return      string          The processed template HTML code
         */
-       function removeRequired($templateCode,$failure) {
+       function removeRequired($templateCode,$failure) {
                foreach ($this->requiredArr as $theField) {
-                       if (!t3lib_div::inList($failure,$theField))     {
+                       if (!t3lib_div::inList($failure,$theField)) {
                                $templateCode = $this->cObj->substituteSubpart($templateCode, '###SUB_REQUIRED_FIELD_'.$theField.'###', '');
                        }
                }
@@ -1126,7 +1126,7 @@ class user_feAdmin        {
         * @return      string          The subpart with all markers found in current $this->markerArray substituted.
         * @see tslib_cObj::fillInMarkerArray()
         */
-       function getPlainTemplate($key,$r='')   {
+       function getPlainTemplate($key,$r='') {
                if ($this->conf['debug'])       debug('getPlainTemplate(): '.$key,1);
                $templateCode = $this->cObj->getSubpart($this->templateCode, $key);
                $this->setCObjects($templateCode,is_array($r)?$r:array());
@@ -1143,17 +1143,17 @@ class user_feAdmin      {
         * @return      array           The processed input array
         * @see displayCreateScreen(), displayEditForm(), tslib_cObj::getUpdateJS()
         */
-       function modifyDataArrForFormUpdate($inputArr)  {
-               if (is_array($this->conf[$this->cmdKey.'.']['evalValues.']))    {
+       function modifyDataArrForFormUpdate($inputArr) {
+               if (is_array($this->conf[$this->cmdKey.'.']['evalValues.'])) {
                        foreach ($this->conf[$this->cmdKey.'.']['evalValues.'] as $theField => $theValue) {
                                $listOfCommands = t3lib_div::trimExplode(',',$theValue,1);
                                foreach ($listOfCommands as $cmd) {
                                        $cmdParts = preg_split('/\[|\]/', $cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
                                        $theCmd = trim($cmdParts[0]);
-                                       switch($theCmd) {
+                                       switch($theCmd) {
                                                case 'twice':
-                                                       if (isset($inputArr[$theField]))        {
-                                                               if (!isset($inputArr[$theField.'_again']))      {
+                                                       if (isset($inputArr[$theField])) {
+                                                               if (!isset($inputArr[$theField.'_again'])) {
                                                                        $inputArr[$theField.'_again'] = $inputArr[$theField];
                                                                }
                                                                $this->additionalUpdateFields.=','.$theField.'_again';
@@ -1163,22 +1163,22 @@ class user_feAdmin      {
                                }
                        }
                }
-               if (is_array($this->conf['parseValues.']))      {
+               if (is_array($this->conf['parseValues.'])) {
                        foreach ($this->conf['parseValues.'] as $theField => $theValue) {
                                $listOfCommands = t3lib_div::trimExplode(',',$theValue,1);
                                foreach ($listOfCommands as $cmd) {
                                        $cmdParts = preg_split('/\[|\]/', $cmd);        // Point is to enable parameters after each command enclosed in brackets [..]. These will be in position 1 in the array.
                                        $theCmd = trim($cmdParts[0]);
-                                       switch($theCmd) {
+                                       switch($theCmd) {
                                                case 'multiple':
-                                                       if (isset($inputArr[$theField]) && !$this->isPreview()) {
+                                                       if (isset($inputArr[$theField]) && !$this->isPreview()) {
                                                                $inputArr[$theField] = explode(',',$inputArr[$theField]);
                                                        }
                                                break;
                                                case 'checkArray':
-                                                       if ($inputArr[$theField] && !$this->isPreview())        {
-                                                               for($a=0;$a<=30;$a++)   {
-                                                                       if ($inputArr[$theField] & pow(2,$a))   {
+                                                       if ($inputArr[$theField] && !$this->isPreview()) {
+                                                               for($a=0;$a<=30;$a++) {
+                                                                       if ($inputArr[$theField] & pow(2,$a)) {
                                                                                $alt_theField = $theField.']['.$a;
                                                                                $inputArr[$alt_theField] = 1;
                                                                                $this->additionalUpdateFields.=','.$alt_theField;
@@ -1210,26 +1210,26 @@ class user_feAdmin      {
         * @param       string          Optional prefix to set for the marker strings.
         * @return      array           The processed $markerArray (if given).
         */
-       function setCObjects($templateCode,$currentArr=array(),$markerArray='',$specialPrefix='')       {
-               if (is_array($this->conf['cObjects.'])) {
+       function setCObjects($templateCode,$currentArr=array(),$markerArray='',$specialPrefix='') {
+               if (is_array($this->conf['cObjects.'])) {
 
                        foreach ($this->conf['cObjects.'] as $theKey => $theConf) {
-                               if (!strstr($theKey,'.'))       {
-                                       if (strstr($templateCode,'###'.$specialPrefix.'CE_'.$theKey.'###'))     {
+                               if (!strstr($theKey,'.')) {
+                                       if (strstr($templateCode,'###'.$specialPrefix.'CE_'.$theKey.'###')) {
                                                $cObjCode = $this->cObj->cObjGetSingle($this->conf['cObjects.'][$theKey], $this->conf['cObjects.'][$theKey.'.'], 'cObjects.'.$theKey);
 
-                                               if (!is_array($markerArray))    {
+                                               if (!is_array($markerArray)) {
                                                        $this->markerArray['###'.$specialPrefix.'CE_'.$theKey.'###'] = $cObjCode;
                                                } else {
                                                        $markerArray['###'.$specialPrefix.'CE_'.$theKey.'###'] = $cObjCode;
                                                }
                                        }
-                                       if (strstr($templateCode,'###'.$specialPrefix.'PCE_'.$theKey.'###'))    {
+                                       if (strstr($templateCode,'###'.$specialPrefix.'PCE_'.$theKey.'###')) {
                                                $local_cObj =t3lib_div::makeInstance('tslib_cObj');
                                                $local_cObj->start(count($currentArr)?$currentArr:$this->dataArr,$this->theTable);
                                                $cObjCode = $local_cObj->cObjGetSingle($this->conf['cObjects.'][$theKey], $this->conf['cObjects.'][$theKey.'.'], 'cObjects.'.$theKey);
 
-                                               if (!is_array($markerArray))    {
+                                               if (!is_array($markerArray)) {
                                                        $this->markerArray['###'.$specialPrefix.'PCE_'.$theKey.'###'] = $cObjCode;
                                                } else {
                                                        $markerArray['###'.$specialPrefix.'PCE_'.$theKey.'###'] = $cObjCode;
@@ -1271,10 +1271,10 @@ class user_feAdmin      {
         * @return      string          HTML content message
         * @see init(),compileMail(), sendMail()
         */
-       function sendInfoMail() {
-               if ($this->conf['infomail'] && $this->conf['email.']['field'])  {
+       function sendInfoMail() {
+               if ($this->conf['infomail'] && $this->conf['email.']['field']) {
                        $fetch = t3lib_div::_GP('fetch');
-                       if ($fetch)     {
+                       if ($fetch) {
                                        // Getting infomail config.
                                $key= trim(t3lib_div::_GP('key'));
                                if (is_array($this->conf['infomail.'][$key.'.']))               {
@@ -1283,19 +1283,19 @@ class user_feAdmin      {
                                        $config = $this->conf['infomail.']['default.'];
                                }
                                $pidLock='';
-                               if (!$config['dontLockPid'])    {
+                               if (!$config['dontLockPid']) {
                                        $pidLock='AND pid IN ('.$this->thePid.') ';
                                }
 
                                        // Getting records
-                               if (t3lib_utility_Math::canBeInterpretedAsInteger($fetch))      {
+                               if (t3lib_utility_Math::canBeInterpretedAsInteger($fetch)) {
                                        $DBrows = $GLOBALS['TSFE']->sys_page->getRecordsByField($this->theTable,'uid',$fetch,$pidLock,'','','1');
                                } elseif ($fetch) {     // $this->conf['email.']['field'] must be a valid field in the table!
                                        $DBrows = $GLOBALS['TSFE']->sys_page->getRecordsByField($this->theTable,$this->conf['email.']['field'],$fetch,$pidLock,'','','100');
                                }
 
                                        // Processing records
-                               if (is_array($DBrows))  {
+                               if (is_array($DBrows)) {
                                        $recipient = $DBrows[0][$this->conf['email.']['field']];
                                        $this->compileMail($config['label'], $DBrows, $recipient, $this->conf['setfixed.']);
                                } elseif (t3lib_div::validEmail($fetch)) {
@@ -1319,7 +1319,7 @@ class user_feAdmin        {
         * @param       array           Additional fields to set in the markerArray used in the substitution process
         * @return      void
         */
-       function compileMail($key, $DBrows, $recipient, $setFixedConfig=array())        {
+       function compileMail($key, $DBrows, $recipient, $setFixedConfig=array()) {
                $GLOBALS['TT']->push('compileMail');
                $mailContent='';
                $key = $this->emailMarkPrefix.$key;
@@ -1342,7 +1342,7 @@ class user_feAdmin        {
                if ($userContent['all'])        $userContent['final'] .=$this->cObj->substituteSubpart($userContent['all'], '###SUB_RECORD###', $userContent['accum']);
                if ($adminContent['all'])       $adminContent['final'].=$this->cObj->substituteSubpart($adminContent['all'], '###SUB_RECORD###', $adminContent['accum']);
 
-               if (t3lib_utility_Math::canBeInterpretedAsInteger($recipient))  {
+               if (t3lib_utility_Math::canBeInterpretedAsInteger($recipient)) {
                        $fe_userRec = $GLOBALS['TSFE']->sys_page->getRawRecord('fe_users',$recipient);
                        $recipient=$fe_userRec['email'];
                }
@@ -1365,9 +1365,9 @@ class user_feAdmin        {
         * @access private
         * @see compileMail(), sendInfoMail()
         */
-       function sendMail($recipient, $admin, $content='', $adminContent='')    {
+       function sendMail($recipient, $admin, $content='', $adminContent='') {
                        // Admin mail:
-               if ($admin && $adminContent)    {
+               if ($admin && $adminContent) {
                        if (!$this->isHTMLContent($adminContent) || !$GLOBALS['TSFE']->config['config']['incT3Lib_htmlmail']) {
                                $admMail = $this->cObj->sendNotifyEmail(
                                                                        strip_tags($adminContent),
@@ -1412,7 +1412,7 @@ class user_feAdmin        {
         * @param       string          Content string to test
         * @return      boolean         Returns TRUE if the content begins and ends with <html></html>-tags
         */
-       function isHTMLContent($c)      {
+       function isHTMLContent($c) {
                $c = trim($c);
                $first = strtolower(substr($c,0,6));
                $last = strtolower(substr($c,-7));
@@ -1432,8 +1432,8 @@ class user_feAdmin        {
         * @access private
         * @see sendMail(), tslib_cObj::sendNotifyEmail()
         */
-       function sendHTMLMail($content,$recipient,$dummy,$fromEmail,$fromName,$replyTo='')      {
-               if (trim($recipient) && trim($content)) {
+       function sendHTMLMail($content,$recipient,$dummy,$fromEmail,$fromName,$replyTo='') {
+               if (trim($recipient) && trim($content)) {
                        $parts = preg_split('/<title>|<\/title>/i', $content, 3);
                        $subject = trim($parts[1]) ? trim($parts[1]) : 'TYPO3 FE Admin message';
 
@@ -1510,8 +1510,8 @@ class user_feAdmin        {
         * @return      boolean         TRUE if authenticated OK
         * @see authCode(), init()
         */
-       function aCAuth($r)     {
-               if ($this->authCode && !strcmp($this->authCode,$this->authCode($r)))    {
+       function aCAuth($r) {
+               if ($this->authCode && !strcmp($this->authCode,$this->authCode($r))) {
                        return TRUE;
                }
        }
@@ -1524,16 +1524,16 @@ class user_feAdmin      {
         * @return      string          Hash string of $this->codeLength (if TypoScript "authcodeFields" was set)
         * @see aCAuth()
         */
-       function authCode($r,$extra='') {
+       function authCode($r,$extra='') {
                $l=$this->codeLength;
-               if ($this->conf['authcodeFields'])      {
+               if ($this->conf['authcodeFields']) {
                        $fieldArr = t3lib_div::trimExplode(',', $this->conf['authcodeFields'], 1);
                        $value='';
                        foreach ($fieldArr as $field) {
                                $value.=$r[$field].'|';
                        }
                        $value.=$extra.'|'.$this->conf['authcodeFields.']['addKey'];
-                       if ($this->conf['authcodeFields.']['addDate'])  {
+                       if ($this->conf['authcodeFields.']['addDate']) {
                                $value.='|'.date($this->conf['authcodeFields.']['addDate']);
                        }
                        $value.=$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
@@ -1550,18 +1550,18 @@ class user_feAdmin      {
         * @return      array           Processed $markerArray
         * @see compileMail()
         */
-       function setfixed($markerArray, $setfixed, $r)  {
-               if (is_array($setfixed))        {
+       function setfixed($markerArray, $setfixed, $r) {
+               if (is_array($setfixed)) {
                        foreach ($setfixed as $theKey => $data) {
-                               if (!strcmp($theKey,'DELETE'))  {
+                               if (!strcmp($theKey,'DELETE')) {
                                        $recCopy = $r;
                                        $string='&cmd=setfixed&sFK='.rawurlencode($theKey).'&rU='.$r['uid'];