Index: image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.module,v
retrieving revision 1.261
diff -u -p -r1.261 image.module
--- image.module	6 Jan 2008 22:15:24 -0000	1.261
+++ image.module	11 Jan 2008 08:13:30 -0000
@@ -99,191 +99,6 @@ function image_access($op, $node) {
 }
 
 /**
- * Admin settings callback.
- */
-function image_admin_settings() {
-  _image_check_settings();
-
-  $form['#submit'][] = 'image_settings_sizes_submit';
-  $form['image_updated'] = array(
-    '#type' => 'hidden',
-    '#value' => variable_get('image_updated', time()),
-  );
-
-  $form['paths'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('File paths')
-  );
-  $form['paths']['image_default_path'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Default image path'),
-    '#default_value' => variable_get('image_default_path', 'images'),
-    '#description' => t('Subdirectory in the directory "%dir" where pictures will be stored. Do not include trailing slash.', array('%dir' => variable_get('file_directory_path', 'files'))),
-  );
-
-  $form['image_max_upload_size'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Maximum upload size'),
-    '#default_value' => variable_get('image_max_upload_size', 800),
-    '#field_suffix' => t('KB'),
-    '#size' => 12,
-    '#description' => t('Maximum file size for image uploads. When a maximum image dimensions is specified for original images the size is checked after resizing. '),
-  );
-
-  $form['image_sizes'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Image sizes'),
-    '#tree' => TRUE,
-    '#theme' => 'image_settings_sizes_form',
-    '#description' => '<p>'. t("The <em>Scale image</em> operation resizes images so that they fit with in the given dimensions. If only one dimension is specified the other dimension will be computed based on the image's aspect ratio. The <em>Scale and crop image</em> operation resizes images to be exactly the given dimensions. If only one dimension is specified the image will not be cropped, making this is equivalent to <em>Scale image</em>.") .'</p>'
-      .'<p>'. t("Note: 'Original' dimensions will only be used to resize images when they are first uploaded. Existing originals will not be modified.") .'</p>',
-    '#validate' => array('image_settings_sizes_validate' => array()),
-  );
-
-  $link_options = array(
-    IMAGE_LINK_HIDDEN => t('Hidden'),
-    IMAGE_LINK_SHOWN => t('Same window'),
-    IMAGE_LINK_NEW => t('New window'),
-  );
-
-  $sizes = image_get_sizes();
-  // Add some empty rows for user defined sizes.
-  for ($i = count($sizes); $i < 6; $i++) {
-    $sizes['new'. $i] = array(
-      'label' => '',
-      'operation' => 'scale',
-      'width' => '',
-      'height' => '',
-      'link' => IMAGE_LINK_SHOWN,
-      'new' => TRUE,
-    );
-  }
-
-  foreach ($sizes as $key => $size) {
-    $form['image_sizes'][$key]['label'] = array(
-      '#type' => 'textfield',
-      '#default_value' => $size['label'],
-      '#size' => 25,
-      '#maxlength' => 32,
-    );
-    
-    // For required sizes, set the value and disable the field.
-    if (_image_is_required_size($key)) {
-      $form['image_sizes'][$key]['label']['#disabled'] = TRUE;
-      $form['image_sizes'][$key]['label']['#value'] = $size['label'];
-      $form['image_sizes'][$key]['label']['#required'] = TRUE;
-    }
-    $form['image_sizes'][$key]['operation'] = array(
-      '#type' => 'select',
-      '#default_value' => $size['operation'],
-      '#options' => array('scale' => t('Scale image'), 'scale_crop' => t('Scale and crop image')),
-    );
-    $form['image_sizes'][$key]['width'] = array(
-      '#type' => 'textfield',
-      '#default_value' => $size['width'],
-      '#size' => 5,
-      '#maxlength' => 5,
-    );
-    $form['image_sizes'][$key]['height'] = array(
-      '#type' => 'textfield',
-      '#default_value' => $size['height'],
-      '#size' => 5,
-      '#maxlength' => 5,
-    );
-    $form['image_sizes'][$key]['link'] = array(
-      '#type' => 'select',
-      '#default_value' => $size['link'],
-      '#options' => $link_options,
-    );
-  }
-
-  return system_settings_form($form);
-}
-
-/**
- * Check that the sizes provided have the required amount of information.
- */
-function image_settings_sizes_validate($form, &$form_state) {
-  foreach (element_children($form) as $key) {
-    // If there's a label they must provide at either a height or width.
-    if ($key != IMAGE_ORIGINAL && !empty($form[$key]['label']['#value'])) {
-      if (empty($form[$key]['width']['#value']) && empty($form[$key]['height']['#value'])) {
-        form_set_error("image_sizes][$key][width", t('Must specify a width or height.'));
-      }
-    }
-  }
-}
-
-/**
- * Make changes to the settings before passing them off to
- * system_settings_form_submit().
- *
- * Remove deleted sizes, and use the label as indexes for new sizes.
- */
-function image_settings_sizes_submit($form, &$form_state) {
-  $old_sizes = image_get_sizes();
-
-  // If the size's operation, or dimensions change we need to rebuild.
-  $rebuild = FALSE;
-
-  foreach ($form_state['values']['image_sizes'] as $key => $size) {
-    // Changed to the original setting only affect new images and they
-    // shouldn't be able to add or remove it.
-    if ($key == IMAGE_ORIGINAL) {
-      continue;
-    }
-
-    // Remove sizes without labels.
-    if (empty($size['label'])) {
-      unset($form_state['values']['image_sizes'][$key]);
-    }
-
-    // Check if only one is set, indicating an addition or removal.
-    if (isset($form_state['values']['image_sizes'][$key]) ^ isset($old_sizes[$key])) {
-      $rebuild |= TRUE;
-
-      // When adding a new size, we need to assign a key.
-      if (isset($form_state['values']['image_sizes'][$key])) {
-        unset($form_state['values']['image_sizes'][$key]);
-        $new_key = drupal_strtolower(drupal_substr($size['label'], 0, 32));
-        $form_state['values']['image_sizes'][$new_key] = $size;
-      }
-    }
-    // Check for changes.
-    else if (isset($form_state['values']['image_sizes'][$key]) && isset($old_sizes[$key])) {
-      // Did the operation, height or width change?
-      foreach (array('operation', 'height', 'width') as $field) {
-        $rebuild |= ($form_state['values']['image_sizes'][$key][$field] != $old_sizes[$key][$field]);
-      }
-    }
-  }
-
-  // If we've changed anything update the image_update variable so the
-  // derivative images are rebuilt.
-  if ($rebuild) {
-    drupal_set_message(t('Changes to the images sizes mean that the derivative images will need to be regenerated.'));
-    $form_state['values']['image_updated'] = time();
-  }
-}
-
-function theme_image_settings_sizes_form(&$form) {
-  $header = array(t('Label'), t('Operation'), t('Width'), t('Height'), t('Link'));
-  foreach (element_children($form) as $key) {
-    $row = array();
-    $row[] = drupal_render($form[$key]['label']);
-    $row[] = drupal_render($form[$key]['operation']);
-    $row[] = drupal_render($form[$key]['width']);
-    $row[] = drupal_render($form[$key]['height']);
-    $row[] = drupal_render($form[$key]['link']);
-    $rows[] = $row;
-  }
-  $output = theme('table', $header, $rows);
-  $output .= drupal_render($form);
-
-  return $output;
-}
-
-/**
  * Implementation of hook_menu
  */
 function image_menu() {
@@ -297,11 +112,12 @@ function image_menu() {
   );
   $items['admin/settings/image'] = array(
     'title' => 'Image',
+    'description' => 'Image module settings.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('image_admin_settings'),
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
-    'description' => 'Image module settings.',
+    'file' => 'image.admin.inc',
   );
 
   return $items;
@@ -410,7 +226,7 @@ function image_node_form_submit($form, &
  * Note that in Drupal 5, the upload.module's hook_file_download() checks its
  * permissions for all files in the {files} table. We store our file
  * information in {files} if private files transfers are selected and the
- * upload.module is enabled, users will the 'view uploaded files'permission to
+ * upload.module is enabled, users will the 'view uploaded files' permission to
  * view images.
  */
 function image_file_download($filename) {
@@ -506,14 +322,6 @@ function image_block($op = 'list', $delt
   }
 }
 
-function image_form_add_thumbnail($form, &$form_state) {
-  if ($form_state['values']['images'][IMAGE_THUMBNAIL]) {
-    $node = (object)($form_state['values']);
-    $form['#title'] = t('Thumbnail');
-    $form['#value'] = image_display($node, IMAGE_THUMBNAIL);
-  }
-  return $form;
-}
 
 /**
  * Implementation of hook_form
@@ -580,6 +388,15 @@ function image_form(&$node, &$param) {
   return $form;
 }
 
+function image_form_add_thumbnail($form, &$form_state) {
+  if ($form_state['values']['images'][IMAGE_THUMBNAIL]) {
+    $node = (object)($form_state['values']);
+    $form['#title'] = t('Thumbnail');
+    $form['#value'] = image_display($node, IMAGE_THUMBNAIL);
+  }
+  return $form;
+}
+
 function image_validate($node) {
   $nid = ($node->nid) ? $node->nid : 'new_node';
   if (!isset($node->images[IMAGE_ORIGINAL]) && !isset($_SESSION['image_new_files'][$nid])) {