Changeset 487

Timestamp:

Aug 20, 2014 11:56:27 AM (10 years ago)

Author:

anonymous

Message:

Added Validator::fileUploadSize(), phpIniGetBytes(), and fixed php version error checking.

Location:

trunk/lib

Files:

• App.inc.php (modified) (4 diffs)
• FormValidator.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (1 diff)
• Validator.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -42 +42 @@
 class App {
 
+    // Minimum version of PHP required for this version of the Codebase.
+    const CODEBASE_MIN_PHP_VERSION = '5.3.0';
+
     // A place to keep an object instance for the singleton pattern.
     protected static $instance = null;
@@ -179 +182 @@
         $this->timer = new ScriptTimer();
         $this->timer->start('_app');
-
-        // The codebase now requires a minimum PHP version.
-        $codebase_minimum_php_version = '5.3.0';
-        if (version_compare(PHP_VERSION, $codebase_minimum_php_version, '<')) {
-            $this->logMsg(sprintf('Codebase minimum PHP version of %s not satisfied (you have %s). ', $codebase_minimum_php_version, phpversion()), LOG_NOTICE, __FILE__, __LINE__);
-        }
     }
 
@@ -382 +379 @@
         // Set the version of the codebase we're using.
         $codebase_version_file = dirname(__FILE__) . '/../docs/version.txt';
+        $codebase_version = '';
         if (is_readable($codebase_version_file)) {
             $codebase_version = trim(file_get_contents($codebase_version_file));
@@ -388 +386 @@
                 header('X-Codebase-Version: ' . $codebase_version);
             }
+        }
+
+        if (version_compare(PHP_VERSION, self::CODEBASE_MIN_PHP_VERSION, '<')) {
+            $this->logMsg(sprintf('PHP %s required for Codebase %s, using %s; some things will break.', self::CODEBASE_MIN_PHP_VERSION, $codebase_version, PHP_VERSION), LOG_NOTICE, __FILE__, __LINE__);
         }
 

trunk/lib/FormValidator.inc.php

@@ -595 +595 @@
         }
     }
+    /**
+     * Check whether a file was selected for uploading. If file is missing, it's an error.
+     *
+     * @param  string $form_name the name of the incoming form variable
+     * @param  string $msg       the message to display on error
+     *
+     * @return bool   true if no errors found, false otherwise
+     */
+    public function fileUploadSize($form_name, $msg='')
+    {
+        if (Validator::fileUploadSize($form_name)) {
+            return true;
+        } else {
+            $msg = '' == $msg ? sprintf(_("Maximum filesize exceeded. Got %s, but limit is %s."), humanFileSize($_SERVER['CONTENT_LENGTH']), humanFileSize(phpIniGetBytes('upload_max_filesize'))) : $msg;
+            $this->addError($form_name, $msg);
+            return false;
+        }
+    }
 
 } // THE END

trunk/lib/Utilities.inc.php

@@ -503 +503 @@
 }
 
+/*
+* Convert a php.ini value (8M, 512K, etc), into integer value of bytes.
+*
+* @access   public
+* @param    string  $val    Value from php config, e.g., upload_max_filesize.
+* @return   int             Value converted to bytes as an integer.
+* @author   Quinn Comendant <quinn@strangecode.com>
+* @version  1.0
+* @since    20 Aug 2014 14:32:41
+*/
+function phpIniGetBytes($val)
+{
+    $val = trim(ini_get($val));
+    if ($val != '') {
+        $last = strtolower($val{strlen($val) - 1});
+    } else {
+        $last = '';
+    }
+    switch ($last) {
+        // The 'G' modifier is available since PHP 5.1.0
+        case 'g':
+            $val *= 1024;
+        case 'm':
+            $val *= 1024;
+        case 'k':
+            $val *= 1024;
+    }
+
+    return (int)$val;
+}
+
 /**
  * Tests the existence of a file anywhere in the include path.

trunk/lib/Validator.inc.php

@@ -363 +363 @@
     }
 
+    /*
+    * Check if the amount of content sent by the browser exceeds the upload_max_filesize value configured in php.ini.
+    * http://stackoverflow.com/a/24202363
+    *
+    * @access   public
+    * @param    string $form_name The input data to validate.
+    * @return   bool   True if no errors found, false otherwise.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    20 Aug 2014 14:44:23
+    */
+    static public function fileUploadSize($form_name)
+    {
+        $upload_max_filesize = phpIniGetBytes('upload_max_filesize');
+        if (isset($_SERVER['CONTENT_LENGTH']) && 0 != $upload_max_filesize && $_SERVER['CONTENT_LENGTH'] > $upload_max_filesize) {
+            return false;
+        }
+        return true;
+    }
+
 } // THE END