* Fixed bug #1861: Call of inexinsting t3lib_exec::imageMagickCommand() instead of...
authorMichael Stucki <michael.stucki@typo3.org>
Fri, 18 Nov 2005 23:13:15 +0000 (23:13 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Fri, 18 Nov 2005 23:13:15 +0000 (23:13 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@870 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_basicfilefunc.php
t3lib/class.t3lib_div.php
t3lib/class.t3lib_iconworks.php
t3lib/class.t3lib_install.php
typo3/sysext/cms/tslib/class.tslib_fe.php

index 93b85f6..77c8374 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
-2006-11-18     Michael Scharkow        <mscharkow@gmx.net>
+2005-11-19  Michael Stucki  <michael@typo3.org>
+
+       * Fixed bug #1861: Call of inexinsting t3lib_exec::imageMagickCommand() instead of t3lib_div::...
+
+2006-11-18  Michael Scharkow  <mscharkow@gmx.net>
+
        * Removed bgColor from default body tag
 
-2006-11-17     Robert Lemke    <robert@typo3.org>
+2006-11-17  Robert Lemke  <robert@typo3.org>
+
        * Added two post-processing hooks into t3lib_tcemain->moveRecord. They are required by TemplaVoila 1.0
 
 2006-11-15  Sebastian Kurfuerst  <sebastian@garbage-group.de>
 
 2005-11-09  Rupert Germann  <rupi@gmx.li>
 
-       * fix for function getBorderAttr: closes bugs 1360 and 1461
+       * Fix for function getBorderAttr: closes bugs 1360 and 1461
 
 2005-11-09  Sebastian Kurfuerst  <sebastian@garbage-group.de>
 
        * New feature #1577: display clickmenus with XMLHTTP / ajax
        * Fixed bug 1066: Shortcut to a invisible page leads to a frontend error
 
-2005-11-09     Ingmar Schlecht <ingmar@typo3.org>
+2005-11-09  Ingmar Schlecht  <ingmar@typo3.org>
 
        * Made TCEForms put <label> tags around icons for moving/deleting repetitive Flexform items
        * Removed annoying feature of typo3/tab.js to focus the textarea
@@ -42,7 +48,7 @@
        * Fixed bug #1570: on timeout in BE, popup appears all the time when clicking no
        * Fixed bug #1571: make new content element wizard easier to use
 
-2005-11-01     Robert Lemke    <robert@typo3.org>
+2005-11-01  Robert Lemke  <robert@typo3.org>
 
        * Added an is_array() check in t3lib_div::resolveSheetDefInDS() to prevent a fatal error in certain circumstances
 
index 16d3d3c..e554eb5 100644 (file)
@@ -445,9 +445,9 @@ class t3lib_basicFileFunctions      {
                if (!is_object($this->csConvObj))       {
                        if (TYPO3_MODE=='FE')   {
                                $this->csConvObj = &$GLOBALS['TSFE']->csConvObj;
-                       } elseif(is_object($GLOBALS['LANG']))   {       // BE assumed:
+                       } elseif (is_object($GLOBALS['LANG']))  {       // BE assumed:
                                $this->csConvObj = &$GLOBALS['LANG']->csConvObj;
-                       } else  {       // The object may not exist yet, so we need to create it now. Happens in the Install Tool for example.
+                       } else        // The object may not exist yet, so we need to create it now. Happens in the Install Tool for example.
                                $this->csConvObj = &t3lib_div::makeInstance('t3lib_cs');
                        }
                }
@@ -455,9 +455,9 @@ class t3lib_basicFileFunctions      {
                if (!$charset)  {
                        if (TYPO3_MODE=='FE')   {
                                $charset = $GLOBALS['TSFE']->renderCharset;
-                       } elseif(is_object($GLOBALS['LANG']))   {       // BE assumed:
+                       } elseif (is_object($GLOBALS['LANG']))  {       // BE assumed:
                                $charset = $GLOBALS['LANG']->charSet;
-                       } else  {       // best guess
+                       } else        // best guess
                                $charset = $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'];
                        }
                }
index b8d9e41..4f8c964 100755 (executable)
@@ -2075,7 +2075,7 @@ class t3lib_div {
                $content = '';
 
                        // (Proxy support implemented by Arco <arco@appeltaart.mine.nu>)
-               if((substr($url,0,7)=='http://') && ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlUse']=='1'))       {
+               if ((substr($url,0,7)=='http://') && ($GLOBALS['TYPO3_CONF_VARS']['SYS']['curlUse']=='1'))      {
                        //external URL without error checking.
                        $ch = curl_init();
                        curl_setopt ($ch,CURLOPT_URL, $url);
@@ -2096,7 +2096,7 @@ class t3lib_div {
                        $content=curl_exec ($ch);
                        curl_close ($ch);
                        return $content;
-               } elseif($fd = fopen($url,'rb'))    {
+               } elseif ($fd = fopen($url,'rb'))    {
                        while (!feof($fd))      {
                                $content.=fread($fd, 5000);
                        }
@@ -2114,9 +2114,9 @@ class t3lib_div {
         * @return      boolean         True if the file was successfully opened and written to.
         */
        function writeFile($file,$content)      {
-               if($fd = fopen($file,'wb'))     {
-                       fwrite( $fd, $content);
-                       fclose( $fd );
+               if ($fd = fopen($file,'wb'))    {
+                       fwrite($fd,$content);
+                       fclose($fd);
 
                        t3lib_div::fixPermissions($file);       // Change the permissions of the file
 
index 1a7252b..8c3f50f 100755 (executable)
@@ -458,7 +458,7 @@ class t3lib_iconWorks       {
                                ImagePng($im, $tempBaseName.'_im.png');
                                ImagePng($cpImg, $tempBaseName.'_cpImg.png');
 
-                               $cmd = t3lib_exec::imageMagickCommand('combine', '-compose over '.$tempBaseName.'_cpImg.png '.$tempBaseName.'_im.png '.$tempBaseName.'_out.png ');
+                               $cmd = t3lib_div::imageMagickCommand('combine', '-compose over '.$tempBaseName.'_cpImg.png '.$tempBaseName.'_im.png '.$tempBaseName.'_out.png ');
                                exec($cmd);
 
                                $im = imagecreatefrompng($tempBaseName.'_out.png');
index 8f8f9db..861ae21 100755 (executable)
@@ -176,7 +176,7 @@ class t3lib_install {
         * Writes or returns lines from localconf.php
         *
         * @param       array           Array of lines to write back to localconf.php. Possibly
-        * @param string        Absolute path of alternative file to use (Notice: this path is not validated in terms of being inside 'TYPO3 space')
+        * @param       string          Absolute path of alternative file to use (Notice: this path is not validated in terms of being inside 'TYPO3 space')
         * @return      mixed           If $inlines is not an array it will return an array with the lines from localconf.php. Otherwise it will return a status string, either "continue" (updated) or "nochange" (not updated)
         * @see setValueInLocalconfFile()
         */
index 68cf9d2..d70c22e 100755 (executable)
                        } else {
                                $path = $this->sys_page->getPathFromRootline($temp,$len);
                        }
-                       $this->config['stat_vars']['pageName'] = str_replace('[path]', preg_replace('/[^.[:alnum:]\/_-]/','_',$path.'/'),$pageName);
+                       $this->config['stat_vars']['pageName'] = str_replace('[path]', preg_replace('/[^.[:alnum:]\/_-]/','_',$path.'/'), $pageName);
                }
 
                        // No cache