Cleanup: Fixed formatting issues in typo3 and test PHP files
authorOliver Hader <oliver.hader@typo3.org>
Sat, 23 May 2009 15:26:20 +0000 (15:26 +0000)
committerOliver Hader <oliver.hader@typo3.org>
Sat, 23 May 2009 15:26:20 +0000 (15:26 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5489 709f56b5-9817-0410-a4d7-c38de5d9e867

75 files changed:
ChangeLog
tests/t3lib/t3lib_tcemain_testcase.php
typo3/classes/class.ajaxlogin.php
typo3/classes/class.clearcachemenu.php
typo3/classes/class.modulemenu.php
typo3/classes/class.typo3_tcefile.php
typo3/interfaces/interface.backend_cacheActionsHook.php
typo3/interfaces/interface.cms_newcontentelementwizarditemshook.php
typo3/mod/tools/em/class.em_xmlhandler.php
typo3/sysext/belog/mod/index.php
typo3/sysext/cms/ext_localconf.php
typo3/sysext/cms/tslib/class.tslib_menu.php
typo3/sysext/cms/web_info/class.tx_cms_webinfo_lang.php
typo3/sysext/dbal/handlers/class.tx_dbal_handler_rawmysql.php
typo3/sysext/dbal/handlers/class.tx_dbal_handler_xmldb.php
typo3/sysext/dbal/mod1/conf.php
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php
typo3/sysext/install/mod/class.tx_install.php
typo3/sysext/install/updates/class.tx_coreupdates_cscsplit.php
typo3/sysext/install/updates/class.tx_coreupdates_imagescols.php
typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php
typo3/sysext/install/updates/class.tx_coreupdates_mergeadvanced.php
typo3/sysext/install/updates/class.tx_coreupdates_notinmenu.php
typo3/sysext/lowlevel/class.tx_lowlevel_cleaner_core.php
typo3/sysext/lowlevel/config/index.php
typo3/sysext/lowlevel/dbint/index.php
typo3/sysext/lowlevel/ext_localconf.php
typo3/sysext/openid/lib/php-openid/Auth/OpenID/Consumer.php
typo3/sysext/openid/lib/php-openid/Auth/OpenID/MemcachedStore.php
typo3/sysext/openid/lib/php-openid/Auth/OpenID/PostgreSQLStore.php
typo3/sysext/openid/lib/php-openid/Auth/OpenID/Server.php
typo3/sysext/openid/lib/php-openid/Auth/OpenID/TrustRoot.php
typo3/sysext/openid/lib/php-openid/Auth/Yadis/HTTPFetcher.php
typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParanoidHTTPFetcher.php
typo3/sysext/openid/lib/php-openid/Auth/Yadis/ParseHTML.php
typo3/sysext/recycler/mod1/index.php
typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
typo3/sysext/rtehtmlarea/class.tx_rtehtmlareaapi.php
typo3/sysext/rtehtmlarea/extensions/AboutEditor/class.tx_rtehtmlarea_abouteditor.php
typo3/sysext/rtehtmlarea/extensions/BlockStyle/class.tx_rtehtmlarea_blockstyle.php
typo3/sysext/rtehtmlarea/extensions/CharacterMap/class.tx_rtehtmlarea_charactermap.php
typo3/sysext/rtehtmlarea/extensions/ContextMenu/class.tx_rtehtmlarea_contextmenu.php
typo3/sysext/rtehtmlarea/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php
typo3/sysext/rtehtmlarea/extensions/DefaultColor/class.tx_rtehtmlarea_defaultcolor.php
typo3/sysext/rtehtmlarea/extensions/DefaultImage/class.tx_rtehtmlarea_defaultimage.php
typo3/sysext/rtehtmlarea/extensions/DefaultInline/class.tx_rtehtmlarea_defaultinline.php
typo3/sysext/rtehtmlarea/extensions/DefaultLink/class.tx_rtehtmlarea_defaultlink.php
typo3/sysext/rtehtmlarea/extensions/DefinitionList/class.tx_rtehtmlarea_definitionlist.php
typo3/sysext/rtehtmlarea/extensions/EditorMode/class.tx_rtehtmlarea_editormode.php
typo3/sysext/rtehtmlarea/extensions/FindReplace/class.tx_rtehtmlarea_findreplace.php
typo3/sysext/rtehtmlarea/extensions/InsertSmiley/class.tx_rtehtmlarea_insertsmiley.php
typo3/sysext/rtehtmlarea/extensions/QuickTag/class.tx_rtehtmlarea_quicktag.php
typo3/sysext/rtehtmlarea/extensions/RemoveFormat/class.tx_rtehtmlarea_removeformat.php
typo3/sysext/rtehtmlarea/extensions/SelectFont/class.tx_rtehtmlarea_selectfont.php
typo3/sysext/rtehtmlarea/extensions/TYPO3Color/class.tx_rtehtmlarea_typo3color.php
typo3/sysext/rtehtmlarea/extensions/TYPO3HtmlParser/class.tx_rtehtmlarea_typo3htmlparser.php
typo3/sysext/rtehtmlarea/extensions/TYPO3Image/class.tx_rtehtmlarea_typo3image.php
typo3/sysext/rtehtmlarea/extensions/TYPO3Link/class.tx_rtehtmlarea_typo3link.php
typo3/sysext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php
typo3/sysext/rtehtmlarea/extensions/TextStyle/class.tx_rtehtmlarea_textstyle.php
typo3/sysext/rtehtmlarea/extensions/UndoRedo/class.tx_rtehtmlarea_undoredo.php
typo3/sysext/rtehtmlarea/extensions/UserElements/class.tx_rtehtmlarea_userelements.php
typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
typo3/sysext/rtehtmlarea/pi1/class.tx_rtehtmlarea_pi1.php
typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php
typo3/sysext/rtehtmlarea/tca.php
typo3/sysext/setup/mod/index.php
typo3/sysext/simulatestatic/class.tx_simulatestatic.php
typo3/sysext/sys_action/toolbarmenu/class.tx_sysaction_toolbarmenu.php
typo3/sysext/t3editor/class.tx_t3editor.php
typo3/sysext/t3editor/lib/ts_codecompletion/class.tx_t3editor_codecompletion.php
typo3/sysext/t3editor/lib/ts_codecompletion/class.tx_t3editor_tsrefloader.php
typo3/sysext/tsconfig_help/ext_tables.php
typo3/sysext/tsconfig_help/mod1/conf.php
typo3/sysext/version/cm1/index.php

index f32b81e..a737de6 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        * Follow-up to #10597: Faulty call to frontend editing instance instead of admin panel
        * Fixed bug #11039: Simulating frontend user groups via admin panel does not work
        * Cleanup: Fixed formatting issues in t3lib PHP files
+       * Cleanup: Fixed formatting issues in typo3 and test PHP files
 
 2009-05-22  Steffen Kamper  <info@sk-typo3.de>
 
index ee13002..7c534b4 100644 (file)
@@ -175,7 +175,7 @@ class t3lib_tcemain_testcase extends tx_phpunit_testcase {
                        $this->fixture->checkModifyAccessList('be_users')
                );
        }
-       
+
        /**
         * @test
         */
@@ -192,10 +192,10 @@ class t3lib_tcemain_testcase extends tx_phpunit_testcase {
                        $returnValue = $this->fixture->checkValue_input_Eval($value, array('double2'), '');
                        $this->assertSame(
                        $returnValue['value'],
-                       $expectedReturnValue 
-                       );      
+                       $expectedReturnValue
+                       );
                }
-       }       
+       }
 
 }
 ?>
index 5718966..bbf9f21 100644 (file)
@@ -90,10 +90,10 @@ class AjaxLogin {
         */
        function isTimedOut($params = array(), TYPO3AJAX &$ajaxObj = null) {
                if(is_object($GLOBALS['BE_USER'])) {
-                       
+
                        if (@is_file(PATH_typo3conf.'LOCK_BACKEND')) {
                                $ajaxObj->addContent('login', '{timed_out: false,locked:true}');
-                               $ajaxObj->setContentFormat('json');     
+                               $ajaxObj->setContentFormat('json');
                        } else {
                                $GLOBALS['BE_USER']->fetchUserSession(true);
                                $ses_tstamp = $GLOBALS['BE_USER']->user['ses_tstamp'];
index c578861..dd682dc 100644 (file)
@@ -93,7 +93,7 @@ class ClearCacheMenu implements backend_toolbarItem {
                        // hook for manipulate cacheActions
                if(is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['additionalBackendItems']['cacheActions'])) {
                        foreach($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['additionalBackendItems']['cacheActions'] as $cacheAction) {
-                               $hookObject = &t3lib_div::getUserObj($cacheAction); 
+                               $hookObject = &t3lib_div::getUserObj($cacheAction);
 
                                if(!($hookObject instanceof backend_cacheActionsHook)) {
                                        throw new UnexpectedValueException('$hookObject must implement interface backend_cacheActionsHook', 1228262000);
@@ -115,7 +115,7 @@ class ClearCacheMenu implements backend_toolbarItem {
                if ($GLOBALS['BE_USER']->isAdmin()) {
                        return true;
                }
-               
+
                if (is_array($this->optionValues)) {
                        foreach($this->optionValues as $value) {
                                if ($GLOBALS['BE_USER']->getTSConfigVal('options.clearCache.' . $value)) {
@@ -124,7 +124,7 @@ class ClearCacheMenu implements backend_toolbarItem {
                        }
                }
                return false;
-               
+
        }
 
        /**
index 701f9d4..d199b83 100644 (file)
@@ -135,7 +135,7 @@ class ModuleMenu {
 
                $tsConfiguration = $GLOBALS['BE_USER']->getTSConfig('options.moduleMenuCollapsable');
                $collapsable = (isset($tsConfiguration['value']) && $tsConfiguration['value'] == 0) ? 0 : 1;
-               
+
                $rawModuleData = $this->getRawModuleData();
 
                foreach($rawModuleData as $moduleKey => $moduleData) {
index f6f0c18..052fc6b 100644 (file)
@@ -31,7 +31,7 @@
  * Basically it includes two libraries which are used to manipulate files on the server.
  * Before TYPO3 4.3, it was located in typo3/tce_file.php and redirected back to a
  * $redirectURL. Since 4.3 this class is also used for accessing via AJAX
- * 
+ *
  *
  * For syntax and API information, see the document 'TYPO3 Core APIs'
  *
@@ -159,7 +159,7 @@ class TYPO3_tcefile {
         * therefore, it does exactly the same as the real typo3/tce_file.php
         * but without calling the "finish" method, thus makes it simpler to deal with the
         * actual return value
-        * 
+        *
         *
         * @param string $params        always empty.
         * @param string $ajaxObj       The Ajax object used to return content and set content types
index 69a8d20..98c5ebe 100644 (file)
@@ -29,7 +29,7 @@
 /**\r
  * interface for classes which hook into ClearCacheMenu and manipulate CacheMenuItems array\r
  *\r
- * @author     Steffen Kamper <info@sk-typo3.de> \r
+ * @author     Steffen Kamper <info@sk-typo3.de>\r
  * @package TYPO3\r
  * @subpackage backend\r
  */\r
@@ -40,7 +40,7 @@ interface backend_cacheActionsHook {
         *\r
         * @param       array   array of CacheMenuItems\r
         * @param       array   array of AccessConfigurations-identifiers (typically  used by userTS with options.clearCache.identifier)\r
-        * @return      \r
+        * @return\r
         */\r
        public function manipulateCacheActions(&$cacheActions, &$optionValues);\r
 \r
index 770c74f..c61477b 100644 (file)
@@ -29,7 +29,7 @@
 /**
  * interface for classes which hook into SC_db_new_content_el and manipulater wizardItems array
  *
- * @author     Steffen Kamper <info@sk-typo3.de> 
+ * @author     Steffen Kamper <info@sk-typo3.de>
  * @package TYPO3
  * @subpackage cms
  */
index 499f500..3f8d68c 100644 (file)
@@ -144,7 +144,7 @@ class SC_mod_tools_em_xmlhandler {
                }
                $GLOBALS['TYPO3_DB']->sql_free_result($res);
        }
-       
+
        /**
         * Reduces the entries in $this->extensionsXML to the latest version per extension and removes entries not matching the search parameter
         * The extension key has to be a valid one as search is done for exact matches only.
index 993bccb..c49b37b 100755 (executable)
@@ -64,7 +64,7 @@ class SC_mod_tools_log_index {
        var $content;
        var $lF;
        var $be_user_Array;
-       
+
        var $theTime = 0;
        var $theTime_end = 0;
 
@@ -170,7 +170,7 @@ class SC_mod_tools_log_index {
                                $this->MOD_MENU['workspaces'][$rec['uid']] = $rec['uid'].': '.$rec['title'];
                        }
                }
-       
+
                // Adding groups to the users_array
                $groups = t3lib_BEfunc::getGroupNames();
                        if (is_array($groups))  {
@@ -188,7 +188,7 @@ class SC_mod_tools_log_index {
 
                        // CLEANSE SETTINGS
                $this->MOD_SETTINGS = t3lib_BEfunc::getModuleData($this->MOD_MENU, t3lib_div::_GP('SET'), $this->MCONF['name']);
-               
+
                        //
                if (!trim($this->MOD_SETTINGS['manualdate']))   {
                        $this->MOD_SETTINGS['manualdate'] = 'YYYY-MM-DD';//"-HH-MM-SS";
@@ -196,7 +196,7 @@ class SC_mod_tools_log_index {
                        $parts = t3lib_div::trimExplode('-',trim($this->MOD_SETTINGS['manualdate']));
                        $this->theTime = mktime((int)$parts[3],(int)$parts[4],(int)$parts[5],$parts[1]?(int)$parts[1]:1,$parts[2]?(int)$parts[2]:1,(int)$parts[0]);
                        $this->MOD_SETTINGS['manualdate'] = date('Y-m-d-H-i-s',$this->theTime);
-               }               
+               }
 
                if (!trim($this->MOD_SETTINGS['manualdate_end']))       {
                        $this->MOD_SETTINGS['manualdate_end'] = 'YYYY-MM-DD';//"-HH-MM-SS";
@@ -204,7 +204,7 @@ class SC_mod_tools_log_index {
                        $parts = t3lib_div::trimExplode('-',trim($this->MOD_SETTINGS['manualdate_end']));
                        $this->theTime_end = mktime((int)$parts[3],(int)$parts[4],(int)$parts[5],$parts[1]?(int)$parts[1]:1,$parts[2]?(int)$parts[2]:1,(int)$parts[0]);
                        $this->MOD_SETTINGS['manualdate_end'] = date('Y-m-d-H-i-s',$this->theTime_end);
-               }               
+               }
        }
 
        /**
@@ -225,7 +225,7 @@ class SC_mod_tools_log_index {
                $menuT= t3lib_BEfunc::getFuncMenu(0,'SET[time]',$this->MOD_SETTINGS['time'],$this->MOD_MENU['time']);
                $menuA= t3lib_BEfunc::getFuncMenu(0,'SET[action]',$this->MOD_SETTINGS['action'],$this->MOD_MENU['action']);
                $menuW= t3lib_BEfunc::getFuncMenu(0,'SET[workspaces]',$this->MOD_SETTINGS['workspaces'],$this->MOD_MENU['workspaces']);
-               
+
                $groupByPage= t3lib_BEfunc::getFuncCheck(0,'SET[groupByPage]',$this->MOD_SETTINGS['groupByPage']);
                $inputDate= t3lib_BEfunc::getFuncInput(0,'SET[manualdate]',$this->MOD_SETTINGS['manualdate'],20);
                $inputDate_end= t3lib_BEfunc::getFuncInput(0,'SET[manualdate_end]',$this->MOD_SETTINGS['manualdate_end'],20);
index 39e42d7..6c96008 100755 (executable)
@@ -53,10 +53,10 @@ mod.wizards.newContentElement.wizardItems {
                                CType = table
                        }
                }
-               
+
        }
        common.show = text,textpic,image,bullets,table
-       
+
        special.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:special
        special.elements {
                uploads {
@@ -92,10 +92,10 @@ mod.wizards.newContentElement.wizardItems {
                                CType = html
                        }
                }
-               
+
        }
        special.show = uploads,multimedia,menu,html
-       
+
        forms.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:forms
        forms.elements {
                mailform {
@@ -133,10 +133,10 @@ Contact me: | tv=check | 1
                                CType = login
                        }
                }
-               
+
        }
        forms.show = mailform,search,login
-       
+
        plugins.header = LLL:EXT:cms/layout/locallang_db_new_content_el.xml:plugins
        plugins.elements {
                general {
index feb03a1..9bccd16 100644 (file)
@@ -1745,7 +1745,7 @@ class tslib_tmenu extends tslib_menu {
                                $this->extProc_beforeLinking($key);
 
                                        // stdWrap for doNotLinkIt
-                               if (isset($this->I['val']['doNotLinkIt.'])) { 
+                               if (isset($this->I['val']['doNotLinkIt.'])) {
                                        $this->I['val']['doNotLinkIt'] = $this->WMcObj->stdWrap($this->I['val']['doNotLinkIt'], $this->I['val']['doNotLinkIt.']);
                                }
 
@@ -1774,12 +1774,12 @@ class tslib_tmenu extends tslib_menu {
                                $this->I['parts'] = array();
                                $this->I['parts']['before']=$this->getBeforeAfter('before');
                                $this->I['parts']['stdWrap2_begin']=$wrapPartsStdWrap[0];
-                               
+
                                        // stdWrap for doNotShowLink
-                               if (isset($this->I['val']['doNotShowLink.'])) { 
+                               if (isset($this->I['val']['doNotShowLink.'])) {
                                        $this->I['val']['doNotShowLink'] = $this->WMcObj->stdWrap($this->I['val']['doNotShowLink'], $this->I['val']['doNotShowLink.']);
                                }
-                               
+
                                if (!$this->I['val']['doNotShowLink']) {
                                        $this->I['parts']['notATagBeforeWrap_begin'] = $wrapPartsAfter[0];
                                        $this->I['parts']['ATag_begin'] = $this->I['A1'];
index 8673f36..be02bed 100644 (file)
@@ -264,14 +264,14 @@ class tx_cms_webinfo_lang extends t3lib_extobjbase {
                                                                // Language has been disabled for this page
                                                        $status = 'c-blocked';
                                                        $info = '';
-                                               } else { 
+                                               } else {
                                                        $status = t3lib_div::hideIfNotTranslated($data['row']['l18n_cfg']) || $data['row']['l18n_cfg']&1 ? 'c-blocked' : 'c-fallback';
                                                        $info = '<input type="checkbox" name="newOL['.$langRow['uid'].']['.$data['row']['uid'].']" value="1" />';
                                                        $newOL_js[$langRow['uid']].= '
                                                                +(document.webinfoForm[\'newOL['.$langRow['uid'].']['.$data['row']['uid'].']\'].checked ? \'&edit[pages_language_overlay]['.$data['row']['uid'].']=new\' : \'\')
                                                        ';
                                                }
-                                               
+
                                                $tCells[] = '<td class="'.$status.' c-leftLine">&nbsp;</td>';
                                                $tCells[] = '<td class="'.$status.'">&nbsp;</td>';
                                                $tCells[] = '<td class="'.$status.'">'.$info.'</td>';
index 0b70e6c..54f711a 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /***************************************************************
 *  Copyright notice
-*  
+*
 *  (c) 2004-2009 Kasper Skaarhoj (kasper@typo3.com)
 *  All rights reserved
 *
@@ -28,7 +28,7 @@
  * Contains an example DBAL handler class
  *
  * $Id$
- * 
+ *
  * @author     Kasper Skaarhoj <kasper@typo3.com>
  */
 /**
  *
  *
  *
- *   86: class tx_dbal_handler_rawmysql extends t3lib_sqlengine 
- *   99:     function init($config,&$pObj)     
- *  123:     function exec_INSERTquery($table,$fields_values)  
- *  135:     function exec_UPDATEquery($table,$where,$fields_values)   
- *  146:     function exec_DELETEquery($table,$where)  
- *  161:     function exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit)      
- *  173:     function sql_error()      
- *  182:     function sql_insert_id()  
- *  191:     function sql_affected_rows()      
- *  201:     function sql_query($query)        
- *  213:     function quoteStr($str)   
+ *   86: class tx_dbal_handler_rawmysql extends t3lib_sqlengine
+ *   99:     function init($config,&$pObj)
+ *  123:     function exec_INSERTquery($table,$fields_values)
+ *  135:     function exec_UPDATEquery($table,$where,$fields_values)
+ *  146:     function exec_DELETEquery($table,$where)
+ *  161:     function exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit)
+ *  173:     function sql_error()
+ *  182:     function sql_insert_id()
+ *  191:     function sql_affected_rows()
+ *  201:     function sql_query($query)
+ *  213:     function quoteStr($str)
  *
  *              SECTION: SQL admin functions
- *  237:     function admin_get_tables()       
- *  254:     function admin_get_fields($tableName)     
- *  272:     function admin_get_keys($tableName)       
- *  290:     function admin_query($query)      
+ *  237:     function admin_get_tables()
+ *  254:     function admin_get_fields($tableName)
+ *  272:     function admin_get_keys($tableName)
+ *  290:     function admin_query($query)
  *
  *
- *  308: class tx_dbal_handler_rawmysql_sqlObj extends t3lib_sqlengine_resultobj 
- *  317:     function sql_num_rows()   
- *  326:     function sql_fetch_assoc()        
- *  335:     function sql_fetch_row()  
- *  345:     function sql_data_seek($pointer)  
+ *  308: class tx_dbal_handler_rawmysql_sqlObj extends t3lib_sqlengine_resultobj
+ *  317:     function sql_num_rows()
+ *  326:     function sql_fetch_assoc()
+ *  335:     function sql_fetch_row()
+ *  345:     function sql_data_seek($pointer)
  *
  * TOTAL FUNCTIONS: 18
  * (This index is automatically created/updated by the extension "extdeveval")
  *
  */
+
 
 
 
 /**
  * Example DBAL userdefined handler class
  * It simply makes pass-through of MySQL
- * 
+ *
  * @author     Kasper Skaarhoj <kasper@typo3.com>
  * @package TYPO3
  * @subpackage tx_dbal
  */
 class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
-       var $config = array();  
+       var $config = array();
        var $link;
        var $pObj;      // Set from DBAL class.
 
        /**
         * Initialize.
         * For MySQL we will have to connect to the database and select the database.
-        * 
+        *
         * @param       array           Configuration array from handler
         * @param       object          Parent object.
         * @return      boolean         True if connection and database selection worked out well.
@@ -101,8 +101,8 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
                $this->config = $config['config'];
                $this->pObj = &$pObj;
                $this->link = mysql_pconnect(
-                                                       $this->config['host'], 
-                                                       $this->config['username'], 
+                                                       $this->config['host'],
+                                                       $this->config['username'],
                                                        $this->config['password']
                                                );
 
@@ -116,7 +116,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * Execute INSERT query
-        * 
+        *
         * @param       string          Table name
         * @param       array           Field=>Value array
         * @return      boolean         True on success
@@ -127,7 +127,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * Execute UPDATE query
-        * 
+        *
         * @param       string          Table name
         * @param       string          WHERE clause
         * @param       array           Field=>Value array
@@ -139,7 +139,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * Execute DELETE query
-        * 
+        *
         * @param       string          Table name
         * @param       string          WHERE clause
         * @return      boolean         True on success
@@ -150,7 +150,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * Execute SELECT query
-        * 
+        *
         * @param       string          List of fields to select from the table. This is what comes right after "SELECT ...". Required value.
         * @param       string          Table(s) from which to select. This is what comes right after "FROM ...". Required value.
         * @param       string          Optional additional WHERE clauses put in the end of the query. NOTICE: You must escape values with addslashes() first
@@ -168,7 +168,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * mysql_error() wrapper
-        * 
+        *
         * @return      string          mysql_error()
         */
        function sql_error()    {
@@ -177,7 +177,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * mysql_insert_id() wrapper
-        * 
+        *
         * @return      integer         mysql_insert_id();
         */
        function sql_insert_id()        {
@@ -186,7 +186,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * mysql_affected_rows() wrapper
-        * 
+        *
         * @return      integer         mysql_affected_rows()
         */
        function sql_affected_rows()    {
@@ -195,7 +195,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * mysql_query() wrapper
-        * 
+        *
         * @param       string          Query string
         * @return      object          Result object
         */
@@ -207,16 +207,16 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * Escape quotes in strings
-        * 
+        *
         * @param       string          Input string
         * @return      string          Output string
         */
        function quoteStr($str) {
                return addslashes($str);
        }
-       
-       
-       
+
+
+
 
 
 
@@ -232,7 +232,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * Returns the list of tables from the database, quering MySQL for it.
-        * 
+        *
         * @return      array           Tables in an array (tablename is in both key and value)
         * @todo        Should return table details in value! see t3lib_db::admin_get_tables()
         */
@@ -249,13 +249,13 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * Returns information about each field in the $table, quering MySQL for it.
-        * 
+        *
         * @param       string          Table name
         * @return      array           Field information in an associative array with fieldname => field row
         */
        function admin_get_fields($tableName)   {
                $output = array();
-               
+
                if ($columns_res = @mysql_query('SHOW columns FROM '.$tableName, $this->link))  {
                        while($fieldRow = mysql_fetch_assoc($columns_res))      {
                                $output[$fieldRow["Field"]] = $fieldRow;
@@ -267,7 +267,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
        /**
         * Returns information about each index key in the $table, quering MySQL for it.
-        * 
+        *
         * @param       string          Table name
         * @return      array           Key information in a numeric array
         */
@@ -281,17 +281,17 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
                }
 
                return $output;
-       }               
+       }
 
        /**
         * mysql() wrapper function, used by the Install Tool and EM for all queries regarding management of the database!
-        * 
+        *
         * @param       string          Query to execute
         * @return      pointer         Result pointer
         */
        function admin_query($query)    {
                return $this->sql_query($query);
-       }       
+       }
 }
 
 
@@ -302,7 +302,7 @@ class tx_dbal_handler_rawmysql extends t3lib_sqlengine {
 
 /**
  * Result object for this MySQL userdefined handler
- * 
+ *
  * @author     Kasper Skaarhoj <kasper@typo3.com>
  * @package TYPO3
  * @subpackage tx_dbal
@@ -313,7 +313,7 @@ class tx_dbal_handler_rawmysql_sqlObj extends t3lib_sqlengine_resultobj {
 
        /**
         * mysql_num_rows() Wrapper
-        * 
+        *
         * @return      integer         mysql_num_rows()
         */
        function sql_num_rows() {
@@ -322,7 +322,7 @@ class tx_dbal_handler_rawmysql_sqlObj extends t3lib_sqlengine_resultobj {
 
        /**
         * mysql_fetch_assoc() Wrapper
-        * 
+        *
         * @return      array           mysql_fetch_assoc()
         */
        function sql_fetch_assoc()      {
@@ -331,7 +331,7 @@ class tx_dbal_handler_rawmysql_sqlObj extends t3lib_sqlengine_resultobj {
 
        /**
         * mysql_fetch_row()    wrapper
-        * 
+        *
         * @return      array           mysql_fetch_row()
         */
        function sql_fetch_row()        {
@@ -340,7 +340,7 @@ class tx_dbal_handler_rawmysql_sqlObj extends t3lib_sqlengine_resultobj {
 
        /**
         * mysql_data_seek() wrapper
-        * 
+        *
         * @param       integer         Pointer to go to.
         * @return      boolean         mysql_data_seek()
         */
index 52c6aa5..c79ebe2 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /***************************************************************
 *  Copyright notice
-*  
+*
 *  (c) 2004-2009 Kasper Skaarhoj (kasper@typo3.com)
 *  All rights reserved
 *
@@ -28,7 +28,7 @@
  * Contains an example DBAL handler class
  *
  * $Id$
- * 
+ *
  * @author     Kasper Skaarhoj <kasper@typo3.com>
  */
 /**
  *
  *
  *
- *   74: class tx_dbal_handler_xmldb extends t3lib_sqlengine 
- *   91:     function init($config, &$pObj)    
- *  128:     function readDataSource($table)   
- *  157:     function saveDataSource($table)   
- *  184:     function xmlDB_writeStructure()   
- *  193:     function xmlDB_readStructure()    
+ *   74: class tx_dbal_handler_xmldb extends t3lib_sqlengine
+ *   91:     function init($config, &$pObj)
+ *  128:     function readDataSource($table)
+ *  157:     function saveDataSource($table)
+ *  184:     function xmlDB_writeStructure()
+ *  193:     function xmlDB_readStructure()
  *
  *              SECTION: SQL admin functions
- *  217:     function admin_get_tables()       
- *  242:     function admin_get_fields($tableName)     
- *  276:     function admin_get_keys($tableName)       
- *  314:     function admin_query($query)      
+ *  217:     function admin_get_tables()
+ *  242:     function admin_get_fields($tableName)
+ *  276:     function admin_get_keys($tableName)
+ *  314:     function admin_query($query)
  *
  * TOTAL FUNCTIONS: 9
  * (This index is automatically created/updated by the extension "extdeveval")
  *
  */
+
 
 
 
@@ -112,22 +112,22 @@ class tx_dbal_handler_xmldb extends t3lib_sqlengine {
                                        $this->errorStatus = 'The database structure file could not be created in dir "'.$dbStorage.'"';
                                }
                        }
-                       
-                       
+
+
                } else $this->errorStatus = 'The database storage dir "'.$dbStorage.'" did not exist!';
 
-debug($this->errorStatus,'XMLDB connect ERROR:');              
+debug($this->errorStatus,'XMLDB connect ERROR:');
                return FALSE;
        }
 
        /**
         * Setting table data (overriding function)
-        * 
+        *
         * @param       string          Table name
-        * @return      void            
+        * @return      void
         */
        function readDataSource($table) {
-               
+
                if (!$this->DBdir)      {
                        $this->errorStatus = 'XMLdatabase not connected';
                        return FALSE;
@@ -151,12 +151,12 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
 
        /**
         * Saving data source
-        * 
+        *
         * @param       string          Table name
         * @return      boolean         True on success
         */
        function saveDataSource($table) {
-               
+
                if (!$this->DBdir)      {
                        $this->errorStatus = 'XMLdatabase not connected';
                        return FALSE;
@@ -179,7 +179,7 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
 
        /**
         * Writing database structure
-        * 
+        *
         * @return      void
         */
        function xmlDB_writeStructure() {
@@ -188,15 +188,15 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
 
        /**
         * Reading database structure
-        * 
+        *
         * @return      void
         */
        function xmlDB_readStructure()  {
                $this->DBstructure = t3lib_div::xml2array(t3lib_div::getUrl($this->DBdir.'_STRUCTURE.xml'));
-       }       
-       
-       
-       
+       }
+
+
+
 
 
 
@@ -212,19 +212,19 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
 
        /**
         * Returns the list of tables from the database
-        * 
+        *
         * @return      array           Tables in an array (tablename is in both key and value)
         * @todo        Should return table details in value! see t3lib_db::admin_get_tables()
         */
        function admin_get_tables()     {
-               
+
                if (!$this->DBdir)      {
                        $this->errorStatus = 'XMLdatabase not connected';
                        return FALSE;
                }
 
                $whichTables = array();
-               
+
                        // Traverse tables:
                if (is_array($this->DBstructure['tables']))     {
                        foreach($this->DBstructure['tables'] as $tableName => $tableInfo)       {
@@ -237,12 +237,12 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
 
        /**
         * Returns information about each field in the $table
-        * 
+        *
         * @param       string          Table name
         * @return      array           Field information in an associative array with fieldname => field row
         */
        function admin_get_fields($tableName)   {
-               
+
                if (!$this->DBdir)      {
                        $this->errorStatus = 'XMLdatabase not connected';
                        return FALSE;
@@ -271,7 +271,7 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
 
        /**
         * Returns information about each index key in the $table
-        * 
+        *
         * @param       string          Table name
         * @return      array           Key information in a numeric array
         */
@@ -306,23 +306,23 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
 
                return $output;
        }
-       
+
        /**
         * mysql() wrapper function, used by the Install Tool and EM for all queries regarding management of the database!
-        * 
+        *
         * @param       string          Query to execute
         * @return      pointer         Result pointer
         */
        function admin_query($query)    {
-               
+
                if (!$this->DBdir)      {
                        $this->errorStatus = 'XMLdatabase not connected';
                        return FALSE;
                }
-               
+
                $parsedQuery = $this->parseSQL($query);
                $table = $parsedQuery['TABLE'];
-               
+
                if (is_array($parsedQuery))     {
                                // Process query based on type:
                        switch($parsedQuery['type'])    {
@@ -334,7 +334,7 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
                                                                // Write table file:
                                                        t3lib_div::writeFile($this->DBdir.$newTableFile, '');   // Create file
                                                        if (@is_file($this->DBdir.$newTableFile))       {
-                                                                       
+
                                                                        // Set and write structure
                                                                if (!is_array($this->DBstructure['tables']))    $this->DBstructure['tables']=array();
                                                                $this->DBstructure['tables'][(string)$table] = $parsedQuery;    // I have some STRANGE behaviours with this variable - had to do this trick to make it work!
@@ -353,7 +353,7 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
                                                                        $this->DBstructure['tables'][$table]['FIELDS'][$parsedQuery['FIELD']]['definition'] = $parsedQuery['definition'];       // Adding field in the end of list.
                                                                        $this->xmlDB_writeStructure();
                                                                        return TRUE;
-                                                               
+
                                                                        // TODO: Should traverse all data an add that field in arrays!
                                                                } else $this->errorStatus = 'Field "'.$parsedQuery['FIELD'].'" already exists!';
                                                        break;
@@ -363,7 +363,7 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
                                                                                $newFieldInfo = array();
                                                                                foreach($this->DBstructure['tables'][$table]['FIELDS'] as $fieldName => $fieldDefinition)       {
                                                                                        if (!strcmp($fieldName,$parsedQuery['FIELD']))  {
-                                                                                       
+
                                                                                                        // New fieldname?
                                                                                                if ($parsedQuery['newField'])   {
                                                                                                        if (!is_array($this->DBstructure['tables'][$table]['FIELDS'][$parsedQuery['newField']]))        {
@@ -376,14 +376,14 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
                                                                                                        // Set new field definition:
                                                                                                $fieldDefinition['definition'] = $parsedQuery['definition'];
                                                                                        }
-                                                                                       
+
                                                                                                // Set the whole thing in new var:
                                                                                        $newFieldInfo[$fieldName] = $fieldDefinition;
                                                                                }
                                                                                $this->DBstructure['tables'][$table]['FIELDS'] = $newFieldInfo;
                                                                                $this->xmlDB_writeStructure();
                                                                                return TRUE;
-                                                               
+
                                                                                // TODO: Should traverse all data an remove that field in arrays!
                                                                        } else $this->errorStatus = 'Field "'.$parsedQuery['FIELD'].'" does not exist!';
                                                                } else $this->errorStatus = 'There are not fields in the table - strange!';
@@ -393,7 +393,7 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
                                                                        unset($this->DBstructure['tables'][$table]['FIELDS'][$parsedQuery['FIELD']]);   // Removing it...
                                                                        $this->xmlDB_writeStructure();
                                                                        return TRUE;
-                                                               
+
                                                                        // TODO: Should traverse all data an remove that field in arrays!
                                                                } else $this->errorStatus = 'Field "'.$parsedQuery['FIELD'].'" does not exist!';
                                                        break;
@@ -404,14 +404,14 @@ debug($this->errorStatus,'XMLDB connect ERROR:');
 
                                                // TODO:
                                        debug($parsedQuery);
-                                       
-                                       
+
+
                                break;
                                default:
                                        $this->errorStatus = 'Query type "'.$parsedQuery['type'].'" was not supported!';
                                break;
                        }
-                       
+
                } else $this->errorStatus = 'SQL parse error: '.$parsedQuery;
 
                return FALSE;
index dabae35..45b1e4b 100644 (file)
@@ -5,7 +5,7 @@ define('TYPO3_MOD_PATH', 'sysext/dbal/mod1/');
 $BACK_PATH='../../../';
 $MCONF['name']='tools_txdbalM1';
 
-       
+
 $MCONF['access']='admin';
 $MCONF['script']='index.php';
 
index 3f68d55..4e81bfe 100644 (file)
@@ -88,9 +88,9 @@ class tx_felogin_pi1 extends tslib_pibase {
                $this->redirectUrl = t3lib_div::_GP('redirect_url');
 
                        // if config.typolinkLinkAccessRestrictedPages is set, the var is return_url
-               $returnUrl =  t3lib_div::_GP('return_url');  
+               $returnUrl =  t3lib_div::_GP('return_url');
                if ($returnUrl) {
-                       $this->redirectUrl = $returnUrl;         
+                       $this->redirectUrl = $returnUrl;
                }
 
                        // Get Template
@@ -237,7 +237,7 @@ class tx_felogin_pi1 extends tslib_pibase {
                $subpart = $this->cObj->getSubpart($this->template, '###TEMPLATE_LOGIN###');
                $subpartArray = $linkpartArray = array();
 
-               $gpRedirectUrl = ''; 
+               $gpRedirectUrl = '';
 
                $markerArray['###LEGEND###'] = $this->pi_getLL('oLabel_header_welcome', '', 1);
 
index 646c074..f55ceb4 100755 (executable)
@@ -2068,8 +2068,8 @@ From sub-directory:
                                        $this->headerStyle .= chr(10) .
                                                '<script type="text/javascript" src="' . t3lib_div::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir . 'contrib/prototype/prototype.js"></script>
                                                 <script type="text/javascript" src="' . t3lib_div::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir . 'sysext/install/mod/install.js"></script>';
-                                                
-                                       
+
+
                                        $out.=$this->wrapInCells('Site name:', '<input type="text" name="TYPO3_INSTALL[localconf.php][sitename]" value="'.htmlspecialchars($GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']).'">');
                                        $out.=$this->wrapInCells('', '<br />');
                                        $out.=$this->wrapInCells('Encryption key:', '<a name="set_encryptionKey"></a><input type="text" name="TYPO3_INSTALL[localconf.php][encryptionKey]" value="'.htmlspecialchars($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']).'"><br /><input type="button" onclick="EncryptionKey.load(this)" value="Generate random key">');
index ef90c49..3d7bb60 100644 (file)
@@ -34,7 +34,7 @@
 class tx_coreupdates_cscsplit {
 
        /**
-        * Function which checks if update is needed. Called in the beginning of an update process. 
+        * Function which checks if update is needed. Called in the beginning of an update process.
         *
         * @param       string          pointer to description for the update
         * @return      boolean         true if update is needs to be performed, false otherwise.
@@ -42,10 +42,10 @@ class tx_coreupdates_cscsplit {
        function checkForUpdate(&$description) {
                global $TYPO3_CONF_VARS;
 
-               $description = '<p>Run this wizard if you use CSS styled content in your templates, as the inclusion of the static templates changed. </p>' . 
-                                               '<p>You are currently using css styled content in <strong>' . count($this->getTemplates($dbQueries, $customMessages)) . '&nbsp;templates</strong>  (including deleted and hidden),' . 
-                                               ' so if you did not run this wizard before, <strong>do it now</strong>.</p>' . 
-                                               '<p>The wizard will automatically choose the right template according to your compatibility version. So if you want to ' . 
+               $description = '<p>Run this wizard if you use CSS styled content in your templates, as the inclusion of the static templates changed. </p>' .
+                                               '<p>You are currently using css styled content in <strong>' . count($this->getTemplates($dbQueries, $customMessages)) . '&nbsp;templates</strong>  (including deleted and hidden),' .
+                                               ' so if you did not run this wizard before, <strong>do it now</strong>.</p>' .
+                                               '<p>The wizard will automatically choose the right template according to your compatibility version. So if you want to ' .
                                                'change the rendering back to an older version, you will have to use the changeCompatibilityVersion wizard above ' .
                                                'first, and then return back to this one.</p>';
 
@@ -64,10 +64,10 @@ class tx_coreupdates_cscsplit {
                if ($customMessages) {
                        return false;
                } else {
-                       return true;    
+                       return true;
                }
        }
-       
+
        /**
         * Gets the templates that include the static css styled content template
         *
@@ -81,7 +81,7 @@ class tx_coreupdates_cscsplit {
                $where = 'include_static_file LIKE "%EXT:css_styled_content/static/%"';
                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery($fields, $table, $where);
 
-               $dbQueries[] = str_replace(chr(10), ' ', $GLOBALS['TYPO3_DB']->debug_lastBuiltQuery);   
+               $dbQueries[] = str_replace(chr(10), ' ', $GLOBALS['TYPO3_DB']->debug_lastBuiltQuery);
 
                if ($GLOBALS['TYPO3_DB']->sql_error()) {
                        $customMessages = 'SQL-ERROR: ' . htmlspecialchars($GLOBALS['TYPO3_DB']->sql_error());
@@ -89,7 +89,7 @@ class tx_coreupdates_cscsplit {
 
                $templates = array();
                while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
-                       $templates[] = $row;                    
+                       $templates[] = $row;
                }
                return $templates;
        }
@@ -114,13 +114,13 @@ class tx_coreupdates_cscsplit {
                        for ($j = 0; $j < $includedTemplatesCount; $j++) {
                                if (strpos($includedTemplates[$j], 'css_styled_content') !== false) {
                                        if ($compatVersion <= t3lib_div::int_from_ver('3.8')) {
-                                               $includedTemplates[$j] = 'EXT:css_styled_content/static/v3.8/'; 
+                                               $includedTemplates[$j] = 'EXT:css_styled_content/static/v3.8/';
                                        } elseif ($compatVersion <= t3lib_div::int_from_ver('4.1')) {
-                                               $includedTemplates[$j] = 'EXT:css_styled_content/static/v3.9/'; 
+                                               $includedTemplates[$j] = 'EXT:css_styled_content/static/v3.9/';
                                        } elseif ($compatVersion <= t3lib_div::int_from_ver('4.2')) {
-                                               $includedTemplates[$j] = 'EXT:css_styled_content/static/v4.2/'; 
+                                               $includedTemplates[$j] = 'EXT:css_styled_content/static/v4.2/';
                                        } elseif ($compatVersion == $currentVersion || $compatVersion > '4.2') {
-                                               $includedTemplates[$j] = 'EXT:css_styled_content/static/';                              
+                                               $includedTemplates[$j] = 'EXT:css_styled_content/static/';
                                        }
                                }
                        }
@@ -136,11 +136,11 @@ class tx_coreupdates_cscsplit {
 
                        $GLOBALS['TYPO3_DB']->exec_UPDATEquery($table, $where, $field_values);
                        $dbQueries[] = str_replace(chr(10), ' ', $GLOBALS['TYPO3_DB']->debug_lastBuiltQuery);
-                       
+
                        if ($GLOBALS['TYPO3_DB']->sql_error()) {
                                $customMessages = 'SQL-ERROR: ' . htmlspecialchars($GLOBALS['TYPO3_DB']->sql_error());
-                       } 
-               }       
+                       }
+               }
        }
 }
 ?>
\ No newline at end of file
index c21aad9..c4e4a9d 100644 (file)
@@ -27,9 +27,9 @@
 \r
 /**\r
  * Contains the update class for merging advanced and normal pagetype.\r
- * \r
+ *\r
  * @author Steffen Kamper <info@sk-typo3.de>\r
- * @version \r
+ * @version\r
  */\r
 class tx_coreupdates_imagecols {\r
        var $versionNumber;     // version number coming from t3lib_div::int_from_ver()\r
@@ -80,7 +80,7 @@ class tx_coreupdates_imagecols {
 \r
                        $res = $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tt_content', 'CTYPE IN (\'textpic\', \'image\') AND imagecols=0', $updateArray);\r
                        $dbQueries[] = str_replace(chr(10), ' ', $GLOBALS['TYPO3_DB']->debug_lastBuiltQuery);\r
-                       \r
+\r
                        if ($GLOBALS['TYPO3_DB']->sql_error()) {\r
                                $customMessages = 'SQL-ERROR: ' . htmlspecialchars($GLOBALS['TYPO3_DB']->sql_error());\r
                        } else {\r
index 68a1bc6..8bc9705 100644 (file)
@@ -56,9 +56,9 @@ class tx_coreupdates_installsysexts {
        public function checkForUpdate(&$description) {
                $result = false;
                $description = 'Install the following system extensions as their functionality is moved out of the TYPO3 base installation and now optional:<br />
-               <strong>Help&gt;About [about]</strong><br />Shows info about TYPO3 and installed extensions.<br />      
+               <strong>Help&gt;About [about]</strong><br />Shows info about TYPO3 and installed extensions.<br />
                <strong>Help&gt;TYPO3 Manual [cshmanual]</strong><br />Shows TYPO3 inline user manual.<br />
-               <strong>Frontend Editing [fe_edit]</strong><br />This module enables FE-editing, configuration is done by Typoscript<br />              
+               <strong>Frontend Editing [fe_edit]</strong><br />This module enables FE-editing, configuration is done by Typoscript<br />
                <strong>Simulate Static URLs [simulatestatic]</strong><br />If you do not want to use RealURL or CoolURI but still want the Speaking URL feature. If you used "config.simulateStaticDocuments = 1" in this installation before, you should install this system extension. Be sure to read the manual of "simulatestatic".</label>';
 
                foreach($this->newSystemExtensions as $ext) {
@@ -77,7 +77,7 @@ class tx_coreupdates_installsysexts {
         */
        public function getUserInput($inputPrefix) {
                $content = '<strong>Install the following SystemExtensions</strong>:<br />
-               <input type="checkbox" id="about" name="' . $inputPrefix . '[sysext][about]" value="1" checked="checked" /><label for="about">Help&gt;About [about]</label><br />               
+               <input type="checkbox" id="about" name="' . $inputPrefix . '[sysext][about]" value="1" checked="checked" /><label for="about">Help&gt;About [about]</label><br />
                <input type="checkbox" id="cshmanual" name="' . $inputPrefix . '[sysext][cshmanual]" value="1" checked="checked" /><label for="cshmanual">Help&gt;TYPO3 Manual [cshmanual]</label><br />
                <input type="checkbox" id="fe_edit" name="' . $inputPrefix . '[sysext][fe_edit]" value="1" checked="checked" /><label for="fe_edit">Frontend Editing [fe_edit]</label><br />
                <input type="checkbox" id="simulatestatic" name="' . $inputPrefix . '[sysext][simulatestatic]" value="1" checked="checked" /><label for="simulatestatic">Simulate Static URLs [simulatestatic]</label><br />';
index adcfc24..6750b2a 100644 (file)
@@ -27,7 +27,7 @@
 
 /**
  * Contains the update class for merging advanced and normal pagetype.
- * 
+ *
  * @author Steffen Kamper <info@sk-typo3.de>
  * @version $Id$
  */
@@ -80,7 +80,7 @@ class tx_coreupdates_mergeadvanced {
 
                        $res = $GLOBALS['TYPO3_DB']->exec_UPDATEquery('pages', 'doktype=2', $updateArray);
                        $dbQueries[] = str_replace(chr(10), ' ', $GLOBALS['TYPO3_DB']->debug_lastBuiltQuery);
-                       
+
                        if ($GLOBALS['TYPO3_DB']->sql_error()) {
                                $customMessages = 'SQL-ERROR: ' . htmlspecialchars($GLOBALS['TYPO3_DB']->sql_error());
                        } else {
index 665ee37..bb1ac4e 100644 (file)
@@ -27,7 +27,7 @@
 
 /**
  * Contains the update class for not in menu pages. Used by the update wizard in the install tool.
- * 
+ *
  * @author Sebastian Kurfuerst <sebastian@garbage-group.de>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @version $Id$
@@ -82,7 +82,7 @@ class tx_coreupdates_notinmenu {
 
                        $res = $GLOBALS['TYPO3_DB']->exec_UPDATEquery('pages', 'doktype=5', $updateArray);
                        $dbQueries[] = str_replace(chr(10), ' ', $GLOBALS['TYPO3_DB']->debug_lastBuiltQuery);
-                       
+
                        if ($GLOBALS['TYPO3_DB']->sql_error()) {
                                $customMessages = 'SQL-ERROR: ' . htmlspecialchars($GLOBALS['TYPO3_DB']->sql_error());
                        } else {
index 805b6b6..726c919 100644 (file)
@@ -80,7 +80,7 @@ class tx_lowlevel_cleaner_core extends t3lib_cli {
        var $label_infoString = 'The list of records is organized as [table]:[uid]:[field]:[flexpointer]:[softref_key]';
        var $pagetreePlugins = array();
        var $cleanerModules = array();
-       
+
        var $performanceStatistics = array();
 
 
@@ -372,7 +372,7 @@ class tx_lowlevel_cleaner_core extends t3lib_cli {
 
                        // Processing performance statistics:
                $this->performanceStatistics['genTree()'] = t3lib_div::milliseconds()-$pt;
-               
+
                        // Count records:
                foreach($GLOBALS['TCA'] as $tableName => $cfg)  {
                                // Select all records belonging to page:
@@ -388,7 +388,7 @@ class tx_lowlevel_cleaner_core extends t3lib_cli {
                                                                $this->performanceStatistics['genTree_traverse():TraverseTables:']['Proc'][$tableName].','.
                                                                $this->performanceStatistics['MySQL_count'][$tableName];
                }
-               
+
                $this->performanceStatistics['recStats_size']['(ALL)']=strlen(serialize($this->recStats));
                foreach($this->recStats as $key => $arrcontent) {
                        $this->performanceStatistics['recStats_size'][$key]=strlen(serialize($arrcontent));
@@ -550,10 +550,10 @@ class tx_lowlevel_cleaner_core extends t3lib_cli {
                                                }
                                        }
                                }
-                               
+
                                $this->performanceStatistics['genTree_traverse():TraverseTables:']['Proc']['(ALL)']+= t3lib_div::milliseconds()-$pt5;
                                $this->performanceStatistics['genTree_traverse():TraverseTables:']['Proc'][$tableName]+= t3lib_div::milliseconds()-$pt5;
-                               
+
                        }
                }
                unset($resSub);
index 229559e..4d964ef 100755 (executable)
@@ -135,7 +135,7 @@ class SC_mod_tools_config_index {
                                1 => $GLOBALS['LANG']->getLL('tca', true),
                                2 => $GLOBALS['LANG']->getLL('tcaDescr', true),
                                3 => $GLOBALS['LANG']->getLL('loadedExt', true),
-                               4 => $GLOBALS['LANG']->getLL('t3services', true), 
+                               4 => $GLOBALS['LANG']->getLL('t3services', true),
                                5 => $GLOBALS['LANG']->getLL('tbemodules', true),
                                6 => $GLOBALS['LANG']->getLL('tbemodulesext', true),
                                7 => $GLOBALS['LANG']->getLL('tbeStyles', true),
index 6b9e680..1e965b3 100755 (executable)
@@ -375,9 +375,9 @@ class SC_mod_tools_dbint_index {
                $content = $GLOBALS['LANG']->getLL('clickToUpdateRefIndex') . ' <input type="submit" name="_update" value="' . $GLOBALS['LANG']->getLL('updateNow') . '" /><br/>';
                $content.= $GLOBALS['LANG']->getLL('clickToTestRefIndex') . ' <input type="submit" name="_check" value="' . $GLOBALS['LANG']->getLL('checkNow') . '" /><br/><br/>';
                $content.= '<p>' . $GLOBALS['LANG']->getLL('checkScript') . '</p><br />';
-               $content.= '<p>' . $GLOBALS['LANG']->getLL('checkScript_check_description') . '<br />' . 
+               $content.= '<p>' . $GLOBALS['LANG']->getLL('checkScript_check_description') . '<br />' .
                                        $GLOBALS['LANG']->getLL('checkScript_check_example') . '</p><br />';
-               $content.= '<p>' . $GLOBALS['LANG']->getLL('checkScript_update_description') . '<br />' . 
+               $content.= '<p>' . $GLOBALS['LANG']->getLL('checkScript_update_description') . '<br />' .
                                        $GLOBALS['LANG']->getLL('checkScript_update_example') . '</p><br />';
                $content.= '<p>' . $GLOBALS['LANG']->getLL('checkScript_more') . '</p>';
                $this->content.= $this->doc->section($GLOBALS['LANG']->getLL('updateRefIndex'), $content, false, true);
index 1bf8080..44b7905 100644 (file)
@@ -6,7 +6,7 @@ if (TYPO3_MODE=='BE')   {
        $TYPO3_CONF_VARS['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_refindex'] = array('EXT:lowlevel/dbint/cli/refindex_cli.php','_CLI_lowlevel');
        $TYPO3_CONF_VARS['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_cleaner'] = array('EXT:lowlevel/dbint/cli/cleaner_cli.php','_CLI_lowlevel');
        $TYPO3_CONF_VARS['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_admin'] = array('EXT:lowlevel/admin_cli.php','_CLI_lowlevel');
-       
+
        $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['missing_files'] = array('EXT:lowlevel/clmods/class.missing_files.php:tx_lowlevel_missing_files');
        $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['missing_relations'] = array('EXT:lowlevel/clmods/class.missing_relations.php:tx_lowlevel_missing_relations');
        $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['double_files'] = array('EXT:lowlevel/clmods/class.double_files.php:tx_lowlevel_double_files');
@@ -14,7 +14,7 @@ if (TYPO3_MODE=='BE') {
        $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['lost_files'] = array('EXT:lowlevel/clmods/class.lost_files.php:tx_lowlevel_lost_files');
        $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['orphan_records'] = array('EXT:lowlevel/clmods/class.orphan_records.php:tx_lowlevel_orphan_records');
        $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['deleted'] = array('EXT:lowlevel/clmods/class.deleted.php:tx_lowlevel_deleted');
-       $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['versions'] = array('EXT:lowlevel/clmods/class.versions.php:tx_lowlevel_versions');   
+       $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['versions'] = array('EXT:lowlevel/clmods/class.versions.php:tx_lowlevel_versions');
        $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['cleanflexform'] = array('EXT:lowlevel/clmods/class.cleanflexform.php:tx_lowlevel_cleanflexform');
        $TYPO3_CONF_VARS['EXTCONF']['lowlevel']['cleanerModules']['syslog'] = array('EXT:lowlevel/clmods/class.syslog.php:tx_lowlevel_syslog');
 }
index a72684c..e823255 100644 (file)
@@ -29,7 +29,7 @@
  * identity check.
  *
  * LIBRARY DESIGN
- * 
+ *
  * This consumer library is designed with that flow in mind.  The goal
  * is to make it as easy as possible to perform the above steps
  * securely.
@@ -427,7 +427,7 @@ class Auth_OpenID_Consumer {
             $loader->fromSession($endpoint_data);
 
         $message = Auth_OpenID_Message::fromPostArgs($query);
-        $response = $this->consumer->complete($message, $endpoint, 
+        $response = $this->consumer->complete($message, $endpoint,
                                               $current_url);
         $this->session->del($this->_token_key);
 
@@ -1196,7 +1196,7 @@ class Auth_OpenID_GenericConsumer {
     /**
      * @access private
      */
-    function _verifyDiscoveryServices($claimed_id, 
+    function _verifyDiscoveryServices($claimed_id,
                                       &$services, &$to_match_endpoints)
     {
         // Search the services resulting from discovery to find one
@@ -1204,7 +1204,7 @@ class Auth_OpenID_GenericConsumer {
 
         foreach ($services as $endpoint) {
             foreach ($to_match_endpoints as $to_match_endpoint) {
-                $result = $this->_verifyDiscoverySingle($endpoint, 
+                $result = $this->_verifyDiscoverySingle($endpoint,
                                                         $to_match_endpoint);
 
                 if (!Auth_OpenID::isFailure($result)) {
@@ -1361,7 +1361,7 @@ class Auth_OpenID_GenericConsumer {
             }
         }
         $ca_message = $message->copy();
-        $ca_message->setArg(Auth_OpenID_OPENID_NS, 'mode', 
+        $ca_message->setArg(Auth_OpenID_OPENID_NS, 'mode',
                             'check_authentication');
         return $ca_message;
     }
@@ -1599,7 +1599,7 @@ class Auth_OpenID_GenericConsumer {
 
         $expires_in = Auth_OpenID::intval($expires_in_str);
         if ($expires_in === false) {
-            
+
             $err = sprintf("Could not parse expires_in from association ".
                            "response %s", print_r($assoc_response, true));
             return new Auth_OpenID_FailureResponse(null, $err);
@@ -1946,7 +1946,7 @@ class Auth_OpenID_AuthRequest {
     function htmlMarkup($realm, $return_to=null, $immediate=false,
                         $form_tag_attrs=null)
     {
-        $form = $this->formMarkup($realm, $return_to, $immediate, 
+        $form = $this->formMarkup($realm, $return_to, $immediate,
                                   $form_tag_attrs);
 
         if (Auth_OpenID::isFailure($form)) {
index d357c6b..b4979f1 100644 (file)
@@ -22,10 +22,10 @@ require_once 'Auth/OpenID/Interface.php';
 
 /**
  * This is a memcached-based store for OpenID associations and
- * nonces. 
- * 
- * As memcache has limit of 250 chars for key length, 
- * server_url, handle and salt are hashed with sha1(). 
+ * nonces.
+ *
+ * As memcache has limit of 250 chars for key length,
+ * server_url, handle and salt are hashed with sha1().
  *
  * Most of the methods of this class are implementation details.
  * People wishing to just use this store need only pay attention to
@@ -48,29 +48,29 @@ class Auth_OpenID_MemcachedStore extends Auth_OpenID_OpenIDStore {
     }
 
     /**
-     * Store association until its expiration time in memcached. 
-     * Overwrites any existing association with same server_url and 
-     * handle. Handles list of associations for every server. 
+     * Store association until its expiration time in memcached.
+     * Overwrites any existing association with same server_url and
+     * handle. Handles list of associations for every server.
      */
     function storeAssociation($server_url, $association)
     {
-        // create memcached keys for association itself 
+        // create memcached keys for association itself
         // and list of associations for this server
-        $associationKey = $this->associationKey($server_url, 
+        $associationKey = $this->associationKey($server_url,
             $association->handle);
         $serverKey = $this->associationServerKey($server_url);
-        
-        // get list of associations 
+
+        // get list of associations
         $serverAssociations = $this->connection->get($serverKey);
-        
+
         // if no such list, initialize it with empty array
         if (!$serverAssociations) {
             $serverAssociations = array();
         }
         // and store given association key in it
         $serverAssociations[$association->issued] = $associationKey;
-        
-        // save associations' keys list 
+
+        // save associations' keys list
         $this->connection->set(
             $serverKey,
             $serverAssociations,
@@ -79,13 +79,13 @@ class Auth_OpenID_MemcachedStore extends Auth_OpenID_OpenIDStore {
         // save association itself
         $this->connection->set(
             $associationKey,
-            $association, 
-            $this->compress, 
+            $association,
+            $this->compress,
             $association->issued + $association->lifetime);
     }
 
     /**
-     * Read association from memcached. If no handle given 
+     * Read association from memcached. If no handle given
      * and multiple associations found, returns latest issued
      */
     function getAssociation($server_url, $handle = null)
@@ -97,23 +97,23 @@ class Auth_OpenID_MemcachedStore extends Auth_OpenID_OpenIDStore {
                 $this->associationKey($server_url, $handle));
             return $association ? $association : null;
         }
-        
+
         // no handle given, working with list
         // create key for list of associations
         $serverKey = $this->associationServerKey($server_url);
-        
+
         // get list of associations
         $serverAssociations = $this->connection->get($serverKey);
         // return null if failed or got empty list
         if (!$serverAssociations) {
             return null;
         }
-        
+
         // get key of most recently issued association
         $keys = array_keys($serverAssociations);
         sort($keys);
         $lastKey = $serverAssociations[array_pop($keys)];
-        
+
         // get association, return null if failed
         $association = $this->connection->get($lastKey);
         return $association ? $association : null;
@@ -124,29 +124,29 @@ class Auth_OpenID_MemcachedStore extends Auth_OpenID_OpenIDStore {
      */
     function removeAssociation($server_url, $handle)
     {
-        // create memcached keys for association itself 
+        // create memcached keys for association itself
         // and list of associations for this server
         $serverKey = $this->associationServerKey($server_url);
-        $associationKey = $this->associationKey($server_url, 
+        $associationKey = $this->associationKey($server_url,
             $handle);
-        
+
         // get list of associations
         $serverAssociations = $this->connection->get($serverKey);
         // return null if failed or got empty list
         if (!$serverAssociations) {
             return false;
         }
-        
+
         // ensure that given association key exists in list
         $serverAssociations = array_flip($serverAssociations);
         if (!array_key_exists($associationKey, $serverAssociations)) {
             return false;
         }
-        
+
         // remove given association key from list
         unset($serverAssociations[$associationKey]);
         $serverAssociations = array_flip($serverAssociations);
-        
+
         // save updated list
         $this->connection->set(
             $serverKey,
@@ -154,48 +154,48 @@ class Auth_OpenID_MemcachedStore extends Auth_OpenID_OpenIDStore {
             $this->compress
         );
 
-        // delete association 
+        // delete association
         return $this->connection->delete($associationKey);
     }
 
     /**
-     * Create nonce for server and salt, expiring after 
+     * Create nonce for server and salt, expiring after
      * $Auth_OpenID_SKEW seconds.
      */
     function useNonce($server_url, $timestamp, $salt)
     {
         global $Auth_OpenID_SKEW;
-        
-        // save one request to memcache when nonce obviously expired 
+
+        // save one request to memcache when nonce obviously expired
         if (abs($timestamp - time()) > $Auth_OpenID_SKEW) {
             return false;
         }
-        
+
         // returns false when nonce already exists
         // otherwise adds nonce
         return $this->connection->add(
-            'openid_nonce_' . sha1($server_url) . '_' . sha1($salt), 
-            1, // any value here 
-            $this->compress, 
+            'openid_nonce_' . sha1($server_url) . '_' . sha1($salt),
+            1, // any value here
+            $this->compress,
             $Auth_OpenID_SKEW);
     }
-    
+
     /**
-     * Memcache key is prefixed with 'openid_association_' string. 
+     * Memcache key is prefixed with 'openid_association_' string.
      */
-    function associationKey($server_url, $handle = null) 
+    function associationKey($server_url, $handle = null)
     {
         return 'openid_association_' . sha1($server_url) . '_' . sha1($handle);
     }
-    
+
     /**
-     * Memcache key is prefixed with 'openid_association_' string. 
+     * Memcache key is prefixed with 'openid_association_' string.
      */
-    function associationServerKey($server_url) 
+    function associationServerKey($server_url)
     {
         return 'openid_association_server_' . sha1($server_url);
     }
-    
+
     /**
      * Report that this storage doesn't support cleanup
      */
index 69d95e7..e7a1441 100644 (file)
@@ -29,7 +29,7 @@ class Auth_OpenID_PostgreSQLStore extends Auth_OpenID_SQLStore {
                 "UNIQUE (server_url, timestamp, salt))";
 
         $this->sql['assoc_table'] =
-            "CREATE TABLE %s (server_url VARCHAR(2047) NOT NULL, ". 
+            "CREATE TABLE %s (server_url VARCHAR(2047) NOT NULL, ".
                              "handle VARCHAR(255) NOT NULL, ".
                              "secret BYTEA NOT NULL, ".
                              "issued INTEGER NOT NULL, ".
index f1db4d8..84e4065 100644 (file)
@@ -2,7 +2,7 @@
 
 /**
  * OpenID server protocol and logic.
- * 
+ *
  * Overview
  *
  * An OpenID server must perform three tasks:
@@ -10,7 +10,7 @@
  *  1. Examine the incoming request to determine its nature and validity.
  *  2. Make a decision about how to respond to this request.
  *  3. Format the response according to the protocol.
- * 
+ *
  * The first and last of these tasks may performed by the {@link
  * Auth_OpenID_Server::decodeRequest()} and {@link
  * Auth_OpenID_Server::encodeResponse} methods.  Who gets to do the
@@ -37,7 +37,7 @@
  * {@link Auth_OpenID_Server::handleRequest()}.
  *
  * OpenID Extensions
- * 
+ *
  * Do you want to provide other information for your users in addition
  * to authentication?  Version 1.2 of the OpenID protocol allows
  * consumers to add extensions to their requests.  For example, with
@@ -661,7 +661,7 @@ class Auth_OpenID_AssociateRequest extends Auth_OpenID_Request {
         $response->fields->updateArgs(Auth_OpenID_OPENID_NS,
            $this->session->answer($assoc->secret));
 
-        if (! ($this->session->session_type == 'no-encryption' 
+        if (! ($this->session->session_type == 'no-encryption'
                && $this->message->isOpenID1())) {
             $response->fields->setArg(Auth_OpenID_OPENID_NS,
                                       'session_type',
@@ -733,7 +733,7 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request {
      * deprecated since version 2.0.2
      */
     var $namespace;
-    
+
     function make(&$message, $identity, $return_to, $trust_root = null,
                   $immediate = false, $assoc_handle = null, $server = null)
     {
@@ -871,13 +871,13 @@ class Auth_OpenID_CheckIDRequest extends Auth_OpenID_Request {
         } else {
             $trust_root_param = 'realm';
         }
-        $trust_root = $message->getArg(Auth_OpenID_OPENID_NS, 
+        $trust_root = $message->getArg(Auth_OpenID_OPENID_NS,
                                        $trust_root_param);
         if (! $trust_root) {
             $trust_root = $return_to;
         }
 
-        if (! $message->isOpenID1() && 
+        if (! $message->isOpenID1() &&
             ($return_to === null) &&
             ($trust_root === null)) {
             return new Auth_OpenID_ServerError($message,
index 4919a60..b0f2b72 100644 (file)
@@ -210,7 +210,7 @@ class Auth_OpenID_TrustRoot {
         if ($parts['host'] == 'localhost') {
             return true;
         }
-        
+
         $host_parts = explode('.', $parts['host']);
         if ($parts['wildcard']) {
             // Remove the empty string from the beginning of the array
index a182540..ba731a8 100644 (file)
@@ -19,7 +19,7 @@
 require_once "Auth/OpenID.php";
 
 define('Auth_OpenID_FETCHER_MAX_RESPONSE_KB', 1024);
-define('Auth_OpenID_USER_AGENT', 
+define('Auth_OpenID_USER_AGENT',
        'php-openid/'.Auth_OpenID_VERSION.' (php/'.phpversion().')');
 
 class Auth_Yadis_HTTPResponse {
index 192dd1e..d577b8b 100644 (file)
@@ -127,7 +127,7 @@ class Auth_Yadis_ParanoidHTTPFetcher extends Auth_Yadis_HTTPFetcher {
                         Auth_OpenID_USER_AGENT.' '.$curl_user_agent);
             curl_setopt($c, CURLOPT_TIMEOUT, $off);
             curl_setopt($c, CURLOPT_URL, $url);
-            curl_setopt($c, CURLOPT_RANGE, 
+            curl_setopt($c, CURLOPT_RANGE,
                         "0-".(1024 * Auth_OpenID_FETCHER_MAX_RESPONSE_KB));
 
                        // <TYPO3-specific>
index 297ccbd..60f39ed 100644 (file)
@@ -113,7 +113,7 @@ class Auth_Yadis_ParseHTML {
     }
 
     /**
-     * Create a regular expression that will match an opening 
+     * Create a regular expression that will match an opening
      * or closing tag from a set of names.
      *
      * @access private
@@ -204,7 +204,7 @@ class Auth_Yadis_ParseHTML {
 
         $link_data = array();
         $link_matches = array();
-        
+
         if (!preg_match_all($this->tagPattern('meta', false, 'maybe'),
                             $html_string, $link_matches)) {
             return array();
index 6579b57..8abc8e6 100644 (file)
@@ -47,7 +47,7 @@ class  tx_recycler_module1 extends t3lib_SCbase {
 
        protected $allowDelete = false;
        protected $recordsPageLimit = 50;
-       
+
        /**
         * Initializes the Module
         *
@@ -64,18 +64,18 @@ class  tx_recycler_module1 extends t3lib_SCbase {
                $this->isAccessibleForCurrentUser = (
                        $this->id && is_array($this->pageRecord) || !$this->id && $this->isCurrentUserAdmin()
                );
-               
+
                //don't access in workspace
                if ($GLOBALS['BE_USER']->workspace !== 0) {
                        $this->isAccessibleForCurrentUser = false;
                }
-               
+
                //read configuration
                $modTS = $GLOBALS['BE_USER']->getTSConfig('mod.recycler');
                if ($this->isCurrentUserAdmin()) {
                        $this->allowDelete = true;
                } else {
-                       $this->allowDelete = ($modTS['properties']['allowDelete'] == '1');                      
+                       $this->allowDelete = ($modTS['properties']['allowDelete'] == '1');
                }
                if (isset($modTS['properties']['recordsPageLimit']) && intval($modTS['properties']['recordsPageLimit']) > 0) {
                        $this->recordsPageLimit = intval($modTS['properties']['recordsPageLimit']);
index 7d85a85..73b5ba2 100644 (file)
@@ -488,7 +488,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                } else {
                        $this->TCEform->addStyleSheet($key, $href, $title, $relation);
                }
-               
+
        }
 
        /**
@@ -765,7 +765,7 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
         */
        function loadJSfiles($RTEcounter) {
                global $TYPO3_CONF_VARS;
-               
+
                $loadPluginCode = '
                                                HTMLArea_plugins = new Array();';
                foreach ($this->pluginEnabledCumulativeArray[$RTEcounter] as $pluginId) {
index 20c599f..4bdfc2e 100644 (file)
@@ -156,7 +156,7 @@ abstract class tx_rtehtmlareaapi {
        public function getPathToPluginDirectory() {
                return ($this->relativePathToPluginDirectory ? $this->htmlAreaRTE->httpTypo3Path . t3lib_extMgm::siteRelPath($this->extensionKey) . $this->relativePathToPluginDirectory : '');
        }
-       
+
        /**
         * Returns a boolean indicating whether the plugin adds buttons or not to the toolbar
         *
index 8b5cd68..73126c3 100644 (file)
@@ -42,12 +42,12 @@ class tx_rtehtmlarea_abouteditor extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'about';
        protected $convertToolbarForHtmlAreaArray = array (
                'about' => 'About',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -61,7 +61,7 @@ class tx_rtehtmlarea_abouteditor extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index eaaf56d..df2d12e 100644 (file)
@@ -42,7 +42,7 @@ class tx_rtehtmlarea_blockstyle extends tx_rtehtmlareaapi {
        protected $thisConfig;                                  // Reference to RTE PageTSConfig
        protected $toolbar;                                     // Reference to RTE toolbar array
        protected $LOCAL_LANG;                                  // Frontend language array
-       
+
        protected $pluginButtons = 'blockstyle';                // The comma-seperated list of button names that the extension id adding to the htmlArea RTE tollbar
        protected $pluginLabels = 'blockstylelabel';            // The comma-seperated list of label names that the extension id adding to the htmlArea RTE tollbar
                                                                // The name-converting array, converting the button names used in the RTE PageTSConfing to the button id's used by the JS scripts
index e408eb0..541fed6 100644 (file)
@@ -42,12 +42,12 @@ class tx_rtehtmlarea_charactermap extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'insertcharacter';
        protected $convertToolbarForHtmlAreaArray = array (
                'insertcharacter'       => 'InsertCharacter',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -61,7 +61,7 @@ class tx_rtehtmlarea_charactermap extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index 69281e5..ad8fd7f 100644 (file)
@@ -42,14 +42,14 @@ class tx_rtehtmlarea_contextmenu extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons;
        protected $convertToolbarForHtmlAreaArray = array ();
-       
+
        public function main($parentObject) {
                return parent::main($parentObject) && !($this->htmlAreaRTE->client['BROWSER'] == 'opera' || $this->thisConfig['disableContextMenu'] || $this->thisConfig['disableRightClick']);
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
index a8a640a..cefc2dc 100644 (file)
@@ -42,16 +42,16 @@ class tx_rtehtmlarea_defaultclean extends tx_rtehtmlareaapi {
        protected $thisConfig;                                  // Reference to RTE PageTSConfig
        protected $toolbar;                                     // Reference to RTE toolbar array
        protected $LOCAL_LANG;                                  // Frontend language array
-       
+
        protected $pluginButtons = 'cleanword';
        protected $convertToolbarForHtmlAreaArray = array (
                'cleanword'     => 'CleanWord',
                );
-       
+
        public function main($parentObject) {
                return parent::main($parentObject) && $this->thisConfig['enableWordClean'] && !is_array($this->thisConfig['enableWordClean.']['HTMLparser.']);
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -64,7 +64,7 @@ class tx_rtehtmlarea_defaultclean extends tx_rtehtmlareaapi {
         *      RTEarea['.$RTEcounter.']["buttons"]["button-id"]["property"] = "value";
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               
+
                $registerRTEinJavascriptString = '';
                $button = 'cleanword';
                if (in_array($button, $this->toolbar)) {
index efdcc3f..9bb62ac 100644 (file)
@@ -42,17 +42,17 @@ class tx_rtehtmlarea_defaultcolor extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'textcolor,bgcolor';
        protected $convertToolbarForHtmlAreaArray = array (
                'textcolor'             => 'ForeColor',
                'bgcolor'               => 'HiliteColor',
                );
-       
+
        public function main($parentObject) {
                return parent::main($parentObject) && $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['allowStyleAttribute'];
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -66,7 +66,7 @@ class tx_rtehtmlarea_defaultcolor extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index 29a9450..96caac8 100644 (file)
@@ -42,12 +42,12 @@ class tx_rtehtmlarea_defaultimage extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'image';
        protected $convertToolbarForHtmlAreaArray = array (
                'image' => 'InsertImage',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -61,7 +61,7 @@ class tx_rtehtmlarea_defaultimage extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index a2742fa..886d1e8 100644 (file)
@@ -42,7 +42,7 @@ class tx_rtehtmlarea_defaultinline extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'bold,italic,strikethrough,subscript,superscript,underline';
        protected $convertToolbarForHtmlAreaArray = array (
                'bold'                  => 'Bold',
@@ -52,7 +52,7 @@ class tx_rtehtmlarea_defaultinline extends tx_rtehtmlareaapi {
                'superscript'           => 'Superscript',
                'subscript'             => 'Subscript',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -66,11 +66,11 @@ class tx_rtehtmlarea_defaultinline extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
-       
+
        /**
         * Return tranformed content
         *
@@ -79,7 +79,7 @@ class tx_rtehtmlarea_defaultinline extends tx_rtehtmlareaapi {
         * @return      string          the transformed content
         */
        public function transformContent($content) {
-               
+
                        // Change the strong and em tags for gecko browsers
                if ($this->htmlAreaRTE->client['BROWSER'] == 'gecko') {
                                // change <strong> to <b>
@@ -87,7 +87,7 @@ class tx_rtehtmlarea_defaultinline extends tx_rtehtmlareaapi {
                                // change <em> to <i>
                        $content = preg_replace('/<(\/?)em([^b>]*>)/i', "<$1i$2", $content);
                }
-               
+
                return $content;
        }
 
index 39e7ae0..9d18cdf 100644 (file)
@@ -42,12 +42,12 @@ class tx_rtehtmlarea_defaultlink extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'link';
        protected $convertToolbarForHtmlAreaArray = array (
                'link'  => 'CreateLink',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
index bc08816..d527f21 100644 (file)
@@ -42,16 +42,16 @@ class tx_rtehtmlarea_definitionlist extends tx_rtehtmlareaapi {
        protected $thisConfig;                                          // Reference to RTE PageTSConfig
        protected $toolbar;                                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                                          // Frontend language array
-       
+
        protected $pluginButtons = 'definitionlist, definitionitem';
-               
+
        protected $convertToolbarForHtmlAreaArray = array (
                'definitionlist'        => 'DefinitionList',
                'definitionitem'        => 'DefinitionItem',
                );
                // The comma-separated list of names of prerequisite plugins
        protected $requiredPlugins = 'BlockElements';
-       
+
        public function main($parentObject) {
                $enabled = parent::main($parentObject) && $this->htmlAreaRTE->isPluginEnabled('BlockElements');
                if ($enabled && is_object($this->htmlAreaRTE->registeredPlugins['BlockElements'])) {
@@ -59,7 +59,7 @@ class tx_rtehtmlarea_definitionlist extends tx_rtehtmlareaapi {
                }
                return $enabled;
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -73,11 +73,11 @@ class tx_rtehtmlarea_definitionlist extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
-       
+
        /**
         * Return an updated array of toolbar enabled buttons
         *
index af0974b..402e4b4 100644 (file)
@@ -49,7 +49,7 @@ class tx_rtehtmlarea_editormode extends tx_rtehtmlareaapi {
                );
                // Requiring itself so that it is always loaded.
        protected $requiredPlugins = 'EditorMode';
-       
+
        public function main($parentObject) {
                parent::main($parentObject);
                        // Do not disable this plugin even if the chMode button is disabled
index 3cdfe32..846c28b 100644 (file)
@@ -42,12 +42,12 @@ class tx_rtehtmlarea_findreplace extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'findreplace';
        protected $convertToolbarForHtmlAreaArray = array (
                'findreplace'   => 'FindReplace',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -61,7 +61,7 @@ class tx_rtehtmlarea_findreplace extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index 3e382d8..e53d4fe 100644 (file)
@@ -42,12 +42,12 @@ class tx_rtehtmlarea_insertsmiley extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'emoticon';
        protected $convertToolbarForHtmlAreaArray = array (
                'emoticon'      => 'InsertSmiley',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -61,7 +61,7 @@ class tx_rtehtmlarea_insertsmiley extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index ccc5479..b69cca2 100644 (file)
@@ -42,13 +42,13 @@ class tx_rtehtmlarea_quicktag extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'inserttag';
        protected $convertToolbarForHtmlAreaArray = array (
                'inserttag'     => 'InsertTag',
                );
        protected $requiredPlugins = 'TYPO3Color';      // The comma-separated list of names of prerequisite plugins
-       
+
        public function main($parentObject) {
                $available = parent::main($parentObject);
                if ($this->thisConfig['disableSelectColor'] && $this->htmlAreaRTE->client['BROWSER'] != 'gecko') {
@@ -56,7 +56,7 @@ class tx_rtehtmlarea_quicktag extends tx_rtehtmlareaapi {
                }
                return $available;
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -69,7 +69,7 @@ class tx_rtehtmlarea_quicktag extends tx_rtehtmlareaapi {
         *      RTEarea['.$RTEcounter.']["buttons"]["button-id"]["property"] = "value";
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               
+
                $registerRTEinJavascriptString = '';
                        // Deprecated inserttag button configuration
                if (in_array('inserttag', $this->toolbar) && trim($this->thisConfig['hideTags'])) {
index 51d6531..f92876b 100644 (file)
@@ -42,12 +42,12 @@ class tx_rtehtmlarea_removeformat extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'removeformat';
        protected $convertToolbarForHtmlAreaArray = array (
                'removeformat'  => 'RemoveFormat',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -61,7 +61,7 @@ class tx_rtehtmlarea_removeformat extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index f298004..d86fec7 100644 (file)
@@ -137,8 +137,8 @@ class tx_rtehtmlarea_selectfont extends tx_rtehtmlareaapi {
                        "' . $GLOBALS['TSFE']->getLLL((($buttonId == 'fontstyle') ? 'Default font' : 'Default size'), $this->LOCAL_LANG) . '" : ""';
                } else {
                        $items['none'] = '
-                       "' . ($this->htmlAreaRTE->TCEform->inline->isAjaxCall 
-                                       ? $GLOBALS['LANG']->csConvObj->utf8_encode($GLOBALS['LANG']->getLL(($buttonId == 'fontstyle') ? 'Default font' : 'Default size'), $GLOBALS['LANG']->charSet) 
+                       "' . ($this->htmlAreaRTE->TCEform->inline->isAjaxCall
+                                       ? $GLOBALS['LANG']->csConvObj->utf8_encode($GLOBALS['LANG']->getLL(($buttonId == 'fontstyle') ? 'Default font' : 'Default size'), $GLOBALS['LANG']->charSet)
                                        : $GLOBALS['LANG']->getLL(($buttonId == 'fontstyle') ? 'Default font' : 'Default size')) . '" : ""';
                }
                        // Inserting and localizing default items
index 7312389..2e15b13 100644 (file)
@@ -42,17 +42,17 @@ class tx_rtehtmlarea_typo3color extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'textcolor,bgcolor';
        protected $convertToolbarForHtmlAreaArray = array (
                'textcolor'             => 'ForeColor',
                'bgcolor'               => 'HiliteColor',
                );
-       
+
        public function main($parentObject) {
                return parent::main($parentObject) && $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['rtehtmlarea']['allowStyleAttribute'] && !$this->thisConfig['disableSelectColor'];
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -65,13 +65,13 @@ class tx_rtehtmlarea_typo3color extends tx_rtehtmlareaapi {
         *      RTEarea['.$RTEcounter.']["buttons"]["button-id"]["property"] = "value";
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               
+
                        // Process colors configuration
                $registerRTEinJavascriptString = $this->buildJSColorsConfig($RTEcounter);
-               
+
                return $registerRTEinJavascriptString;
        }
-       
+
        /**
         * Return Javascript configuration of colors
         *
@@ -80,18 +80,18 @@ class tx_rtehtmlarea_typo3color extends tx_rtehtmlareaapi {
         * @return      string          Javascript configuration of colors
         */
        function buildJSColorsConfig($RTEcounter) {
-               
+
                if ($this->htmlAreaRTE->is_FE()) {
                        $RTEProperties = $this->htmlAreaRTE->RTEsetup;
                } else {
                        $RTEProperties = $this->htmlAreaRTE->RTEsetup['properties'];
                }
-               
+
                $configureRTEInJavascriptString = '';
-               
+
                $configureRTEInJavascriptString .= '
                        RTEarea['.$RTEcounter.'].disableColorPicker = ' . (trim($this->thisConfig['disableColorPicker']) ? 'true' : 'false') . ';';
-               
+
                        // Building JS array of configured colors
                if (is_array($RTEProperties['colors.']) )  {
                        $HTMLAreaColorname = array();
@@ -102,14 +102,14 @@ class tx_rtehtmlarea_typo3color extends tx_rtehtmlareaapi {
                                [' . $colorLabel . ' , "' . $conf['value'] . '"]';
                        }
                }
-               
+
                        // Setting the list of colors if specified in the RTE config
                if ($this->thisConfig['colors'] ) {
                        $HTMLAreaJSColors = '[';
                        $HTMLAreaColors = t3lib_div::trimExplode(',' , $this->htmlAreaRTE->cleanList($this->thisConfig['colors']));
                        $HTMLAreaColorsIndex = 0;
                        foreach ($HTMLAreaColors as $colorName) {
-                               if($HTMLAreaColorsIndex && $HTMLAreaColorname[$colorName]) { 
+                               if($HTMLAreaColorsIndex && $HTMLAreaColorname[$colorName]) {
                                        $HTMLAreaJSColors .= ',';
                                }
                                $HTMLAreaJSColors .= $HTMLAreaColorname[$colorName];
@@ -119,7 +119,7 @@ class tx_rtehtmlarea_typo3color extends tx_rtehtmlareaapi {
                        $configureRTEInJavascriptString .= '
                        RTEarea['.$RTEcounter.'].colors = '. $HTMLAreaJSColors;
                }
-               
+
                return $configureRTEInJavascriptString;
        }
 
index 8cfba23..d90b983 100644 (file)
@@ -42,16 +42,16 @@ class tx_rtehtmlarea_typo3htmlparser extends tx_rtehtmlareaapi {
        protected $thisConfig;                                  // Reference to RTE PageTSConfig
        protected $toolbar;                                     // Reference to RTE toolbar array
        protected $LOCAL_LANG;                                  // Frontend language array
-       
+
        protected $pluginButtons = 'cleanword';
        protected $convertToolbarForHtmlAreaArray = array (
                'cleanword'     => 'CleanWord',
                );
-       
+
        public function main($parentObject) {
                return parent::main($parentObject) && $this->thisConfig['enableWordClean'] && is_array($this->thisConfig['enableWordClean.']['HTMLparser.']);
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -64,7 +64,7 @@ class tx_rtehtmlarea_typo3htmlparser extends tx_rtehtmlareaapi {
         *      RTEarea['.$RTEcounter.']["buttons"]["button-id"]["property"] = "value";
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               
+
                $registerRTEinJavascriptString = '';
                $button = 'cleanword';
                if (in_array($button, $this->toolbar)) {
@@ -78,7 +78,7 @@ class tx_rtehtmlarea_typo3htmlparser extends tx_rtehtmlareaapi {
                }
                return $registerRTEinJavascriptString;
        }
-       
+
        /**
         * Return an updated array of toolbar enabled buttons
         * Force inclusion of hidden button cleanword
index a3cdcd4..36dc9c8 100644 (file)
@@ -42,18 +42,18 @@ class tx_rtehtmlarea_typo3image extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'image';
        protected $convertToolbarForHtmlAreaArray = array (
                'image' => 'InsertImage',
                );
-       
+
        public function main($parentObject) {
                        // Check if this should be enabled based on Page TSConfig
-               return parent::main($parentObject) && !$this->thisConfig['disableTYPO3Browsers'] 
+               return parent::main($parentObject) && !$this->thisConfig['disableTYPO3Browsers']
                                && !(is_array( $this->thisConfig['buttons.']) && is_array($this->thisConfig['buttons.']['image.']) && is_array($this->thisConfig['buttons.']['image.']['TYPO3Browser.']) && $this->thisConfig['buttons.']['image.']['TYPO3Browser.']['disabled']);
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -66,7 +66,7 @@ class tx_rtehtmlarea_typo3image extends tx_rtehtmlareaapi {
         *      RTEarea['.$RTEcounter.']["buttons"]["button-id"]["property"] = "value";
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               
+
                $registerRTEinJavascriptString = '';
                $button = 'image';
                if (in_array($button, $this->toolbar)) {
@@ -77,7 +77,7 @@ class tx_rtehtmlarea_typo3image extends tx_rtehtmlareaapi {
                        $registerRTEinJavascriptString .= '
                        RTEarea['.$RTEcounter.'].buttons.'. $button .'.pathImageModule = "../../mod4/select_image.php";';
                }
-               
+
                return $registerRTEinJavascriptString;
        }
 
index 26d4a00..d845a9e 100644 (file)
@@ -42,19 +42,19 @@ class tx_rtehtmlarea_typo3link extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'link, unlink';
        protected $convertToolbarForHtmlAreaArray = array (
                'link'          => 'CreateLink',
                'unlink'        => 'UnLink',
                );
-       
+
        public function main($parentObject) {
                        // Check if this should be enabled based on Page TSConfig
-               return parent::main($parentObject) && !$this->thisConfig['disableTYPO3Browsers'] 
+               return parent::main($parentObject) && !$this->thisConfig['disableTYPO3Browsers']
                                && !(is_array( $this->thisConfig['buttons.']) && is_array($this->thisConfig['buttons.']['link.']) && is_array($this->thisConfig['buttons.']['link.']['TYPO3Browser.']) && $this->thisConfig['buttons.']['link.']['TYPO3Browser.']['disabled']);
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -67,7 +67,7 @@ class tx_rtehtmlarea_typo3link extends tx_rtehtmlareaapi {
         *      RTEarea['.$RTEcounter.']["buttons"]["button-id"]["property"] = "value";
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               
+
                $registerRTEinJavascriptString = '';
                $button = 'link';
                if (in_array($button, $this->toolbar)) {
@@ -77,7 +77,7 @@ class tx_rtehtmlarea_typo3link extends tx_rtehtmlareaapi {
                        }
                        $registerRTEinJavascriptString .= '
                        RTEarea['.$RTEcounter.'].buttons.'. $button .'.pathLinkModule = "../../mod3/browse_links.php";';
-                       
+
                        if ($this->htmlAreaRTE->is_FE()) {
                                $RTEProperties = $this->htmlAreaRTE->RTEsetup;
                        } else {
@@ -94,7 +94,7 @@ class tx_rtehtmlarea_typo3link extends tx_rtehtmlareaapi {
                }
                return $registerRTEinJavascriptString;
        }
-       
+
        /**
         * Return a JS array for special anchor classes
         *
@@ -102,7 +102,7 @@ class tx_rtehtmlarea_typo3link extends tx_rtehtmlareaapi {
         */
        public function buildJSClassesAnchorArray() {
                global $LANG, $TYPO3_CONF_VARS;
-               
+
                $linebreak = $TYPO3_CONF_VARS['EXTCONF'][$this->htmlAreaRTE->ID]['enableCompressedScripts'] ? '' : chr(10);
                $JSClassesAnchorArray .= 'HTMLArea.classesAnchorSetup = [ ' . $linebreak;
                $classesAnchorIndex = 0;
@@ -131,11 +131,11 @@ class tx_rtehtmlarea_typo3link extends tx_rtehtmlareaapi {
                                }
                                $JSClassesAnchorArray .= '}' . $linebreak;
                        }
-               }       
+               }
                $JSClassesAnchorArray .= '];' . $linebreak;
                return $JSClassesAnchorArray;
        }
-        
+
        /**
         * Return an updated array of toolbar enabled buttons
         *
index f1e9cf9..5d6e352 100644 (file)
@@ -44,7 +44,7 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlareaapi {
        protected $LOCAL_LANG;                                  // Frontend language array
        protected $requiresClassesConfiguration = true;         // True if the registered plugin requires the PageTSConfig Classes configuration
        protected $requiredPlugins = 'TYPO3Color';              // The comma-separated list of names of prerequisite plugins
-       
+
        protected $pluginButtons = 'table, toggleborders, tableproperties, tablerestyle, rowproperties, rowinsertabove, rowinsertunder, rowdelete, rowsplit,
                                                columnproperties, columninsertbefore, columninsertafter, columndelete, columnsplit,
                                                cellproperties, cellinsertbefore, cellinsertafter, celldelete, cellsplit, cellmerge';
@@ -70,11 +70,11 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlareaapi {
                'cellsplit'             => 'TO-cell-split',
                'cellmerge'             => 'TO-cell-merge',
                );
-       
+
        public function main($parentObject) {
-               
+
                $available = parent::main($parentObject);
-               
+
                if ($this->htmlAreaRTE->client['BROWSER'] == 'opera') {
                        $this->thisConfig['hideTableOperationsInToolbar'] = 0;
                }
@@ -83,7 +83,7 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlareaapi {
                }
                return $available;
        }
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -97,10 +97,10 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlareaapi {
         */
        public function buildJavascriptConfiguration($RTEcounter) {
                global $TSFE, $LANG;
-               
+
                $registerRTEinJavascriptString = '';
                if (in_array('table', $this->toolbar)) {
-                       
+
                                // Combining fieldset disablers as a list
                        $disabledFieldsets = array('Alignment', 'Borders', 'Color', 'Description', 'Layout', 'RowGroup', 'Spacing', 'Style');
                        foreach ($disabledFieldsets as $index => $fieldset) {
@@ -109,7 +109,7 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlareaapi {
                                }
                        }
                        $disabledFieldsets = strtolower(implode(',', $disabledFieldsets));
-                       
+
                                // Dialogue fieldsets removal configuration
                        $dialogues = array('table', 'tableproperties', 'rowproperties', 'columnproperties', 'cellproperties');
                        foreach ($dialogues as $dialogue) {
@@ -125,10 +125,10 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlareaapi {
                        RTEarea['.$RTEcounter.'].buttons.'.$dialogue.'.removeFieldsets = ",' . $disabledFieldsets . '";';
                                }
                        }
-                       
+
                        $registerRTEinJavascriptString .= '
                        RTEarea['.$RTEcounter.'].hideTableOperationsInToolbar = ' . (trim($this->thisConfig['hideTableOperationsInToolbar']) ? 'true' : 'false') . ';';
-                       
+
                                // Deprecated toggleborders button configuration
                        if (in_array('toggleborders',$this->toolbar) && $this->thisConfig['keepToggleBordersInToolbar']) {
                                if (!is_array($this->thisConfig['buttons.']['toggleborders.'])) {
@@ -143,8 +143,8 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlareaapi {
                }
                return $registerRTEinJavascriptString;
        }
-       
-        
+
+
        /**
         * Return an updated array of toolbar enabled buttons
         *
index 57d120a..cf024f5 100644 (file)
@@ -42,7 +42,7 @@ class tx_rtehtmlarea_textstyle extends tx_rtehtmlareaapi {
        protected $thisConfig;                                          // Reference to RTE PageTSConfig
        protected $toolbar;                                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                                          // Frontend language array
-       
+
        protected $pluginButtons = 'textstyle';                         // The comma-seperated list of button names that the extension id adding to the htmlArea RTE tollbar
        protected $pluginLabels = 'textstylelabel';                     // The comma-seperated list of label names that the extension id adding to the htmlArea RTE tollbar
                                                                        // The name-converting array, converting the button names used in the RTE PageTSConfing to the button id's used by the JS scripts
index 883ae06..fe5c43d 100644 (file)
@@ -42,13 +42,13 @@ class tx_rtehtmlarea_undoredo extends tx_rtehtmlareaapi {
        protected $thisConfig;                          // Reference to RTE PageTSConfig
        protected $toolbar;                             // Reference to RTE toolbar array
        protected $LOCAL_LANG;                          // Frontend language array
-       
+
        protected $pluginButtons = 'undo,redo';
        protected $convertToolbarForHtmlAreaArray = array (
                'undo'  => 'Undo',
                'redo'  => 'Redo',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
index b13dce9..7012174 100644 (file)
@@ -42,12 +42,12 @@ class tx_rtehtmlarea_userelements extends tx_rtehtmlareaapi {
        protected $thisConfig;                                  // Reference to RTE PageTSConfig
        protected $toolbar;                                     // Reference to RTE toolbar array
        protected $LOCAL_LANG;                                  // Frontend language array
-       
+
        protected $pluginButtons = 'user';
        protected $convertToolbarForHtmlAreaArray = array (
                'user'  => 'UserElements',
                );
-       
+
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -60,7 +60,7 @@ class tx_rtehtmlarea_userelements extends tx_rtehtmlareaapi {
         *      RTEarea['.$RTEcounter.']["buttons"]["button-id"]["property"] = "value";
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               
+
                $registerRTEinJavascriptString = '';
                $button = 'user';
                if (in_array($button, $this->toolbar)) {
@@ -71,7 +71,7 @@ class tx_rtehtmlarea_userelements extends tx_rtehtmlareaapi {
                        $registerRTEinJavascriptString .= '
                        RTEarea['.$RTEcounter.'].buttons.'. $button .'.pathUserModule = "../../mod5/user.php";';
                }
-               
+
                return $registerRTEinJavascriptString;
        }
 
index 468e6e6..f39c819 100644 (file)
@@ -255,7 +255,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                }
                        // Setting intial values for link attributes
                $this->initLinkAttributes();
-               
+
                        // Add attributes to body tag. Note: getBodyTagAdditions will invoke the hooks
                $this->doc->bodyTagAdditions = $this->getBodyTagAdditions();
                        // Adding RTE JS code
@@ -444,7 +444,7 @@ class tx_rtehtmlarea_browse_links extends browse_links {
                        }
                }
        }
-       
+
        /**
         * Provide the additional parameters to be included in the template body tag
         *
index d627b0f..f41fa6c 100644 (file)
@@ -271,7 +271,7 @@ class tx_rtehtmlarea_pi1 {
        }  // end of function main
 
        function startHandler($xml_parser, $tag, $attributes) {
-               
+
                if (strlen($this->xmlCharacterData)) {
                        $this->spellCheckHandler($xml_parser, $this->xmlCharacterData);
                        $this->xmlCharacterData = '';
index 2cc0416..7166926 100644 (file)
@@ -292,7 +292,7 @@ class tx_rtehtmlarea_pi2 extends tx_rtehtmlarea_base {
                if (RTEarea[\'' . $textareaId . '\'] && !RTEarea[\'' . $textareaId . '\'].deleted) {
                        fields = document.getElementsByName(\'' . $textareaId . '\');
                        field = fields.item(0);
-                       if (field && field.nodeName.toLowerCase() == \'textarea\') { 
+                       if (field && field.nodeName.toLowerCase() == \'textarea\') {
                                field.value = RTEarea[\'' . $textareaId . '\'][\'editor\'].getHTML();
                        }
                } else {
index da0d0af..4ab1bf3 100644 (file)
@@ -59,7 +59,7 @@ $TCA['tx_rtehtmlarea_acronym'] = Array (
                ),
                'type' => Array (
                        'exclude' => 1,
-                       'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.type',          
+                       'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.type',
                        'config' => Array (
                                'type' => 'radio',
                                'items' => Array (
@@ -69,8 +69,8 @@ $TCA['tx_rtehtmlarea_acronym'] = Array (
                                'default' => '2',
                        )
                ),
-               'term' => Array (               
-                       'exclude' => 0,         
+               'term' => Array (
+                       'exclude' => 0,
                        'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.term',
                        'config' => Array (
                                'type' => 'input',
@@ -78,8 +78,8 @@ $TCA['tx_rtehtmlarea_acronym'] = Array (
                                'eval' => 'trim,required',
                        )
                ),
-               'acronym' => Array (            
-                       'exclude' => 0,         
+               'acronym' => Array (
+                       'exclude' => 0,
                        'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.acronym',
                        'config' => Array (
                                'type' => 'input',
@@ -87,7 +87,7 @@ $TCA['tx_rtehtmlarea_acronym'] = Array (
                                'eval' => 'trim,required',
                        )
                ),
-               'static_lang_isocode' => Array (                
+               'static_lang_isocode' => Array (
                        'exclude' => 0,
                        'label' => 'LLL:EXT:rtehtmlarea/locallang_db.xml:tx_rtehtmlarea_acronym.static_lang_isocode',
                        'displayCond' => 'EXT:static_info_tables:LOADED:true',
index 1539a60..97f2b72 100755 (executable)
@@ -274,7 +274,7 @@ class SC_mod_user_setup_index {
                                } else {
                                        top.TYPO3ModuleMenu.refreshMenu();
                                }
-                       
+
                                if (top.shortcutFrame) {
                                        top.shortcutFrame.refreshShortcuts();
                                }
@@ -314,7 +314,7 @@ class SC_mod_user_setup_index {
 
                        // Submit and reset buttons
                $this->content .= $this->doc->spacer(20);
-               $this->content .= $this->doc->section('', 
+               $this->content .= $this->doc->section('',
                        t3lib_BEfunc::cshItem('_MOD_user_setup', 'reset', $BACK_PATH) . '
                        <input type="hidden" name="simUser" value="'.$this->simUser.'" />
                        <input type="submit" name="submit" value="'.$LANG->getLL('save').'" />
@@ -425,7 +425,7 @@ class SC_mod_user_setup_index {
                }
                ksort($languageOptions);
                $languageCode = '
-                               <select id="field_language" name="data[lang]">' . 
+                               <select id="field_language" name="data[lang]">' .
                                        implode('', $languageOptions) . '
                                </select>';
                if ($BE_USER->uc['lang'] && !@is_dir(PATH_typo3conf . 'l10n/' . $BE_USER->uc['lang'])) {
@@ -609,7 +609,7 @@ class SC_mod_user_setup_index {
         * @param       $data   a multi-dimensional array that will be converted to table contents
         * @param       $tabLabel       the label that is put on top of the tab array
         * @return      ready to use for the dyntabmenu itemarray
-        */  
+        */
        function renderUserSetupTabs($data) {
                $result = array();
                foreach ($data as $k => $tabData) {
@@ -641,7 +641,7 @@ class SC_mod_user_setup_index {
                                $result[] = array(
                                        'label'   => $tabData['ctrl']['label'],
                                        'content' => $this->doc->spacer(20) . $this->doc->table($code)
-                               );              
+                               );
                        }
                }
                return $result;
index 21f1fdb..5e40c6c 100644 (file)
@@ -368,7 +368,7 @@ class tx_simulatestatic {
                        $parts = t3lib_div::trimExplode('&', $linkVars);
                        // This sorts the parameters - and may not be needed and further
                        // it will generate new MD5 hashes in many cases. Maybe not so smart. Hmm?
-                       sort($parts);   
+                       sort($parts);
                        $remainingParts = array();
                        foreach ($parts as $index => $value) {
                                if (strlen($value)) {
index f533ead..96aa443 100644 (file)
@@ -99,7 +99,7 @@ class tx_sysactionToolbarMenu implements backend_toolbarItem {
                        return '';
                }
 
-               
+
        }
 
        /**
index a2b4f73..fdf261d 100755 (executable)
@@ -138,14 +138,14 @@ class tx_t3editor {
                                // include editor-js-lib
                        $doc->loadJavascriptLib($path_t3e . 'jslib/codemirror/codemirror.js');
                        $doc->loadJavascriptLib($path_t3e . 'jslib/t3editor.js');
-                       
+
                        $doc->loadJavascriptLib($path_t3e . 'jslib/ts_codecompletion/tsref.js');
                        $doc->loadJavascriptLib($path_t3e . 'jslib/ts_codecompletion/completionresult.js');
                        $doc->loadJavascriptLib($path_t3e . 'jslib/ts_codecompletion/tsparser.js');
                        $doc->loadJavascriptLib($path_t3e . 'jslib/ts_codecompletion/tscodecompletion.js');
-                       
+
                        // set correct path to the editor
-                       
+
                        $code.= t3lib_div::wrapJS(
                                'var PATH_t3e = "' . $GLOBALS['BACK_PATH'] . t3lib_extmgm::extRelPath('t3editor') . '"; ' .
                                'var URL_typo3 = "' . htmlspecialchars(t3lib_div::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir) . '"; '
@@ -422,7 +422,7 @@ class tx_t3editor {
                }
                return $savingsuccess;
        }
-       
+
        /**
         * Gets plugins that are defined at $TYPO3_CONF_VARS['EXTCONF']['t3editor']['plugins']
         * (called by typo3/ajax.php)
index 7e8153d..541b451 100644 (file)
@@ -60,7 +60,7 @@ class tx_t3editor_codecompletion {
         * Loads all templates up to a given page id (walking the rootline) and
         * cleans parts that are not required for the t3editor codecompletion.
         *
-        * @param       integer         $pageId: id of the page 
+        * @param       integer         $pageId: id of the page
         * @param       integer         $templateId: currently unused (default: 0)
         * @return      array           Cleaned array of TypoScript information
         * @author      Oliver Hader <oliver@typo3.org>
@@ -73,7 +73,7 @@ class tx_t3editor_codecompletion {
                                // Check whether there is a pageId given:
                        if ($pageId) {
                                $templates = $this->getMergedTemplates($pageId);
-                               // Otherwise, set an error: 
+                               // Otherwise, set an error:
                        } else {
                                $this->ajaxObj->setError('Syntax error: Parameter pageId must be a valid integer.');
                        }
index d45f4fc..55daac5 100644 (file)
 class tx_t3editor_TSrefLoader {
        /** @var DOMDocument */
        protected $xmlDoc;
-       
+
        /** @var TYPO3AJAX */
        protected $ajaxObj;
-       
+
        /**
         * General processor for AJAX requests.
         * (called by typo3/ajax.php)
index bc16924..39d393e 100644 (file)
@@ -2,7 +2,7 @@
 if (!defined ('TYPO3_MODE'))   die ('Access denied.');
 
 if (TYPO3_MODE == 'BE')        {
-               
+
        t3lib_extMgm::addModule('help','txtsconfighelpM1','',t3lib_extMgm::extPath($_EXTKEY).'mod1/');
 }
 ?>
\ No newline at end of file
index a083e02..3831167 100644 (file)
@@ -3,7 +3,7 @@ define('TYPO3_MOD_PATH', 'sysext/tsconfig_help/mod1/');
 $BACK_PATH='../../../';
 $MCONF['name']='help_txtsconfighelpM1';
 
-       
+
 $MCONF['access']='user,group';
 $MCONF['script']='index.php';
 
index bc27671..329f701 100755 (executable)
@@ -708,7 +708,7 @@ class tx_version_cm1 extends t3lib_SCbase {
                $actionLinks.= '<input type="submit" name="_" value="' . $GLOBALS['LANG']->getLL('refresh') . '" />';
                $actionLinks.= '<input type="submit" name="_previewLink" value="' . $GLOBALS['LANG']->getLL('previewLink') . '" />';
                $actionLinks.= $this->displayWorkspaceOverview_allStageCmd();
-               
+
                if ($actionLinks || count($errors))     {
                        $this->content.= $this->doc->section('',$actionLinks.(count($errors) ? '<h3>' . $GLOABLS['LANG']->getLL('errors') . '</h3><br/>'.implode('<br/>',$errors).'<hr/>' : ''),0,1);
                }