[TASK] CGL FunctionCallArgumentSpacingNoSpaceAfterComma in sysext "cms"
authorRoland Waldner <most.wanted@gmx.at>
Tue, 12 Jun 2012 17:14:09 +0000 (19:14 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 14 Jun 2012 21:13:27 +0000 (23:13 +0200)
Change-Id: I938b2f4780bd1a307105f3b48ca93757171de548
Resolves: #37964
Releases: 6.0
Reviewed-on: http://review.typo3.org/11998
Reviewed-by: Oliver Klee
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
15 files changed:
typo3/sysext/cms/layout/db_layout.php
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/class.tslib_fe.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/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/makeMenu_datedirectory.inc
typo3/sysext/cms/tslib/media/scripts/postit.inc
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/web_info/class.tx_cms_webinfo_lang.php

index 5800ab6..1def5a6 100755 (executable)
@@ -642,7 +642,7 @@ class SC_db_layout {
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                                                '*',
                                                'tt_content',
-                                               'pid='.intval($this->id).' AND colPos='.intval(substr($edit_record,10)).' AND sys_language_uid='.intval($this->current_sys_language).
+                                               'pid=' . intval($this->id) . ' AND colPos=' . intval(substr($edit_record, 10)) . ' AND sys_language_uid=' . intval($this->current_sys_language) .
                                                                ($this->MOD_SETTINGS['tt_content_showHidden'] ? '' : t3lib_BEfunc::BEenableFields('tt_content')).
                                                                t3lib_BEfunc::deleteClause('tt_content').
                                                                t3lib_BEfunc::versioningPlaceholderClause('tt_content'),
@@ -1226,7 +1226,7 @@ class SC_db_layout {
 
                        if ($function == 'quickEdit') {
                                        // Save record
-                               $buttons['savedok'] = '<input class="c-inputButton" type="image" name="savedok"' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/savedok.gif','') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', 1) . '" alt="" />';
+                               $buttons['savedok'] = '<input class="c-inputButton" type="image" name="savedok"' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/savedok.gif', '') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDoc', 1) . '" alt="" />';
 
                                        // Save record and show page
                                $buttons['savedokshow'] = '<a href="#" onclick="' . htmlspecialchars('document.editform.redirect.value+=\'&popView=1\'; TBE_EDITOR.checkAndDoSubmit(1); return false;') . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:rm.saveDocShow', TRUE) . '">' .
index 8a95cd5..96ec8a3 100644 (file)
@@ -4882,7 +4882,7 @@ class tslib_cObj {
                        $nWrapped = 0;
                        if (substr($l, 0, 1) == '<' && substr($l, -1) == '>') {
                                $fwParts = explode('>', substr($l, 1), 2);
-                               list($tagName, $tagParams) = explode(' ',$fwParts[0], 2);
+                               list($tagName, $tagParams) = explode(' ', $fwParts[0], 2);
                                if (!$fwParts[1]) {
                                        if (substr($tagName, -1) == '/') {
                                                $tagName = substr($tagName, 0, -1);
@@ -4893,7 +4893,7 @@ class tslib_cObj {
                                                $attrib = t3lib_div::get_tag_attributes('<'.substr($fwParts[0], 0, -1).'>');
                                        }
                                } else {
-                                       $backParts = t3lib_div::revExplode('<', substr($fwParts[1],0,-1), 2);
+                                       $backParts = t3lib_div::revExplode('<', substr($fwParts[1], 0, -1), 2);
                                        $attrib = t3lib_div::get_tag_attributes('<'.$fwParts[0].'>');
                                        $str_content = $backParts[0];
                                        $sameBeginEnd = (substr(strtolower($backParts[1]), 1, strlen($tagName))==strtolower($tagName));
index d6b1172..59c228b 100644 (file)
@@ -3570,7 +3570,7 @@ if (version == "n3") {
                if ($this->config['config']['stat_apache_niceTitle'] == 'utf-8') {
                        $this->config['stat_vars']['pageName'] = str_replace('[path]', $path.'/', $pageName);
                } else {
-                       $this->config['stat_vars']['pageName'] = str_replace('[path]', preg_replace('/[^.[:alnum:]\/_-]/','_', $path.'/'), $pageName);
+                       $this->config['stat_vars']['pageName'] = str_replace('[path]', preg_replace('/[^.[:alnum:]\/_-]/', '_', $path . '/'), $pageName);
                }
        }
 
@@ -3688,7 +3688,7 @@ if (version == "n3") {
         */
        function statistics() {
                if (!empty($this->config['config']['stat']) &&
-                               (!strcmp('',$this->config['config']['stat_typeNumList']) || t3lib_div::inList(str_replace(' ', '', $this->config['config']['stat_typeNumList']), $this->type)) &&
+                               (!strcmp('', $this->config['config']['stat_typeNumList']) || t3lib_div::inList(str_replace(' ', '', $this->config['config']['stat_typeNumList']), $this->type)) &&
                                (empty($this->config['config']['stat_excludeBEuserHits']) || !$this->beUserLogin) &&
                                (empty($this->config['config']['stat_excludeIPList']) || !t3lib_div::cmpIP(t3lib_div::getIndpEnv('REMOTE_ADDR'), str_replace(' ', '', $this->config['config']['stat_excludeIPList'])))) {
 
index 845fd44..012df42 100644 (file)
@@ -405,7 +405,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                if (intval($theKey) && $conf=$this->setup[$theKey.'.']) {
                                        $isStdWrapped = array();
                                        foreach($conf as $key => $value) {
-                                               $parameter = rtrim($key,'.');
+                                               $parameter = rtrim($key, '.');
                                                if (!$isStdWrapped[$parameter] && isset($conf[$parameter.'.'])) {
                                                        $conf[$parameter] = $this->cObj->stdWrap($conf[$parameter], $conf[$parameter.'.']);
                                                        $isStdWrapped[$parameter] = 1;
@@ -433,7 +433,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                                                        $isStdWrapped[$parameter] = 1;
                                                                                }
                                                                        }
-                                                                       $this->makeShadow($this->im,$conf['shadow.'], $this->workArea, $conf);
+                                                                       $this->makeShadow($this->im, $conf['shadow.'], $this->workArea, $conf);
                                                                }
                                                                if (is_array($conf['emboss.'])) {
                                                                        $isStdWrapped = array();
@@ -444,7 +444,7 @@ class tslib_gifBuilder extends t3lib_stdGraphic {
                                                                                        $isStdWrapped[$parameter] = 1;
                                                                                }
                                                                        }
-                                                                       $this->makeEmboss($this->im,$conf['emboss.'], $this->workArea, $conf);
+                                                                       $this->makeEmboss($this->im, $conf['emboss.'], $this->workArea, $conf);
                                                                }
                                                                if (is_array($conf['outline.'])) {
                                                                        $isStdWrapped = array();
index c4fbc24..1ec4815 100644 (file)
@@ -468,7 +468,7 @@ class tslib_menu {
                                                $id_list_arr = Array();
 
                                                foreach($items as $id) {
-                                                       $bA = t3lib_utility_Math::forceIntegerInRange($this->conf['special.']['beginAtLevel'], 0,100);
+                                                       $bA = t3lib_utility_Math::forceIntegerInRange($this->conf['special.']['beginAtLevel'], 0, 100);
                                                        $id_list_arr[] = tslib_cObj::getTreeList(-1*$id, $depth-1+$bA, $bA-1);
                                                }
                                                $id_list = implode(',', $id_list_arr);
@@ -501,7 +501,13 @@ class tslib_menu {
                                                        $extraWhere.=' AND '.$sortField.'>'.($GLOBALS['SIM_ACCESS_TIME']-$maxAge);
                                                }
 
-                                               $res = $this->parent_cObj->exec_getQuery('pages',Array('pidInList'=>'0', 'uidInList'=>$id_list, 'where'=>$sortField.'>=0'.$extraWhere, 'orderBy'=>($altSortFieldValue ? $altSortFieldValue : $sortField.' desc'),'max'=>$limit));
+                                               $res = $this->parent_cObj->exec_getQuery('pages', Array(
+                                                       'pidInList' =>'0',
+                                                       'uidInList' => $id_list,
+                                                       'where' => $sortField . '>=0' . $extraWhere,
+                                                       'orderBy' => ($altSortFieldValue ? $altSortFieldValue : $sortField . ' desc'),
+                                                       'max' => $limit)
+                                               );
                                                while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                                                        $GLOBALS['TSFE']->sys_page->versionOL('pages', $row);
                                                        if (is_array($row)) {
@@ -1262,7 +1268,7 @@ class tslib_menu {
                        $addParams = $this->mconf['showAccessRestrictedPages.']['addParams'];
                        $addParams = str_replace('###RETURN_URL###', rawurlencode($LD['totalURL']), $addParams);
                        $addParams = str_replace('###PAGE_ID###', $page['uid'], $addParams);
-                       $LD = $this->menuTypoLink($thePage,$mainTarget, '', '', '', $addParams, $typeOverride);
+                       $LD = $this->menuTypoLink($thePage, $mainTarget, '', '', '', $addParams, $typeOverride);
                }
        }
 
@@ -3033,7 +3039,8 @@ class tslib_jsmenu extends tslib_menu {
 
                        $spacer = (t3lib_div::inList($this->spacerIDList, $data['doktype'])?1:0);               // if item is a spacer, $spacer is set
                        if ($this->mconf['SPC'] || !$spacer)    {       // If the spacer-function is not enabled, spacers will not enter the $menuArr
-                               if (!t3lib_div::inList($this->doktypeExcludeList,$data['doktype']) && (!$data['nav_hide'] || $this->conf['includeNotInMenu']) && !t3lib_div::inArray($banUidArray, $uid))       {               // Page may not be 'not_in_menu' or 'Backend User Section' + not in banned uid's
+                                       // Page may not be 'not_in_menu' or 'Backend User Section' + not in banned uid's
+                               if (!t3lib_div::inList($this->doktypeExcludeList, $data['doktype']) && (!$data['nav_hide'] || $this->conf['includeNotInMenu']) && !t3lib_div::inArray($banUidArray, $uid))      {
                                        if ($count<$levels) {
                                                $addLines = $this->generate_level($levels, $count+1, $data['uid'], '', $MP_array_sub);
                                        } else {
index eb5dae3..0ae472a 100644 (file)
@@ -525,7 +525,7 @@ class tslib_pibase {
                        } else {
                                // render the resultcount in the "traditional" way using sprintf
                                $resultCountMsg = sprintf(
-                                       str_replace('###SPAN_BEGIN###','<span'.$this->pi_classParam('browsebox-strong').'>', $this->pi_getLL('pi_list_browseresults_displays', 'Displaying results ###SPAN_BEGIN###%s to %s</span> out of ###SPAN_BEGIN###%s</span>')),
+                                       str_replace('###SPAN_BEGIN###', '<span' . $this->pi_classParam('browsebox-strong') . '>', $this->pi_getLL('pi_list_browseresults_displays', 'Displaying results ###SPAN_BEGIN###%s to %s</span> out of ###SPAN_BEGIN###%s</span>')),
                                        $count > 0 ? $pR1 : 0,
                                        min($count, $pR2),
                                        $count);
@@ -559,7 +559,7 @@ class tslib_pibase {
                        <'.trim('table '.$tableParams).'>
                                <tr>
                                        <td><input type="text" name="'.$this->prefixId.'[sword]" value="'.htmlspecialchars($this->piVars['sword']).'"'.$this->pi_classParam('searchbox-sword').' /></td>
-                                       <td><input type="submit" value="'.$this->pi_getLL('pi_list_searchBox_search', 'Search',TRUE).'"'.$this->pi_classParam('searchbox-button').' />'.
+                                       <td><input type="submit" value="' . $this->pi_getLL('pi_list_searchBox_search', 'Search', TRUE) . '"' . $this->pi_classParam('searchbox-button') . ' />'.
                                                '<input type="hidden" name="no_cache" value="1" />'.
                                                '<input type="hidden" name="'.$this->prefixId.'[pointer]" value="" />'.
                                                '</td>
@@ -829,9 +829,9 @@ class tslib_pibase {
                                $tablename = $this->internal['currentTable'];
                        }
                        $conf=array_merge(array(
-                               'beforeLastTag'=>1,
+                               'beforeLastTag' => 1,
                                'iconTitle' => $title
-                       ),$oConf);
+                       ), $oConf);
                        $content=$this->cObj->editIcons($content, $tablename.':'.$fields, $conf, $tablename.':'.$row['uid'], $row, '&viewUrl='.rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')));
                }
                return $content;
@@ -925,7 +925,7 @@ class tslib_pibase {
                        $basePath = 'EXT:' . $this->extKey . '/' . dirname($this->scriptRelPath) . '/locallang.xml';
 
                                // Read the strings in the required charset (since TYPO3 4.2)
-                       $this->LOCAL_LANG = t3lib_div::readLLfile($basePath,$this->LLkey, $GLOBALS['TSFE']->renderCharset);
+                       $this->LOCAL_LANG = t3lib_div::readLLfile($basePath, $this->LLkey, $GLOBALS['TSFE']->renderCharset);
                        if ($this->altLLkey) {
                                $this->LOCAL_LANG = t3lib_div::readLLfile($basePath, $this->altLLkey);
                        }
index 8995cb3..4a6f8e9 100755 (executable)
@@ -207,7 +207,7 @@ class user_feAdmin  {
                        $this->overrideValues();
                        $this->evalValues();
                        if ($this->conf['evalFunc']) {
-                               $this->dataArr = $this->userProcess('evalFunc',$this->dataArr);
+                               $this->dataArr = $this->userProcess('evalFunc', $this->dataArr);
                        }
 
                                // if not preview and no failures, then set data...
@@ -353,16 +353,16 @@ class user_feAdmin        {
                                                        $this->dataArr[$theField] = str_replace(' ', '', $this->dataArr[$theField]);
                                                break;
                                                case 'alpha':
-                                                       $this->dataArr[$theField] = preg_replace('/[^a-zA-Z]/','',$this->dataArr[$theField]);
+                                                       $this->dataArr[$theField] = preg_replace('/[^a-zA-Z]/', '', $this->dataArr[$theField]);
                                                break;
                                                case 'num':
-                                                       $this->dataArr[$theField] = preg_replace('/[^0-9]/','',$this->dataArr[$theField]);
+                                                       $this->dataArr[$theField] = preg_replace('/[^0-9]/', '', $this->dataArr[$theField]);
                                                break;
                                                case 'alphanum':
-                                                       $this->dataArr[$theField] = preg_replace('/[^a-zA-Z0-9]/','',$this->dataArr[$theField]);
+                                                       $this->dataArr[$theField] = preg_replace('/[^a-zA-Z0-9]/', '', $this->dataArr[$theField]);
                                                break;
                                                case 'alphanum_x':
-                                                       $this->dataArr[$theField] = preg_replace('/[^a-zA-Z0-9_-]/','',$this->dataArr[$theField]);
+                                                       $this->dataArr[$theField] = preg_replace('/[^a-zA-Z0-9_-]/', '', $this->dataArr[$theField]);
                                                break;
                                                case 'trim':
                                                        $this->dataArr[$theField] = trim($this->dataArr[$theField]);
@@ -382,7 +382,7 @@ class user_feAdmin  {
                                                break;
                                                case 'multiple':
                                                        if (is_array($this->dataArr[$theField])) {
-                                                               $this->dataArr[$theField] = implode(',',$this->dataArr[$theField]);
+                                                               $this->dataArr[$theField] = implode(',', $this->dataArr[$theField]);
                                                        }
                                                break;
                                                case 'checkArray':
@@ -404,8 +404,8 @@ class user_feAdmin  {
                                                        $hashArray=array();
                                                        foreach ($otherFields as $fN) {
                                                                $vv = $this->dataArr[$fN];
-                                                               $vv = preg_replace('/[[:space:]]/','',$vv);
-                                                               $vv = preg_replace('/[^[:alnum:]]/','',$vv);
+                                                               $vv = preg_replace('/[[:space:]]/', '', $vv);
+                                                               $vv = preg_replace('/[^[:alnum:]]/', '', $vv);
                                                                $vv = strtolower($vv);
                                                                $hashArray[]=$vv;
                                                        }
@@ -432,9 +432,9 @@ class user_feAdmin  {
                $filesArr = array();
 
                if (is_string($this->dataArr[$theField]))       {               // files from preview.
-                       $tmpArr = explode(',',$this->dataArr[$theField]);
+                       $tmpArr = explode(',', $this->dataArr[$theField]);
                        foreach ($tmpArr as $val) {
-                               $valParts = explode('|',$val);
+                               $valParts = explode('|', $val);
                                $filesArr[] = array (
                                        'name'=>$valParts[1],
                                        'tmp_name'=>PATH_site.'typo3temp/'.$valParts[0]
@@ -472,7 +472,7 @@ class user_feAdmin  {
                $this->dataArr[$theField]='';
                $finalFilesArr=array();
                if (count($filesArr)) {
-                       $extArray = t3lib_div::trimExplode(';',strtolower($cmdParts[1]),1);
+                       $extArray = t3lib_div::trimExplode(';', strtolower($cmdParts[1]), 1);
                        $maxSize = intval($cmdParts[3]);
                        foreach ($filesArr as $infoArr) {
                                $fI = pathinfo($infoArr['name']);
@@ -517,7 +517,7 @@ class user_feAdmin  {
                                }
                        }
                                // Implode the list of filenames
-                       $this->dataArr[$theField] = implode(',',$fileNameList);
+                       $this->dataArr[$theField] = implode(',', $fileNameList);
                }
        }
 
@@ -642,7 +642,7 @@ class user_feAdmin  {
                                                        }
                                                break;
                                                case 'inBranch':
-                                                       $pars = explode(';',$cmdParts[1]);
+                                                       $pars = explode(';', $cmdParts[1]);
                                                        if (intval($pars[0])) {
                                                                $pid_list = $this->cObj->getTreeList(
                                                                        intval($pars[0]),
@@ -666,10 +666,11 @@ class user_feAdmin        {
                                                break;
                                        }
                                }
-                               $this->markerArray['###EVAL_ERROR_FIELD_'.$theField.'###'] = is_array($this->failureMsg[$theField]) ? implode('<br />',$this->failureMsg[$theField]) : '';
+                               $this->markerArray['###EVAL_ERROR_FIELD_' . $theField . '###'] = is_array($this->failureMsg[$theField]) ? implode('<br />', $this->failureMsg[$theField]) : '';
                        }
                }
-               $this->failure=implode(',',$tempArr);    //$failure will show which fields were not OK
+                       // $failure will show which fields were not OK
+               $this->failure=implode(',', $tempArr);
        }
 
        /**
@@ -759,7 +760,7 @@ class user_feAdmin  {
                        break;
                        default:
                                if ($this->conf['create']) {
-                                       $newFieldList = implode(',',array_intersect(explode(',', $this->fieldList), t3lib_div::trimExplode(',', $this->conf['create.']['fields'], 1)));
+                                       $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();
 
@@ -773,7 +774,7 @@ class user_feAdmin  {
                                                }
                                                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']);
+                                                       list($dataArr[$field])=explode(',', $this->dataArr['usergroup']);
                                                        $dataArr[$field]=intval($dataArr[$field]);
                                                        $extraList.=','.$field;
                                                }
@@ -840,7 +841,7 @@ class user_feAdmin  {
 
                                $GLOBALS['TYPO3_DB']->exec_UPDATEquery($table, 'uid='.intval($uid), array($field => ''));
 
-                               $delFileArr = explode(',',$rec[$field]);
+                               $delFileArr = explode(',', $rec[$field]);
                                foreach ($delFileArr as $n) {
                                        if ($n) {
                                                $fpath = $conf['config']['uploadfolder'].'/'.$n;
@@ -992,7 +993,9 @@ class user_feAdmin  {
        function displayEditForm($origArr) {
                $currentArr = is_array($this->dataArr) ? $this->dataArr+$origArr : $origArr;
 
-               if ($this->conf['debug'])       debug('displayEditForm(): '.'###TEMPLATE_EDIT'.$this->previewLabel.'###',1);
+               if ($this->conf['debug']) {
+                       debug('displayEditForm(): ###TEMPLATE_EDIT' . $this->previewLabel . '###', 1);
+               }
                $templateCode = $this->cObj->getSubpart($this->templateCode, '###TEMPLATE_EDIT'.$this->previewLabel.'###');
                $failure = t3lib_div::_GP('noWarnings')?'':$this->failure;
                if (!$failure)  {$templateCode = $this->cObj->substituteSubpart($templateCode, '###SUB_REQUIRED_FIELDS_WARNING###', '');}
@@ -1168,7 +1171,7 @@ class user_feAdmin        {
                                        switch($theCmd) {
                                                case 'multiple':
                                                        if (isset($inputArr[$theField]) && !$this->isPreview()) {
-                                                               $inputArr[$theField] = explode(',',$inputArr[$theField]);
+                                                               $inputArr[$theField] = explode(',', $inputArr[$theField]);
                                                        }
                                                break;
                                                case 'checkArray':
@@ -1265,7 +1268,7 @@ class user_feAdmin        {
         * Sends info mail to user
         *
         * @return      string          HTML content message
-        * @see init(),compileMail(), sendMail()
+        * @see init(), compileMail(), sendMail()
         */
        function sendInfoMail() {
                if ($this->conf['infomail'] && $this->conf['email.']['field']) {
@@ -1339,7 +1342,7 @@ class user_feAdmin        {
                if ($adminContent['all'])       $adminContent['final'].=$this->cObj->substituteSubpart($adminContent['all'], '###SUB_RECORD###', $adminContent['accum']);
 
                if (t3lib_utility_Math::canBeInterpretedAsInteger($recipient)) {
-                       $fe_userRec = $GLOBALS['TSFE']->sys_page->getRawRecord('fe_users',$recipient);
+                       $fe_userRec = $GLOBALS['TSFE']->sys_page->getRawRecord('fe_users', $recipient);
                        $recipient=$fe_userRec['email'];
                }
 
@@ -1580,7 +1583,7 @@ class user_feAdmin        {
         * @param       array           The data record
         * @param       string          List of fields to use
         * @return      string          Hash string of $this->codeLength (if TypoScript "authcodeFields" was set)
-        * @see setfixed(),authCode()
+        * @see setfixed(), authCode()
         */
        function setfixedHash($recCopy, $fields='') {
                if ($fields) {
@@ -1591,7 +1594,7 @@ class user_feAdmin        {
                } else {
                        $recCopy_temp=$recCopy;
                }
-               $encStr = implode('|',$recCopy_temp).'|'.$this->conf['authcodeFields.']['addKey'].'|'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
+               $encStr = implode('|', $recCopy_temp) . '|' . $this->conf['authcodeFields.']['addKey'] . '|' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
                $hash = substr(md5($encStr), 0, $this->codeLength);
                return $hash;
        }
index 56a44e9..273e087 100755 (executable)
@@ -149,8 +149,8 @@ class tslib_gmenu_foldout extends tslib_gmenu {
                $mHeight = t3lib_utility_Math::forceIntegerInRange(($this->mconf['menuHeight']?$this->mconf['menuHeight']:400), 0, 3000);
                $insertmColor= $this->mconf['menuBackColor'] ? 'BACKGROUND-COLOR: '.$this->mconf['menuBackColor'].'; layer-background-color: '.$this->mconf['menuBackColor'] : '';
                $insertBottomColor= $this->mconf['bottomBackColor'] ? 'BACKGROUND-COLOR: '.$this->mconf['bottomBackColor'].'; layer-background-color: '.$this->mconf['bottomBackColor'] : '';
-               $menuOffset = t3lib_div::intExplode(',', $this->mconf['menuOffset'].',');
-               $subOffset = t3lib_div::intExplode(',', $this->mconf['subMenuOffset'].',');
+               $menuOffset = t3lib_div::intExplode(',', $this->mconf['menuOffset'] . ',');
+               $subOffset = t3lib_div::intExplode(',', $this->mconf['subMenuOffset'] . ',');
 
 
                $GLOBALS['TSFE']->additionalHeaderData['gmenu_layer_shared']='<script type="text/javascript" src="'.t3lib_extMgm::siteRelPath('cms').'tslib/media/scripts/jsfunc.layermenu.js"></script>';
index 803852c..3fcf1c7 100644 (file)
@@ -101,7 +101,7 @@ class tslib_gmenu_layers extends tslib_gmenu {
 
                        // Save:
                $this->WMonlyOnLoad = ($this->mconf['displayActiveOnLoad'] && !$this->mconf['displayActiveOnLoad.']['onlyOnLoad']);
-               $this->WMbordersWithin = t3lib_div::intExplode(',', $this->mconf['bordersWithin'].',0,0,0,0,0');
+               $this->WMbordersWithin = t3lib_div::intExplode(',', $this->mconf['bordersWithin'] . ',0,0,0,0,0');
        }
 
        /**
index 1cd23d4..bf3f6e2 100755 (executable)
@@ -47,12 +47,17 @@ $menuItemsArray = array();
 
 if ($day==-1) $day=date('w');
 if ($day==date('w')) {
-       $son=mktime(0,0,0,date('m'),date('d'),date('Y'));
+       $son = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
 } else {
        for ($i=1;;$i++) {
-               $son=mktime(0,0,0,date('m'),date('d')-$i,date('Y'));
-               if ($day==date('w',$son)) break;
-               if ($i>100) break;      // Security that it's not an eternal loop.
+               $son = mktime(0, 0, 0, date('m'), date('d') - $i, date('Y'));
+               if ($day == date('w', $son)) {
+                       break;
+               }
+                       // Security that it's not an eternal loop.
+               if ($i > 100) {
+                       break;
+               }
        }
 }
 
@@ -65,10 +70,10 @@ $value=$row['uid'];
 if ($value=='') {
        $value=$GLOBALS['TSFE']->page['uid'];
 }
-$items=t3lib_div::intExplode(',',$value);
+$items = t3lib_div::intExplode(',', $value);
 foreach ($items as $id) {
-       $res = $GLOBALS['TSFE']->cObj->exec_getQuery('pages',Array('pidInList'=>$id,'orderBy'=>$altSortField));
-       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))        {
+       $res = $GLOBALS['TSFE']->cObj->exec_getQuery('pages', Array('pidInList' => $id, 'orderBy' => $altSortField));
+       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                $menuItemsArray[]=$row;
        }
 }
index 53b4f43..8a38fe1 100755 (executable)
@@ -111,18 +111,18 @@ tt_content.splash.20 {
 
 
 
-$data = $this->stdWrap($conf['data'],$conf['data.']);
+$data = $this->stdWrap($conf['data'], $conf['data.']);
 $cols = intval($conf['cols']) ? intval($conf['cols']) : 3;
 
 
-$lines = explode(chr(10),$data);
+$lines = explode(chr(10), $data);
 $imageArr = array();
 foreach ($lines as $key => $content) {
        $content = trim($content);
        if ($content) {
-               $parts = explode('|',$content);
+               $parts = explode('|', $content);
                $text = trim($parts[0]);
-               $type = t3lib_utility_Math::forceIntegerInRange($parts[1],1,3);
+               $type = t3lib_utility_Math::forceIntegerInRange($parts[1], 1, 3);
                $link = trim($parts[2]);
                if ($text) {
                        $imgConf = $conf['images.'][$type.'.'];
@@ -131,7 +131,7 @@ foreach ($lines as $key => $content) {
                        $image = $this->IMAGE($imgConf);
                        if ($image) {
                                $this->setCurrentVal($link);
-                               $imageArr[] = $this->typolink($image,$conf['typolink.']);
+                               $imageArr[] = $this->typolink($image, $conf['typolink.']);
                        }
                }
        }
@@ -154,7 +154,7 @@ if (is_array($imageArr)) {
 
                $content='<table border="0" cellspacing="0" cellpadding="0">'.$res.'</table>';
        } else {
-               $content.=implode($imageArr,'');
+               $content .= implode($imageArr, '');
        }
 }
 
index 95b9eda..eb581a3 100644 (file)
@@ -101,7 +101,7 @@ class tslib_tmenu_layers extends tslib_tmenu {
 
                        // Save:
                $this->WMonlyOnLoad = ($this->mconf['displayActiveOnLoad'] && !$this->mconf['displayActiveOnLoad.']['onlyOnLoad']);
-               $this->WMbordersWithin = t3lib_div::intExplode(',', $this->mconf['bordersWithin'].',0,0,0,0,0');
+               $this->WMbordersWithin = t3lib_div::intExplode(',', $this->mconf['bordersWithin'] . ',0,0,0,0,0');
        }
 
        /**
index ca8a9bc..4fbf9fd 100755 (executable)
@@ -87,7 +87,7 @@ class user_wapversion {
         * @param       array           TypoScript properties for this content object/function call
         * @return      string          WML content
         */
-       function main_wapversion($content,$conf) {
+       function main_wapversion($content, $conf) {
                $GLOBALS['TSFE']->set_no_cache();
 
                $xmlObj = t3lib_div::makeInstance('t3lib_xml', 'wml');
@@ -108,19 +108,23 @@ class user_wapversion {
                        ));
 
                        $cParts = $this->contentAll();
-                       $pointer = t3lib_utility_Math::forceIntegerInRange($GLOBALS['TSFE']->idParts[1],1,10000);
+                       $pointer = t3lib_utility_Math::forceIntegerInRange($GLOBALS['TSFE']->idParts[1], 1, 10000);
 
                        $msg='';
-                       if ($pointer-1) {$msg.=$this->navLink(htmlspecialchars($conf['navLabels.']['prev']),$pointer-1).' ';}
-                       $msg.=$this->navLink(htmlspecialchars($conf['navLabels.']['up']),0).' ';
-                       if ($pointer<count($cParts))    {$msg.=$this->navLink(htmlspecialchars($conf['navLabels.']['next']),$pointer+1).' ';}
+                       if ($pointer - 1)       {
+                               $msg .= $this->navLink(htmlspecialchars($conf['navLabels.']['prev']), $pointer - 1) . ' ';
+                       }
+                       $msg .= $this->navLink(htmlspecialchars($conf['navLabels.']['up']), 0).' ';
+                       if ($pointer < count($cParts)) {
+                               $msg .= $this->navLink(htmlspecialchars($conf['navLabels.']['next']), $pointer + 1) . ' ';
+                       }
                        $msg.= '['.$pointer.'/'.count($cParts).']<br/>';
 
                        $xmlObj->lines[] = $this->paragraph($msg);
                        $xmlObj->lines[] = $this->paragraph($cParts[$pointer-1]);
                        $xmlObj->lines[] = $this->paragraph('<br/>'.$msg);
 
-                       $xmlObj->newLevel('card',0);
+                       $xmlObj->newLevel('card', 0);
                } else {
                                // Creating menu card:
                        $xmlObj->newLevel('card',1,array(
@@ -130,7 +134,7 @@ class user_wapversion {
                        $xmlObj->lines[] = $this->contentAbstract();
                        $xmlObj->lines[] = '<p><br/>'.$this->bold('Menu:').'</p>';
                        $xmlObj->lines[] = $this->menuCurrentLevel($xmlObj->Icode);
-                       $xmlObj->newLevel('card',0);
+                       $xmlObj->newLevel('card', 0);
                }
 
                        // Footer
@@ -147,9 +151,9 @@ class user_wapversion {
        function contentAbstract() {
                $res = $this->getContentResult('tt_content');
                $row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res);
-               $out = $this->bold(t3lib_div::fixed_lgd_cs(htmlspecialchars($row['header']),20)).'<br/>';
-               $out.= t3lib_div::fixed_lgd_cs(htmlspecialchars($row['bodytext']),50);
-               $out = '<p>'.$out.' <a href="'.htmlspecialchars('?id='.$GLOBALS['TSFE']->id.',1.'.$GLOBALS['TSFE']->type).'">[more]</a></p>';
+               $out = $this->bold(t3lib_div::fixed_lgd_cs(htmlspecialchars($row['header']), 20)) . '<br/>' .
+                       t3lib_div::fixed_lgd_cs(htmlspecialchars($row['bodytext']), 50);
+               $out = '<p>' . $out . ' <a href="' . htmlspecialchars('?id=' . $GLOBALS['TSFE']->id . ',1.' . $GLOBALS['TSFE']->type) . '">[more]</a></p>';
                return $out;
        }
 
@@ -183,7 +187,7 @@ class user_wapversion {
                                case 'textpic':
                                case 'image':
                                        if ($row['CType']!='image')             {$bodyText = $row['bodytext'];}
-                                       $bodyText.= chr(10).'['.count(explode(',',$row['image'])).'images, caption: '.$row['imagecaption'].']';
+                                       $bodyText .= chr(10) . '[' . count(explode(',', $row['image'])) . 'images, caption: ' . $row['imagecaption'] . ']';
                                break;
                                case 'header':
                                        $bodyText=$row['subheader'];
@@ -200,12 +204,12 @@ class user_wapversion {
                        if ($diff>strlen($get)) {
                                $out[$idx].=$get;
                        } else {
-                               $out[$idx].=$this->cBodytext($bodyText,0,$diff+$overlap).'<br/>';
+                               $out[$idx] .= $this->cBodytext($bodyText, 0, $diff + $overlap) . '<br/>';
 
                                $safe=0;
                                do {
                                        $idx++;
-                                       $out[$idx].=$this->cBodytext($bodyText,$diff+($safe*$chunkLgd)-$overlap,$chunkLgd+$overlap).'<br/>';
+                                       $out[$idx] .= $this->cBodytext($bodyText, $diff + ($safe * $chunkLgd) - $overlap, $chunkLgd + $overlap) . '<br/>';
                                        $safe++;
                                        if ($safe>100) break;
                                } while (strlen($out[$idx])>$chunkLgd);
@@ -235,9 +239,10 @@ class user_wapversion {
         * @return      string          Prepared content
         * @see contentAll()
         */
-       function cBodytext($str,$start=0,$max=0) {
-               $out = t3lib_div::fixed_lgd_cs(($start?'...':'').substr($this->nl2br(htmlspecialchars(strip_tags($str))),$start),($max?$max:100000));
-               $out = str_replace('&','',$out);        // No & in WAP docs??? --> or maybe just htmlspecialchar() things as the LAST thing instead!)
+       function cBodytext($str, $start = 0, $max = 0) {
+               $out = t3lib_div::fixed_lgd_cs(($start ? '...' : '') . substr($this->nl2br(htmlspecialchars(strip_tags($str))), $start), ($max ? $max : 100000));
+                       // No & in WAP docs??? --> or maybe just htmlspecialchar() things as the LAST thing instead!)
+               $out = str_replace('&', '', $out);
                return $out;
        }
 
@@ -248,7 +253,7 @@ class user_wapversion {
         * @return      string          The processed value returned.
         */
        function nl2br($str) {
-               return str_replace(chr(10),'<br/>',$str);
+               return str_replace(chr(10), '<br/>', $str);
        }
 
        /**
@@ -305,7 +310,7 @@ class user_wapversion {
         * @param       integer         The pointer value
         * @return      string          The input string, linked with the pointer value to the current page.
         */
-       function navLink($str,$pointer) {
+       function navLink($str, $pointer) {
                return '<a href="'.htmlspecialchars('?id='.$GLOBALS['TSFE']->id.','.$pointer.'.'.$GLOBALS['TSFE']->type).'">'.$str.'</a>';
        }
 
@@ -323,7 +328,7 @@ class user_wapversion {
                foreach ($rL as $level => $data) {
                        $preSign = count($rL)-1 > $level ? '-' : '>';
                        $menuItem = htmlspecialchars($preSign.' '.$data['title']);
-                       $menuItem = $this->link($preSpace.$menuItem,$data['uid']);
+                       $menuItem = $this->link($preSpace . $menuItem, $data['uid']);
                        $out[]=$indent.$this->line($menuItem);
                        $preSpace.='..';
                }
@@ -332,10 +337,10 @@ class user_wapversion {
                foreach ($menu as $data) {
                        $preSign = count($this->cleanMenuArray($GLOBALS['TSFE']->sys_page->getMenu($data['uid']))) ? '+' : '*';
                        $menuItem = htmlspecialchars($preSign.' '.$data['title']);
-                       $menuItem = $this->link($preSpace.$menuItem,$data['uid']);
+                       $menuItem = $this->link($preSpace . $menuItem, $data['uid']);
                        $out[]=$indent.$this->line($menuItem);
                }
-               return $this->paragraph(implode(chr(10),$out));
+               return $this->paragraph(implode(chr(10), $out));
        }
 
        /**
@@ -348,7 +353,7 @@ class user_wapversion {
         * @return      string          String wrapped in <a> tags
         * @see menuCurrentLevel()
         */
-       function link($str,$id,$deck='') {
+       function link($str, $id, $deck = '') {
                if ($GLOBALS['TSFE']->id==$id && $deck) {
                        $out = '<a href="#'.$deck.'">'.$str.'</a>';
                } else {
@@ -368,7 +373,7 @@ class user_wapversion {
        function cleanMenuArray($menu) {
                reset($menu);
                $newMenu=array();
-               while(list(,$data)=each($menu)) {
+               while(list(, $data) = each($menu)) {
                        if (!$data['nav_hide']) {
                                $newMenu[]=$data;
                        }
index 933ac2b..0f6420d 100644 (file)
@@ -69,22 +69,22 @@ class user_xmlversion {
         * @param       array           TypoScript properties for this content object/function call
         * @return      string          XML content
         */
-       function main_xmlversion($content,$conf) {
+       function main_xmlversion($content, $conf) {
                $xmlObj = t3lib_div::makeInstance('t3lib_xml', 'typo3_page');
                $xmlObj->XMLdebug=0;
-               $xmlObj->setRecFields('pages','doktype,title,alias,hidden,starttime,endtime,fe_group,url,target,no_cache,shortcut,keywords,description,abstract,author,author_email,newUntil,lastUpdated,cache_timeout');
-               $xmlObj->setRecFields('tt_content','CType,header,header_link,bodytext,image,imagewidth,imageorient,media,records,colPos,starttime,endtime,fe_group');
+               $xmlObj->setRecFields('pages', 'doktype,title,alias,hidden,starttime,endtime,fe_group,url,target,no_cache,shortcut,keywords,description,abstract,author,author_email,newUntil,lastUpdated,cache_timeout');
+               $xmlObj->setRecFields('tt_content', 'CType,header,header_link,bodytext,image,imagewidth,imageorient,media,records,colPos,starttime,endtime,fe_group');
 
                        // Creating top level object
                $xmlObj->renderHeader();
 
                        // Add page information
-               $xmlObj->addRecord('pages',$GLOBALS['TSFE']->page);
+               $xmlObj->addRecord('pages', $GLOBALS['TSFE']->page);
 
                        // Add page content information
-               $xmlObj->newLevel('content_records',1);
-               $xmlObj->renderRecords('pages',$this->getContentResult('pages'));
-               $xmlObj->renderRecords('tt_content',$this->getContentResult('tt_content'));
+               $xmlObj->newLevel('content_records', 1);
+               $xmlObj->renderRecords('pages', $this->getContentResult('pages'));
+               $xmlObj->renderRecords('tt_content', $this->getContentResult('tt_content'));
                $xmlObj->newLevel('content_records');
 
                $xmlObj->renderFooter();
index f604134..ca56037 100644 (file)
@@ -210,7 +210,7 @@ class tx_cms_webinfo_lang extends t3lib_extobjbase {
                                                $info.= '<a href="#" onclick="'.htmlspecialchars('top.loadEditId('.intval($data['row']['uid']).',"&SET[language]='.$langRow['uid'].'"); return false;').'" title="' . $LANG->getLL('lang_renderl10n_editPageLang', TRUE) . '">' .
                                                                        t3lib_iconWorks::getSpriteIcon('actions-page-open') .
                                                                '</a>';
-                                               $info.= str_replace('###LANG_UID###',$langRow['uid'], $viewPageLink);
+                                               $info .= str_replace('###LANG_UID###', $langRow['uid'], $viewPageLink);
 
                                                $tCells[] = '<td class="'.$status.'">'.$info.'</td>';
                                                $tCells[] = '<td class="'.$status.'" title="'.$LANG->getLL('lang_renderl10n_CEcount', '1').'" align="center">'.$this->getContentElementCount($data['row']['uid'], $langRow['uid']).'</td>';
@@ -234,10 +234,10 @@ class tx_cms_webinfo_lang extends t3lib_extobjbase {
                                }
                        }
 
-                       $output.= '
+                       $output .= '
                                <tr class="bgColor4">
-                                       '.implode('
-                                       ',$tCells).'
+                                       ' . implode('
+                                       ', $tCells) . '
                                </tr>';
                }
 
@@ -281,9 +281,9 @@ class tx_cms_webinfo_lang extends t3lib_extobjbase {
 
                $output = '
                        <tr class="t3-row-header">
-                               '.implode('
-                               ',$tCells).'
-                       </tr>'.$output;
+                               ' . implode('
+                               ', $tCells) . '
+                       </tr>' . $output;
 
                $output = '