fixed/added svn properties

ChangeLog

@@ -3,7 +3,7 @@ phpMyAdmin - ChangeLog
 ----------------------
 
 $Id$
-$HeadURL$
+$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
 + [import] support handling of DELIMITER to mimic mysql CLI, thanks to fb1
 - bug #1674914 [structure] changing definition of a TIMESTAMP field

libraries/PMA_File.class.php

@@ -1,4 +1,5 @@
 <?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * file upload functions
  *
@@ -7,6 +8,8 @@
 /**
  *
  * @todo replace error messages with localized string
+ * @todo when uploading a file into a blob field, should we also consider using
+ *       chunks like in import? UPDATE `table` SET `field` = `field` + [chunk]
  */
 class PMA_File
 {
@@ -34,6 +37,37 @@ class PMA_File
      */
     var $_is_temp = false;
 
+    /**
+     * @var string type of compression
+     * @access protected
+     */
+    var $_compression = null;
+
+    /**
+     * @var integer
+     */
+    var $_offset = 0;
+
+    /**
+     * @var integer size of chunk to read with every step
+     */
+    var $_chunk_size = 32768;
+
+    /**
+     * @var resource file handle
+     */
+    var $_handle = null;
+
+    /**
+     * @var boolean whether to decompress content before returning
+     */
+    var $_decompress = false;
+
+    /**
+     * @var string charset of file
+     */
+    var $_charset = null;
+
     /**
      * old PHP 4 style constructor
      *
@@ -64,6 +98,7 @@ class PMA_File
      * destructor
      *
      * @see     PMA_File::cleanUp()
+     * @access  public
      * @uses    PMA_File::cleanUp()
      */
     function __destruct()
@@ -72,7 +107,12 @@ class PMA_File
     }
 
     /**
-     * deletes temp file from upload
+     * deletes file if it is temporary, usally from a moved upload file
+     *
+     * @access  public
+     * @uses    PMA_File::delet()
+     * @uses    PMA_File::isTemp()
+     * @return  boolean success
      */
     function cleanUp()
     {
@@ -86,6 +126,7 @@ class PMA_File
     /**
      * deletes the file
      *
+     * @access  public
      * @uses    PMA_File::getName()
      * @uses    unlink()
      * @return  boolean success
@@ -99,6 +140,7 @@ class PMA_File
      * checks or sets the temp flag for this file
      * file objects with temp flags are deleted with object destruction
      *
+     * @access  public
      * @uses    PMA_File::$_is_temp to set and read it
      * @param   boolean sets the temp flag
      * @return  boolean PMA_File::$_is_temp
@@ -115,6 +157,7 @@ class PMA_File
     /**
      * accessor
      *
+     * @access  public
      * @uses    PMA_File::$_name
      * @param   string  $name   file name
      * @access  public
@@ -139,35 +182,39 @@ class PMA_File
      * @uses    bin2hex()
      * @return  string  binary file content
      */
-    function getContent()
+    function getContent($as_binary = true, $offset = 0, $length = null)
     {
-        if (null !== $this->_content) {
+        if (null === $this->_content) {
-            return $this->_content;
+            if ($this->isUploaded() && ! $this->checkUploadedFile()) {
+                return false;
+            }
+
+            if (! $this->isReadable()) {
+                return false;
+            }
+
+            if (function_exists('file_get_contents')) {
+                $this->_content = file_get_contents($this->getName());
+            } elseif ($size = filesize($this->getName())) {
+                $this->_content = fread(fopen($this->getName(), 'rb'), $size);
+            }
         }
 
-        if ($this->isUploaded() && ! $this->checkUploadedFile()) {
+        if (! empty($this->_content) && $as_binary) {
-            return false;
+            return '0x' . bin2hex($this->_content);
         }
 
-        if (! $this->isReadable()) {
+        if (null !== $length) {
-            return false;
+            return substr($this->_content, $offset, $length);
-        }
+        } elseif ($offset > 0) {
-
+            return substr($this->_content, $offset);
-        // check if file is not empty
-        if (function_exists('file_get_contents')) {
-            $this->_content = file_get_contents($this->getName());
-        } elseif ($size = filesize($this->getName())) {
-            $this->_content = fread(fopen($this->getName(), 'rb'), $size);
-        }
-
-        if (! empty($this->_content)) {
-            $this->_content = '0x' . bin2hex($this->_content);
         }
 
         return $this->_content;
     }
 
     /**
+     * @access  public
      * @uses    PMA_File::getName()
      * @uses    is_uploaded_file()
      */
@@ -179,6 +226,7 @@ class PMA_File
     /**
      * accessor
      *
+     * @access  public
      * @uses    PMA_File::$name as return value
      * @return  string  PMA_File::$_name
      */
@@ -189,6 +237,7 @@ class PMA_File
 
     /**
      * @todo replace error message with localized string
+     * @access  public
      * @uses    PMA_File::isUploaded()
      * @uses    PMA_File::setName()
      * @uses    PMA_File::$_error_message
@@ -209,6 +258,7 @@ class PMA_File
     }
 
     /**
+     * @access  public
      * @uses    PMA_File::fetchUploadedFromTblChangeRequestMultiple()
      * @uses    PMA_File::setUploadedFile()
      * @uses    PMA_File::$_error_message
@@ -290,6 +340,8 @@ class PMA_File
      * </code>
      *
      * @todo re-check if requirements changes to PHP >= 4.2.0
+     * @access  public
+     * @static
      * @param   array   $file       the array
      * @param   string  $primary
      * @return  array
@@ -315,6 +367,7 @@ class PMA_File
     /**
      * sets the name if the file to the one selected in the tbl_change form
      *
+     * @access  public
      * @uses    $_REQUEST
      * @uses    PMA_File::setLocalSelectedFile()
      * @uses    is_string()
@@ -341,6 +394,7 @@ class PMA_File
     }
 
     /**
+     * @access  public
      * @uses    PMA_File->$_error_message as return value
      * @return  string  error message
      */
@@ -350,6 +404,7 @@ class PMA_File
     }
 
     /**
+     * @access  public
      * @uses    PMA_File->$_error_message to check it
      * @return  boolean whether an error occured or not
      */
@@ -359,9 +414,10 @@ class PMA_File
     }
 
     /**
-     * chacks the supergloabls provided if the tbl_change form is submitted
+     * checks the superglobals provided if the tbl_change form is submitted
      * and uses the submitted/selected file
      *
+     * @access  public
      * @uses    PMA_File::setUploadedFromTblChangeRequest()
      * @uses    PMA_File::setSelectedFromTblChangeRequest()
      * @param   string  $key    a numeric key used to identify the different rows
@@ -390,18 +446,29 @@ class PMA_File
 
     /**
      *
+     * @access  public
+     * @uses    $GLOBALS['strFileCouldNotBeRead']
      * @uses    PMA_File::setName()
-     * @uses    preg_replace()
+     * @uses    PMA_securePath()
      * @uses    PMA_userDir()
      * @uses    $GLOBALS['cfg']['UploadDir']
      * @param   string  $name
+     * @return  boolean success
      */
     function setLocalSelectedFile($name)
     {
-        $this->setName(PMA_userDir($GLOBALS['cfg']['UploadDir']) . preg_replace('@\.\.*@', '.', $name));
+        $this->setName(PMA_userDir($GLOBALS['cfg']['UploadDir']) . PMA_securePath($name));
+        if (! $this->isReadable()) {
+            $this->_error_message = $GLOBALS['strFileCouldNotBeRead'];
+            $this->setName(null);
+            return false;
+        }
+
+        return true;
     }
 
     /**
+     * @access  public
      * @uses    PMA_File::getName()
      * @uses    is_readable()
      * @uses    ob_start()
@@ -410,7 +477,7 @@ class PMA_File
      */
     function isReadable()
     {
-        // surprees warnings form beeing displayed, but not from beeing logged
+        // surpress warnings from beeing displayed, but not from beeing logged
         // any file access outside of open_basedir will issue a warning
         ob_start();
         $is_readable = is_readable($this->getName());
@@ -425,6 +492,7 @@ class PMA_File
      *
      * @todo replace error message with localized string
      * @todo move check of $cfg['TempDir'] into PMA_Config?
+     * @access  public
      * @uses    $cfg['TempDir']
      * @uses    $GLOBALS['strFieldInsertFromFileTempDirNotExists']
      * @uses    PMA_File::isReadable()
@@ -459,7 +527,7 @@ class PMA_File
             $GLOBALS['cfg']['TempDir'] = 'tmp/';
         }
 
-        // surprees warnings form beeing displayed, but not from beeing logged
+        // surpress warnings from beeing displayed, but not from beeing logged
         ob_start();
         // check tmp dir
         if (! is_dir($GLOBALS['cfg']['TempDir'])) {
@@ -483,7 +551,7 @@ class PMA_File
 
         $new_file_to_upload = $GLOBALS['cfg']['TempDir'] . '/' . basename($this->getName());
 
-        // surprees warnings form beeing displayed, but not from beeing logged
+        // surpress warnings from beeing displayed, but not from beeing logged
         // any file access outside of open_basedir will issue a warning
         ob_start();
         $move_uploaded_file_result = move_uploaded_file($this->getName(), $new_file_to_upload);
@@ -503,5 +571,265 @@ class PMA_File
 
         return true;
     }
+
+    /**
+     * Detects what compression filse uses
+     *
+     * @todo    move file read part into readChunk() or getChunk()
+     * @todo    add support for compression plugins
+     * @uses    $GLOBALS['strFileCouldNotBeRead']
+     * @uses    PMA_File::$_compression to set it
+     * @uses    PMA_File::getName()
+     * @uses    fopen()
+     * @uses    fread()
+     * @uses    strlen()
+     * @uses    fclose()
+     * @uses    chr()
+     * @uses    substr()
+     * @access  protected
+     * @return  string MIME type of compression, none for none
+     */
+    function _detectCompression()
+    {
+        // surpress warnings from beeing displayed, but not from beeing logged
+        // f.e. any file access outside of open_basedir will issue a warning
+        ob_start();
+        $file = fopen($this->getName(), 'rb');
+        ob_end_clean();
+
+        if (! $file) {
+            $this->_error_message = $GLOBALS['strFileCouldNotBeRead'];
+            return false;
+        }
+
+        /**
+         * @todo
+         * get registered plugins for file compression
+
+        foreach (PMA_getPlugins($type = 'compression') as $plugin) {
+            if (call_user_func_array(array($plugin['classname'], 'canHandle'), array($this->getName()))) {
+                $this->setCompressionPlugin($plugin);
+                break;
+            }
+        }
+         */
+
+        $test = fread($file, 4);
+        $len = strlen($test);
+        fclose($file);
+
+        if ($len >= 2 && $test[0] == chr(31) && $test[1] == chr(139)) {
+            $this->_compression = 'application/gzip';
+        } elseif ($len >= 3 && substr($test, 0, 3) == 'BZh') {
+            $this->_compression = 'application/bzip2';
+        } elseif ($len >= 4 && $test == "PK\003\004") {
+            $this->_compression = 'application/zip';
+        }
+
+        $this->_compression = 'none';
+        return $this->_compression;
+    }
+
+    /**
+     * whether the content should be decompressed before returned
+     */
+    function setDecompressContent($decompress)
+    {
+        $this->_decompress = (bool) $decompress;
+    }
+
+    function getHandle()
+    {
+        return $this->_handle;
+    }
+
+    function setHandle($handle)
+    {
+        $this->_handle = $handle;
+    }
+
+    /**
+     *
+     */
+    function open()
+    {
+        if (! $this->_decompress) {
+            $this->_handle = @fopen($this->getName(), 'r');
+        }
+
+        switch ($this->getCompression()) {
+            case false:
+                return false;
+            case 'application/bzip2':
+                if ($GLOBALS['cfg']['BZipDump'] && @function_exists('bzopen')) {
+                    $this->_handle = @bzopen($this->getName(), 'r');
+                } else {
+                    $this->_error_message = sprintf($GLOBALS['strUnsupportedCompressionDetected'], $this->getCompression());
+                    return false;
+                }
+                break;
+            case 'application/gzip':
+                if ($GLOBALS['cfg']['GZipDump'] && @function_exists('gzopen')) {
+                    $this->_handle = @gzopen($this->getName(), 'r');
+                } else {
+                    $this->_error_message = sprintf($GLOBALS['strUnsupportedCompressionDetected'], $this->getCompression());
+                    return false;
+                }
+                break;
+            case 'application/zip':
+                if ($GLOBALS['cfg']['GZipDump'] && @function_exists('gzinflate')) {
+                    include_once './libraries/unzip.lib.php';
+                    $this->_handle = new SimpleUnzip();
+                    $this->_handle->ReadFile($this->getName());
+                    if ($this->_handle->Count() == 0) {
+                        $this->_error_message = $GLOBALS['strNoFilesFoundInZip'];
+                        return false;
+                    } elseif ($this->_handle->GetError(0) != 0) {
+                        $this->_error_message = $GLOBALS['strErrorInZipFile'] . ' ' . $this->_handle->GetErrorMsg(0);
+                        return false;
+                    } else {
+                        $this->content_uncompressed = $this->_handle->GetData(0);
+                    }
+                    // We don't need to store it further
+                    $this->_handle = null;
+                } else {
+                    $this->_error_message = sprintf($GLOBALS['strUnsupportedCompressionDetected'], $this->getCompression());
+                    return false;
+                }
+                break;
+            case 'none':
+                $this->_handle = @fopen($this->getName(), 'r');
+                break;
+            default:
+                $this->_error_message = sprintf($GLOBALS['strUnsupportedCompressionDetected'], $this->getCompression());
+                return false;
+                break;
+        }
+
+
+    }
+
+    function getCharset()
+    {
+        return $this->_charset;
+    }
+
+    function setCharset($charset)
+    {
+        $this->_charset = $charset;
+    }
+
+    /**
+     * @uses    PMA_File::$_compression as return value
+     * @uses    PMA_File::detectCompression()
+     * @return  string MIME type of compression, none for none
+     * @access  public
+     */
+    function getCompression()
+    {
+        if (null === $this->_compression) {
+            return $this->_detectCompression();
+        }
+
+        return $this->_compression;
+    }
+
+    /**
+     * advances the file pointer in the file handle by $length bytes/chars
+     *
+     * @param   integer $length numbers of chars/bytes to skip
+     * @return  boolean
+     */
+    function advanceFilePointer($length)
+    {
+        while ($length > 0) {
+            // Disable read progresivity, otherwise we eat all memory!
+            $read_multiply = 1; // required?
+            $this->getNextChunk($length);
+            $length -= $this->getChunkSize();
+        }
+    }
+
+    function getNextChunk($max_size = null)
+    {
+        if (null !== $max_size) {
+            $size = min($max_size, $this->getChunkSize());
+        } else {
+            $size = $this->getChunkSize();
+        }
+
+        // $result = $this->handler->getNextChunk($size);
+
+        switch ($this->getCompression()) {
+            case 'application/bzip2':
+                $result = bzread($this->getHandle(), $size);
+                break;
+            case 'application/gzip':
+                $result = gzread($this->getHandle(), $size);
+                break;
+            case 'application/zip':
+                $result = $this->getContent($this->getOffset(), $this->_offset, $size);
+                break;
+            case 'none':
+                $result = fread($this->getHandle(), $size);
+                break;
+        }
+
+        if ($GLOBALS['charset_conversion']) {
+            $result = PMA_convert_string($this->getCharset(), $GLOBALS['charset'], $result);
+        } else {
+            /**
+             * Skip possible byte order marks (I do not think we need more
+             * charsets, but feel free to add more, you can use wikipedia for
+             * reference: <http://en.wikipedia.org/wiki/Byte_Order_Mark>)
+             *
+             * @todo BOM could be used for charset autodetection
+             */
+            if ($this->getOffset() === 0) {
+                // UTF-8
+                if (strncmp($result, "\xEF\xBB\xBF", 3) == 0) {
+                    $result = substr($result, 3);
+                // UTF-16 BE, LE
+                } elseif (strncmp($result, "\xFE\xFF", 2) == 0
+                 || strncmp($result, "\xFF\xFE", 2) == 0) {
+                    $result = substr($result, 2);
+                }
+            }
+        }
+
+        $this->_offset += $size;
+
+        return $result;
+    }
+
+    function getOffset()
+    {
+        return $this->_offset;
+    }
+
+    function getChunkSize()
+    {
+        return $this->_chunk_size;
+    }
+
+    function setChunkSize($chunk_size)
+    {
+        $this->_chunk_size = (int) $chunk_size;
+    }
+
+    function getContentLength()
+    {
+        return strlen($this->_content);
+    }
+
+    function eof()
+    {
+        if ($this->getHandle()) {
+            return feof($this->getHandle());
+        } else {
+            return ($this->getOffset() >= $this->getContentLength());
+        }
+
+    }
 }
 ?>

libraries/cleanup.lib.php

@@ -1,6 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id: common.lib.php 9531 2006-10-10 14:06:56Z nijel $ */
+/* $Id$ */
 
 /**
  * Functions for cleanup of user input.

libraries/js_escape.lib.php

@@ -1,6 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $ */
+/* $Id$ */
 
 /**
  * Javascript escaping functions.

libraries/sqlvalidator.class.php

@@ -18,7 +18,7 @@
 * If you got this file from somewhere other than phpMyAdmin
 * please be aware that the latest copy will always be in the
 * phpMyAdmin subversion tree as
-* $HeadURL$
+* $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/libraries/sqlvalidator.class.php $
 *
 * This code that also used to depend on the PHP overload module, but that has been
 * removed now.

libraries/tcpdf/font/LICENSE

@@ -95,4 +95,4 @@ dealings in this Font Software without prior written authorization
 from Tavmjong Bah. For further information, contact: tavmjong @ free
 . fr.
 
-$Id: LICENSE 778 2006-04-20 18:14:24Z moyogo $
+$Id$

pmd_display_field.php

@@ -1,6 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id: pmd_display_field.php 9828 2007-01-05 17:30:36Z lem9 $ */
+/* $Id$ */
 
 /*
 @author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)

test/escape_js_string.php

@@ -5,7 +5,7 @@
  *
  * @author Michal Čihař <michal@cihar.com>
  * @package phpMyAdmin-test
- * @version $Id: common.lib.php 9832 2007-01-09 09:50:49Z nijel $
+ * @version $Id$
  */
 
 /**