[TASK] Harmonize coding style of if constructs in /typo3/sysext/cms/
authorRoland Waldner <most.wanted@gmx.at>
Wed, 6 Jun 2012 11:30:33 +0000 (13:30 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 11 Jun 2012 18:15:44 +0000 (20:15 +0200)
Change-Id: Ie934ab73b9c24f2f383d15a2f5f91347382ea48b
Resolves: #37789
Releases: 6.0
Reviewed-on: http://review.typo3.org/11849
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
24 files changed:
typo3/sysext/cms/layout/db_layout.php
typo3/sysext/cms/layout/db_new_content_el.php
typo3/sysext/cms/tslib/class.tslib_adminpanel.php
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/class.tslib_fe.php
typo3/sysext/cms/tslib/class.tslib_feuserauth.php
typo3/sysext/cms/tslib/class.tslib_gifbuilder.php
typo3/sysext/cms/tslib/class.tslib_menu.php
typo3/sysext/cms/tslib/class.tslib_pibase.php
typo3/sysext/cms/tslib/content/class.tslib_content_case.php
typo3/sysext/cms/tslib/content/class.tslib_content_columns.php
typo3/sysext/cms/tslib/content/class.tslib_content_fluidtemplate.php
typo3/sysext/cms/tslib/content/class.tslib_content_form.php
typo3/sysext/cms/tslib/content/class.tslib_content_horizontalruler.php
typo3/sysext/cms/tslib/content/class.tslib_content_imagetext.php
typo3/sysext/cms/tslib/content/class.tslib_content_loadregister.php
typo3/sysext/cms/tslib/content/class.tslib_content_multimedia.php
typo3/sysext/cms/tslib/content/class.tslib_content_quicktimeobject.php
typo3/sysext/cms/tslib/content/class.tslib_content_scalablevectorgraphics.php
typo3/sysext/cms/tslib/content/class.tslib_content_shockwaveflashobject.php
typo3/sysext/cms/tslib/content/class.tslib_content_template.php
typo3/sysext/cms/tslib/content/class.tslib_content_text.php
typo3/sysext/cms/tslib/hooks/class.tx_cms_treelistcacheupdate.php
typo3/sysext/cms/tslib/index_ts.php

index ff2809a..5800ab6 100755 (executable)
@@ -487,11 +487,11 @@ class SC_db_layout {
                        if (!strcmp($this->colPosList, '')) {
                                $backendLayout = t3lib_div::callUserFunction( 'EXT:cms/classes/class.tx_cms_backendlayout.php:tx_cms_BackendLayout->getSelectedBackendLayout', $this->id, $this );
 
-                               if(count($backendLayout['__colPosList'])) {
+                               if (count($backendLayout['__colPosList'])) {
                                        $this->colPosList = implode(',', $backendLayout['__colPosList']);
                                }
                        }
-                       if( !strcmp($this->colPosList, '') ){
+                       if (!strcmp($this->colPosList, '')) {
                                $this->colPosList = '1,0,2,3';
                        }
                        $this->colPosList = implode(',', array_unique(t3lib_div::intExplode(',', $this->colPosList)));          // Removing duplicates, if any
@@ -1239,13 +1239,13 @@ class SC_db_layout {
                                        '</a>';
 
                                        // Delete record
-                               if($this->deleteButton) {
+                               if ($this->deleteButton) {
                                        $buttons['deletedok'] = '<a href="#" onclick="' . htmlspecialchars('return deleteRecord(\'' . $this->eRParts[0] . '\',\'' . $this->eRParts[1] . '\',\'' . t3lib_div::getIndpEnv('SCRIPT_NAME') . '?id=' . $this->id . '\');') . '" title="' . $GLOBALS['LANG']->getLL('deleteItem', TRUE) . '">' .
                                                        t3lib_iconWorks::getSpriteIcon('actions-edit-delete') .
                                                '</a>';
                                }
 
-                               if($this->undoButton) {
+                               if ($this->undoButton) {
                                                // Undo button
                                        $buttons['undo'] = '<a href="#"
                                                onclick="' . htmlspecialchars('window.location.href=\'' . $GLOBALS['BACK_PATH'] . 'show_rechis.php?element=' . rawurlencode($this->eRParts[0] . ':' . $this->eRParts[1]) . '&revert=ALL_FIELDS&sumUp=-1&returnUrl=' . rawurlencode($this->R_URI) . '\'; return false;') . '"
index 8850571..2fc9392 100644 (file)
@@ -232,11 +232,11 @@ class SC_db_new_content_el {
 
 
                                // Hook for manipulating wizardItems, wrapper, onClickEvent etc.
-                       if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'])) {
+                       if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'])) {
                                foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'] as $classData) {
                                        $hookObject = t3lib_div::getUserObj($classData);
 
-                                       if(!($hookObject instanceof cms_newContentElementWizardsHook)) {
+                                       if (!($hookObject instanceof cms_newContentElementWizardsHook)) {
                                                throw new UnexpectedValueException('$hookObject must implement interface cms_newContentElementWizardItemsHook', 1227834741);
                                        }
 
index 5b01bee..e344dec 100644 (file)
@@ -111,7 +111,7 @@ class tslib_AdminPanel {
                // Include BE styles
                $GLOBALS['TSFE']->includeTCA();
 
-               if(!empty($GLOBALS['TBE_STYLES']['stylesheets']['admPanel'])) {
+               if (!empty($GLOBALS['TBE_STYLES']['stylesheets']['admPanel'])) {
                        $result =       '<link rel="stylesheet" type="text/css" href="' .
                                htmlspecialchars(t3lib_div::locationHeaderUrl($GLOBALS['TBE_STYLES']['stylesheets']['admPanel'])) .
                                '" />';
index de133c2..8a95cd5 100644 (file)
@@ -1177,7 +1177,7 @@ class tslib_cObj {
 
 
                        $altParam = $this->getAltParam($conf);
-                       if($conf['params'] && !isset($conf['params.'])) {
+                       if ($conf['params'] && !isset($conf['params.'])) {
                                $params = ' ' . $conf['params'];
                        } else {
                                $params = isset($conf['params.'])
@@ -1202,7 +1202,7 @@ class tslib_cObj {
                        $wrap = isset($conf['wrap.'])
                                ? $this->stdWrap($conf['wrap'], $conf['wrap.'])
                                : $conf['wrap'];
-                       if($wrap) {
+                       if ($wrap) {
                                $theValue = $this->wrap($theValue, $conf['wrap']);
                        }
                        return $theValue;
@@ -1242,7 +1242,7 @@ class tslib_cObj {
                        : $conf['enable'];
                if ($enable) {
                        $content = $this->typolink($string, $conf['typolink.']);
-                       if(isset($conf['file.'])) {
+                       if (isset($conf['file.'])) {
                                $imageFile = $this->stdWrap($imageFile, $conf['file.']);
                        }
 
@@ -1259,7 +1259,7 @@ class tslib_cObj {
                                }
 
                                foreach ($parameterNames as $parameterName) {
-                                       if(isset($conf[$parameterName.'.'])) {
+                                       if (isset($conf[$parameterName.'.'])) {
                                                $conf[$parameterName] = $this->stdWrap($conf[$parameterName], $conf[$parameterName.'.']);
                                        }
                                        if (isset($conf[$parameterName]) && $conf[$parameterName]) {
@@ -1351,7 +1351,7 @@ class tslib_cObj {
                                        $string = $this->typoLink($string, $conf['linkParams.']);
                                }
 
-                               if(isset($conf['stdWrap.'])) {
+                               if (isset($conf['stdWrap.'])) {
                                        $string = $this->stdWrap($string, $conf['stdWrap.']);
                                }
 
@@ -1954,7 +1954,7 @@ class tslib_cObj {
                                                        $singleConf
                                                );
                                        // for booleans we have to mark the function as executed in any case, even if it has been 0, '' or false to avoid a second call based on the functionProperties, which would always be true
-                                       } elseif($functionType == 'boolean' && !$conf[$functionName]) {
+                                       } elseif ($functionType == 'boolean' && !$conf[$functionName]) {
                                                $isExecuted[$functionName] = TRUE;
                                                $isExecuted[$functionProperties] = TRUE;
                                        }
@@ -3171,7 +3171,7 @@ class tslib_cObj {
         */
        public function stdWrap_editIcons($content = '', $conf = array()) {
                if ($GLOBALS['TSFE']->beUserLogin && $conf['editIcons']) {
-                       if(!is_array($conf['editIcons.'])) {
+                       if (!is_array($conf['editIcons.'])) {
                                $conf['editIcons.'] = array();
                        }
                        $content = $this->editIcons($content, $conf['editIcons'], $conf['editIcons.']);
@@ -3913,21 +3913,21 @@ class tslib_cObj {
 
                        // Fonttag
                $theFace = $conf['face.'][$face];
-               if(!$theFace) {
+               if (!$theFace) {
                        $theFace = isset($conf['face.']['default.'])
                                ? $this->stdWrap($conf['face.']['default'], $conf['face.']['default.'])
                                : $conf['face.']['default'];
                }
 
                $theSize = $conf['size.'][$size];
-               if(!$theSize) {
+               if (!$theSize) {
                        $theSize = isset($conf['size.']['default.'])
                                ? $this->stdWrap($conf['size.']['default'], $conf['size.']['default.'])
                                : $conf['size.']['default'];
                }
 
                $theColor = $conf['color.'][$color];
-               if(!$theColor) {
+               if (!$theColor) {
                        $theColor = isset($conf['color.']['default.'])
                                ? $this->stdWrap($conf['color.']['default'], $conf['color.']['default.'])
                                : $conf['color.']['default.'];
@@ -4183,7 +4183,7 @@ class tslib_cObj {
                        if ($conf['removePrependedNumbers']) {
                                $theValue = preg_replace('/_[0-9][0-9](\.[[:alnum:]]*)$/', '\1', $theValue);
                        }
-                       if(isset($conf['labelStdWrap.'])) {
+                       if (isset($conf['labelStdWrap.'])) {
                                $theValue = $this->stdWrap($theValue, $conf['labelStdWrap.']);
                        }
 
@@ -4215,7 +4215,7 @@ class tslib_cObj {
                                        // output
                                $output = $icon . $file . $size;
                        }
-                       if(isset($conf['stdWrap.'])) {
+                       if (isset($conf['stdWrap.'])) {
                                $output = $this->stdWrap($output, $conf['stdWrap.']);
                        }
 
@@ -5453,7 +5453,7 @@ class tslib_cObj {
                                        return $fileObject->getUid();
                                        break;
                                case 'originalUid':
-                                       if($fileObject instanceof t3lib_file_FileReference) {
+                                       if ($fileObject instanceof t3lib_file_FileReference) {
                                                return $fileObject->getOriginalFile()->getUid();
                                        } else {
                                                return NULL;
@@ -5973,7 +5973,7 @@ class tslib_cObj {
                                                        $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
                                                                // Set targetDomain to first found domain record if the target page cannot be reached within the current domain
-                                                       if(
+                                                       if (
                                                                count($foundDomains) > 0 &&
                                                                (
                                                                        (
index 3601b3f..d6b1172 100644 (file)
@@ -1152,10 +1152,10 @@ class tslib_fe {
         * @access private
         */
        function checkPageGroupAccess($row, $groupList=NULL) {
-               if(is_null($groupList)) {
+               if (is_null($groupList)) {
                        $groupList = $this->gr_list;
                }
-               if(!is_array($groupList)) {
+               if (!is_array($groupList)) {
                        $groupList = explode(',', $groupList);
                }
                $pageGroupList = explode(',', $row['fe_group'] ? $row['fe_group'] : 0);
@@ -1348,7 +1348,7 @@ class tslib_fe {
         * @return      boolean         TRUE/FALSE whether the pageUnavailable_handler should be used.
         */
        function checkPageUnavailableHandler() {
-               if($this->TYPO3_CONF_VARS['FE']['pageUnavailable_handling'] &&
+               if ($this->TYPO3_CONF_VARS['FE']['pageUnavailable_handling'] &&
                        !t3lib_div::cmpIP(t3lib_div::getIndpEnv('REMOTE_ADDR'), $this->TYPO3_CONF_VARS['SYS']['devIPmask'])) {
                        $checkPageUnavailableHandler = TRUE;
                } else {
@@ -3602,7 +3602,7 @@ if (version == "n3") {
         * @return string stripped address
         */
        protected function stripIPv6($strIP) {
-               if(isset($this->config['config']['stat_IP_anonymize_mask_ipv6'])) {
+               if (isset($this->config['config']['stat_IP_anonymize_mask_ipv6'])) {
                        $netPrefix = intval($this->config['config']['stat_IP_anonymize_mask_ipv6']);
                } else {
                        $netPrefix = 64;
@@ -3633,7 +3633,7 @@ if (version == "n3") {
         * @return string  stripped IP address
         */
        protected function stripIPv4($strIP) {
-               if(isset($this->config['config']['stat_IP_anonymize_mask_ipv4'])) {
+               if (isset($this->config['config']['stat_IP_anonymize_mask_ipv4'])) {
                        $netPrefix = intval($this->config['config']['stat_IP_anonymize_mask_ipv4']);
                } else {
                        $netPrefix = 24;
@@ -3656,7 +3656,7 @@ if (version == "n3") {
         * @return the host name to log
         */
        public function getLogHostName() {
-               if($this->config['config']['stat_IP_anonymize']) {
+               if ($this->config['config']['stat_IP_anonymize']) {
                                // ignore hostname if IP anonymized
                        $hostName = '<anonymized>';
                } else {
@@ -4258,7 +4258,7 @@ if (version == "n3") {
        function getStorageSiterootPids() {
                $res=array();
 
-               if(!is_array($this->rootLine)) {
+               if (!is_array($this->rootLine)) {
                        return array();
                }
 
@@ -4760,4 +4760,4 @@ if (version == "n3") {
                return $result;
        }
 }
-?>
+?>
\ No newline at end of file
index d0dee3a..0e5ce1d 100644 (file)
@@ -196,19 +196,19 @@ 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 ($GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 0 || $GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 1) {
                        if ($this->getMethodEnabled) {
                                $isPermanent = t3lib_div::_GP($this->formfield_permanent);
                        } else {
                                $isPermanent = t3lib_div::_POST($this->formfield_permanent);
                        }
-                       if(strlen($isPermanent) != 1) {
+                       if (strlen($isPermanent) != 1) {
                                $isPermanent = $GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'];
-                       } elseif(!$isPermanent) {
+                       } elseif (!$isPermanent) {
                                $this->forceSetCookie = TRUE; // To make sure the user gets a session cookie and doesn't keep a possibly existing time based cookie, we need to force seeting the session cookie here
                        }
                        $isPermanent = $isPermanent?1:0;
-               } elseif($GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 2) {
+               } elseif ($GLOBALS['TYPO3_CONF_VARS']['FE']['permalogin'] == 2) {
                        $isPermanent = 1;
                } else {
                        $isPermanent = 0;
index 5685e32..845fd44 100644 (file)
@@ -160,10 +160,10 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                        : explode('|', trim($this->setup['transparentColor']));
                        }
 
-                       if(isset($this->setup['transparentBackground.'])) {
+                       if (isset($this->setup['transparentBackground.'])) {
                                $this->setup['transparentBackground'] = $this->cObj->stdWrap($this->setup['transparentBackground'], $this->setup['transparentBackground.']);
                        }
-                       if(isset($this->setup['reduceColors.'])) {
+                       if (isset($this->setup['reduceColors.'])) {
                                $this->setup['reduceColors'] = $this->cObj->stdWrap($this->setup['reduceColors'], $this->setup['reduceColors.']);
                        }
 
@@ -236,12 +236,12 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                // Calculate offsets on elements
                        $this->setup['XY'] = $this->calcOffset($this->setup['XY']);
 
-                       if(isset($this->setup['offset.'])) {
+                       if (isset($this->setup['offset.'])) {
                                $this->setup['offset'] = $this->cObj->stdWrap($this->setup['offset'], $this->setup['offset.']);
                        }
                        $this->setup['offset'] = $this->calcOffset($this->setup['offset']);
 
-                       if(isset($this->setup['workArea.'])) {
+                       if (isset($this->setup['workArea.'])) {
                                $this->setup['workArea'] = $this->cObj->stdWrap($this->setup['workArea'], $this->setup['workArea.']);
                        }
                        $this->setup['workArea'] = $this->calcOffset($this->setup['workArea']);
@@ -253,7 +253,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                        switch($theValue) {
                                                case 'TEXT':
                                                case 'IMAGE':
-                                                       if(isset($this->setup[$theKey.'.']['offset.'])) {
+                                                       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']) {
@@ -262,7 +262,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                break;
                                                case 'BOX':
                                                case 'ELLIPSE':
-                                                       if(isset($this->setup[$theKey.'.']['dimensions.'])) {
+                                                       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']) {
@@ -270,7 +270,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                        }
                                                break;
                                                case 'WORKAREA':
-                                                       if(isset($this->setup[$theKey.'.']['set.'])) {
+                                                       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']) {
@@ -278,7 +278,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                        }
                                                break;
                                                case 'CROP':
-                                                       if(isset($this->setup[$theKey.'.']['crop.'])) {
+                                                       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']) {
@@ -286,13 +286,13 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                        }
                                                break;
                                                case 'SCALE':
-                                                       if(isset($this->setup[$theKey.'.']['width.'])) {
+                                                       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']) {
                                                                $this->setup[$theKey.'.']['width'] = $this->calcOffset($this->setup[$theKey.'.']['width']);
                                                        }
-                                                       if(isset($this->setup[$theKey.'.']['height.'])) {
+                                                       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']) {
@@ -406,7 +406,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                        $isStdWrapped = array();
                                        foreach($conf as $key => $value) {
                                                $parameter = rtrim($key,'.');
-                                               if(!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
+                                               if (!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
                                                        $conf[$parameter] = $this->cObj->stdWrap($conf[$parameter], $conf[$parameter.'.']);
                                                        $isStdWrapped[$parameter] = 1;
                                                }
@@ -428,7 +428,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                                        $isStdWrapped = array();
                                                                        foreach($conf['shadow.'] as $key => $value) {
                                                                                $parameter = rtrim($key, '.');
-                                                                               if(!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
+                                                                               if (!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
                                                                                        $conf['shadow.'][$parameter] = $this->cObj->stdWrap($conf[$parameter], $conf[$parameter.'.']);
                                                                                        $isStdWrapped[$parameter] = 1;
                                                                                }
@@ -439,7 +439,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                                        $isStdWrapped = array();
                                                                        foreach($conf['emboss.'] as $key => $value) {
                                                                                $parameter = rtrim($key, '.');
-                                                                               if(!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
+                                                                               if (!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
                                                                                        $conf['emboss.'][$parameter] = $this->cObj->stdWrap($conf[$parameter], $conf[$parameter.'.']);
                                                                                        $isStdWrapped[$parameter] = 1;
                                                                                }
@@ -450,7 +450,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                                        $isStdWrapped = array();
                                                                        foreach($conf['outline.'] as $key => $value) {
                                                                                $parameter = rtrim($key, '.');
-                                                                               if(!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
+                                                                               if (!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
                                                                                        $conf['outline.'][$parameter] = $this->cObj->stdWrap($conf[$parameter], $conf[$parameter.'.']);
                                                                                        $isStdWrapped[$parameter] = 1;
                                                                                }
@@ -575,7 +575,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                $isStdWrapped = array();
                foreach($conf as $key => $value) {
                        $parameter = rtrim($key, '.');
-                       if(!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
+                       if (!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
                                $conf[$parameter] = $cObj->stdWrap($conf[$parameter], $conf[$parameter . '.']);
                                $isStdWrapped[$parameter] = 1;
                        }
index d4dbd33..c4fbc24 100644 (file)
@@ -171,7 +171,7 @@ class tslib_menu {
                        }
 
                                // 'not in menu' doktypes
-                       if($this->conf['excludeDoktypes']) {
+                       if ($this->conf['excludeDoktypes']) {
                                $this->doktypeExcludeList = $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['excludeDoktypes']);
                        }
                                // EntryLevel
@@ -1220,7 +1220,7 @@ class tslib_menu {
                $targetIsType = $LD['target'] && (string) intval($LD['target']) == trim($LD['target']) ? intval($LD['target']) : FALSE;
                if (preg_match('/([0-9]+[\s])?(([0-9]+)x([0-9]+))?(:.+)?/s', $LD['target'], $matches) || $targetIsType) {
                                // has type?
-                       if(intval($matches[1]) || $targetIsType) {
+                       if (intval($matches[1]) || $targetIsType) {
                                $LD['totalURL'] = $this->parent_cObj->URLqMark(
                                        $LD['totalURL'],
                                        '&type=' . ($targetIsType ? $targetIsType : intval($matches[1]))
@@ -1789,7 +1789,7 @@ class tslib_tmenu extends tslib_menu {
 
                                        // Make link tag
                                $this->I['val']['ATagParams'] = $this->WMcObj->getATagParams($this->I['val']);
-                               if(isset($this->I['val']['additionalParams.'])) {
+                               if (isset($this->I['val']['additionalParams.'])) {
                                        $this->I['val']['additionalParams'] = $this->WMcObj->stdWrap($this->I['val']['additionalParams'], $this->I['val']['additionalParams.']);
                                }
                                $this->I['linkHREF'] = $this->link($key, $this->I['val']['altTarget'], $this->mconf['forceTypeValue']);
@@ -2757,7 +2757,7 @@ class tslib_imgmenu extends tslib_menu {
                                                                        if (is_array($theValArr['imgMap.']['altText.'])) {
                                                                                $cObj =t3lib_div::makeInstance('tslib_cObj');
                                                                                $cObj->start($cObjData, 'pages');
-                                                                               if(isset($theValArr['imgMap.']['altText.'])) {
+                                                                               if (isset($theValArr['imgMap.']['altText.'])) {
                                                                                        $theValArr['imgMap.']['altText'] = $cObj->stdWrap($theValArr['imgMap.']['altText'], $theValArr['imgMap.']['altText.']);
                                                                                }
                                                                                unset($theValArr['imgMap.']['altText.']);
@@ -2765,7 +2765,7 @@ class tslib_imgmenu extends tslib_menu {
                                                                        if (is_array($theValArr['imgMap.']['titleText.'])) {
                                                                                $cObj =t3lib_div::makeInstance('tslib_cObj');
                                                                                $cObj->start($cObjData, 'pages');
-                                                                               if(isset($theValArr['imgMap.']['titleText.'])) {
+                                                                               if (isset($theValArr['imgMap.']['titleText.'])) {
                                                                                        $theValArr['imgMap.']['titleText'] = $cObj->stdWrap($theValArr['imgMap.']['titleText'], $theValArr['imgMap.']['titleText.']);
                                                                                }
                                                                                unset($theValArr['imgMap.']['titleText.']);
index f7ce948..eb5dae3 100644 (file)
@@ -730,7 +730,7 @@ class tslib_pibase {
        </div>
        ';
 
-               if(!$GLOBALS['TSFE']->config['config']['disablePrefixComment']) {
+               if (!$GLOBALS['TSFE']->config['config']['disablePrefixComment']) {
                        $content = '
 
 
index 66e8f44..a68fc4a 100644 (file)
@@ -43,7 +43,7 @@ class tslib_content_Case extends tslib_content_Abstract {
        public function render($conf = array()) {
                if ($this->cObj->checkIf($conf['if.'])) {
                        $setCurrent = isset($conf['setCurrent.']) ? $this->cObj->stdWrap($conf['setCurrent'], $conf['setCurrent.']) : $conf['setCurrent'];
-                       if($setCurrent) {
+                       if ($setCurrent) {
                                $this->cObj->data[$this->cObj->currentValKey] = $setCurrent;
                        }
                        $key = isset($conf['key.']) ? $this->cObj->stdWrap($conf['key'], $conf['key.']) : $conf['key'];
index d87d29d..30f49c8 100644 (file)
@@ -110,7 +110,7 @@ class tslib_content_Columns extends tslib_content_Abstract {
                        }
                        $content = '<tr>' . $content . '</tr>';
                        $content = '<table' . $tableParams . '>' . $content . '</table>';
-                       if($conf['after'] || isset($conf['after.'])) {
+                       if ($conf['after'] || isset($conf['after.'])) {
                                $content .= $this->cObj->cObjGetSingle($conf['after'], $conf['after.'], 'after');
                        }
                        if (isset($conf['stdWrap.'])) {
index a52aa7d..a38f032 100644 (file)
@@ -81,7 +81,7 @@ class tslib_content_FluidTemplate extends tslib_content_Abstract {
                $layoutRootPath = isset($conf['layoutRootPath.'])
                        ? $this->cObj->stdWrap($conf['layoutRootPath'], $conf['layoutRootPath.'])
                        : $conf['layoutRootPath'];
-               if($layoutRootPath) {
+               if ($layoutRootPath) {
                        $layoutRootPath = t3lib_div::getFileAbsFileName($layoutRootPath);
                        $view->setLayoutRootPath($layoutRootPath);
                }
@@ -90,7 +90,7 @@ class tslib_content_FluidTemplate extends tslib_content_Abstract {
                $partialRootPath = isset($conf['partialRootPath.'])
                        ? $this->cObj->stdWrap($conf['partialRootPath'], $conf['partialRootPath.'])
                        : $conf['partialRootPath'];
-               if($partialRootPath) {
+               if ($partialRootPath) {
                        $partialRootPath = t3lib_div::getFileAbsFileName($partialRootPath);
                        $view->setPartialRootPath($partialRootPath);
                }
@@ -107,28 +107,28 @@ class tslib_content_FluidTemplate extends tslib_content_Abstract {
                $requestPluginName = isset($conf['extbase.']['pluginName.'])
                        ? $this->cObj->stdWrap($conf['extbase.']['pluginName'], $conf['extbase.']['pluginName.'])
                        : $conf['extbase.']['pluginName'];
-               if($requestPluginName) {
+               if ($requestPluginName) {
                        $view->getRequest()->setPluginName($requestPluginName);
                }
 
                $requestControllerExtensionName = isset($conf['extbase.']['controllerExtensionName.'])
                        ? $this->cObj->stdWrap($conf['extbase.']['controllerExtensionName'], $conf['extbase.']['controllerExtensionName.'])
                        : $conf['extbase.']['controllerExtensionName'];
-               if($requestControllerExtensionName) {
+               if ($requestControllerExtensionName) {
                        $view->getRequest()->setControllerExtensionName($requestControllerExtensionName);
                }
 
                $requestControllerName = isset($conf['extbase.']['controllerName.'])
                        ? $this->cObj->stdWrap($conf['extbase.']['controllerName'], $conf['extbase.']['controllerName.'])
                        : $conf['extbase.']['controllerName'];
-               if($requestControllerName) {
+               if ($requestControllerName) {
                        $view->getRequest()->setControllerName($requestControllerName);
                }
 
                $requestControllerActionName = isset($conf['extbase.']['controllerActionName.'])
                        ? $this->cObj->stdWrap($conf['extbase.']['controllerActionName'], $conf['extbase.']['controllerActionName.'])
                        : $conf['extbase.']['controllerActionName'];
-               if($requestControllerActionName) {
+               if ($requestControllerActionName) {
                        $view->getRequest()->setControllerActionName($requestControllerActionName);
                }
 
@@ -143,7 +143,7 @@ class tslib_content_FluidTemplate extends tslib_content_Abstract {
                        if (is_array($cObjType)) {
                                continue;
                        }
-                       if(!in_array($variableName, $reservedVariables)) {
+                       if (!in_array($variableName, $reservedVariables)) {
                                $view->assign($variableName, $this->cObj->cObjGetSingle($cObjType, $variables[$variableName . '.']));
                        } else {
                                throw new InvalidArgumentException('Cannot use reserved name "' . $variableName . '" as variable name in FLUIDTEMPLATE.', 1288095720);
@@ -157,7 +157,7 @@ class tslib_content_FluidTemplate extends tslib_content_Abstract {
                 */
                $theValue = $view->render();
 
-               if(isset($conf['stdWrap.'])) {
+               if (isset($conf['stdWrap.'])) {
                        $theValue = $this->cObj->stdWrap($theValue, $conf['stdWrap.']);
                }
 
index 871e155..f7a754f 100644 (file)
@@ -492,7 +492,7 @@ class tslib_content_Form extends tslib_content_Abstract {
                                                                ? $this->cObj->stdWrap($conf['radioWrap.']['accessibilityWrap'], $conf['radioWrap.']['accessibilityWrap.'])
                                                                : $conf['radioWrap.']['accessibilityWrap.'];
 
-                                                       if($accessibilityWrap) {
+                                                       if ($accessibilityWrap) {
                                                                $search = array(
                                                                        '###RADIO_FIELD_ID###', '###RADIO_GROUP_LABEL###'
                                                                );
@@ -629,7 +629,7 @@ class tslib_content_Form extends tslib_content_Abstract {
                                        }
 
                                                // Getting template code:
-                                       if(isset($conf['fieldWrap.'])) {
+                                       if (isset($conf['fieldWrap.'])) {
                                                $fieldCode = $this->cObj->stdWrap($fieldCode, $conf['fieldWrap.']);
                                        }
                                        $labelCode = isset($conf['labelWrap.'])
@@ -744,7 +744,7 @@ class tslib_content_Form extends tslib_content_Abstract {
                }
 
                        // Formtype (where to submit to!):
-               if($propertyOverride['type']) {
+               if ($propertyOverride['type']) {
                        $formtype = $propertyOverride['type'];
                } else {
                        $formtype = isset($conf['type.'])
index 876da72..fdc2e04 100644 (file)
@@ -50,7 +50,7 @@ class tslib_content_HorizontalRuler extends tslib_content_Abstract {
                $lineColor = isset($conf['lineColor.'])
                        ? $this->cObj->stdWrap($conf['lineColor'], $conf['lineColor.'])
                        : $conf['lineColor'];
-               if(!$lineColor) {
+               if (!$lineColor) {
                        $lineColor = 'black';
                }
 
@@ -65,7 +65,7 @@ class tslib_content_HorizontalRuler extends tslib_content_Abstract {
                $tableWidth = isset($conf['tableWidth.'])
                        ? intval($this->cObj->stdWrap($conf['tableWidth'], $conf['tableWidth.']))
                        : intval($conf['tableWidth']);
-               if(!$tableWidth) {
+               if (!$tableWidth) {
                        $tableWidth = '99%';
                }
 
index 3d6d8d9..827a712 100644 (file)
@@ -135,18 +135,18 @@ class tslib_content_ImageText extends tslib_content_Abstract {
                                ? 1
                                : 0;
 
-                       if($border) {
+                       if ($border) {
                                $borderColor = isset($conf['borderCol.'])
                                        ? $this->cObj->stdWrap($conf['borderCol'], $conf['borderCol.'])
                                        : $conf['borderCol'];
-                               if(!$borderColor) {
+                               if (!$borderColor) {
                                        $borderColor = 'black';
                                }
 
                                $borderThickness = isset($conf['borderThick.'])
                                        ? intval($this->cObj->stdWrap($conf['borderThick'], $conf['borderThick.']))
                                        : intval($conf['borderThick']);
-                               if(!$borderThickness) {
+                               if (!$borderThickness) {
                                        $borderThickness = 'black';
                                }
                        }
index 0fcac69..d67df01 100644 (file)
@@ -48,11 +48,11 @@ class tslib_content_LoadRegister extends tslib_content_Abstract {
                        $isExecuted = array();
                        foreach ($conf as $theKey => $theValue) {
                                $register = rtrim($theKey, '.');
-                               if(!$isExecuted[$register]) {
+                               if (!$isExecuted[$register]) {
                                        $registerProperties = $register . '.';
-                                       if(isset($conf[$register]) && isset($conf[$registerProperties])) {
+                                       if (isset($conf[$register]) && isset($conf[$registerProperties])) {
                                                $theValue = $this->cObj->stdWrap($conf[$register], $conf[$registerProperties]);
-                                       } elseif(isset($conf[$registerProperties])) {
+                                       } elseif (isset($conf[$registerProperties])) {
                                                $theValue = $this->cObj->stdWrap('', $conf[$registerProperties]);
                                        }
                                        $GLOBALS['TSFE']->register[$register] = $theValue;
index 6821eed..5d0affa 100644 (file)
@@ -58,14 +58,14 @@ class tslib_content_Multimedia extends tslib_content_Abstract {
                                $width = isset($conf['width.'])
                                        ? $this->cObj->stdWrap($conf['width'], $conf['width.'])
                                        : $conf['width'];
-                               if(!$width) {
+                               if (!$width) {
                                        $width = 200;
                                }
 
                                $height = isset($conf['height.'])
                                        ? $this->cObj->stdWrap($conf['height'], $conf['height.'])
                                        : $conf['height'];
-                               if(!$height) {
+                               if (!$height) {
                                        $height = 200;
                                }
 
index 0a545bd..8ad510c 100644 (file)
@@ -89,14 +89,14 @@ class tslib_content_QuicktimeObject extends tslib_content_Abstract {
                $width = isset($conf['width.'])
                        ? $this->cObj->stdWrap($conf['width'], $conf['width.'])
                        : $conf['width'];
-               if(!$width) {
+               if (!$width) {
                        $width = $conf[$type . '.']['defaultWidth'];
                }
 
                $height = isset($conf['height.'])
                        ? $this->cObj->stdWrap($conf['height'], $conf['height.'])
                        : $conf['height'];
-               if(!$height) {
+               if (!$height) {
                        $height = $conf[$type . '.']['defaultHeight'];
                }
 
index df63952..5041564 100644 (file)
@@ -44,20 +44,20 @@ class tslib_content_ScalableVectorGraphics extends tslib_content_Abstract {
                $width = isset($conf['width.'])
                        ? $this->cObj->stdWrap($conf['width'], $conf['width.'])
                        : $conf['width'];
-               if(!$width) {
+               if (!$width) {
                        $width = 600;
                }
                $height = isset($conf['height.'])
                        ? $this->cObj->stdWrap($conf['height'], $conf['height.'])
                        : $conf['height'];
-               if(!$height) {
+               if (!$height) {
                        $height = 400;
                }
 
                $src = isset($conf['src.'])
                        ? $this->cObj->stdWrap($conf['src'], $conf['src.'])
                        : $conf['src'];
-               if(!$src) {
+               if (!$src) {
                        $src = NULL;
                }
                $value = isset($conf['value.'])
index 713d530..b51c4ef 100644 (file)
@@ -64,7 +64,7 @@ class tslib_content_ShockwaveFlashObject extends tslib_content_Abstract {
                $installUrl = isset($conf['installUrl.'])
                        ? $this->cObj->stdWrap($conf['installUrl'], $conf['installUrl.'])
                        : $conf['installUrl'];
-               if(!$installUrl) {
+               if (!$installUrl) {
                        $installUrl = $prefix . TYPO3_mainDir . 'contrib/flashmedia/swfobject/expressInstall.swf';
                }
 
@@ -146,14 +146,14 @@ class tslib_content_ShockwaveFlashObject extends tslib_content_Abstract {
                $width = isset($conf['width.'])
                        ? $this->cObj->stdWrap($conf['width'], $conf['width.'])
                        : $conf['width'];
-               if(!$width) {
+               if (!$width) {
                        $width = $conf[$type . '.']['defaultWidth'];
                }
 
                $height = isset($conf['height.'])
                        ? $this->cObj->stdWrap($conf['height'], $conf['height.'])
                        : $conf['height'];
-               if(!$height) {
+               if (!$height) {
                        $height = $conf[$type . '.']['defaultHeight'];
                }
 
index 8e0213d..0aa05e2 100644 (file)
@@ -49,7 +49,7 @@ class tslib_content_Template extends tslib_content_Abstract {
                $markerWrap = isset($conf['markerWrap.'])
                        ? $this->cObj->stdWrap($conf['markerWrap'], $conf['markerWrap.'])
                        : $conf['markerWrap'];
-               if(!$markerWrap) {
+               if (!$markerWrap) {
                        $markerWrap = '### | ###';
                }
 
index df59e10..25db79c 100644 (file)
@@ -46,7 +46,7 @@ class tslib_content_Text extends tslib_content_Abstract {
                        $content = $conf['value'];
                        unset($conf['value']);
                }
-               if(count($conf)) {
+               if (count($conf)) {
                        $content = $this->cObj->stdWrap($content, $conf);
                }
                return $content;
index 2b7135a..5cff55e 100644 (file)
@@ -310,7 +310,7 @@ class tx_cms_treelistCacheUpdate {
 
                $rootlineIds = array();
                foreach ($rootline as $page) {
-                       if($page['uid'] != 0) {
+                       if ($page['uid'] != 0) {
                                $rootlineIds[] = $page['uid'];
                        }
                }
@@ -424,7 +424,7 @@ class tx_cms_treelistCacheUpdate {
                                                         expiration time. When unsetting the end time the
                                                         page must become listed in the treelist again.
                                                        */
-                                               if($updatedFields['endtime'] > 0) {
+                                               if ($updatedFields['endtime'] > 0) {
                                                        $actions['setExpiration'] = TRUE;
                                                } else {
                                                        $actions['uidInTreelist'] = TRUE;
index 379bff1..77b7162 100644 (file)
@@ -116,7 +116,7 @@ $TSFE = t3lib_div::makeInstance('tslib_fe',
 );
 /** @var $TSFE tslib_fe */
 
-if($TYPO3_CONF_VARS['FE']['pageUnavailable_force'] &&
+if ($TYPO3_CONF_VARS['FE']['pageUnavailable_force'] &&
        !t3lib_div::cmpIP(t3lib_div::getIndpEnv('REMOTE_ADDR'), $TYPO3_CONF_VARS['SYS']['devIPmask'])) {
        $TSFE->pageUnavailableAndExit('This page is temporarily unavailable.');
 }
@@ -377,7 +377,7 @@ if ($sendTSFEContent) {
 // *************
 // Debugging Output
 // *************
-if(isset($error) && is_object($error) && @is_callable(array($error, 'debugOutput'))) {
+if (isset($error) && is_object($error) && @is_callable(array($error, 'debugOutput'))) {
        $error->debugOutput();
 }
 if (TYPO3_DLOG) {