Code cleanup and small typo fixes
authorMichael Stucki <michael.stucki@typo3.org>
Wed, 26 Jul 2006 17:55:14 +0000 (17:55 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Wed, 26 Jul 2006 17:55:14 +0000 (17:55 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@1658 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_befunc.php
t3lib/class.t3lib_extfilefunc.php
t3lib/class.t3lib_stdgraphic.php
t3lib/class.t3lib_tcemain.php
t3lib/config_default.php
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/class.tslib_menu.php
typo3/sysext/cms/tslib/class.tslib_pagegen.php
typo3/sysext/css_styled_content/doc/manual.sxw

index 20e2f64..54d6e7d 100755 (executable)
@@ -2781,12 +2781,12 @@ class t3lib_BEfunc      {
 
        /**
         * Find the real PID of the record (with $uid from $table). This MAY be impossible if the pid is set as a reference to the former record or a page (if two records are created at one time).
-        * NOTICE: Make sure that the input PID is never negativ because the record was an offline version! Therefore, you should always use t3lib_BEfunc::fixVersioningPid($table,$row); on the data you input before calling this function!
+        * NOTICE: Make sure that the input PID is never negative because the record was an offline version! Therefore, you should always use t3lib_BEfunc::fixVersioningPid($table,$row); on the data you input before calling this function!
         * Usage: 2
         *
         * @param       string          Table name
         * @param       integer         Record uid
-        * @param       integer         Record pid, could be negative then pointing to a record from same table whos pid to find and return.
+        * @param       integer         Record pid, could be negative then pointing to a record from same table whose pid to find and return.
         * @return      integer
         * @internal
         * @see t3lib_TCEmain::copyRecord(), getTSCpid()
index 66c8081..e7af10a 100755 (executable)
@@ -745,7 +745,7 @@ class t3lib_extFileFunctions extends t3lib_basicFileFunctions       {
        }
 
        /**
-        * Editing textfiles or foldes (action=9)
+        * Editing textfiles or folders (action=9)
         *
         * @param       array           $cmds['data'] is the new content. $cmds['target'] is the target (file or dir)
         * @return      boolean         Returns true on success
index 72cd293..d4b7590 100644 (file)
@@ -303,7 +303,7 @@ class t3lib_stdGraphic      {
 
                        $this->cmds['jpg'] = $this->cmds['jpeg'] = '-colorspace RGB -quality '.$this->jpegQuality;
                }
-                       // ... but if 'im_v5effects' is set, dont care about 'im_no_effects'
+                       // ... but if 'im_v5effects' is set, don't care about 'im_no_effects'
                if ($gfxConf['im_v5effects'])   {
                        $this->NO_IM_EFFECTS = 0;
                        $this->V5_EFFECTS = 1;
@@ -2186,7 +2186,8 @@ class t3lib_stdGraphic    {
                                        // Register temporary filename:
                                $GLOBALS['TEMP_IMAGES_ON_PAGE'][] = $output;
 
-                               if ($data['crs']) {
+                                       // Cropscaling:
+                               if ($data['crs'])       {
                                        if ($this->dontCheckForExistingTempFile || !$this->file_exists_typo3temp_file($output, $imagefile))     {
                                                $crsOutput = str_replace('pics/', 'pics/crs-', $output);
                                                $this->imageMagickExec($imagefile.$frame, $crsOutput, $command);
index 159ff50..7f322cd 100755 (executable)
@@ -2251,7 +2251,7 @@ class t3lib_TCEmain       {
 
                                $nonFields = array_unique(t3lib_div::trimExplode(',','uid,perms_userid,perms_groupid,perms_user,perms_group,perms_everybody,t3ver_oid,t3ver_wsid,t3ver_id,t3ver_label,t3ver_state,t3ver_swapmode,t3ver_count,t3ver_stage,t3ver_tstamp,'.$excludeFields,1));
 
-                               #$row = $this->recordInfo($table,$uid,'*');
+                               // $row = $this->recordInfo($table,$uid,'*');
                                $row = t3lib_BEfunc::getRecordWSOL($table,$uid);        // So it copies (and localized) content from workspace...
                                if (is_array($row))     {
 
@@ -2268,7 +2268,7 @@ class t3lib_TCEmain       {
                                        $copyAfterFields = $destPid<0 ? $this->fixCopyAfterDuplFields($table,$uid,abs($destPid),0) : array();
 
                                                // Page TSconfig related:
-                                       $tscPID = t3lib_BEfunc::getTSconfig_pidValue($table,$uid,$destPid);     // NOT using t3lib_BEfunc::getTSCpid() because we need the real pid - not the id of a page, if the input is a page...
+                                       $tscPID = t3lib_BEfunc::getTSconfig_pidValue($table,$uid,$destPid);     // NOT using t3lib_BEfunc::getTSCpid() because we need the real pid - not the ID of a page, if the input is a page...
                                        $TSConfig = $this->getTCEMAIN_TSconfig($tscPID);
                                        $tE = $this->getTableEntries($table,$TSConfig);
 
index b7ba735..91f59bf 100755 (executable)
@@ -367,8 +367,8 @@ $T3_SERVICES = array();
 
 
        // Turn error logging on/off.
-if(($displayErrors=intval($TYPO3_CONF_VARS['SYS']['displayErrors']))!='-1')    {
-       if($displayErrors==2)   {       // Special value "2" enables this feature only if $TYPO3_CONF_VARS[SYS][devIPmask] matches
+if (($displayErrors=intval($TYPO3_CONF_VARS['SYS']['displayErrors']))!='-1')   {
+       if ($displayErrors==2)  {       // Special value "2" enables this feature only if $TYPO3_CONF_VARS[SYS][devIPmask] matches
                if (t3lib_div::cmpIP(t3lib_div::getIndpEnv('REMOTE_ADDR'), $GLOBALS['TYPO3_CONF_VARS']['SYS']['devIPmask']))    {
                        $displayErrors=1;
                } else {
@@ -378,7 +378,6 @@ if(($displayErrors=intval($TYPO3_CONF_VARS['SYS']['displayErrors']))!='-1') {
        @ini_set('display_errors', $displayErrors);
 }
 
-
        // Set PHP memory limit depending on value of $TYPO3_CONF_VARS["SYS"]["setMemoryLimit"]
 if(intval($TYPO3_CONF_VARS["SYS"]["setMemoryLimit"])>16) {
        @ini_set('memory_limit',intval($TYPO3_CONF_VARS["SYS"]["setMemoryLimit"]).'m');
index 71f0be9..35ff5d0 100755 (executable)
@@ -2080,6 +2080,7 @@ class tslib_cObj {
                        $hiddenfields.$content,
                        '</form>'
                );
+
                if ($conf['arrayReturnMode'])   {
                        $content['validateForm']=$validateForm;
                        $content['formname']=$formname;
index f3b26ad..9f325cd 100755 (executable)
@@ -1634,7 +1634,7 @@ class tslib_tmenu extends tslib_menu {
                                        $this->I['A2'] = '';
                                }
 
-                                       // ATAGBeforeWrap processing:
+                                       // ATagBeforeWrap processing:
                                if ($this->I['val']['ATagBeforeWrap'])  {
                                        $wrapPartsBefore = explode('|',$this->I['val']['linkWrap']);
                                        $wrapPartsAfter = array('','');
index 7c10580..17b2d1b 100755 (executable)
@@ -152,7 +152,7 @@ See <a href="http://wiki.typo3.org/index.php/TYPO3_3.8.1" target="_blank">wiki.t
                        $GLOBALS['TSFE']->spamProtectEmailAddresses = t3lib_div::intInRange($GLOBALS['TSFE']->config['config']['spamProtectEmailAddresses'],-10,10,0);
                        if ($GLOBALS['TSFE']->spamProtectEmailAddresses)        {
                                $GLOBALS['TSFE']->additionalJavaScript['UnCryptMailto()']='
-  // decrypt helper function 
+  // decrypt helper function
 function decryptCharcode(n,start,end,offset) {
        n = n + offset;
        if (offset > 0 && n > end)      {
@@ -802,11 +802,11 @@ $GLOBALS['TSFE']->content.='
 
                // Div-sections
                if ($GLOBALS['TSFE']->divSection)       {
-                       $GLOBALS['TSFE']->content.=     chr(10).$GLOBALS['TSFE']->divSection;
+                       $GLOBALS['TSFE']->content.= chr(10).$GLOBALS['TSFE']->divSection;
                }
 
                // Page content
-               $GLOBALS['TSFE']->content.=chr(10).$pageContent;
+               $GLOBALS['TSFE']->content.= chr(10).$pageContent;
 
                // Ending page
                $GLOBALS['TSFE']->content.= chr(10).'</body>';
index 6481508..b9c92f5 100755 (executable)
Binary files a/typo3/sysext/css_styled_content/doc/manual.sxw and b/typo3/sysext/css_styled_content/doc/manual.sxw differ