[TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/r*/
authorRoland Waldner <most.wanted@gmx.at>
Tue, 29 May 2012 20:59:28 +0000 (22:59 +0200)
committerGeorg Ringer <mail@ringerge.org>
Wed, 30 May 2012 02:14:14 +0000 (04:14 +0200)
There were violations against the CGL rule
"FunctionCallArgumentSpacingNoSpaceAfterComma" in /typo3/syset/r*/.
These will be reduced by this commit.

Change-Id: I27129f0e9ad055420f957077dfb619d05e4ffd60
Resolves: #37588
Releases: 6.0
Reviewed-on: http://review.typo3.org/11706
Reviewed-by: Oliver Klee
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
18 files changed:
typo3/sysext/recordlist/mod1/index.php
typo3/sysext/recycler/classes/helper/class.tx_recycler_helper.php
typo3/sysext/recycler/ext_tables.php
typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
typo3/sysext/rtehtmlarea/ext_localconf.php
typo3/sysext/rtehtmlarea/ext_tables.php
typo3/sysext/rtehtmlarea/extensions/Language/class.tx_rtehtmlarea_language.php
typo3/sysext/rtehtmlarea/extensions/SelectFont/class.tx_rtehtmlarea_selectfont.php
typo3/sysext/rtehtmlarea/mod3/browse_links.php
typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php
typo3/sysext/rtehtmlarea/mod4/select_image.php
typo3/sysext/rtehtmlarea/mod5/class.tx_rtehtmlarea_user.php
typo3/sysext/rtehtmlarea/mod6/class.tx_rtehtmlarea_parse_html.php
typo3/sysext/rtehtmlarea/pi1/class.tx_rtehtmlarea_pi1.php
typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
typo3/sysext/rtehtmlarea/pi3/class.tx_rtehtmlarea_pi3.php
typo3/sysext/rtehtmlarea/tca.php

index cc5a8f2..f9b4b4f 100644 (file)
@@ -43,7 +43,7 @@
 $LANG->includeLLFile('EXT:lang/locallang_mod_web_list.xml');
 require_once ($BACK_PATH.'class.db_list.inc');
 require_once ($BACK_PATH.'class.db_list_extra.inc');
-$BE_USER->modAccess($MCONF,1);
+$BE_USER->modAccess($MCONF, 1);
 
 t3lib_BEfunc::lockRecords();
 
@@ -147,7 +147,7 @@ class SC_db_list {
                );
 
                        // Loading module configuration:
-               $this->modTSconfig = t3lib_BEfunc::getModTSconfig($this->id,'mod.'.$this->MCONF['name']);
+               $this->modTSconfig = t3lib_BEfunc::getModTSconfig($this->id, 'mod.'.$this->MCONF['name']);
 
                        // Clean up settings:
                $this->MOD_SETTINGS = t3lib_BEfunc::getModuleData($this->MOD_MENU, t3lib_div::_GP('SET'), $this->MCONF['name']);
@@ -162,7 +162,7 @@ class SC_db_list {
                if ($this->clear_cache) {
                        $tce = t3lib_div::makeInstance('t3lib_TCEmain');
                        $tce->stripslashes_values=0;
-                       $tce->start(Array(),Array());
+                       $tce->start(Array(), Array());
                        $tce->clear_cacheCmd($this->id);
                }
        }
@@ -179,7 +179,7 @@ class SC_db_list {
                $this->doc->setModuleTemplate('templates/db_list.html');
 
                        // Loading current page record and checking access:
-               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id,$this->perms_clause);
+               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id, $this->perms_clause);
                $access = is_array($this->pageinfo) ? 1 : 0;
 
                        // Apply predefined values for hidden checkboxes
@@ -238,7 +238,7 @@ class SC_db_list {
                if ($this->cmd=='setCB') {
                                // CBH is all the fields selected for the clipboard, CBC is the checkbox fields which were checked. By merging we get a full array of checked/unchecked elements
                                // This is set to the 'el' array of the CB after being parsed so only the table in question is registered.
-                       $CB['el'] = $dblist->clipObj->cleanUpCBC(array_merge((array)t3lib_div::_POST('CBH'),(array)t3lib_div::_POST('CBC')),$this->cmd_table);
+                       $CB['el'] = $dblist->clipObj->cleanUpCBC(array_merge((array)t3lib_div::_POST('CBH'), (array)t3lib_div::_POST('CBC')), $this->cmd_table);
                }
                if (!$this->MOD_SETTINGS['clipBoard'])  $CB['setP']='normal';   // If the clipboard is NOT shown, set the pad to 'normal'.
                $dblist->clipObj->setCmd($CB);          // Execute commands.
@@ -259,16 +259,16 @@ class SC_db_list {
                                // Deleting records...:
                                // Has not to do with the clipboard but is simply the delete action. The clipboard object is used to clean up the submitted entries to only the selected table.
                        if ($this->cmd=='delete') {
-                               $items = $dblist->clipObj->cleanUpCBC(t3lib_div::_POST('CBC'),$this->cmd_table,1);
+                               $items = $dblist->clipObj->cleanUpCBC(t3lib_div::_POST('CBC'), $this->cmd_table, 1);
                                if (count($items)) {
                                        $cmd=array();
                                        foreach ($items as $iK => $value) {
-                                               $iKParts = explode('|',$iK);
+                                               $iKParts = explode('|', $iK);
                                                $cmd[$iKParts[0]][$iKParts[1]]['delete']=1;
                                        }
                                        $tce = t3lib_div::makeInstance('t3lib_TCEmain');
                                        $tce->stripslashes_values=0;
-                                       $tce->start(array(),$cmd);
+                                       $tce->start(array(), $cmd);
                                        $tce->process_cmdmap();
 
                                        if (isset($cmd['pages'])) {
@@ -280,8 +280,8 @@ class SC_db_list {
                        }
 
                                // Initialize the listing object, dblist, for rendering the list:
-                       $this->pointer = t3lib_utility_Math::forceIntegerInRange($this->pointer,0,100000);
-                       $dblist->start($this->id,$this->table,$this->pointer,$this->search_field,$this->search_levels,$this->showLimit);
+                       $this->pointer = t3lib_utility_Math::forceIntegerInRange($this->pointer, 0, 100000);
+                       $dblist->start($this->id, $this->table, $this->pointer, $this->search_field, $this->search_levels, $this->showLimit);
                        $dblist->setDispFields();
 
                                // Render versioning selector:
index 68cdbb6..a98cf25 100644 (file)
@@ -51,13 +51,13 @@ class tx_recycler_helper {
                $hasAccess = 0;
 
                $calcPRec = $row;
-               t3lib_BEfunc::fixVersioningPid($table,$calcPRec);
+               t3lib_BEfunc::fixVersioningPid($table, $calcPRec);
                if (is_array($calcPRec)) {
                        if ($table=='pages') {  // If pages:
                                $CALC_PERMS = $GLOBALS['BE_USER']->calcPerms($calcPRec);
                                $hasAccess = $CALC_PERMS & 2 ? 1 : 0;
                        } else {
-                               $CALC_PERMS = $GLOBALS['BE_USER']->calcPerms(t3lib_BEfunc::getRecord('pages',$calcPRec['pid']));        // Fetching pid-record first.
+                               $CALC_PERMS = $GLOBALS['BE_USER']->calcPerms(t3lib_BEfunc::getRecord('pages', $calcPRec['pid']));       // Fetching pid-record first.
                                $hasAccess = $CALC_PERMS & 16 ? 1 : 0;
                        }
                                        // Check internals regarding access:
index fcdcc0a..e5f641a 100644 (file)
@@ -5,8 +5,8 @@ if (TYPO3_MODE == 'BE') {
 
                // add module
 
-       t3lib_extMgm::addModulePath('web_txrecyclerM1',t3lib_extMgm::extPath ($_EXTKEY).'mod1/');
-       t3lib_extMgm::addModule('web','txrecyclerM1','',t3lib_extMgm::extPath($_EXTKEY).'mod1/');
+       t3lib_extMgm::addModulePath('web_txrecyclerM1', t3lib_extMgm::extPath ($_EXTKEY).'mod1/');
+       t3lib_extMgm::addModule('web', 'txrecyclerM1', '', t3lib_extMgm::extPath($_EXTKEY).'mod1/');
 
 }
 ?>
\ No newline at end of file
index 6d86ccf..dd2ddc3 100644 (file)
@@ -611,7 +611,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                        $show = is_array($this->specConf['richtext']['parameters']) ? $this->specConf['richtext']['parameters'] : array();
                        if ($this->thisConfig['showButtons']) {
                                if (!t3lib_div::inList($this->thisConfig['showButtons'], '*')) {
-                                       $show = array_unique(array_merge($show,t3lib_div::trimExplode(',', $this->thisConfig['showButtons'], 1)));
+                                       $show = array_unique(array_merge($show, t3lib_div::trimExplode(',', $this->thisConfig['showButtons'], 1)));
                                } else {
                                        $show = array_unique(array_merge($show, $toolbarOrder));
                                }
@@ -638,7 +638,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                $hideButtons = array('space', 'bar', 'linebreak');
                foreach ($this->pluginButton as $pluginId => $buttonList) {
                        if (!$this->isPluginEnabled($pluginId)) {
-                               $buttonArray = t3lib_div::trimExplode(',',$buttonList,1);
+                               $buttonArray = t3lib_div::trimExplode(',', $buttonList, 1);
                                foreach ($buttonArray as $button) {
                                        $hideButtons[] = $button;
                                }
@@ -1272,7 +1272,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                global $LANG, $TSFE, $TYPO3_CONF_VARS;
 
                if ($this->is_FE()) {
-                       if (strcmp(substr($string,0,4), 'LLL:')) {
+                       if (strcmp(substr($string, 0, 4), 'LLL:')) {
                                        // A pure string coming from Page TSConfig must be in utf-8
                                $label = $TSFE->csConvObj->conv($TSFE->sL(trim($string)), 'utf-8', $this->OutputCharset);
                        } else {
@@ -1432,7 +1432,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
        }
 
        public function cleanList($str) {
-               if (strstr($str,'*')) {
+               if (strstr($str, '*')) {
                        $str = '*';
                } else {
                        $str = implode(',', array_unique(t3lib_div::trimExplode(',', $str, 1)));
@@ -1440,7 +1440,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                return $str;
        }
 
-       function filterStyleEl($elValue,$matchList) {
+       function filterStyleEl($elValue, $matchList) {
                $matchParts = t3lib_div::trimExplode(',', $matchList, 1);
                $styleParts = explode(';', $elValue);
                $nStyle = array();
index 65fb8fd..40bedaf 100644 (file)
@@ -48,9 +48,9 @@ $_EXTCONF = unserialize($_EXTCONF);
 t3lib_extMgm::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:' . $_EXTKEY . '/res/proc/pageTSConfig.txt">');
 
        // Add default Page TS Config RTE configuration
-if (strstr($_EXTCONF['defaultConfiguration'],'Minimal')) {
+if (strstr($_EXTCONF['defaultConfiguration'], 'Minimal')) {
        $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['defaultConfiguration'] = 'Advanced';
-} elseif (strstr($_EXTCONF['defaultConfiguration'],'Demo')) {
+} elseif (strstr($_EXTCONF['defaultConfiguration'], 'Demo')) {
        $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['defaultConfiguration'] = 'Demo';
 } else {
        $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['defaultConfiguration'] = 'Typical';
index c69c586..1e3ab34 100644 (file)
@@ -2,7 +2,7 @@
 if (!defined ('TYPO3_MODE'))   die ('Access denied.');
 
                // Add static template for Click-enlarge rendering
-       t3lib_extMgm::addStaticFile($_EXTKEY,'static/clickenlarge/','Clickenlarge Rendering');
+       t3lib_extMgm::addStaticFile($_EXTKEY, 'static/clickenlarge/', 'Clickenlarge Rendering');
 
                // Add configuration of soft references on image tags in RTE content
        require_once(t3lib_extMgm::extPath($_EXTKEY) . 'hooks/softref/ext_tables.php');
@@ -25,7 +25,7 @@ if (!defined ('TYPO3_MODE'))  die ('Access denied.');
                ),
        );
        t3lib_extMgm::allowTableOnStandardPages('tx_rtehtmlarea_acronym');
-       t3lib_extMgm::addLLrefForTCAdescr('tx_rtehtmlarea_acronym','EXT:' . $_EXTKEY . '/locallang_csh_abbreviation.xml');
+       t3lib_extMgm::addLLrefForTCAdescr('tx_rtehtmlarea_acronym', 'EXT:' . $_EXTKEY . '/locallang_csh_abbreviation.xml');
 
                // Add contextual help files
        $htmlAreaRteContextHelpFiles = array(
index 7f28f43..3b3770c 100644 (file)
@@ -74,7 +74,7 @@ class tx_rtehtmlarea_language extends tx_rtehtmlarea_api {
                        RTEarea['.$RTEcounter.'].buttons.'. $button .' = new Object();';
                }
                if ($this->htmlAreaRTE->is_FE()) {
-                       $first = $GLOBALS['TSFE']->getLLL('No language mark',$this->LOCAL_LANG);
+                       $first = $GLOBALS['TSFE']->getLLL('No language mark', $this->LOCAL_LANG);
                } else {
                        $first = $GLOBALS['LANG']->getLL('No language mark');
                }
index 0172c86..d7df91a 100644 (file)
@@ -148,7 +148,7 @@ class tx_rtehtmlarea_selectfont extends tx_rtehtmlarea_api {
                        foreach ($this->defaultFont[$buttonId] as $name => $value) {
                                if (!t3lib_div::inList($hideItems, strval($index+1))) {
                                        if ($this->htmlAreaRTE->is_FE()) {
-                                               $label = $GLOBALS['TSFE']->getLLL($name,$this->LOCAL_LANG);
+                                               $label = $GLOBALS['TSFE']->getLLL($name, $this->LOCAL_LANG);
                                        } else {
                                                $label = $GLOBALS['LANG']->getLL($name);
                                                if (!$label) {
@@ -163,9 +163,9 @@ class tx_rtehtmlarea_selectfont extends tx_rtehtmlarea_api {
                        // Adding configured items
                if (is_array($this->RTEProperties[($buttonId == 'fontstyle') ? 'fonts.' : 'fontSizes.'])) {
                        foreach ($this->RTEProperties[($buttonId == 'fontstyle') ? 'fonts.' : 'fontSizes.'] as $name => $conf) {
-                               $name = substr($name,0,-1);
+                               $name = substr($name, 0, -1);
                                if (in_array($name, $addItems)) {
-                                       $label = $this->htmlAreaRTE->getPageConfigLabel($conf['name'],0);
+                                       $label = $this->htmlAreaRTE->getPageConfigLabel($conf['name'], 0);
                                        $items[$name] = array($label, $this->htmlAreaRTE->cleanList($conf['value']));
                                }
                        }
index 77665e3..3a54728 100644 (file)
@@ -108,9 +108,9 @@ class tx_rtehtmlarea_SC_browse_links {
                if (!$browserRendered) {
                        $GLOBALS['SOBE']->browser = t3lib_div::makeInstance('tx_rtehtmlarea_browse_links');
                        $GLOBALS['SOBE']->browser->init();
-                       $modData = $GLOBALS['BE_USER']->getModuleData('browse_links.php','ses');
+                       $modData = $GLOBALS['BE_USER']->getModuleData('browse_links.php', 'ses');
                        list($modData, $store) = $GLOBALS['SOBE']->browser->processSessionData($modData);
-                       $GLOBALS['BE_USER']->pushModuleData('browse_links.php',$modData);
+                       $GLOBALS['BE_USER']->pushModuleData('browse_links.php', $modData);
                        $this->content = $GLOBALS['SOBE']->browser->main_rte();
                }
        }
index b06469e..6907d5a 100644 (file)
@@ -73,13 +73,13 @@ class tx_rtehtmlarea_pageTree extends rtePageTree {
 
                        $aOnClick = 'return jumpToUrl(\''.$this->thisScript.'?act='.$GLOBALS['SOBE']->browser->act.'&editorNo='.$GLOBALS['SOBE']->browser->editorNo.'&contentTypo3Language='.$GLOBALS['SOBE']->browser->contentTypo3Language.'&mode='.$GLOBALS['SOBE']->browser->mode.'&expandPage='.$v['row']['uid'].'\');';
                        $cEbullet = ($this->ext_isLinkable($v['row']['doktype'], $v['row']['uid'])
-                               ? '<a href="#" onclick="' . htmlspecialchars($aOnClick) . '"><img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/ol/arrowbullet.gif', 'width="18" height="16"') . ' alt="" /></a>'
+                               ? '<a href="#" onclick="' . htmlspecialchars($aOnClick) . '"><img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/ol/arrowbullet.gif', 'width="18" height="16"') . ' alt="" /></a>'
                                : '');
                        $out.='
                                <tr class="'.$bgColorClass.'">
                                        <td nowrap="nowrap"'.($v['row']['_CSSCLASS'] ? ' class="'.$v['row']['_CSSCLASS'].'"' : '').'>'.
                                        $v['HTML'].
-                                       $this->wrapTitle($this->getTitleStr($v['row'],$titleLen),$v['row'],$this->ext_pArrPages).
+                                       $this->wrapTitle($this->getTitleStr($v['row'], $titleLen), $v['row'], $this->ext_pArrPages).
                                        '</td>'.
                                        $arrCol.
                                        '<td>'.$cEbullet.'</td>
@@ -285,7 +285,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                $RTEtsConfigParts = explode(':', $this->RTEtsConfigParams);
                $RTEsetup = $GLOBALS['BE_USER']->getTSConfig('RTE', t3lib_BEfunc::getPagesTSconfig($RTEtsConfigParts[5]));
                $this->RTEProperties = $RTEsetup['properties'];
-               return t3lib_BEfunc::RTEsetup($this->RTEProperties, $RTEtsConfigParts[0],$RTEtsConfigParts[2],$RTEtsConfigParts[4]);
+               return t3lib_BEfunc::RTEsetup($this->RTEProperties, $RTEtsConfigParts[0], $RTEtsConfigParts[2], $RTEtsConfigParts[4]);
        }
 
        /**
@@ -573,10 +573,10 @@ class tx_rtehtmlarea_browse_links extends browse_links {
        function main_rte ($wiz=0) {
 
                        // Starting content:
-               $content=$this->doc->startPage($GLOBALS['LANG']->getLL('Insert/Modify Link',1));
+               $content=$this->doc->startPage($GLOBALS['LANG']->getLL('Insert/Modify Link', 1));
 
                        // Default allowed values
-               $this->allowedItems = explode(',','page,file,folder,url,mail,spec');
+               $this->allowedItems = explode(',', 'page,file,folder,url,mail,spec');
 
                        // Calling hook for extra options
                foreach($this->hookObjects as $hookObject) {
@@ -584,7 +584,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                }
                        // Removing items as per configuration
                if (is_array($this->buttonConfig['options.']) && $this->buttonConfig['options.']['removeItems']) {
-                       $this->allowedItems = array_diff($this->allowedItems,t3lib_div::trimExplode(',',$this->buttonConfig['options.']['removeItems'],1));
+                       $this->allowedItems = array_diff($this->allowedItems, t3lib_div::trimExplode(',', $this->buttonConfig['options.']['removeItems'], 1));
                }
                reset($this->allowedItems);
                if (!in_array($this->act, $this->allowedItems)) {
@@ -595,13 +595,13 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                $menuDef = array();
                if (!$wiz && $this->curUrlArray['href']) {
                        $menuDef['removeLink']['isActive'] = $this->act=='removeLink';
-                       $menuDef['removeLink']['label'] = $GLOBALS['LANG']->getLL('removeLink',1);
+                       $menuDef['removeLink']['label'] = $GLOBALS['LANG']->getLL('removeLink', 1);
                        $menuDef['removeLink']['url'] = '#';
                        $menuDef['removeLink']['addParams'] = 'onclick="plugin.unLink();return false;"';
                }
                if (in_array('page', $this->allowedItems)) {
                        $menuDef['page']['isActive'] = $this->act=='page';
-                       $menuDef['page']['label'] = $GLOBALS['LANG']->getLL('page',1);
+                       $menuDef['page']['label'] = $GLOBALS['LANG']->getLL('page', 1);
                        $menuDef['page']['url'] = '#';
                        $menuDef['page']['addParams'] = 'onclick="jumpToUrl(\''.htmlspecialchars('?act=page&mode='.$this->mode.'&bparams='.$this->bparams).'\');return false;"';
                }
@@ -619,19 +619,19 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                }
                if (in_array('url', $this->allowedItems)) {
                        $menuDef['url']['isActive'] = $this->act=='url';
-                       $menuDef['url']['label'] = $GLOBALS['LANG']->getLL('extUrl',1);
+                       $menuDef['url']['label'] = $GLOBALS['LANG']->getLL('extUrl', 1);
                        $menuDef['url']['url'] = '#';
                        $menuDef['url']['addParams'] = 'onclick="jumpToUrl(\''.htmlspecialchars('?act=url&mode='.$this->mode.'&bparams='.$this->bparams).'\');return false;"';
                }
                if (in_array('mail', $this->allowedItems)) {
                        $menuDef['mail']['isActive'] = $this->act=='mail';
-                       $menuDef['mail']['label'] = $GLOBALS['LANG']->getLL('email',1);
+                       $menuDef['mail']['label'] = $GLOBALS['LANG']->getLL('email', 1);
                        $menuDef['mail']['url'] = '#';
                        $menuDef['mail']['addParams'] = 'onclick="jumpToUrl(\''.htmlspecialchars('?act=mail&mode='.$this->mode.'&bparams='.$this->bparams).'\');return false;"';
                }
                if (is_array($this->thisConfig['userLinks.']) && in_array('spec', $this->allowedItems)) {
                        $menuDef['spec']['isActive'] = $this->act=='spec';
-                       $menuDef['spec']['label'] = $GLOBALS['LANG']->getLL('special',1);
+                       $menuDef['spec']['label'] = $GLOBALS['LANG']->getLL('special', 1);
                        $menuDef['spec']['url'] = '#';
                        $menuDef['spec']['addParams'] = 'onclick="jumpToUrl(\''.htmlspecialchars('?act=spec&mode='.$this->mode.'&bparams='.$this->bparams).'\');return false;"';
                }
@@ -656,9 +656,9 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                                        <form action="" name="lurlform" id="lurlform">
                                                <table border="0" cellpadding="2" cellspacing="1" id="typo3-linkMail">
                                                        <tr>
-                                                               <td>' . $GLOBALS['LANG']->getLL('emailAddress',1).':</td>
+                                                               <td>' . $GLOBALS['LANG']->getLL('emailAddress', 1).':</td>
                                                                <td><input type="text" name="lemail"'.$this->doc->formWidth(20).' value="'.htmlspecialchars($this->curUrlInfo['act']=='mail'?$this->curUrlInfo['info']:'').'" /> '.
-                                                                       '<input type="submit" value="' . $GLOBALS['LANG']->getLL('setLink',1).'" onclick="browse_links_setTarget(\'\');browse_links_setHref(\'mailto:\'+document.lurlform.lemail.value);browse_links_setAdditionalValue(\'data-htmlarea-external\', \'\');return link_current();" /></td>
+                                                                       '<input type="submit" value="' . $GLOBALS['LANG']->getLL('setLink', 1).'" onclick="browse_links_setTarget(\'\');browse_links_setHref(\'mailto:\'+document.lurlform.lemail.value);browse_links_setAdditionalValue(\'data-htmlarea-external\', \'\');return link_current();" /></td>
                                                        </tr>
                                                </table>
                                        </form>';
@@ -675,7 +675,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                                                        <tr>
                                                                <td>URL:</td>
                                                                <td><input type="text" name="lurl"'.$this->doc->formWidth(20).' value="'.htmlspecialchars($this->curUrlInfo['act']=='url'?$this->curUrlInfo['info']:'http://').'" /> '.
-                                                                       '<input type="submit" value="' . $GLOBALS['LANG']->getLL('setLink',1).'" onclick="if (/^[A-Za-z0-9_+]{1,8}:/.test(document.lurlform.lurl.value)) { browse_links_setHref(document.lurlform.lurl.value); } else { browse_links_setHref(\'http://\'+document.lurlform.lurl.value); }; browse_links_setAdditionalValue(\'data-htmlarea-external\', \'1\'); return link_current();" /></td>
+                                                                       '<input type="submit" value="' . $GLOBALS['LANG']->getLL('setLink', 1).'" onclick="if (/^[A-Za-z0-9_+]{1,8}:/.test(document.lurlform.lurl.value)) { browse_links_setHref(document.lurlform.lurl.value); } else { browse_links_setHref(\'http://\'+document.lurlform.lurl.value); }; browse_links_setAdditionalValue(\'data-htmlarea-external\', \'1\'); return link_current();" /></td>
                                                        </tr>
                                                </table>
                                        </form>';
@@ -768,7 +768,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                                        $v=$this->thisConfig['userLinks.'];
                                        foreach ($v as $k2 => $dummyValue) {
                                                $k2i = intval($k2);
-                                               if (substr($k2,-1)=='.' && is_array($v[$k2i.'.'])) {
+                                               if (substr($k2, -1)=='.' && is_array($v[$k2i.'.'])) {
 
                                                                // Title:
                                                        $title = trim($v[$k2i]);
@@ -783,8 +783,8 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                                                                // URL + onclick event:
                                                        $onClickEvent='';
                                                        if (isset($v[$k2i.'.']['target']))      $onClickEvent.="browse_links_setTarget('".$v[$k2i.'.']['target']."');";
-                                                       $v[$k2i.'.']['url'] = str_replace('###_URL###',$this->siteURL,$v[$k2i.'.']['url']);
-                                                       if (substr($v[$k2i.'.']['url'],0,7)=="http://" || substr($v[$k2i.'.']['url'],0,7)=='mailto:') {
+                                                       $v[$k2i.'.']['url'] = str_replace('###_URL###', $this->siteURL, $v[$k2i.'.']['url']);
+                                                       if (substr($v[$k2i.'.']['url'], 0, 7)=="http://" || substr($v[$k2i.'.']['url'], 0, 7)=='mailto:') {
                                                                $onClickEvent.="cur_href=unescape('".rawurlencode($v[$k2i.'.']['url'])."');link_current();";
                                                        } else {
                                                                $onClickEvent.="link_spec(unescape('".$this->siteURL.rawurlencode($v[$k2i.'.']['url'])."'));";
@@ -796,7 +796,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                                                                // Adding link to menu of user defined links:
                                                        $subcats[$k2i]='
                                                                <tr>
-                                                                       <td class="bgColor4">'.$A[0].'<strong>'.htmlspecialchars($title).($this->curUrlInfo['info']==$v[$k2i.'.']['url']?'<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/blinkarrow_right.gif','width="5" height="9"').' class="c-blinkArrowR" alt="" />':'').'</strong><br />'.$description.$A[1].'</td>
+                                                                       <td class="bgColor4">'.$A[0].'<strong>'.htmlspecialchars($title).($this->curUrlInfo['info']==$v[$k2i.'.']['url']?'<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_right.gif', 'width="5" height="9"').' class="c-blinkArrowR" alt="" />':'').'</strong><br />'.$description.$A[1].'</td>
                                                                </tr>';
                                                }
                                        }
@@ -813,7 +813,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                                                        <tr>
                                                                <td class="bgColor5" class="c-wCell" valign="top"><strong>' . $GLOBALS['LANG']->getLL('special', 1) . '</strong></td>
                                                        </tr>
-                                                       '.implode('',$subcats).'
+                                                       '.implode('', $subcats).'
                                                </table>
                                                ';
                                }
@@ -917,7 +917,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                                                        <td>
                                                        </td>
                                                        <td colspan="3">
-                                                               <input type="submit" value="' . $GLOBALS['LANG']->getLL('update',1) . '" onclick="' . (($this->act == 'url') ? 'browse_links_setAdditionalValue(\'data-htmlarea-external\', \'1\'); ' : '') . 'return link_current();" />
+                                                               <input type="submit" value="' . $GLOBALS['LANG']->getLL('update', 1) . '" onclick="' . (($this->act == 'url') ? 'browse_links_setAdditionalValue(\'data-htmlarea-external\', \'1\'); ' : '') . 'return link_current();" />
                                                        </td>
                                                </tr>';
                }
@@ -931,7 +931,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
 
                return ($this->act == 'page' && $this->buttonConfig && is_array($this->buttonConfig['pageIdSelector.']) && $this->buttonConfig['pageIdSelector.']['enabled'])?'
                                                <tr>
-                                                       <td>' . $GLOBALS['LANG']->getLL('page_id',1) . ':</td>
+                                                       <td>' . $GLOBALS['LANG']->getLL('page_id', 1) . ':</td>
                                                        <td colspan="3">
                                                                <input type="text" size="6" name="luid" />&nbsp;<input type="submit" value="' . $GLOBALS['LANG']->getLL('setLink', 1) . '" onclick="return link_typo3Page(document.ltargetform.luid.value);" />
                                                        </td>
@@ -941,7 +941,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
        function addRelField() {
                return (($this->act == 'page' || $this->act == 'url' || $this->act == 'file') && $this->buttonConfig && is_array($this->buttonConfig['relAttribute.']) && $this->buttonConfig['relAttribute.']['enabled'])?'
                                                <tr>
-                                                       <td>'.$GLOBALS['LANG']->getLL('linkRelationship',1).':</td>
+                                                       <td>'.$GLOBALS['LANG']->getLL('linkRelationship', 1).':</td>
                                                        <td colspan="3">
                                                                <input type="text" name="lrel" value="' . $this->additionalAttributes['rel']. '"  ' . $this->doc->formWidth(30) . ' />
                                                        </td>
@@ -1037,7 +1037,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                if ($this->classesAnchorJSOptions[$this->act]) {
                        $selectClass ='
                                                <tr>
-                                                       <td>'.$GLOBALS['LANG']->getLL('anchor_class',1).':</td>
+                                                       <td>'.$GLOBALS['LANG']->getLL('anchor_class', 1).':</td>
                                                        <td colspan="3">
                                                                <select name="anchor_class" onchange="'.$this->getClassOnChangeJS().'">
                                                                        ' . $this->classesAnchorJSOptions[$this->act] . '
@@ -1093,7 +1093,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                }
                return '
                                                <tr>
-                                                       <td><label for="rtehtmlarea-browse-links-anchor_title" id="rtehtmlarea-browse-links-title-label">' . $GLOBALS['LANG']->getLL('anchor_title',1) . ':</label></td>
+                                                       <td><label for="rtehtmlarea-browse-links-anchor_title" id="rtehtmlarea-browse-links-title-label">' . $GLOBALS['LANG']->getLL('anchor_title', 1) . ':</label></td>
                                                        <td colspan="3">
                                                                <span id="rtehtmlarea-browse-links-title-input" style="display: ' . ($readOnly ? 'none' : 'inline') . ';">
                                                                        <input type="text" id="rtehtmlarea-browse-links-anchor_title" name="anchor_title" value="' . $title . '" ' . $this->doc->formWidth(30) . ' />
@@ -1125,8 +1125,8 @@ class tx_rtehtmlarea_browse_links extends browse_links {
         * @param       string          string: the label to be localized
         * @return      string          Localized string.
         */
-       public function getPageConfigLabel($string,$JScharCode=1) {
-               if (strcmp(substr($string,0,4),'LLL:')) {
+       public function getPageConfigLabel($string, $JScharCode=1) {
+               if (strcmp(substr($string, 0, 4), 'LLL:')) {
                        $label = $string;
                } else {
                        $label = $GLOBALS['LANG']->sL(trim($string));
index 2ea50ed..6014447 100644 (file)
@@ -186,7 +186,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
                $pArr[1] = implode(':', array($this->editorNo, $this->sys_language_content));
                $pArr[2] = $this->RTEtsConfigParams;
                if ($this->act == 'dragdrop' || $this->act == 'plain') {
-                       $this->allowedFileTypes = explode(',','jpg,jpeg,gif,png');
+                       $this->allowedFileTypes = explode(',', 'jpg,jpeg,gif,png');
                }
                $pArr[3] = implode(',', $this->allowedFileTypes);
                $this->bparams = implode('|', $pArr);
@@ -358,7 +358,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
 <body>
 <script type="text/javascript">
 /*<![CDATA[*/
-       insertImage('.t3lib_div::quoteJSvalue($url,1).','.$width.','.$height.','.t3lib_div::quoteJSvalue($altText,1).','.t3lib_div::quoteJSvalue($titleText,1).','.t3lib_div::quoteJSvalue($additionalParams, 1).');
+       insertImage('.t3lib_div::quoteJSvalue($url, 1).','.$width.','.$height.','.t3lib_div::quoteJSvalue($altText, 1).','.t3lib_div::quoteJSvalue($titleText, 1).','.t3lib_div::quoteJSvalue($additionalParams, 1).');
 /*]]>*/
 </script>
 </body>
@@ -379,7 +379,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
                $removedProperties = array();
                if (is_array($this->buttonConfig['properties.'])) {
                        if ($this->buttonConfig['properties.']['removeItems']) {
-                               $removedProperties = t3lib_div::trimExplode(',',$this->buttonConfig['properties.']['removeItems'],1);
+                               $removedProperties = t3lib_div::trimExplode(',', $this->buttonConfig['properties.']['removeItems'], 1);
                        }
                }
                        // The following property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
@@ -497,7 +497,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
                                        sz+=\'<tr><td\'+bgColor+\'><label for="iLang">\' + plugin.editor.getPlugin("Language").localize(\'Language-Tooltip\') + \': </label></td><td>\' + languageSelector + \'</td></tr>\';
                                }')
                                .((in_array('clickenlarge', $removedProperties) || in_array('data-htmlarea-clickenlarge', $removedProperties)) ?'':'
-                               sz+=\'<tr><td\'+bgColor+\'><label for="iClickEnlarge">'.$GLOBALS['LANG']->sL('LLL:EXT:cms/locallang_ttc.php:image_zoom',1).' </label></td><td><input type="checkbox" name="iClickEnlarge" id="iClickEnlarge" value="0" /></td></tr>\';').'
+                               sz+=\'<tr><td\'+bgColor+\'><label for="iClickEnlarge">'.$GLOBALS['LANG']->sL('LLL:EXT:cms/locallang_ttc.php:image_zoom', 1).' </label></td><td><input type="checkbox" name="iClickEnlarge" id="iClickEnlarge" value="0" /></td></tr>\';').'
                                sz+=\'<tr><td><input type="submit" value="'.$GLOBALS['LANG']->getLL('update').'" onClick="return setImageProperties();"></td></tr>\';
                                sz+=\'</form></table>\';
                                return sz;
@@ -742,7 +742,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
         */
        function main_rte() {
                        // Starting content:
-               $this->content = $this->doc->startPage($GLOBALS['LANG']->getLL('Insert Image',1));
+               $this->content = $this->doc->startPage($GLOBALS['LANG']->getLL('Insert Image', 1));
 
                        // Making menu in top:
                $menuDef = array();
@@ -948,8 +948,8 @@ class tx_rtehtmlarea_select_image extends browse_links {
         */
        protected function getRTEConfig() {
                $RTEtsConfigParts = explode(':', $this->RTEtsConfigParams);
-               $RTEsetup = $GLOBALS['BE_USER']->getTSConfig('RTE',t3lib_BEfunc::getPagesTSconfig($RTEtsConfigParts[5]));
-               return t3lib_BEfunc::RTEsetup($RTEsetup['properties'],$RTEtsConfigParts[0],$RTEtsConfigParts[2],$RTEtsConfigParts[4]);
+               $RTEsetup = $GLOBALS['BE_USER']->getTSConfig('RTE', t3lib_BEfunc::getPagesTSconfig($RTEtsConfigParts[5]));
+               return t3lib_BEfunc::RTEsetup($RTEsetup['properties'], $RTEtsConfigParts[0], $RTEtsConfigParts[2], $RTEtsConfigParts[4]);
        }
 
        /**
@@ -1168,7 +1168,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
                                                'fileIcon' => $icon,
                                        );
                                        $ATag = "<a href=\"#\" onclick=\"return BrowseLinks.File.insertElement('file_$filesIndex');\">";
-                                       $ATag_alt = substr($ATag,0,-4).",1);\">";
+                                       $ATag_alt = substr($ATag, 0, -4).",1);\">";
                                        $ATag_e='</a>';
                                }
 
@@ -1196,7 +1196,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
                                        $lines[]='
                                                <tr class="file_list_normal">
                                                        <td nowrap="nowrap">'.$filenameAndIcon.'&nbsp;</td>
-                                                       <td nowrap="nowrap">' . ($ATag2 . '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/zoom2.gif','width="12" height="12"') . ' title="' . $GLOBALS['LANG']->getLL('info', 1) . '" alt="" /> ' . $GLOBALS['LANG']->getLL('info', 1) . $ATag2_e) . '</td>
+                                                       <td nowrap="nowrap">' . ($ATag2 . '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/zoom2.gif', 'width="12" height="12"') . ' title="' . $GLOBALS['LANG']->getLL('info', 1) . '" alt="" /> ' . $GLOBALS['LANG']->getLL('info', 1) . $ATag2_e) . '</td>
                                                        <td>&nbsp;</td>
                                                </tr>';
                                }
@@ -1211,7 +1211,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
                        File listing
                -->
                                <table cellpadding="0" cellspacing="0" id="typo3-filelist">
-                                       '.implode('',$lines).'
+                                       '.implode('', $lines).'
                                </table>';
                }
                        // Return accumulated content for filelisting:
index 98c34f3..09030d2 100644 (file)
@@ -86,9 +86,9 @@ class tx_rtehtmlarea_SC_select_image {
                if (!$browserRendered) {
                        $GLOBALS['SOBE']->browser = t3lib_div::makeInstance('tx_rtehtmlarea_select_image');
                        $GLOBALS['SOBE']->browser->init();
-                       $modData = $GLOBALS['BE_USER']->getModuleData('select_image.php','ses');
+                       $modData = $GLOBALS['BE_USER']->getModuleData('select_image.php', 'ses');
                        list($modData, $store) = $GLOBALS['SOBE']->browser->processSessionData($modData);
-                       $GLOBALS['BE_USER']->pushModuleData('select_image.php',$modData);
+                       $GLOBALS['BE_USER']->pushModuleData('select_image.php', $modData);
                        $this->content = $GLOBALS['SOBE']->browser->main_rte();
                }
        }
index 68c9d72..9d09757 100644 (file)
@@ -101,7 +101,7 @@ class tx_rtehtmlarea_user {
 
                $this->modData = $GLOBALS['BE_USER']->getModuleData('user.php', 'ses');
                if (t3lib_div::_GP('OC_key')) {
-                       $parts = explode('|',t3lib_div::_GP('OC_key'));
+                       $parts = explode('|', t3lib_div::_GP('OC_key'));
                        $this->modData['openKeys'][$parts[1]] = $parts[0]=='O' ? 1 : 0;
                        $GLOBALS['BE_USER']->pushModuleData('user.php', $this->modData);
                }
@@ -141,7 +141,7 @@ class tx_rtehtmlarea_user {
         * @param       [type]          $maxH: ...
         * @return      [type]          ...
         */
-       function calcWH($imgInfo,$maxW=380,$maxH=500) {
+       function calcWH($imgInfo, $maxW=380, $maxH=500) {
                $IW = $imgInfo[0];
                $IH = $imgInfo[1];
                if ($IW>$maxW) {
@@ -167,9 +167,9 @@ class tx_rtehtmlarea_user {
                        // Starting content:
                $content = $this->doc->startPage($GLOBALS['LANG']->getLL('Insert Custom Element', 1));
 
-               $RTEtsConfigParts = explode(':',t3lib_div::_GP('RTEtsConfigParams'));
+               $RTEtsConfigParts = explode(':', t3lib_div::_GP('RTEtsConfigParams'));
                $RTEsetup = $GLOBALS['BE_USER']->getTSConfig('RTE', t3lib_BEfunc::getPagesTSconfig($RTEtsConfigParts[5]));
-               $thisConfig = t3lib_BEfunc::RTEsetup($RTEsetup['properties'],$RTEtsConfigParts[0],$RTEtsConfigParts[2],$RTEtsConfigParts[4]);
+               $thisConfig = t3lib_BEfunc::RTEsetup($RTEsetup['properties'], $RTEtsConfigParts[0], $RTEtsConfigParts[2], $RTEtsConfigParts[4]);
 
                if (is_array($thisConfig['userElements.'])) {
 
@@ -177,7 +177,7 @@ class tx_rtehtmlarea_user {
                        foreach ($thisConfig['userElements.'] as $k => $value) {
                                $ki=intval($k);
                                $v = $thisConfig['userElements.'][$ki.'.'];
-                               if (substr($k,-1)=="." && is_array($v)) {
+                               if (substr($k, -1)=="." && is_array($v)) {
                                        $subcats=array();
                                        $openK = $ki;
                                        if ($openKeys[$openK]) {
@@ -187,12 +187,12 @@ class tx_rtehtmlarea_user {
                                                        case 'images_from_folder':
                                                                $mArray=array();
                                                                if ($v['path'] && @is_dir(PATH_site.$v['path'])) {
-                                                                       $files = t3lib_div::getFilesInDir(PATH_site.$v['path'],'gif,jpg,jpeg,png',0,'');
+                                                                       $files = t3lib_div::getFilesInDir(PATH_site.$v['path'], 'gif,jpg,jpeg,png', 0, '');
                                                                        if (is_array($files)) {
                                                                                $c=0;
                                                                                foreach ($files as $filename) {
                                                                                        $iInfo = @getimagesize(PATH_site.$v['path'].$filename);
-                                                                                       $iInfo = $this->calcWH($iInfo,50,100);
+                                                                                       $iInfo = $this->calcWH($iInfo, 50, 100);
 
                                                                                        $ks=(string)(100+$c);
                                                                                        $mArray[$ks]=$filename;
@@ -209,14 +209,14 @@ class tx_rtehtmlarea_user {
                                                }
                                                if (is_array($mArray)) {
                                                        if ($v['merge']) {
-                                                               $v=t3lib_div::array_merge_recursive_overrule($mArray,$v);
+                                                               $v=t3lib_div::array_merge_recursive_overrule($mArray, $v);
                                                        } else {
                                                                $v=$mArray;
                                                        }
                                                }
                                                foreach ($v as $k2 => $dummyValue) {
                                                        $k2i = intval($k2);
-                                                       if (substr($k2,-1)=='.' && is_array($v[$k2i.'.'])) {
+                                                       if (substr($k2, -1)=='.' && is_array($v[$k2i.'.'])) {
                                                                $title = trim($v[$k2i]);
                                                                if (!$title) {
                                                                        $title = '[' . $GLOBALS['LANG']->getLL('noTitle', 1) . ']';
@@ -224,19 +224,19 @@ class tx_rtehtmlarea_user {
                                                                        $title = $GLOBALS['LANG']->sL($title, 1);
                                                                }
                                                                $description = $GLOBALS['LANG']->sL($v[$k2i . '.']['description'], 1) . '<br />';
-                                                               if (!$v[$k2i.'.']['dontInsertSiteUrl']) $v[$k2i.'.']['content'] = str_replace('###_URL###',$this->siteUrl,$v[$k2i.'.']['content']);
+                                                               if (!$v[$k2i.'.']['dontInsertSiteUrl']) $v[$k2i.'.']['content'] = str_replace('###_URL###', $this->siteUrl, $v[$k2i.'.']['content']);
 
                                                                $logo = $v[$k2i.'.']['_icon'] ? $v[$k2i.'.']['_icon'] : '';
 
                                                                $onClickEvent='';
                                                                switch((string)$v[$k2i.'.']['mode']) {
                                                                        case 'wrap':
-                                                                               $wrap = explode('|',$v[$k2i.'.']['content']);
+                                                                               $wrap = explode('|', $v[$k2i.'.']['content']);
                                                                                $onClickEvent = 'wrapHTML(' . $GLOBALS['LANG']->JScharCode($wrap[0]) . ',' . $GLOBALS['LANG']->JScharCode($wrap[1]) . ',false);';
                                                                        break;
                                                                        case 'processor':
                                                                                $script = trim($v[$k2i.'.']['submitToScript']);
-                                                                               if (substr($script,0,4)!='http') $script = $this->siteUrl.$script;
+                                                                               if (substr($script, 0, 4)!='http') $script = $this->siteUrl.$script;
                                                                                if ($script) {
                                                                                        $onClickEvent='processSelection(' . $GLOBALS['LANG']->JScharCode($script) . ');';
                                                                                }
@@ -256,7 +256,7 @@ class tx_rtehtmlarea_user {
                                                }
                                                ksort($subcats);
                                        }
-                                       $categories[$ki]=implode('',$subcats);
+                                       $categories[$ki]=implode('', $subcats);
                                }
                        }
                        ksort($categories);
@@ -275,7 +275,7 @@ class tx_rtehtmlarea_user {
                                $lines[]=$v;
                        }
 
-                       $content.='<table border="0" cellpadding="1" cellspacing="1">'.implode('',$lines).'</table>';
+                       $content.='<table border="0" cellpadding="1" cellspacing="1">'.implode('', $lines).'</table>';
                }
 
                $content.= $this->doc->endPage();
index eeaaf33..6d2f598 100644 (file)
@@ -53,7 +53,7 @@ class tx_rtehtmlarea_parse_html {
 
                $this->modData = $GLOBALS['BE_USER']->getModuleData($GLOBALS['MCONF']['name'], 'ses');
                if (t3lib_div::_GP('OC_key')) {
-                       $parts = explode('|',t3lib_div::_GP('OC_key'));
+                       $parts = explode('|', t3lib_div::_GP('OC_key'));
                        $this->modData['openKeys'][$parts[1]] = $parts[0]=='O' ? 1 : 0;
                        $GLOBALS['BE_USER']->pushModuleData($GLOBALS['MCONF']['name'], $this->modData);
                }
@@ -90,9 +90,9 @@ class tx_rtehtmlarea_parse_html {
                $editorNo = t3lib_div::_GP('editorNo');
                $html = t3lib_div::_GP('content');
 
-               $RTEtsConfigParts = explode(':',t3lib_div::_GP('RTEtsConfigParams'));
+               $RTEtsConfigParts = explode(':', t3lib_div::_GP('RTEtsConfigParams'));
                $RTEsetup = $GLOBALS['BE_USER']->getTSConfig('RTE', t3lib_BEfunc::getPagesTSconfig($RTEtsConfigParts[5]));
-               $thisConfig = t3lib_BEfunc::RTEsetup($RTEsetup['properties'],$RTEtsConfigParts[0],$RTEtsConfigParts[2],$RTEtsConfigParts[4]);
+               $thisConfig = t3lib_BEfunc::RTEsetup($RTEsetup['properties'], $RTEtsConfigParts[0], $RTEtsConfigParts[2], $RTEtsConfigParts[4]);
 
                $HTMLParser = t3lib_div::makeInstance('t3lib_parsehtml');
                if (is_array($thisConfig['enableWordClean.'])) {
index 4437fad..dc11338 100644 (file)
@@ -102,7 +102,7 @@ class tx_rtehtmlarea_pi1 {
                        // Setting the pspell suggestion mode
                $this->pspellMode = t3lib_div::_POST('pspell_mode')?t3lib_div::_POST('pspell_mode'): $this->pspellMode;
                        // Now sanitize $this->pspellMode
-               $this->pspellMode = t3lib_div::inList('ultra,fast,normal,bad-spellers',$this->pspellMode)?$this->pspellMode:'normal';
+               $this->pspellMode = t3lib_div::inList('ultra,fast,normal,bad-spellers', $this->pspellMode)?$this->pspellMode:'normal';
                switch($this->pspellMode) {
                        case 'ultra':
                        case 'fast':
@@ -178,7 +178,7 @@ class tx_rtehtmlarea_pi1 {
                        header('Pragma: no-cache');
                        if($to_p_dict || $to_r_list) {
                                $tmpFileName = t3lib_div::tempnam($this->filePrefix);
-                               if($filehandle = fopen($tmpFileName,'wb')) {
+                               if($filehandle = fopen($tmpFileName, 'wb')) {
                                        foreach ($to_p_dict as $personal_word) {
                                                $cmd = '&' . $personal_word . LF;
                                                echo $cmd;
@@ -233,7 +233,7 @@ class tx_rtehtmlarea_pi1 {
                        if (!xml_set_element_handler($parser, 'startHandler', 'endHandler')) echo('Bad xml handler setting');
                        if (!xml_set_character_data_handler($parser, 'collectDataHandler')) echo('Bad xml handler setting');
                        if (!xml_set_default_handler($parser, 'defaultHandler')) echo('Bad xml handler setting');
-                       if (!xml_parse($parser,'<?xml version="1.0" encoding="' . $this->parserCharset . '"?><spellchecker> ' . preg_replace('/&nbsp;/'.(($this->parserCharset == 'utf-8')?'u':''), ' ', $content) . ' </spellchecker>')) echo('Bad parsing');
+                       if (!xml_parse($parser, '<?xml version="1.0" encoding="' . $this->parserCharset . '"?><spellchecker> ' . preg_replace('/&nbsp;/'.(($this->parserCharset == 'utf-8')?'u':''), ' ', $content) . ' </spellchecker>')) echo('Bad parsing');
                        if (xml_get_error_code($parser)) {
                                throw new UnexpectedException('Line ' . xml_get_current_line_number($parser) . ': ' . xml_error_string(xml_get_error_code($parser)), 1294585788);
                        }
@@ -336,7 +336,7 @@ var selectedDictionary = "' . $this->dictionary . '";
                $incurrent=array();
                $stringText = $string;
                $words = preg_split((($this->parserCharset == 'utf-8')?'/\P{L}+/u':'/\W+/'), $stringText);
-               while( list(,$word) = each($words) ) {
+               while( list(, $word) = each($words) ) {
                        $word = preg_replace('/ /'.(($this->parserCharset == 'utf-8')?'u':''), '', $word);
                        if( $word && !is_numeric($word)) {
                                if($this->pspell_is_available && !$this->forceCommandMode) {
@@ -351,7 +351,7 @@ var selectedDictionary = "' . $this->dictionary . '";
                                                                $this->suggestionCount++;
                                                                $this->suggestedWordCount += sizeof($suggest);
                                                        }
-                                                       $this->suggestedWords .= '"'.$word.'":"'.implode(',',$suggest).'"';
+                                                       $this->suggestedWords .= '"'.$word.'":"'.implode(',', $suggest).'"';
                                                        $this->misspelled[] = $word;
                                                        unset($suggest);
                                                }
@@ -362,23 +362,23 @@ var selectedDictionary = "' . $this->dictionary . '";
                                        }
                                } else {
                                        $tmpFileName = t3lib_div::tempnam($this->filePrefix);
-                                       if(!$filehandle = fopen($tmpFileName,'wb')) echo('SpellChecker tempfile open error');
+                                       if(!$filehandle = fopen($tmpFileName, 'wb')) echo('SpellChecker tempfile open error');
                                        if(!fwrite($filehandle, $word)) echo('SpellChecker tempfile write error');
                                        if(!fclose($filehandle)) echo('SpellChecker tempfile close error');
                                        $AspellCommand = 'cat ' . escapeshellarg($tmpFileName) . ' | ' . $this->AspellDirectory . ' -a check --mode=none --sug-mode=' . escapeshellarg($this->pspellMode) . $this->personalDictsArg . ' --lang=' . escapeshellarg($this->dictionary) . ' --encoding=' . escapeshellarg($this->aspellEncoding) . ' 2>&1';
                                        $AspellAnswer = shell_exec($AspellCommand);
                                        $AspellResultLines = array();
                                        $AspellResultLines = t3lib_div::trimExplode(LF, $AspellAnswer, 1);
-                                       if(substr($AspellResultLines[0],0,6) == 'Error:') echo("{$AspellAnswer}");
+                                       if(substr($AspellResultLines[0], 0, 6) == 'Error:') echo("{$AspellAnswer}");
                                        t3lib_div::unlink_tempfile($tmpFileName);
-                                       if(substr($AspellResultLines['1'],0,1) != '*') {
+                                       if(substr($AspellResultLines['1'], 0, 1) != '*') {
                                                if(!in_array($word, $this->misspelled)) {
                                                        if(sizeof($this->misspelled) != 0 ) {
                                                                $this->suggestedWords .= ',';
                                                        }
                                                        $suggest = array();
                                                        $suggestions = array();
-                                                       if (substr($AspellResultLines['1'],0,1) == '&') {
+                                                       if (substr($AspellResultLines['1'], 0, 1) == '&') {
                                                                $suggestions = t3lib_div::trimExplode(':', $AspellResultLines['1'], 1);
                                                                $suggest =  t3lib_div::trimExplode(',', $suggestions['1'], 1);
                                                        }
@@ -386,7 +386,7 @@ var selectedDictionary = "' . $this->dictionary . '";
                                                                $this->suggestionCount++;
                                                                $this->suggestedWordCount += sizeof($suggest);
                                                        }
-                                                       $this->suggestedWords .= '"'.$word.'":"'.implode(',',$suggest).'"';
+                                                       $this->suggestedWords .= '"'.$word.'":"'.implode(',', $suggest).'"';
                                                        $this->misspelled[] = $word;
                                                        unset($suggest);
                                                        unset($suggestions);
index b5b5728..8b6a808 100644 (file)
@@ -68,7 +68,7 @@ class tx_rtehtmlarea_pi2 extends tx_rtehtmlarea_base {
         * @param       integer         PID value of record (true parent page id)
         * @return      string          HTML code for RTE!
         */
-       function drawRTE($parentObject,$table,$field,$row,$PA,$specConf,$thisConfig,$RTEtypeVal,$RTErelPath,$thePidValue) {
+       function drawRTE($parentObject, $table, $field, $row, $PA, $specConf, $thisConfig, $RTEtypeVal, $RTErelPath, $thePidValue) {
                global $TSFE, $TYPO3_CONF_VARS, $TYPO3_DB;
 
                $this->TCEform = $parentObject;
@@ -212,7 +212,7 @@ class tx_rtehtmlarea_pi2 extends tx_rtehtmlarea_base {
                $this->addPageStyle();
                $this->addSkin();
                        // Register RTE in JS
-               $this->TCEform->additionalJS_post[] = $this->wrapCDATA($this->registerRTEinJS($this->TCEform->RTEcounter, '', '', '',$textAreaId));
+               $this->TCEform->additionalJS_post[] = $this->wrapCDATA($this->registerRTEinJS($this->TCEform->RTEcounter, '', '', '', $textAreaId));
                        // Set the save option for the RTE:
                $this->TCEform->additionalJS_submit[] = $this->setSaveRTE($this->TCEform->RTEcounter, $this->TCEform->formName, $textAreaId);
                        // Loading ExtJs JavaScript files and inline code, if not configured in TS setup
@@ -235,7 +235,7 @@ class tx_rtehtmlarea_pi2 extends tx_rtehtmlarea_base {
                 * =======================================
                 */
                        // Transform value:
-               $value = $this->transformContent('rte',$PA['itemFormElValue'],$table,$field,$row,$specConf,$thisConfig,$RTErelPath,$thePidValue);
+               $value = $this->transformContent('rte', $PA['itemFormElValue'], $table, $field, $row, $specConf, $thisConfig, $RTErelPath, $thePidValue);
 
                        // Further content transformation by registered plugins
                foreach ($this->registeredPlugins as $pluginId => $plugin) {
@@ -245,7 +245,7 @@ class tx_rtehtmlarea_pi2 extends tx_rtehtmlarea_base {
                }
                        // draw the textarea
                $item = $this->triggerField($PA['itemFormElName']).'
-                       <div id="pleasewait' . $textAreaId . '" class="pleasewait" style="display: block;" >' . $TSFE->csConvObj->conv($TSFE->getLLL('Please wait',$this->LOCAL_LANG), $this->charset, $TSFE->renderCharset) . '</div>
+                       <div id="pleasewait' . $textAreaId . '" class="pleasewait" style="display: block;" >' . $TSFE->csConvObj->conv($TSFE->getLLL('Please wait', $this->LOCAL_LANG), $this->charset, $TSFE->renderCharset) . '</div>
                        <div id="editorWrap' . $textAreaId . '" class="editorWrap" style="visibility: hidden; '. htmlspecialchars($this->RTEWrapStyle). '">
                        <textarea id="RTEarea' . $textAreaId . '" name="'.htmlspecialchars($PA['itemFormElName']).'" rows="0" cols="0" style="'.htmlspecialchars($this->RTEdivStyle).'">'.t3lib_div::formatForTextarea($value).'</textarea>
                        </div>' . LF;
index 1a91333..1fd9151 100644 (file)
@@ -52,7 +52,7 @@ class tx_rtehtmlarea_pi3 extends tslib_pibase {
         * @return      string          HTML output.
         * @access private
         */
-       function render_clickenlarge($content,$conf) {
+       function render_clickenlarge($content, $conf) {
 
                $clickenlarge = isset($this->cObj->parameters['data-htmlarea-clickenlarge']) ? $this->cObj->parameters['data-htmlarea-clickenlarge'] : 0;
                if (!$clickenlarge) {
index 02d4c71..732a69b 100644 (file)
@@ -38,8 +38,8 @@ $TCA['tx_rtehtmlarea_acronym'] = Array (
                                "checkbox" => "0",
                                "default" => "0",
                                "range" => Array (
-                                       "upper" => mktime(0,0,0,12,31,2020),
-                                       "lower" => mktime(0,0,0,date("m")-1,date("d"),date("Y"))
+                                       "upper" => mktime(0, 0, 0, 12, 31, 2020),
+                                       "lower" => mktime(0, 0, 0, date("m")-1, date("d"), date("Y"))
                                )
 
                        )