Non-functional changes...
authorMichael Stucki <michael.stucki@typo3.org>
Tue, 5 Dec 2006 00:22:45 +0000 (00:22 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Tue, 5 Dec 2006 00:22:45 +0000 (00:22 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@1855 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_befunc.php
t3lib/class.t3lib_div.php
t3lib/thumbs.php
typo3/class.browse_links.php
typo3/class.file_list.inc
typo3/show_item.php
typo3/sysext/cms/tslib/class.tslib_content.php

index f7d322f..76aa24e 100755 (executable)
@@ -1608,8 +1608,8 @@ class t3lib_BEfunc        {
                                        // use the original image if it's size fits to the thumbnail size
                                if ($max && $max<=(count($sizeParts)&&max($sizeParts)?max($sizeParts):56))      {
                                        $theFile = $url = ($abs?'':'../').($uploaddir?$uploaddir.'/':'').trim($theFile);
-                                       $onClick='top.launchView(\''.$theFile.'\',\'\',\''.$backPath.'\');return false;';
-                                       $thumbData.='<a href="#" onclick="'.htmlspecialchars($onClick).'"><img src="'.$backPath.$url.'" '.$imgInfo[3].' hspace="2" border="0" title="'.trim($url).'"'.$tparams.' alt="" /></a> ';
+                                       $onClick = 'top.launchView(\''.$theFile.'\',\'\',\''.$backPath.'\');return false;';
+                                       $thumbData.= '<a href="#" onclick="'.htmlspecialchars($onClick).'"><img src="'.$backPath.$url.'" '.$imgInfo[3].' hspace="2" border="0" title="'.trim($url).'"'.$tparams.' alt="" /></a> ';
                                                // New 190201 stop
                                } elseif ($ext=='ttf' || t3lib_div::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'],$ext)) {
                                        $theFile_abs = PATH_site.($uploaddir?$uploaddir.'/':'').trim($theFile);
@@ -1617,16 +1617,16 @@ class t3lib_BEfunc      {
 
                                        $check = basename($theFile_abs).':'.filemtime($theFile_abs).':'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
                                        $params = '&file='.rawurlencode($theFile);
-                                       $params .= $size?'&size='.$size:'';
+                                       $params.= $size?'&size='.$size:'';
                                        $params.= '&md5sum='.t3lib_div::shortMD5($check);
 
                                        $url = $thumbScript.'?&dummy='.$GLOBALS['EXEC_TIME'].$params;
-                                       $onClick='top.launchView(\''.$theFile.'\',\'\',\''.$backPath.'\');return false;';
-                                       $thumbData.='<a href="#" onclick="'.htmlspecialchars($onClick).'"><img src="'.htmlspecialchars($backPath.$url).'" hspace="2" border="0" title="'.trim($theFile).'"'.$tparams.' alt="" /></a> ';
+                                       $onClick = 'top.launchView(\''.$theFile.'\',\'\',\''.$backPath.'\');return false;';
+                                       $thumbData.= '<a href="#" onclick="'.htmlspecialchars($onClick).'"><img src="'.htmlspecialchars($backPath.$url).'" hspace="2" border="0" title="'.trim($theFile).'"'.$tparams.' alt="" /></a> ';
                                } else {
                                        $icon = t3lib_BEfunc::getFileIcon($ext);
                                        $url = 'gfx/fileicons/'.$icon;
-                                       $thumbData.='<img src="'.$backPath.$url.'" hspace="2" border="0" title="'.trim($theFile).'"'.$tparams.' alt="" /> ';
+                                       $thumbData.= '<img src="'.$backPath.$url.'" hspace="2" border="0" title="'.trim($theFile).'"'.$tparams.' alt="" /> ';
                                }
                        }
                }
@@ -1646,7 +1646,7 @@ class t3lib_BEfunc        {
        function getThumbNail($thumbScript,$theFile,$tparams='',$size='')       {
                $check = basename($theFile).':'.filemtime($theFile).':'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
                $params = '&file='.rawurlencode($theFile);
-               $params .= trim($size)?'&size='.trim($size):'';
+               $params.= trim($size)?'&size='.trim($size):'';
                $params.= '&md5sum='.t3lib_div::shortMD5($check);
 
                $url = $thumbScript.'?&dummy='.$GLOBALS['EXEC_TIME'].$params;
index 2d51ce4..c01b776 100755 (executable)
@@ -2385,7 +2385,7 @@ class t3lib_div {
                        elseif (false !== ($fd = @fopen($url, 'rb', false, $ctx)))      {
                                $content = '';
                                while (!feof($fd))      {
-                                       $content .= fread($fd, 4096);
+                                       $content.= fread($fd, 4096);
                                }
                                fclose($fd);
                        }
@@ -2396,7 +2396,7 @@ class t3lib_div {
                elseif (false !== ($fd = @fopen($url, 'rb')))   {
                        $content = '';
                        while (!feof($fd))      {
-                               $content .= fread($fd, 4096);
+                               $content.= fread($fd, 4096);
                        }
                        fclose($fd);
                }
index c076a07..a1e8687 100755 (executable)
@@ -111,13 +111,13 @@ if (!$TYPO3_CONF_VARS['GFX']['image_processing']) die ('ImageProcessing was disa
  * @subpackage t3lib
  */
 class SC_t3lib_thumbs {
-       var $include_once=array();
+       var $include_once = array();
 
        var $outdir = 'typo3temp/';             // The output directory of temporary files in PATH_site
        var $output = '';
        var $sizeDefault='56x56';
 
-       var $imageList; // Coming from $TYPO3_CONF_VARS['GFX']['imagefile_ext']
+       var $imageList;         // Coming from $TYPO3_CONF_VARS['GFX']['imagefile_ext']
        var $input;             // Contains the absolute path to the file for which to make a thumbnail (after init())
 
                // Internal, static: GPvar:
@@ -143,7 +143,7 @@ class SC_t3lib_thumbs {
                        // Image extension list is set:
                $this->imageList = $TYPO3_CONF_VARS['GFX']['imagefile_ext'];                    // valid extensions. OBS: No spaces in the list, all lowercase...
 
-                       // if the filereference $this->file is relative, we correct the path
+                       // If the filereference $this->file is relative, we correct the path
                if (substr($file,0,3)=='../')   {
                        $file = PATH_site.substr($file,3);
                }
@@ -242,7 +242,7 @@ class SC_t3lib_thumbs {
                                }
                                        // The thumbnail is read and output to the browser
                                if($fd = @fopen($this->output,'rb'))    {
-                                       Header('Content-type: image/'.$outext);
+                                       header('Content-type: image/'.$outext);
                                        while (!feof($fd))      {
                                                echo fread($fd, 10000);
                                        }
@@ -289,30 +289,30 @@ class SC_t3lib_thumbs {
 
                        // Creates the basis for the error image
                if ($TYPO3_CONF_VARS['GFX']['gdlib_png'])       {
-                       Header('Content-type: image/png');
+                       header('Content-type: image/png');
                        $im = imagecreatefrompng(PATH_typo3.'gfx/notfound_thumb.png');
                } else {
-                       Header('Content-type: image/gif');
+                       header('Content-type: image/gif');
                        $im = imagecreatefromgif(PATH_typo3.'gfx/notfound_thumb.gif');
                }
                        // Sets background color and print color.
-           $white = ImageColorAllocate($im, 0,0,0);
-           $black = ImageColorAllocate($im, 255,255,0);
+               $white = imageColorAllocate($im, 0,0,0);
+               $black = imageColorAllocate($im, 255,255,0);
 
                        // Prints the text strings with the build-in font functions of GD
                $x=0;
                $font=0;
                if ($l1)        {
                        imagefilledrectangle($im, $x, 9, 56, 16, $black);
-               ImageString($im,$font,$x,9,$l1,$white);
+                       imageString($im,$font,$x,9,$l1,$white);
                }
                if ($l2)        {
                        imagefilledrectangle($im, $x, 19, 56, 26, $black);
-               ImageString($im,$font,$x,19,$l2,$white);
+                       imageString($im,$font,$x,19,$l2,$white);
                }
                if ($l3)        {
                        imagefilledrectangle($im, $x, 29, 56, 36, $black);
-               ImageString($im,$font,$x,29,substr($l3,-14),$white);
+                       imageString($im,$font,$x,29,substr($l3,-14),$white);
                }
 
                        // Outputting the image stream and exit
@@ -340,9 +340,9 @@ class SC_t3lib_thumbs {
                if (!$TYPO3_CONF_VARS['GFX']['gdlib'])  die('');
 
                        // Create image and set background color to white.
-               $im = ImageCreate(250,76);
-           $white = ImageColorAllocate($im, 255,255,255);
-           $col = ImageColorAllocate($im, 0,0,0);
+               $im = imageCreate(250,76);
+               $white = imageColorAllocate($im, 255,255,255);
+               $col = imageColorAllocate($im, 0,0,0);
 
                        // The test string and offset in x-axis.
                $string = 'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZzÆæØøÅåÄäÖöÜüß';
@@ -364,10 +364,10 @@ class SC_t3lib_thumbs {
 
                        // Output PNG or GIF based on $TYPO3_CONF_VARS['GFX']['gdlib_png']
                if ($TYPO3_CONF_VARS['GFX']['gdlib_png'])       {
-                       Header('Content-type: image/png');
+                       header('Content-type: image/png');
                        imagePng($im);
                } else {
-                       Header('Content-type: image/gif');
+                       header('Content-type: image/gif');
                        imageGif($im);
                }
                imagedestroy($im);
index fee5406..3df3af0 100755 (executable)
@@ -1458,7 +1458,7 @@ class browse_links {
                } else {
                        $thumbNailCheck='';
                }
-               $noThumbs = $noThumbs?$noThumbs:!$_MOD_SETTINGS['displayThumbs'];
+               $noThumbs = $noThumbs ? $noThumbs : !$_MOD_SETTINGS['displayThumbs'];
 
                        // Create folder tree:
                $foldertree = t3lib_div::makeInstance('TBE_FolderTree');
@@ -1487,7 +1487,7 @@ class browse_links {
                                </tr>
                        </table>
                        ';
-               $content.=$thumbNailCheck;
+               $content.= $thumbNailCheck;
 
                        // Adding create folder + upload forms if applicable:
                if (!$BE_USER->getTSConfigVal('options.uploadFieldsInTopOfEB')) $content.=$uploadForm;
index 9b8e618..c78dbdd 100755 (executable)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -491,13 +491,13 @@ class fileList extends t3lib_recordList {
                                                        break;
                                                }
                                        }
-                                       $out.=$this->addelement(1,$theIcon,$theData);
+                                       $out.= $this->addelement(1,$theIcon,$theData);
 
                                                // Thumbsnails?
                                        if ($this->thumbs && $this->isImage($theFile['fileext']))       {
-                                               $thumbData=Array();
+                                               $thumbData = array();
                                                $theFile_R = rawurlencode($theFile['path'].$theFile['file']);
-                                               $titleCol=$this->fieldArray[0];
+                                               $titleCol = $this->fieldArray[0];
 
                                                $theFile_abs = $theFile['path'].$theFile['file'];
                                                $check = basename($theFile_abs).':'.filemtime($theFile_abs).':'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'];
@@ -506,7 +506,7 @@ class fileList extends t3lib_recordList {
                                                $href = $this->backPath.$this->thumbScript.'?&dummy='.$GLOBALS['EXEC_TIME'].$params;
 
                                                $thumbData[$titleCol]='<img src="'.htmlspecialchars($href).'" hspace="2" title="'.htmlspecialchars(trim($theFile['file'])).'" alt="" />';
-                                               $out.=$this->addelement(4,'',$thumbData);
+                                               $out.= $this->addelement(4,'',$thumbData);
                                        }
                                }
                                $this->eCounter++;
index e24d82c..81c389d 100755 (executable)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
index 94691cb..ca9d755 100755 (executable)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -2579,14 +2579,14 @@ class tslib_cObj {
        function netprintApplication_offsiteLinkWrap($str,$imgConf,$conf)       {
                if ($conf['url'] && @is_file($imgConf['origFile']))     {
                        $thisUrl = $conf['thisUrl'] ? $conf['thisUrl'] : t3lib_div::getIndpEnv('TYPO3_REQUEST_DIR');
-                       $origFile=$thisUrl.$imgConf['origFile'];
+                       $origFile = $thisUrl.$imgConf['origFile'];
                                // Original file dimensions:
                        $gifCreator = t3lib_div::makeInstance('tslib_gifbuilder');
                        $gifCreator->init();
                        $origDim = $gifCreator->getImageDimensions($imgConf['origFile']);
                        if (!$conf['linkOnlyPixelsAbove'] || $origDim[0]*$origDim[1]>$conf['linkOnlyPixelsAbove'])      {
                                        // Set parameters
-                               $thumbFile=$thisUrl.$imgConf['3'].'|'.$imgConf[0].'x'.$imgConf[1].'|'.$origDim[0].'x'.$origDim[1].'|'.filesize($imgConf['origFile']).'|'.filemtime($imgConf['origFile']);
+                               $thumbFile = $thisUrl.$imgConf['3'].'|'.$imgConf[0].'x'.$imgConf[1].'|'.$origDim[0].'x'.$origDim[1].'|'.filesize($imgConf['origFile']).'|'.filemtime($imgConf['origFile']);
                                        // Set url:
                                $url = $conf['url']
                                        .'&NP[offsite][1]='.rawurlencode($origFile)