DB error log

[lhc/web/wiklou.git] / includes / Image.php

diff --git a/includes/Image.php b/includes/Image.php
index 9b01e78..27eeb9d 100644 (file)
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -11,8 +11,11 @@ class Image
                $url,           # Image URL
                $title,         # Title object for this image. Initialized when needed.
                $fileExists,    # does the image file exist on disk?
+               $historyLine,   # Number of line to return by nextHistoryLine()
+               $historyRes,    # result of the query for the image's history
                $width,         # \
-               $height,        #  --- returned by getimagesize, see http://de3.php.net/manual/en/function.getimagesize.php
+               $height,        #  |
+               $bits,          #   --- returned by getimagesize, see http://de3.php.net/manual/en/function.getimagesize.php
                $type,          #  |
                $attr;          # /
 
@@ -32,8 +35,20 @@ class Image
 
                if ( $this->fileExists = file_exists( $this->imagePath ) ) // Sic!, "=" is intended
                {
-                       list($this->width, $this->height, $this->type, $this->attr) = getimagesize( $this->imagePath );
+                       @$gis = getimagesize( $this->imagePath );
+                       if( $gis !== false ) {
+                               $this->width = $gis[0];
+                               $this->height = $gis[1];
+                               $this->type = $gis[2];
+                               $this->attr = $gis[3];
+                               if ( isset( $gis["bits"] ) )  {
+                                       $this->bits = $gis["bits"];
+                               } else {
+                                       $this->bits = 0;
+                               }
+                       }
                }
+               $this->historyLine = 0;
        }
 
        function newFromTitle( $nt )
@@ -108,11 +123,20 @@ class Image
                return $width."px-".$this->name;
        }
 
+       //**********************************************************************
+       // Create a thumbnail of the image having the specified width.
+       // The thumbnail will not be created if the width is larger than the
+       // image's width. Let the browser do the scaling in this case.
+       // The thumbnail is stored on disk and is only computed if the thumbnail
+       // file does not exist OR if it is older than the image.
        function createThumb( $width ) {
                global $wgUploadDirectory;
                global $wgImageMagickConvertCommand;
                global $wgUseImageMagick;
                global $wgUseSquid, $wgInternalServer;
+
+               $width = IntVal( $width );
+
                $thumbName = $this->thumbName( $width );
                $thumbPath = wfImageThumbDir( $thumbName )."/".$thumbName;
                $thumbUrl  = $this->thumbUrl( $width );
@@ -124,11 +148,11 @@ class Image
                }
                
                # Sanity check $width
-               $width = IntVal( $width );
                if( $width <= 0 ) {
                        # BZZZT
                        return "";
                }
+
                if( $width > $this->width ) {
                        # Don't make an image bigger than the source
                        return $this->getURL();
@@ -156,6 +180,8 @@ class Image
                                #
                                # First find out what kind of file this is, and select the correct
                                # input routine for this.
+
+                               $truecolor = false;
                                
                                switch( $this->type ) {
                                        case 1: # GIF
@@ -163,9 +189,11 @@ class Image
                                                break;
                                        case 2: # JPG
                                                $src_image = imagecreatefromjpeg( $this->imagePath );
+                                               $truecolor = true;
                                                break;
                                        case 3: # PNG
                                                $src_image = imagecreatefrompng( $this->imagePath );
+                                               $truecolor = ( $this->bits > 8 );
                                                break;
                                        case 15: # WBMP for WML
                                                $src_image = imagecreatefromwbmp( $this->imagePath );
@@ -178,7 +206,11 @@ class Image
                                                break;
                                }
                                $height = floor( $this->height * ( $width/$this->width ) );
-                               $dst_image = imagecreatetruecolor( $width, $height );
+                               if ( $truecolor ) {
+                                       $dst_image = imagecreatetruecolor( $width, $height );
+                               } else {
+                                       $dst_image = imagecreate( $width, $height );
+                               }
                                imagecopyresampled( $dst_image, $src_image, 
                                                        0,0,0,0,
                                                        $width, $height, $this->width, $this->height );
@@ -217,7 +249,47 @@ class Image
 
                }
                return $thumbUrl;
-       } //function createThumb
+       } // END OF function createThumb
+
+       //**********************************************************************
+       // Return the image history of this image, line by line.
+       // start with current version, than old versions.
+       // use $this->historyLine to check which line to return:
+       //  0      return line for current version
+       //  1      query for old versions, return first one
+       //  2, ... return next old version from above query
+       function nextHistoryLine()
+       {
+               $fname = "Image::nextHistoryLine()";
+               
+               if ( $this->historyLine == 0 ) // called for the first time, return line from cur
+               { 
+                       $sql = "SELECT img_size,img_description,img_user," .
+                         "img_user_text,img_timestamp, '' AS oi_archive_name FROM image WHERE " .
+                         "img_name='" . wfStrencode( $this->title->getDBkey() ) . "'";
+                       $this->historyRes = wfQuery( $sql, DB_READ, $fname );
+
+                       if ( 0 == wfNumRows( $this->historyRes ) ) { return FALSE; }
+
+               } else if ( $this->historyLine == 1 )
+               {
+                       $sql = "SELECT oi_size AS img_size, oi_description AS img_description," .
+                         "oi_user AS img_user," .
+                         "oi_user_text AS img_user_text, oi_timestamp AS img_timestamp , oi_archive_name FROM oldimage WHERE " .
+                         "oi_name='" . wfStrencode( $this->title->getDBkey() ) . "' " .
+                         "ORDER BY oi_timestamp DESC";
+                       $this->historyRes = wfQuery( $sql, DB_READ, $fname );
+               }
+               $this->historyLine ++;
+
+               return wfFetchObject( $this->historyRes );
+       }
+
+       function resetHistory()
+       {
+               $this->historyLine = 0;
+       }
+
 
 } //class