Index: CHANGELOG.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image_pub/Attic/CHANGELOG.txt,v retrieving revision 1.2.4.2 diff -u -p -r1.2.4.2 CHANGELOG.txt --- CHANGELOG.txt 20 Oct 2007 15:45:20 -0000 1.2.4.2 +++ CHANGELOG.txt 13 Jun 2008 06:39:32 -0000 @@ -1,3 +1,7 @@ +12 June 2008 +---------------------------- +- Image module 6.0.0 support + 12 April 2007 ---------------------------- - Image module 5.0.0 support Index: image_pub.info =================================================================== RCS file: image_pub.info diff -N image_pub.info --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ image_pub.info 13 Jun 2008 06:39:32 -0000 @@ -0,0 +1,6 @@ +; $Id: image_pub.info,v 1.1.2.2 2007/10/20 15:45:20 robloach Exp $ +name = Image Publishing +description = "Supports image uploads using third party publishing applications." +package = Image +core = 6.x +dependencies[] = image \ No newline at end of file Index: image_pub.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image_pub/Attic/image_pub.module,v retrieving revision 1.11.2.4 diff -u -p -r1.11.2.4 image_pub.module --- image_pub.module 20 Oct 2007 18:01:43 -0000 1.11.2.4 +++ image_pub.module 13 Jun 2008 06:39:34 -0000 @@ -12,8 +12,8 @@ /** * Implementation of hook_help(). */ -function image_pub_help($section = 'admin/help#image_pub') { - switch ($section) { +function image_pub_help($path = 'admin/help#image_pub', $arg=null) { + switch ($path) { case 'admin/help#image_pub': return '

'. t('The Image Publishing module supports third party image upload and management applications.') .'

'; } @@ -22,27 +22,25 @@ function image_pub_help($section = 'admi /** * Implementation of hook_menu(). */ -function image_pub_menu($may_cache) { - $items = array(); - if ($may_cache) { - $items[] = array('path' => 'gallery_remote2.php', - 'callback' => '_image_pub_gr_request', - 'access' => TRUE, - 'type' => MENU_CALLBACK); - $items[] = array('path' => 'publish_xp', - 'callback' => '_image_pub_xp_request', - 'access' => TRUE, - 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/settings/image_pub_xp_reghack', - 'callback' => '_image_pub_xp_reghack', - 'access' => TRUE, - 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/settings/image_pub', - 'title' => t('Image publishing'), - 'description' => t('Provides information regarding remote image publishing.'), - 'callback' => '_image_pub_admin', - 'access' => user_access('create images')); - } +function image_pub_menu() { + $items = array(); + $items['gallery_remote2.php'] = array( + 'page callback' => '_image_pub_gr_request', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK); + $items['publish_xp'] = array( + 'page callback' => '_image_pub_xp_request', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK); + $items['admin/settings/image_pub_xp_reghack'] = array( + 'page callback' => '_image_pub_xp_reghack', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK); + $items['admin/settings/image_pub'] = array( + 'title' => 'Image publishing', + 'description' => 'Provides information regarding remote image publishing.', + 'page callback' => '_image_pub_admin', + 'access arguments' => array('create images')); return $items; } @@ -153,7 +151,7 @@ function _image_pub_album_selector($fnam return implode("\r\n", $body); } -function _image_pub_album_access($type, $album) { +function _image_pub_album_access($type, $album, $account=null) { switch ($type) { case 'view': return user_access('access content'); @@ -176,18 +174,18 @@ function _image_pub_album_images($tid) { function _image_pub_authenticate($uname, $pass) { global $user; if ($user->uid) { - watchdog('image_pub', t('Session closed for %user', array('%user' => theme('placeholder', $user->name)))); + watchdog('image_pub', 'Session closed for %user', array('%user' => theme('placeholder', $user->name))); unset($user); } - $user = user_authenticate($uname, $pass); + $user = user_authenticate(array('name' => $uname, 'pass' => $pass)); if (!$user->uid) { return FALSE; } - watchdog('image_pub', t('Session opened for %user', array('%user' => theme('placeholder', $user->name)))); + watchdog('image_pub', 'Session opened for %user', array('%user' => theme('placeholder', $user->name))); return TRUE; } function _image_pub_album_add($title, $descr, $palbum) { - watchdog('image_pub', t('Album added with title %title', array('%title' => $title))); + watchdog('image_pub', 'Album added with title %title', array('%title' => $title)); if (empty($title)) { $title = 'Untitled album'; @@ -262,7 +260,7 @@ function _image_pub_image_add($album, $c @unlink(file_directory_temp() . '/' . $filename); } // FIXME: check that the uploaded image was accepted. - watchdog('image_pub', t('%image was added.', array('%image' => $filename))); + watchdog('image_pub', '%image was added.', array('%image' => $filename)); return array('success' => TRUE, 'node' => $node); } @@ -397,7 +395,7 @@ function _image_pub_gr_finish($code, $bo } } if ($code != GR_STAT_SUCCESS) { - watchdog('image_pub', t('Request failure: %code, %msg', array('%code' => $code, '%msg' => $message))); + watchdog('image_pub', 'Request failure: %code, %msg', array('%code' => $code, '%msg' => $message)); } else { //watchdog('image_pub', t('Command succeeded: %msg', array('%msg' => theme('placeholder', $message)))); } @@ -657,7 +655,7 @@ function _image_pub_gr_add_image($albnam * usable destinations for the publishing wizard. */ function _image_pub_xp_reghack() { - $pub_url = url('publish_xp', NULL, NULL, TRUE); + $pub_url = url('publish_xp', array('absolute' => TRUE)); $site_name = variable_get('site_name', 'drupal'); $site_descr = sprintf(t("Publish Your Photos to %s."), $site_name); if (!strncmp($pub_url, 'https:', 6)) { @@ -1038,7 +1036,7 @@ var files = xml.selectNodes("transferman for (i = 0; i < files.length; i++) { var postTag = xml.createNode(1, "post", ""); - postTag.setAttribute("href", ""); + postTag.setAttribute("href", " TRUE)); ?>"); postTag.setAttribute("name", "userfile"); var dataTag = xml.createNode(1, "formdata", "");