Ticket #591: diff.patch

system/config/mimes.php

@@ -143 +143 @@
         'pl'    => array('text/x-perl'),
         'pm'    => array('text/x-perl'),
         'png'   => array('image/png', 'image/x-png'),
+        'po'    => array('text/x-gettext-translation'),
         'pot'   => array('application/vnd.ms-powerpoint'),
         'pps'   => array('application/vnd.ms-powerpoint'),
         'ppt'   => array('application/powerpoint'),

system/helpers/file.php

@@ -174 +174 @@
                 return ($piece - 1);
         }
 
-} // End file
- No newline at end of file
+        /**
+         * Return file size using metric prefixes (SI), allow rounding
+         *
+         * @param   string   path to file
+         * @param   integer  integer to round to
+         * @return  string   file size with metric prefix
+         */
+        public static function size($filename, $round = FALSE)
+        {
+                // Check that file exists
+                if ( ! file_exists($filename) OR ! is_file($filename) OR ! is_readable($filename))
+                        return FALSE;
+
+                // Find filesize in bytes
+                $file_size = sprintf("%u", filesize($filename)); // filesize() has troubles between 2GB and 4GB
+
+                // Make sure $file_size was calculated
+                if (empty($file_size) || $file_size === FALSE)
+                        return FALSE;
+        
+                $sizes = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+                for ($i=0; $file_size > 1024 && $i < count($sizes) - 1; $i++)
+                        $file_size /= 1024;
+                return round($file_size,$round).' '.$sizes[$i]; // ex: 10 kB
+        }
+
+} // End file

system/helpers/security.php

@@ -43 +43 @@
         {
                 return str_replace(array('<?', '?>'), array('&lt;?', '?&gt;'), $str);
         }
+        
+        /**
+         * Generate a pseudo-random token between 1-40 characters
+         *
+         * @param   integar  length of token (min 1, max 40)
+         * @param   string   string to hash
+         * @return  string   return psuedo-random token
+         */
+        public static function generate_token($length = FALSE, $key = uniqid(rand(), TRUE))
+        {
+                // sha1 is a 256-bit hex hash and is 40 characters long, thus it can not be longer than 40
+                // generate a 40 character long hash if length is greater than 40 or less than 0 (fail safe)
+                if ($length == FALSE || $length >= 40 || $length <= 0) 
+                {
+                        return sha1($key);
+                }
+                else
+                {
+                        $start = rand(0,40-$length); // random number between 0 and maximum acceptable number before $start + $length > 40
+                        return substr(sha1($key),$start,$length);
+                }
+        }
 
-} // End security
- No newline at end of file
+} // End security