Index: outline_designer.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/outline_designer/outline_designer.module,v
retrieving revision 1.10
diff -u -r1.10 outline_designer.module
--- outline_designer.module	10 Feb 2009 21:45:49 -0000	1.10
+++ outline_designer.module	11 Feb 2009 18:59:22 -0000
@@ -250,7 +250,7 @@
       '#size' => '10', 
       '#title' => t("Icon for ". $value['name']), 
       /*'#default_value' => variable_get("outline_designer_". $value['type'] ."_icon",  drupal_get_path('module', 'outline_designer') ."/images/node.png"), */
-      '#description' => t("This is what icon will be associated to each content type in the outline designer. They must be 16x16 gif or png format."), 
+      '#description' => t("This icon will be associated with the %type-name content type in the outline designer. The icon must be 16x16, unless an <a href=@toolkit>image toolkit</a> is installed, and in jpg, gif or png format.", array('%type-name' => $value['type'], '@toolkit'=> url('admin/settings/image-toolkit'))), 
       '#required' => FALSE, 
       );
   }
@@ -267,34 +267,14 @@
   if ($is_writable) { 
     $validators = array(
       'file_validate_is_image' => array(), 
-      'file_validate_image_resolution' => array('85x85'), 
+      'file_validate_image_resolution' => array('16x16', '16x16'), 
       'file_validate_size' => array(30 * 1024), 
     );
     $result = db_query("SELECT type, name FROM {node_type}");
     while ($value = db_fetch_array($result)) {
-        if ($file = file_save_upload($form["outline_designer_". $value['type'] ."_icon"],  $validators, $dir)) {
-          $image_ary = image_get_info($file->filepath);
-          if ($image_ary) {
-            //icons must be 16x16,  png or gif format
-            if ($image_ary['mime_type'] != 'image/png' && $image_ary['mime_type'] != 'image/gif') {
-              file_delete($file->filepath);
-              drupal_set_message('Uploaded file must be PNG or GIF format.', 'error');
-            }
-            else {
-              if ($image_ary['height'] != 16 || $image_ary['width'] != 16) {
-                file_delete($file->filepath);
-                drupal_set_message('Uploaded image must be 16x16 pixels.', 'error');
-              }
-              else {
-                drupal_set_message(t('New '. $value['name'] .' icon saved.'));
-                variable_set("outline_designer_". $value['type'] ."_icon",  $file->filepath);
-              }
-            }
-          }
-          else {
-            file_delete($file->filepath);
-            drupal_set_message('Uploaded file does not appear to be a valid image file. Please try again.', 'error');
-          }
+        if ($file = file_save_upload("outline_designer_". $value['type'] ."_icon",  $validators, $dir)) {
+          drupal_set_message(t('New '. $value['name'] .' icon saved.'));
+          variable_set("outline_designer_". $value['type'] ."_icon",  $file->filepath);
         }
         else {
       //this is the case when there is no image uploaded to associate the textfield icon to the icon page to use,  this will allow for references to icons already used