diff options
| -rw-r--r-- | actions/addalbum.php | 67 |
1 files changed, 25 insertions, 42 deletions
diff --git a/actions/addalbum.php b/actions/addalbum.php index accdd082b..bdac9bfbf 100644 --- a/actions/addalbum.php +++ b/actions/addalbum.php @@ -19,54 +19,37 @@ $_SESSION['tidypicstitle'] = $title; $_SESSION['tidypicsbody'] = $body; $_SESSION['tidypicstags'] = $tags; -// Convert string of tags into a preformatted array -$tagarray = string_to_tag_array($tags); -// Make sure the title isn't blank + if (empty($title)) { register_error(elgg_echo("album:blank")); - forward($_SERVER['HTTP_REFERER']); //failed, so forward to previous page - // Otherwise, save the album -} else { - - // Initialise a new ElggObject - $album = new ElggObject(); - // Tell the system it's an album - $album->subtype = "album"; - - // Set its owner to the current user - $album->container_guid = $container_guid; - $album->owner_guid = $_SESSION['user']->getGUID(); - $album->access_id = $access; - // Set its title and description appropriately - $album->title = $title; - $album->description = $body; - - // we catch the adding images to new albums in the upload action and throw a river new album event - $album->new_album = TP_NEW_ALBUM; - - // Before we can set metadata, we need to save the album - if (!$album->save()) { - register_error(elgg_echo("album:error")); - forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page - } + forward($_SERVER['HTTP_REFERER']); +} - // Now let's add tags - if (is_array($tagarray)) { - $album->tags = $tagarray; - } +$album = new TidypicsAlbum(); +$album->container_guid = $container_guid; +$album->owner_guid = get_loggedin_userid(); +$album->access_id = $access; +$album->title = $title; +$album->description = $body; +if ($tags) { + $album->tags = string_to_tag_array($tags); +} +$album->new_album = TP_NEW_ALBUM; +if (!$album->save()) { + register_error(elgg_echo("album:error")); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); +} - // Success message - system_message(elgg_echo("album:created")); +system_message(elgg_echo("album:created")); - // Remove the album post cache - unset($_SESSION['tidypicstitle']); - unset($_SESSION['tidypicsbody']); - unset($_SESSION['tidypicstags']); +// Remove the album post cache +unset($_SESSION['tidypicstitle']); +unset($_SESSION['tidypicsbody']); +unset($_SESSION['tidypicstags']); - // plugins can register to be told when a new Tidypics album has been created - trigger_elgg_event('add', 'tp_album', $album); +// plugins can register to be told when a new Tidypics album has been created +trigger_elgg_event('add', 'tp_album', $album); - forward("pg/photos/upload/" . $album->guid); -} +forward("pg/photos/upload/" . $album->guid); |