*** image_pub-5.x-1.x-dev.module	2008-04-30 00:27:57.522625000 -0400
--- image_pub.module	2008-04-30 00:48:39.413250000 -0400
***************
*** 323,328 ****
--- 323,332 ----
    $numref = FALSE;
  
    //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':
***************
*** 345,351 ****
      case 'new-album':
        _image_pub_gr_add_album($_POST['set_albumName'],
                                $_POST['newAlbumTitle'],
!                               $_POST['newAlbumDesc']);
        break;
  
      case 'move-album':
--- 349,356 ----
      case 'new-album':
        _image_pub_gr_add_album($_POST['set_albumName'],
                                $_POST['newAlbumTitle'],
!                               $_POST['newAlbumDesc'],
!                               $_POST['newAlbumName']);
        break;
  
      case 'move-album':
***************
*** 489,494 ****
--- 494,504 ----
  
  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,560 ****
  }
  
  
! function _image_pub_gr_add_album($parentaname, $title, $descr) {
    $body = '';
  
    $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)));
--- 562,574 ----
  }
  
  
! 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,572 ****
--- 581,588 ----
    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,581 ****
--- 592,601 ----
  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,593 ****
--- 608,618 ----
    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,610 ****
--- 630,640 ----
  
  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');