Index: watermark.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/watermark/watermark.info,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 watermark.info
--- watermark.info	6 Jun 2008 02:24:33 -0000	1.1.2.4
+++ watermark.info	23 Jun 2008 19:45:29 -0000
@@ -1,6 +1,6 @@
 ; $Id: watermark.info,v 1.1.2.4 2008/06/06 02:24:33 kbahey Exp $
 name = Image Watermark
 description = "Allows the user to apply watermarks on image upload"
-dependencies = image
+dependencies[] = image
 package = Image
-
+core = 6.x
Index: watermark.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/watermark/watermark.module,v
retrieving revision 1.5.2.6
diff -u -r1.5.2.6 watermark.module
--- watermark.module	17 May 2008 20:38:05 -0000	1.5.2.6
+++ watermark.module	23 Jun 2008 20:44:07 -0000
@@ -26,22 +26,21 @@
 
 define('WATERMARK_PERM_MANAGE',           'manage watermarks');
 
-function watermark_help($section) {
-  switch ($section) {
+function watermark_help($path, $arg) {
+  switch ($path) {
     case 'admin/help#description':
       return t('Adds watermark to image.module. Requires image.module');
   }
 }
 
-function watermark_menu($may_cache) {
+function watermark_menu() {
   $items = array();
-  $items[] = array(
-    'path' => 'admin/settings/image_watermark',
-    'title' => t('Image Watermark'),
-    'description' => t('Configure image watermark settings.'),
-    'callback' => 'drupal_get_form',
-    'callback arguments' => array('watermark_admin_settings'),
-    'access' => user_access('administer images'),
+  $items['admin/settings/image_watermark'] = array(
+    'title' => 'Image Watermark',
+    'description' => 'Configure image watermark settings.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('watermark_admin_settings'),
+    'access arguments' => array('administer images'),
     'type' => MENU_NORMAL_ITEM,
   );
   return $items;
@@ -141,7 +140,7 @@
     $label_var = WATERMARK . $id;
     $form['watermark']['labels'][$label_var] = array(
       '#type' => 'checkbox',
-      '#title' => $size['label'] . " ($id)",
+      '#title' => $size['label'] ." ($id)",
       '#default_value' => variable_get($label_var, FALSE),
     );
   }
@@ -170,17 +169,17 @@
   return system_settings_form($form);
 }
 
-function watermark_admin_settings_validate($form_id, $form_values) {
-  if (!is_numeric($form_values[WATERMARK_SCALING_PERCENTAGE]) || $form_values[WATERMARK_SCALING_PERCENTAGE] <= 0 || $form_values[WATERMARK_SCALING_PERCENTAGE] >= 100) {
+function watermark_admin_settings_validate($form, &$form_state) {
+  if (!is_numeric($form_state['values'][WATERMARK_SCALING_PERCENTAGE]) || $form_state['values'][WATERMARK_SCALING_PERCENTAGE] <= 0 || $form_state['values'][WATERMARK_SCALING_PERCENTAGE] >= 100) {
     form_set_error(WATERMARK_SCALING_PERCENTAGE, t('Please enter a number between 1 and 100 for scaling percentage.'));
   }
-  else if ($form_values[WATERMARK_SCALING_PERCENTAGE] < 10 || $form_values[WATERMARK_MIN_WIDTH] < 50) {
+  else if ($form_state['values'][WATERMARK_SCALING_PERCENTAGE] < 10 || $form_state['values'][WATERMARK_MIN_WIDTH] < 50) {
     // we do not disable scaling for low values, e.g. if the user chooses to scale down to 1%, we just warn
     drupal_set_message(t('Warning: Scaling is set to @percentage%, minimum width is only @min_width px. This may result in very small or almost invisible watermarks. It is recommended to check twice that an adequate minimum width has been set.',
-                       array('@percentage' => $form_values[WATERMARK_SCALING_PERCENTAGE], '@min_width' => $form_values[WATERMARK_MIN_WIDTH])));
+                       array('@percentage' => $form_state['values'][WATERMARK_SCALING_PERCENTAGE], '@min_width' => $form_state['values'][WATERMARK_MIN_WIDTH])));
   }
 
-  if (intval($form_values[WATERMARK_MIN_WIDTH]) < 0) {
+  if (intval($form_state['values'][WATERMARK_MIN_WIDTH]) < 0) {
     form_set_error(WATERMARK_MIN_WIDTH, t('Please enter a positive number for minimum width.'));
   }
 }
@@ -251,7 +250,7 @@
   }
 }
 
-function watermark_form_alter($form_id, &$form) {
+function watermark_form_alter(&$form, &$form_state, $form_id) {
   // additional option to toggle watermark process when a user has "manage watermarks" permission
   if ($form_id == 'image_node_form' && user_access(WATERMARK_PERM_MANAGE)) {
     $apply_watermark = TRUE;
@@ -281,10 +280,11 @@
 function _watermark_apply($node) {
   $watermark = variable_get(WATERMARK_PATH, '');
   $location = variable_get(WATERMARK_LOCATION, 0);
-  foreach ($node->images as $label => $filepath) {
-    if (variable_get(WATERMARK . $label, FALSE)) {
+  $sizes = _image_get_sizes();
+  foreach ($node->images as $size => $filepath) {
+    if (variable_get(WATERMARK . $size, FALSE)) {
       if (_watermark_process($filepath, $watermark, $location)) {
-        drupal_set_message(t('Watermark applied to image: %file', array('%file' => $label)));
+        drupal_set_message(t('Watermark applied to image: %file', array('%file' => $sizes[$size]['label'])));
       }
       else {
         drupal_set_message(t('Error adding watermark.'), 'error');
@@ -496,7 +496,7 @@
   // code from image gallery module
 
   $vid = variable_get('image_gallery_nav_vocabulary', '');
-  if (empty($vid) || !taxonomy_get_vocabulary($vid)) {
+  if (empty($vid) || !taxonomy_vocabulary_load($vid)) {
     // Check to see if an image gallery vocabulary exists
     $vid = db_result(db_query("SELECT vid FROM {vocabulary} WHERE module='image_gallery'"));
     if (!$vid) {