Changeset 4317 in subversion

Timestamp:

Dec 7, 2010 5:33:01 PM (2 years ago)

Author:

thomasb

Message:

Little corrections and improvements

Location:

branches/devel-addressbook

Files:

• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcmail.php (modified) (1 diff)
• program/steps/addressbook/save.inc (modified) (3 diffs)
• program/steps/addressbook/show.inc (modified) (1 diff)
• skins/default/functions.js (modified) (1 diff)

branches/devel-addressbook/config/main.inc.php.dist

@@ -293 +293 @@
 $rcmail_config['im_convert_path'] = null;
 
-// maximum size of uploaded contact photos
+// maximum size of uploaded contact photos in pixel
 $rcmail_config['contact_photo_size'] = 160;
 

branches/devel-addressbook/program/include/rcmail.php

@@ -1359 +1359 @@
    * @param $cmd Format string with {keywords} to be replaced
    * @param $values (zero, one or more arrays can be passed)
-   * @return output of command. shell errors not detectable, see error_log in /www/server/logs
+   * @return output of command. shell errors not detectable
    */
   public static function exec(/* $cmd, $values1 = array(), ... */)

branches/devel-addressbook/program/steps/addressbook/save.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -37 +37 @@
 
     if ($filepath = $_FILES['_photo']['tmp_name']) {
-        // TODO: check file type and resize image
+        // check file type and resize image
         $imageprop = rcmail::imageprops($_FILES['_photo']['tmp_name']);
         
         if ($imageprop['width'] && $imageprop['height']) {
-            $maxsize = $RCMAIL->config->get('contact_photo_size', 160);
+            $maxsize = intval($RCMAIL->config->get('contact_photo_size', 160));
             $tmpfname = tempnam($RCMAIL->config->get('temp_dir'), 'rcmImgConvert');
             $save_hook = 'attachment_upload';
@@ -57 +57 @@
                 'size' => $_FILES['_photo']['size'],
                 'name' => $_FILES['_photo']['name'],
-                'mimetype' => rc_mime_content_type($filepath, $_FILES['_photo']['name'], 'image/' . $imageprop['type'])
+                'mimetype' => 'image/' . $imageprop['type'],
             ));
         }

branches/devel-addressbook/program/steps/addressbook/show.inc

@@ -47 +47 @@
     if (preg_match('/^\x89\x50\x4E\x47/', $data))      $type = 'png';
     else if (preg_match('/^\x47\x49\x46\x38/', $data)) $type = 'gif';
+    else if (preg_match('/^\x00\x00\x01\x00/', $data)) $type = 'ico';
 //  else if (preg_match('/^\xFF\xD8\xFF\xE0/', $data)) $type = 'jpeg';
     

branches/devel-addressbook/skins/default/functions.js

@@ -89 +89 @@
     // toggle: #1486823, #1486930
     uploadmenu:     {id:'attachment-form', editable:1, above:1, toggle:!bw.ie&&!bw.linux },
-    uploadform:     {id:'upload-form', editable:1, toggle:true}
+    uploadform:     {id:'upload-form', editable:1, toggle:!bw.ie&&!bw.linux }
   };