'. t('The Image Publishing module supports third party image upload and management applications.') .'
'; } @@ -22,27 +22,25 @@ /** * Implementation of hook_menu(). */ -function image_pub_menu($may_cache) { +function image_pub_menu() { $items = array(); - if ($may_cache) { - $items[] = array('path' => 'gallery_remote2.php', - 'callback' => '_image_pub_gr_request', - 'access' => TRUE, + $items['gallery_remote2.php'] = array( + 'page callback' => '_image_pub_gr_request', + 'access callback' => TRUE, 'type' => MENU_CALLBACK); - $items[] = array('path' => 'publish_xp', - 'callback' => '_image_pub_xp_request', - 'access' => TRUE, + $items['publish_xp'] = array( + 'page callback' => '_image_pub_xp_request', + 'access callback' => TRUE, 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/settings/image_pub_xp_reghack', - 'callback' => '_image_pub_xp_reghack', - 'access' => TRUE, + $items['admin/settings/image_pub_xp_reghack'] = array( + 'page callback' => '_image_pub_xp_reghack', + 'access callback' => 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')); - } + $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 @@ 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_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 @@ @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); } @@ -324,6 +322,10 @@ //watchdog('image_pub', t('Processing command %cmd', array('%cmd' => theme('placeholder', $cmd)))); + if (!isset($_SESSION['image_pub_gr_albumname_map']) || !is_array($_SESSION['image_pub_gr_albumname_map']) ) { + $_SESSION['image_pub_gr_albumname_map'] = array(); + } + switch($cmd) { case 'login': _image_pub_gr_login($_POST['uname'], $_POST['password']); @@ -345,7 +347,8 @@ case 'new-album': _image_pub_gr_add_album($_POST['set_albumName'], $_POST['newAlbumTitle'], - $_POST['newAlbumDesc']); + $_POST['newAlbumDesc'], + $_POST['newAlbumName']); break; case 'move-album': @@ -397,7 +400,7 @@ } } 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)))); } @@ -489,6 +492,11 @@ function _image_pub_gr_fetch_album_images($albname, $albumstoo) { $body = ''; + + if (array_key_exists($_SESSION['image_pub_gr_albumname_map'],$albname)){ + $albname=_image_pub_gr_get_albumname($_SESSION['image_pub_gr_albumname_map'][$albname]); + } + $album = _image_pub_album_get(_image_pub_gr_get_albumid($albname)); if (!isset($album) || !_image_pub_album_access('view', $album)) { _image_pub_gr_finish(GR_STAT_NO_FILENAME, $body, 'No such album'); @@ -552,9 +560,13 @@ } -function _image_pub_gr_add_album($parentaname, $title, $descr) { +function _image_pub_gr_add_album($parentaname, $title, $descr, $aname) { $body = ''; + if (array_key_exists($parentaname, $_SESSION['image_pub_gr_albumname_map'])){ + $parentaname=_image_pub_gr_get_albumname($_SESSION['image_pub_gr_albumname_map'][$parentaname]); + } + $palbum = _image_pub_album_get(_image_pub_gr_get_albumid($parentaname)); if (!isset($palbum)) { _image_pub_gr_finish(GR_STAT_CREATE_ALBUM_FAILED, $body, t('No such parent album: %parent', array('%parent' => $parentaname))); @@ -567,6 +579,8 @@ if (!isset($term)) { _image_pub_gr_finish(GR_STAT_CREATE_ALBUM_FAILED); } else { + $_SESSION['image_pub_gr_albumname_map'][$aname]=$term; + $body .= 'album.name='. _image_pub_gr_get_albumname($term)."\n"; _image_pub_gr_finish(GR_STAT_SUCCESS, $body, 'Album created'); } @@ -576,6 +590,10 @@ function _image_pub_gr_move_album($albname, $destaname) { $body = ''; + if (array_key_exists($albname, $_SESSION['image_pub_gr_albumname_map'])){ + $albname=_image_pub_gr_get_albumname($_SESSION['image_pub_gr_albumname_map'][$albname]); + } + $album = _image_pub_album_get(_image_pub_gr_get_albumid($albname)); if (!isset($album)) { _image_pub_gr_finish(GR_STAT_CREATE_ALBUM_FAILED, $body, 'No such album'); @@ -588,6 +606,11 @@ if (!isset($destaname) || ($destaname == '0') || ($destaname == 'rootalbum')) { $dtid = 0; } else { + + if (array_key_exists($destname, $_SESSION['image_pub_gr_albumname_map'])){ + $destname=_image_pub_gr_get_albumname($_SESSION['image_pub_gr_albumname_map'][$destname]); + } + $dalbum = _image_pub_album_get(_image_pub_gr_get_albumid($destaname)); if (!isset($dalbum) || !_image_pub_album_access('update', $dalbum)) { _image_pub_gr_finish(GR_STAT_CREATE_ALBUM_FAILED, $body, 'Invalid destination album '.$destaname); @@ -605,6 +628,11 @@ function _image_pub_gr_add_image($albname, $caption, $description) { $body = ''; + + if (array_key_exists($albname, $_SESSION['image_pub_gr_albumname_map'])){ + $albname=_image_pub_gr_get_albumname($_SESSION['image_pub_gr_albumname_map'][$albname]); + } + $album = _image_pub_album_get(_image_pub_gr_get_albumid($albname)); if (!isset($album)) { _image_pub_gr_finish(GR_STAT_UPLOAD_PHOTO_FAIL, 'No such album'); @@ -657,7 +685,7 @@ * 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)) { @@ -804,7 +832,7 @@ $site_name = variable_get('site_name', 'drupal'); ?> - + @@ -915,6 +943,7 @@ // Build a form array $form = array(); + $form_state = array(); // create a fieldset to wrap the form in // note #parents must be forced for this set to work with original code @@ -1007,7 +1036,7 @@ // Render the form elements to themed HTML $body[] = ''; $body[] = ''; @@ -1038,7 +1067,7 @@ 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", ""); @@ -1070,7 +1099,7 @@ var uploadTag = xml.createNode(1, "uploadinfo", ""); var htmluiTag = xml.createNode(1, "htmlui", ""); -htmluiTag.text = ""; +htmluiTag.text = " TRUE)); ?>"; uploadTag.appendChild(htmluiTag); xml.documentElement.appendChild(uploadTag);