Changeset 256

Timestamp:

May 9, 2007 3:06:24 AM (17 years ago)

Author:

quinn

Message:

Minor bug fixes.

Location:

trunk

Files:

• docs/codebase_v1-to-v2_upgrade_checklist.txt (modified) (2 diffs)
• docs/example_config.inc.php (modified) (1 diff)
• lib/ImageThumb.inc.php (modified) (2 diffs)
• lib/Upload.inc.php (modified) (2 diffs)

trunk/docs/codebase_v1-to-v2_upgrade_checklist.txt

@@ -113 +113 @@
 sslOff();                               $app->sslOff();
 
+The following regex will find any of the above:
+(?<!raiseMsg|logMsg|include|ohref|printHiddenSession|dieURL|dieBoomerangURL|setBoomerangURL|getBoomerangURL|validBoomerangURL|deleteBoomerangURL|sslOn|sslOff)
+
+Also convert all site config variables, as earlier:
 $CFG->site_name                         $app->getParam('site_name')
 
@@ -175 +179 @@
 =====================================================================
 
-Massive changes. See quinn.
+Massive changes. See Quinn.
 
 =====================================================================

trunk/docs/example_config.inc.php

@@ -60 +60 @@
 
     'log_directory' => COMMON_BASE . '/log',
-    'log_filename' => 'site.log',
+    'log_filename' => 'site_log',
     'log_file_priority' => LOG_DEBUG,
     'log_email_priority' => false,

trunk/lib/ImageThumb.inc.php

@@ -226 +226 @@
         
         return $final_spec;
+    }
+    
+    /*
+    * Retreive a value of a thumb specification.
+    *
+    * @access   public
+    * @param    string  $key    Key to return. See _default_image_specs above for a list.
+    * @param    int     $index  The index in the spec array of the value to retreive. The first if not specified.
+    * @return   mixed           Value of requested index.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    08 May 2007 15:26:39
+    */
+    function getSpec($key, $index=null)
+    {
+        $index = isset($index) ? $index : 0;
+        return $this->_image_specs[$index][$key];
     }
 
@@ -570 +587 @@
         // Sharpen image using a custom filter matrix.
         if (phpversion() > '5.1' && true === $spec['sharpen'] && $spec['sharpen_value'] > 0) {
-            $sharpen_value = round((((48 - 10) / (100 - 1)) * (100 - $spec['sharpen_value'])) + 10);
+            $sharpen_value = round((((48 - 10) / (100 - 1)) * (100 - $spec['sharpen_value'])) + 10); /// WTF is this math?
             imageconvolution($dest_image_resource, array(array(-1,-1,-1),array(-1,$sharpen_value,-1),array(-1,-1,-1)), ($sharpen_value - 8), 0);
         }

trunk/lib/Upload.inc.php

@@ -117 +117 @@
      * @access  public
      * @param   string  $form_name          The name of the form to process.
-     * @param   string  $custom_file_name   The new name of the file. An array of filename in the case of multiple files.
+     * @param   string  $custom_file_name   The new name of the file. An array of filenames in the case of multiple files.
      * @return  mixed   Returns FALSE if a major error occured preventing any file uploads.
      *                  Returns an empty array if any minor errors occured or no files were found.
@@ -186 +186 @@
             } else {
                 // Multiple upload. Final file names must be array.
-                if (isset($custom_file_name) && is_array($custom_file_name) && is_array($custom_file_name[$i]) && '' != $custom_file_name[$i]) {
+                if (isset($custom_file_name) && is_array($custom_file_name) && '' != $custom_file_name[$i]) {
                     // Valid custom file name.
                     $file_name = $custom_file_name[$i];