From 4e0c1576475390faa2f1fb4c4dc2902a953f440e Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 25 Feb 2009 12:16:53 +0000 Subject: First commit --- actions/addalbum.php | 72 ++++++++++ actions/delete.php | 105 +++++++++++++++ actions/download.php | 43 ++++++ actions/edit_multi.php | 62 +++++++++ actions/editalbum.php | 91 +++++++++++++ actions/icon.php | 41 ++++++ actions/upload.php | 133 +++++++++++++++++++ contributions.txt | 170 ++++++++++++++++++++++++ edit.php | 46 +++++++ edit_multi.php | 33 +++++ friends.php | 43 ++++++ graphics/Thumbs.db | Bin 0 -> 18944 bytes graphics/arrow_next.gif | Bin 0 -> 304 bytes graphics/arrow_previous.gif | Bin 0 -> 306 bytes graphics/bl.gif | Bin 0 -> 215 bytes graphics/br.gif | Bin 0 -> 217 bytes graphics/btnClose.gif | Bin 0 -> 361 bytes graphics/btnContract.gif | Bin 0 -> 188 bytes graphics/btnExpand.gif | Bin 0 -> 192 bytes graphics/btnNext.gif | Bin 0 -> 308 bytes graphics/btnPrevious.gif | Bin 0 -> 317 bytes graphics/icons/Thumbs.db | Bin 0 -> 24064 bytes graphics/icons/album.gif | Bin 0 -> 1411 bytes graphics/icons/general.jpg | Bin 0 -> 7036 bytes graphics/icons/general.png | Bin 0 -> 7177 bytes graphics/icons/river_icon_album.gif | Bin 0 -> 398 bytes graphics/icons/river_icon_image.gif | Bin 0 -> 284 bytes graphics/img_error.jpg | Bin 0 -> 5864 bytes graphics/loader.gif | Bin 0 -> 2545 bytes graphics/tl.gif | Bin 0 -> 214 bytes graphics/tr.gif | Bin 0 -> 217 bytes graphics/ttl.gif | Bin 0 -> 288 bytes graphics/ttp.gif | Bin 0 -> 192 bytes graphics/ttr.gif | Bin 0 -> 288 bytes index.php | 45 +++++++ languages/de.php | 114 ++++++++++++++++ languages/en.php | 115 ++++++++++++++++ languages/es.php | 115 ++++++++++++++++ languages/pl.php | 115 ++++++++++++++++ manifest.xml | 9 ++ newalbum.php | 31 +++++ start.php | 174 +++++++++++++++++++++++++ tasks.txt | 66 ++++++++++ thumbnail.php | 55 ++++++++ tidypics_user_instructions_.txt | 71 ++++++++++ upload.php | 49 +++++++ view.php | 62 +++++++++ views/default/input/accessRead.php | 61 +++++++++ views/default/input/cover_checkbox.php | 45 +++++++ views/default/input/multi_radio.php | 42 ++++++ views/default/object/album.php | 137 +++++++++++++++++++ views/default/object/image.php | 130 ++++++++++++++++++ views/default/river/object/album/annotate.php | 13 ++ views/default/river/object/album/create.php | 13 ++ views/default/river/object/image/annotate.php | 13 ++ views/default/river/object/image/create.php | 13 ++ views/default/settings/tidypics/edit.php | 10 ++ views/default/tidypics/css.php | 128 ++++++++++++++++++ views/default/tidypics/forms/edit.php | 115 ++++++++++++++++ views/default/tidypics/forms/edit_multi.php | 44 +++++++ views/default/tidypics/forms/upload.php | 79 +++++++++++ views/default/tidypics/groupprofile_albums.php | 60 +++++++++ views/default/tidypics/icon.php | 41 ++++++ views/default/tidypics/menu.php | 16 +++ views/default/widgets/album_view/edit.php | 21 +++ views/default/widgets/album_view/view.php | 53 ++++++++ views/rss/object/file.php | 30 +++++ world.php | 37 ++++++ 68 files changed, 2961 insertions(+) create mode 100644 actions/addalbum.php create mode 100644 actions/delete.php create mode 100644 actions/download.php create mode 100644 actions/edit_multi.php create mode 100644 actions/editalbum.php create mode 100644 actions/icon.php create mode 100644 actions/upload.php create mode 100644 contributions.txt create mode 100644 edit.php create mode 100644 edit_multi.php create mode 100644 friends.php create mode 100644 graphics/Thumbs.db create mode 100644 graphics/arrow_next.gif create mode 100644 graphics/arrow_previous.gif create mode 100644 graphics/bl.gif create mode 100644 graphics/br.gif create mode 100644 graphics/btnClose.gif create mode 100644 graphics/btnContract.gif create mode 100644 graphics/btnExpand.gif create mode 100644 graphics/btnNext.gif create mode 100644 graphics/btnPrevious.gif create mode 100644 graphics/icons/Thumbs.db create mode 100644 graphics/icons/album.gif create mode 100644 graphics/icons/general.jpg create mode 100644 graphics/icons/general.png create mode 100644 graphics/icons/river_icon_album.gif create mode 100644 graphics/icons/river_icon_image.gif create mode 100644 graphics/img_error.jpg create mode 100644 graphics/loader.gif create mode 100644 graphics/tl.gif create mode 100644 graphics/tr.gif create mode 100644 graphics/ttl.gif create mode 100644 graphics/ttp.gif create mode 100644 graphics/ttr.gif create mode 100644 index.php create mode 100644 languages/de.php create mode 100644 languages/en.php create mode 100644 languages/es.php create mode 100644 languages/pl.php create mode 100644 manifest.xml create mode 100644 newalbum.php create mode 100644 start.php create mode 100644 tasks.txt create mode 100644 thumbnail.php create mode 100644 tidypics_user_instructions_.txt create mode 100644 upload.php create mode 100644 view.php create mode 100644 views/default/input/accessRead.php create mode 100644 views/default/input/cover_checkbox.php create mode 100644 views/default/input/multi_radio.php create mode 100644 views/default/object/album.php create mode 100644 views/default/object/image.php create mode 100644 views/default/river/object/album/annotate.php create mode 100644 views/default/river/object/album/create.php create mode 100644 views/default/river/object/image/annotate.php create mode 100644 views/default/river/object/image/create.php create mode 100644 views/default/settings/tidypics/edit.php create mode 100644 views/default/tidypics/css.php create mode 100644 views/default/tidypics/forms/edit.php create mode 100644 views/default/tidypics/forms/edit_multi.php create mode 100644 views/default/tidypics/forms/upload.php create mode 100644 views/default/tidypics/groupprofile_albums.php create mode 100644 views/default/tidypics/icon.php create mode 100644 views/default/tidypics/menu.php create mode 100644 views/default/widgets/album_view/edit.php create mode 100644 views/default/widgets/album_view/view.php create mode 100644 views/rss/object/file.php create mode 100644 world.php diff --git a/actions/addalbum.php b/actions/addalbum.php new file mode 100644 index 000000000..127885270 --- /dev/null +++ b/actions/addalbum.php @@ -0,0 +1,72 @@ + + * @copyright Curverider Ltd 2008 + * @link http://elgg.org/ + */ + + // Make sure we're logged in (send us to the front page if not) + if (!isloggedin()) forward(); + + // Get input data + $title = get_input('albumtitle'); + $body = get_input('albumbody'); + $tags = get_input('albumtags'); + $access = get_input('access_id'); + $container_guid = get_input('container_guid', $_SESSION['user']->getGUID()); + $back_url = 'pg/photos/new/' . get_entity($container_guid)->username; + + // Cache to the session + $_SESSION['albumtitle'] = $title; + $_SESSION['albumbody'] = $body; + $_SESSION['albumtags'] = $tags; + + // Convert string of tags into a preformatted array + $tagarray = string_to_tag_array($tags); + // Make sure the title / description aren't blank + if (empty($title) || empty($body)) { + register_error(elgg_echo("album:blank")); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page + + // Otherwise, save the blog post + } 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(); + // For now, set its access to public (we'll add an access dropdown shortly) + $album->access_id = $access; + // Set its title and description appropriately + $album->title = $title; + $album->description = $body; + // Before we can set metadata, we need to save the blog post + if (!$album->save()) { + register_error(elgg_echo("album:error")); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page + } + // Now let's add tags. We can pass an array directly to the object property! Easy. + if (is_array($tagarray)) { + $album->tags = $tagarray; + } + // Success message + system_message(elgg_echo("album:created")); + // Remove the blog post cache + unset($_SESSION['albumtitle']); + unset($_SESSION['albumbody']); + unset($_SESSION['albumtags']); + // Forward to the main blog page + + forward("pg/photos/upload/" . $album->guid); + + } + +?> \ No newline at end of file diff --git a/actions/delete.php b/actions/delete.php new file mode 100644 index 000000000..6b8789fb4 --- /dev/null +++ b/actions/delete.php @@ -0,0 +1,105 @@ +canEdit()) { + $subtype = $photoObject->getSubtype(); + $container = get_entity($photoObject->container_guid); + + if ($subtype!='image' && $subtype!='album') forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //back off if not an album or image + + if ($subtype == 'image') { //deleting an image + $forward_url = $container->getURL(); //forward back to album after deleting pictures + $images = array($photoObject); + } else { //deleting an album + $forward_url = 'pg/photos/owned/' . $container->username; + $images = get_entities("object","image", $guid, '', 999); //get all the images from this album, or the image requested + } //end of subtype comparison + + //loop through all images and delete them + foreach($images as $im) { + $thumbnail = $im->thumbnail; + $smallthumb = $im->smallthumb; + $largethumb = $im->largethumb; + + if ($thumbnail) { //delete standard thumbnail image + $delfile = new ElggFile(); + $delfile->owner_guid = $im->getOwner(); + $delfile->setFilename($thumbnail); + $delfile->delete(); + } + if ($smallthumb) { //delete small thumbnail image + $delfile = new ElggFile(); + $delfile->owner_guid = $im->getOwner(); + $delfile->setFilename($smallthumb); + $delfile->delete(); + } + if ($largethumb) { //delete large thumbnail image + $delfile = new ElggFile(); + $delfile->owner_guid = $im->getOwner(); + $delfile->setFilename($largethumb); + $delfile->delete(); + } + if ($im) { //delete actual image file + $delfile = new ElggFile($im->getGUID()); + $delfile->owner_guid = $im->getOwner(); + //$delfile->setFilename($im->originalfilename); + if (!$delfile->delete()) { + if ($subtype=='image') register_error(elgg_echo("file:deletefailed")); //unable to delete object + } else { + if ($subtype=='image') system_message(elgg_echo("file:deleted")); //successfully deleted object + } + } //end delete actual image file + } //end looping through each image to delete it + + //now that all images have been deleted, delete the album + if ($subtype=='album') { + //delete the album's directory manually; first create a temp file to get the directory path + $tmpfile = new ElggFile(); + $tmpfile->setFilename('image/' . $guid . '/._tmp_del_tidypics_album_'); + $tmpfile->subtype = 'image'; + $tmpfile->container_guid = $guid; + $tmpfile->open("write"); + $tmpfile->write(''); + $tmpfile->close(); + $tmpfile->save(); + $albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore()); + $tmpfile->delete(); + if (is_dir($albumdir)) + rmdir($albumdir); + + //delete object from database + if (!$photoObject->delete()) { + register_error(elgg_echo("file:deletefailed")); //unable to delete object + } else { + system_message(elgg_echo("file:deleted")); //successfully deleted object + } + } //end of delete album + + + } else { //user does not have permissions to delete this image or album + $container = $_SESSION['user']; + register_error(elgg_echo("file:deletefailed")); + } //end of canEdit() comparison + + } else { // unable to get Elgg entity + register_error(elgg_echo("file:deletefailed")); + } //end of get_entitty() + + forward($forward_url); + +?> \ No newline at end of file diff --git a/actions/download.php b/actions/download.php new file mode 100644 index 000000000..31f21f0f5 --- /dev/null +++ b/actions/download.php @@ -0,0 +1,43 @@ +originalfilename; + $mime = $file->mimetype; + + header("Content-type: $mime"); + if (strpos($mime, "image/")!==false) + header("Content-Disposition: inline; filename=\"$filename\""); + else + header("Content-Disposition: attachment; filename=\"$filename\""); + + + $readfile = new ElggFile($file_guid); + $readfile->owner_guid = $file->owner_guid; + //$readfile->setFilename($filename); + + $contents = $readfile->grabFile(); + + if (empty($contents)) + echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/icons/general.jpg" ); + else + echo $contents; + + exit; + } + else + register_error(elgg_echo("image:downloadfailed")); + +?> \ No newline at end of file diff --git a/actions/edit_multi.php b/actions/edit_multi.php new file mode 100644 index 000000000..9bb9c4eed --- /dev/null +++ b/actions/edit_multi.php @@ -0,0 +1,62 @@ + $im){ + $image = get_entity($im); + + if ($image->canEdit()){ + + // Convert string of tags into a preformatted array + $tagarray = string_to_tag_array($tags_array[$key]); + + //set description appropriately + $image->title = $title_array[$key]; + + //set description appropriately + $image->description = $caption_array[$key]; + + // Before we can set metadata, we need to save the image + if (!$image->save()) { + array_push($not_updated, $image->guid); + } + + // Now let's add tags. We can pass an array directly to the object property! Easy. + $image->clearMetadata('tags'); + if (is_array($tagarray)) { + $image->tags = $tagarray; + } + + //if cover meta is sent from image save as metadata + if($cover == $im){ + $album_entity->cover = $im; + } + } + } + // Success message + if (count($not_updated) > 0) { + register_error(elgg_echo("images:notedited")); + } else { + system_message(elgg_echo("images:edited")); + } + + // Forward to the main album page + forward($album_entity->getURL()); + + +?> \ No newline at end of file diff --git a/actions/editalbum.php b/actions/editalbum.php new file mode 100644 index 000000000..36b0f7379 --- /dev/null +++ b/actions/editalbum.php @@ -0,0 +1,91 @@ + + * @copyright Curverider Ltd 2008 + * @link http://elgg.org/ + */ + + // Make sure we're logged in (send us to the front page if not) + if (!isloggedin()) forward(); + + // Get input data + $guid = (int) get_input('albumpost'); + $title = get_input('albumtitle'); + $body = get_input('albumbody'); + $access = get_input('access_id'); + $tags = get_input('albumtags'); + $back_url = 'mod/tidypics/edit.php?file_guid=' . $guid; + + // Make sure we actually have permission to edit + $album = get_entity($guid); + if ($album->canEdit()) + { + + // Cache to the session + $_SESSION['albumtitle'] = $title; + $_SESSION['albumbody'] = $body; + $_SESSION['albumtags'] = $tags; + + // Convert string of tags into a preformatted array + $tagarray = string_to_tag_array($tags); + + // Get owning user + $owner = get_entity($album->getOwner()); + + // edit access only if access is different from current + + if($album->access_id != $access) + { + $album->access_id = $access; + + //get images from album and update access on image entities + $images = get_entities("object","image", $guid, '', 999, '', false); + foreach($images as $im){ + $im->access_id = $access; + $im->save(); + //new core updates all metadata access as well! + } + } + + + // Set its title and description appropriately + $album->title = $title; + $album->description = $body; + + // Before we can set metadata, we need to save the image + if (!$album->save()) { + register_error(elgg_echo("album:error")); + $album->delete(); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page + } + + // Now let's add tags. We can pass an array directly to the object property! Easy. + $album->clearMetadata('tags'); + if (is_array($tagarray)) { + $album->tags = $tagarray; + } + + //if cover meta is sent from image save as metadata + if(get_input('cover') == elgg_echo('album:cover:yes')){ + $container = get_entity($album->container_guid); + $container->cover = $album->guid; + } + + // Success message + system_message(elgg_echo("album:edited")); + + // Remove the image cache + unset($_SESSION['albumtitle']); + unset($_SESSION['albumbody']); + unset($_SESSION['albumtags']); + + // Forward to the main blog page + forward($album->getURL()); + + } +?> \ No newline at end of file diff --git a/actions/icon.php b/actions/icon.php new file mode 100644 index 000000000..718425819 --- /dev/null +++ b/actions/icon.php @@ -0,0 +1,41 @@ +thumbnail; + $mime = $file->mimetype; + + header("Content-type: $mime"); + if (strpos($mime, "image/")!==false) + header("Content-Disposition: inline; filename=\"$filename\""); + else + header("Content-Disposition: attachment; filename=\"$filename\""); + + + $readfile = new ElggFile(); + $readfile->owner_guid = $file->owner_guid; + $readfile->setFilename($filename); + + $contents = $readfile->grabFile(); + + if (empty($contents)) + echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/icons/general.jpg" ); + else + echo $contents; + + exit; + } + else + register_error(elgg_echo("file:downloadfailed")); +?> \ No newline at end of file diff --git a/actions/upload.php b/actions/upload.php new file mode 100644 index 000000000..f969f6f40 --- /dev/null +++ b/actions/upload.php @@ -0,0 +1,133 @@ +getGUID(); + + $not_uploaded = array(); + $uploaded_images = array(); + + foreach($_FILES as $key => $sent_file) { + if(!empty($sent_file['name'])) { + $name = $_FILES[$key]['name']; + $mime = $_FILES[$key]['type']; + + //make sure file is an image + if($mime == 'image/jpeg' || $mime == 'image/gif' || $mime == 'image/png' || $mime == 'image/pjpeg') { + //this will save to users folder in /image/ and organize by photo album + $prefix = "image/" . $container_guid . "/"; + $file = new ElggFile(); + $filestorename = strtolower(time().$name); + $file->setFilename($prefix.$filestorename); + $file->setMimeType($mime); + $file->originalfilename = $name; + $file->subtype="image"; + $file->access_id = $access_id; + if ($container_guid) { + $file->container_guid = $container_guid; + } + $file->open("write"); + $file->write(get_uploaded_file($key)); + $file->close(); + $result = $file->save(); + + if ($result) { //file was saved; now create some thumbnails + //get maximum file size from plugin settings + if (get_plugin_setting('maxfilesize','tidypics')) { + if (((int) get_plugin_setting('maxfilesize','tidypics')) < 1 || ((int) get_plugin_setting('maxfilesize','tidypics')) > 1048576) { + $maxfilesize = 10240; //if file size is less than 1KB or greater than 1GB, default to 10MB + } else { + $maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics'); + } + } else { + $maxfilesize = 10240; //if the file size limit is not set, default to 10MB + } + $maxfilesize = 1024 * $maxfilesize; //convert to bytes + + //check file size and remove picture if it exceeds the maximum + if (filesize($file->getFilenameOnFilestore())<= $maxfilesize) { + array_push($uploaded_images, $file->guid); + + // Generate thumbnail + //TODO: REMOVE THE BELOW IF STATEMENT ONCE get_resized_image_from_existing_file() ACCEPTS IMAGES OVER 0.9MB IN SIZE + if (filesize($file->getFilenameOnFilestore())<= 943718) { //create thumbnails if file size < 0.9MB + try {$thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false); } catch (Exception $e) { $thumblarge = false; } + try {$thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true); } catch (Exception $e) { $thumbsmall = false; } + try {$thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true); } catch (Exception $e) { $thumbnail = false; } + } + if ($thumbnail) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."thumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumbnail)) { + $file->thumbnail = $prefix."thumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + } + if ($thumbsmall) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."smallthumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumbsmall)) { + $file->smallthumb = $prefix."smallthumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + } + if ($thumblarge) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."largethumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumblarge)) { + $file->largethumb = $prefix."largethumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + } + } else { //file exceeds file size limit, so delete it + $file->delete(); + array_push($not_uploaded, $name); + } //end of file size check + } else { //file was not saved for some unknown reason + array_push($not_uploaded, $name); + } //end of file saved check and thumbnail creation + } else { // file is not a supported image type + array_push($not_uploaded, $name); + } //end of mimetype block + } //end of file name empty check + } //end of loop + + if (count($not_uploaded) == 0) { + system_message(elgg_echo("images:saved")); + } else { + $error = elgg_echo("image:uploadfailed") . '
'; + foreach($not_uploaded as $im_name){ + $error .= ' [' . $im_name . '] '; + } + $error .= ' ' . elgg_echo("image:notimage"); + register_error($error); + } //end of upload check + + if (count($uploaded_images)>0) { + forward($CONFIG->wwwroot . 'mod/tidypics/edit_multi.php?files=' . implode('-', $uploaded_images)); //forward to multi-image edit page + } else { + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page + } + +?> \ No newline at end of file diff --git a/contributions.txt b/contributions.txt new file mode 100644 index 000000000..ff014654c --- /dev/null +++ b/contributions.txt @@ -0,0 +1,170 @@ +Elgg community and users: + + The original author of Tidypics has not been active in the Elgg community lately. Therefore, I took on the task of improving his plug-in and maintaining a log of all changes in this file. If you contribute to this plug-in, please record your changes here and release them under a GPL license. + +Best regards, + +Gabriel Monge-Franco (gabrielinux) +http://gabriel.mongefranco.com + + +------------------------------------------------------------------------ +Version 1.08.2 Change List +Release Date: 02/13/2008 +Contributors: + * Gabriel Monge-Franco (http://gabriel.mongefranco.com) +------------------------------------------------------------------------ +BEGIN VERSION 1.08.2 CHANGES +------------------------------------------------------------------------ +* Fixed bug introduced in v1.08.1 that broke the picture upload (thanks to Karsten Schulze). +* Fixed empty variables in several files that were supposed to send the user back to the previous page, but didn't. +* Cleaned up change log (contributions.txt). +* Finally fixed the Polish language file!!! Yay!! :) + +* TODO: Work around large image (high resolution) limit when creating thumbnails (an Elgg limitation... can probably be fixed by using PHP GD functions directly or ImageMagic if available) + - The problem is with get_resized_image_from_existing_file(). Submitted a ticket to the Elgg tracking bug system. + - Edit actions/upload.php when done. There is a dirty hack in place for now that needs to be removed once the above bug is fixed. +* TODO: disable public by default (input/accessRead.php) -- add setting to admin page that lets the site admin decide whether pictures can be public or not. +* TODO: allow group members to add pictures to group photo albums +* TODO: implement photo anotations +* TODO: look into replacing individual image views with lightbox2 or jQuery lightbox album views. +* TODO: create a new widget to show pictures (in slideshow) in a user's profile. +* TODO: add settings for group albums so that the group owner can select the number of albums to show. +* TODO: implement a way to move pictures from one album to another (should be pretty easy). +* TODO: add an "Add Photos" option to the user widget similar to the one in the group widget. +* TODO: implement automagic file resizing to meet the admin's maximum resolution and file size. + +* OF NOTE: It is currently not possible to allow group members to edit an album created by another group member. This is a bug with group permissions and it will probably not be fixed until [at least] Elgg v1.5 comes out. +------------------------------------------------------------------------ +END VERSION 1.08.2 CHANGES +------------------------------------------------------------------------ + + +------------------------------------------------------------------------ +Version 1.08.1 Change List +Release Date: 02/13/2008 +Contributors: + * Gabriel Monge-Franco (http://gabriel.mongefranco.com) + * LKLaRose (http://community.elgg.org/pg/profile/lauren) + * Webgalli (http://community.elgg.org/pg/profile/webgalli) + * Karsten Schulze (http://ks.frinx.eu) + * Cash (http://community.elgg.org/pg/profile/costelloc) +------------------------------------------------------------------------ +BEGIN VERSION 1.08.1 CHANGES +------------------------------------------------------------------------ +* Fixed bug introduced in v1.08 that caused fake files to be created during thumbnail creation (thanks to Karsten Schulze). +* Reverted to old directory structure that saves pictures to /image/ALBUMGUID/picGUID (v1.08 saved to /image/ALBUMGUID__picGUID, thus keeping everything in one folder). +* Album directory is now deleted when the album is deleted (along with every picture inside of the album). +* Reverted thumbnail and small thumbnail to use picture cropping instead of scaling, so that sites that already use Tidypics can keep a consisting look and feel. +* Completed River integration by moving album and image directories to an "object" sub-directory (thanks to LKLaRose). +* Added status messages/graphics to give the user some feedback. +* Fixed bug in profile widget whereby the selected number of albums had no effect (thanks to @Webgalli and @cheltenham). +* Fixed bug introduced in v1.06 that prevented anonymous users from viewing a user's album (thanks to Karsten Schulze). +* Fixed more language file bugs (thanks to Karsten Schulze). +* Administrators can now set a file size limit from the plugin configuration (it has to be in Kilobytes). + +* JUST PLAIN WEIRD: Fixed Polish language file (thanks to @Vazco, Ian Medlock and Brett Profitt) and saved as UTF8 without BOM. However, it still doesn't work. Can somebody try saving it on a Polish box for me? :) + +* TODO: fix Polish language file -- it seems to break the whole Elgg site! Maybe it needs to use HTML codes in place of international characters? +* TODO: Work around large image (high resolution) limit when creating thumbnails (an Elgg limitation... can probably be fixed by using PHP GD functions directly or ImageMagic if available) + - The problem is with get_resized_image_from_existing_file(). Submitted a ticket to the Elgg tracking bug system. + - Edit actions/upload.php when done. There is a dirty hack in place for now that needs to be removed once the above bug is fixed. +* TODO: disable public by default (input/accessRead.php) -- add setting to admin page that lets the site admin decide whether pictures can be public or not. +* TODO: allow group members to add pictures to group photo albums +* TODO: implement photo anotations +* TODO: look into replacing individual image views with lightbox2 or jQuery lightbox album views. +* TODO: create a new widget to show pictures (in slideshow) in a user's profile. +* TODO: add settings for group albums so that the group owner can select the number of albums to show. +* TODO: implement a way to move pictures from one album to another (should be pretty easy). + +* OF NOTE: It is currently not possible to allow group members to edit an album created by another group member. This is a bug with group permissions and it will probably not be fixed until [at least] Elgg v1.5 comes out. +------------------------------------------------------------------------ +END VERSION 1.08.1 CHANGES +------------------------------------------------------------------------ + + +------------------------------------------------------------------------ +Version 1.08 Change List +Release Date: 02/08/2008 +Contributors: + * Gabriel Monge-Franco (http://gabriel.mongefranco.com) +------------------------------------------------------------------------ +BEGIN VERSION 1.08 CHANGES +------------------------------------------------------------------------ +* Merged most (safe) changes made by other contributors in v1.07. + - Did not include SWFuploader or JQuery due to the number of bugs reported. +* Changed ugly "new album" picture into something better looking. +* Fixed bug whereby image objects were deleted from the database, but they physical files remained on the server. + - Since deleting directories was not possible without the use of unsafe file operations, albums no longer create new directories. Instead, all pictures are saved as /image/ALBUMGUID__picturename. +* Fixed some bugs in the English, Spanish and German language files and added missing error messages. +* Thumbnails now display the default error image (same as new album) when the requested image cannot be found. +* Fixed a bug in the multi-edit form that did not allow image titles to be saved. +* Removed some customizations made to edit.php action in v1.07 since they removed the ability to add titles to images. +* Fixed bug introduced in v1.07 that prevented images from being set as album covers. +* Fixed miscellaneous bugs in group albums widget. +* Removed jQuery for now since it was making the albums too slow. In the future, we should look into replacing individual image views with lightbox2 or jQuery lightbox album views. + + +* TODO: fix Polish language file -- it seems to break the whole Elgg site! Maybe it needs to use HTML codes in place of international characters? +* TODO: Work around 0.9MB source file size limit when creating thumbnails (an Elgg limitation... can probably be fixed by using PHP GD functions directly) + - The problem is with get_resized_image_from_existing_file(). Submitted a ticket to the Elgg tracking bug system. + - Edit actions/upload.php when done. There is a dirty hack in place for now that needs to be removed once the above bug is fixed. +* TODO: disable public by default (input/accessRead.php) -- add setting to admin page that lets the site admin decide whether pictures can be public or not. +* TODO: allow group members to add pictures to group photo albums +* TODO: implement photo anotations +* TODO: look into replacing individual image views with lightbox2 or jQuery lightbox album views. + +* OF NOTE: It is currently not possible to allow group members to edit an album created by another group member. This is a bug with group permissions and it will probably not be fixed until [at least] Elgg v1.5 comes out. +------------------------------------------------------------------------ +END VERSION 1.08 CHANGES +------------------------------------------------------------------------ + + +------------------------------------------------------------------------ +Version 1.07 Change List +Release Date: 02/03/2008 +Contributors: + * vazco (http://community.elgg.org/pg/profile/vazco) + * simophin (http://community.elgg.org/pg/profile/simophin) +------------------------------------------------------------------------ +BEGIN VERSION 1.07 CHANGES +------------------------------------------------------------------------ +* About 10 missing translations added +* Translated to polish +* When no album is present, user can add a new album straight from the widget if he has the required rights +* Added some missing

+* Changed some getFilename(), but would it be safe to execute shell commands directly??? +------------------------------------------------------------------------ +END VERSION 1.06 CHANGES +------------------------------------------------------------------------ + diff --git a/edit.php b/edit.php new file mode 100644 index 000000000..2c202e402 --- /dev/null +++ b/edit.php @@ -0,0 +1,46 @@ +canEdit()) + forward(); + + $subtype = $file->getSubtype(); + + if($subtype == 'album'){ + if($container = $file->container_guid) + set_page_owner($container); + + $area2 .= elgg_view_title($title = elgg_echo('album:edit')); + } + elseif($subtype == 'image'){ + if($container = get_entity($file->container_guid)->container_guid) + set_page_owner($container); + + $area2 .= elgg_view_title($title = elgg_echo('image:edit')); + } + else{ + forward(); + } + + $area2 .= elgg_view("tidypics/forms/edit",array('entity' => $file, 'subtype' => $subtype)); + $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); + page_draw(elgg_echo("edit"), $body); + + +?> \ No newline at end of file diff --git a/edit_multi.php b/edit_multi.php new file mode 100644 index 000000000..2fdc85e42 --- /dev/null +++ b/edit_multi.php @@ -0,0 +1,33 @@ +canEdit()){ + array_push($new_file_array, $file_guid); + } + if(!$album_guid) $album_guid = $entity->container_guid; + + } + } + + $area2 .= elgg_view_title($title = elgg_echo('image:edit')); + $area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid)); + $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); + page_draw(elgg_echo("edit"), $body); +?> \ No newline at end of file diff --git a/friends.php b/friends.php new file mode 100644 index 000000000..61ed52380 --- /dev/null +++ b/friends.php @@ -0,0 +1,43 @@ +username); + } + } + + if (is_null(page_owner_entity()->name) || page_owner_entity()->name == '') { + $friendname = get_input('username'); + } else { + $friendname = page_owner_entity()->name; + }; + + if(isloggedin() && (page_owner() == $_SESSION['guid'])) { + $area2 = elgg_view_title($title = elgg_echo('album:yours:friends')); + } else { + $area2 = elgg_view_title($title = sprintf(elgg_echo('album:friends'), "$friendname")); + } + + set_context('search'); + set_input('search_viewtype', 'gallery'); + $area2 .= list_user_friends_objects(page_owner(), 'album'); + + set_context('photos'); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + + // Finally draw the page + page_draw(sprintf(elgg_echo("album:friends"),$_SESSION['user']->name), $body); +?> \ No newline at end of file diff --git a/graphics/Thumbs.db b/graphics/Thumbs.db new file mode 100644 index 000000000..46eac31d3 Binary files /dev/null and b/graphics/Thumbs.db differ diff --git a/graphics/arrow_next.gif b/graphics/arrow_next.gif new file mode 100644 index 000000000..6b3d8f829 Binary files /dev/null and b/graphics/arrow_next.gif differ diff --git a/graphics/arrow_previous.gif b/graphics/arrow_previous.gif new file mode 100644 index 000000000..e7ded54eb Binary files /dev/null and b/graphics/arrow_previous.gif differ diff --git a/graphics/bl.gif b/graphics/bl.gif new file mode 100644 index 000000000..735fcb582 Binary files /dev/null and b/graphics/bl.gif differ diff --git a/graphics/br.gif b/graphics/br.gif new file mode 100644 index 000000000..90cdccdcb Binary files /dev/null and b/graphics/br.gif differ diff --git a/graphics/btnClose.gif b/graphics/btnClose.gif new file mode 100644 index 000000000..b8ab4638d Binary files /dev/null and b/graphics/btnClose.gif differ diff --git a/graphics/btnContract.gif b/graphics/btnContract.gif new file mode 100644 index 000000000..9be301039 Binary files /dev/null and b/graphics/btnContract.gif differ diff --git a/graphics/btnExpand.gif b/graphics/btnExpand.gif new file mode 100644 index 000000000..72a8471b3 Binary files /dev/null and b/graphics/btnExpand.gif differ diff --git a/graphics/btnNext.gif b/graphics/btnNext.gif new file mode 100644 index 000000000..467f23246 Binary files /dev/null and b/graphics/btnNext.gif differ diff --git a/graphics/btnPrevious.gif b/graphics/btnPrevious.gif new file mode 100644 index 000000000..298c1e99c Binary files /dev/null and b/graphics/btnPrevious.gif differ diff --git a/graphics/icons/Thumbs.db b/graphics/icons/Thumbs.db new file mode 100644 index 000000000..fb5d56ed3 Binary files /dev/null and b/graphics/icons/Thumbs.db differ diff --git a/graphics/icons/album.gif b/graphics/icons/album.gif new file mode 100644 index 000000000..73ce91356 Binary files /dev/null and b/graphics/icons/album.gif differ diff --git a/graphics/icons/general.jpg b/graphics/icons/general.jpg new file mode 100644 index 000000000..23494eff2 Binary files /dev/null and b/graphics/icons/general.jpg differ diff --git a/graphics/icons/general.png b/graphics/icons/general.png new file mode 100644 index 000000000..267ae010c Binary files /dev/null and b/graphics/icons/general.png differ diff --git a/graphics/icons/river_icon_album.gif b/graphics/icons/river_icon_album.gif new file mode 100644 index 000000000..e1bbfedaa Binary files /dev/null and b/graphics/icons/river_icon_album.gif differ diff --git a/graphics/icons/river_icon_image.gif b/graphics/icons/river_icon_image.gif new file mode 100644 index 000000000..6f8bfd6af Binary files /dev/null and b/graphics/icons/river_icon_image.gif differ diff --git a/graphics/img_error.jpg b/graphics/img_error.jpg new file mode 100644 index 000000000..e3aad2aed Binary files /dev/null and b/graphics/img_error.jpg differ diff --git a/graphics/loader.gif b/graphics/loader.gif new file mode 100644 index 000000000..7ac990cf0 Binary files /dev/null and b/graphics/loader.gif differ diff --git a/graphics/tl.gif b/graphics/tl.gif new file mode 100644 index 000000000..ff93dadcc Binary files /dev/null and b/graphics/tl.gif differ diff --git a/graphics/tr.gif b/graphics/tr.gif new file mode 100644 index 000000000..8dc197272 Binary files /dev/null and b/graphics/tr.gif differ diff --git a/graphics/ttl.gif b/graphics/ttl.gif new file mode 100644 index 000000000..8e44c0374 Binary files /dev/null and b/graphics/ttl.gif differ diff --git a/graphics/ttp.gif b/graphics/ttp.gif new file mode 100644 index 000000000..36f7211c4 Binary files /dev/null and b/graphics/ttp.gif differ diff --git a/graphics/ttr.gif b/graphics/ttr.gif new file mode 100644 index 000000000..66d06941e Binary files /dev/null and b/graphics/ttr.gif differ diff --git a/index.php b/index.php new file mode 100644 index 000000000..00b09d14b --- /dev/null +++ b/index.php @@ -0,0 +1,45 @@ +username) || empty($owner->username)) { + //if not logged in, see world pictures instead + if (!isloggedin()) forward('pg/photos/world'); + forward('pg/photos/owned/' . $_SESSION['user']->username); + } + + //set the title + $area2 = elgg_view_title($title = sprintf(elgg_echo('album:user'), "$owner->name")); + + //allow new album creation + if(can_write_to_container($_SESSION['guid'], page_owner())){ + $area2 .= 'username.'">'.elgg_echo('album:create').'

'; + } + + // Get objects + set_context('search'); + set_input('search_viewtype', 'gallery'); + $area2 .= list_entities("object","album",page_owner(),10); + + set_context('photos'); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + + // Finally draw the page + page_draw(sprintf(elgg_echo("album:user"),page_owner_entity()->name), $body); +?> \ No newline at end of file diff --git a/languages/de.php b/languages/de.php new file mode 100644 index 000000000..2d668f72f --- /dev/null +++ b/languages/de.php @@ -0,0 +1,114 @@ + "Bild", + 'images' => "Bilder", + 'caption' => "Untertitel", + 'photos' => "Photos", + 'images:upload' => "Bilder hochladen", + 'album' => "Fotoalbum", + 'albums' => "Fotoalben", + 'album:yours' => "Deine Fotoalben", + 'album:yours:friends' => "Fotoalben von Freunden", + 'album:user' => "Fotoalben von %s", + 'album:friends' => "Fotoalben von Freunden von %s", + 'album:all' => "Alle Fotoalben", + 'album:group' => "Alben der Gruppe", + 'item:object:image' => "Photos", + 'item:object:album' => "Alben", + 'tidypics:settings:maxfilesize' => "Maximale Dateigre in den Kilobytes (KB):", + + //actions + + 'album:create' => "Neues Album", + 'album:add' => "Fotoalbum hinzufügen", + 'album:addpix' => "Fotos hinzufügen", + 'album:edit' => "Album bearbeiten", + 'album:delete' => "Album löschen", + + 'image:edit' => "Bild bearbeiten", + 'image:delete' => "Bild löschen", + 'image:download' => "Download Bild", + + //forms + + 'album:title' => "Titel", + 'album:desc' => "Beschreibung", + 'album:tags' => "Stichwörter", + 'album:cover' => "Albumcover erstellen?", + 'album:cover:yes' => "Ja", + 'image:access:note' => "(Zugriffsberechtigung wird vom Album übernommen)", + + //views + + 'image:total' => "Bilder im Album:", + 'image:by' => "Bild hinzugefügt von", + 'album:by' => "Album erstellt von:", + 'album:created:on' => "Verursacht", + 'image:none' => "Noch keine Bilder hinzugefügt.", + 'image:back' => "Zurück", + 'image:next' => "Weiter", + + //widgets + + 'album:widget' => "Fotoalben", + 'album:more' => "Alle Alben ansehen", + 'album:widget:description' => "Zeige Deine neuesten Fotoalben", + 'album:display:number' => "Anzahl der Alben, die angezeigt werden sollen", + 'album:num_albums' => "Anzahl der anzuzeigenden Alben", + + // river + + //images + 'image:river:created' => "%s hat hochgeladen:", + 'image:river:item' => "ein Bild", + 'image:river:annotate' => "%s kommentierte", + + //albums + 'album:river:created' => "%s erstellte", + 'album:river:item' => "ein Album", + 'album:river:annotate' => "%s kommentierte", + + // Status messages + + 'image:saved' => "Dein Bild wurde gespeichert.", + 'images:saved' => "Alle Bilder wurden gespeichert.", + 'image:deleted' => "Dein Bild wurde gelöscht.", + 'image:delete:confirm' => "Willst Du das Bild wirklich löschen?", + + 'images:edited' => "Dein Bild wurde aktualisiert.", + 'album:edited' => "Dein Album wurde aktualisiert.", + 'album:saved' => "Dein Album wurde gespeichert.", + 'album:deleted' => "Dein Album wurde gelöscht.", + 'album:delete:confirm' => "Willst Du das Album wirklich löschen?", + 'album:created' => "Ihr neues Album ist hergestellt worden.", + 'tidypics:status:processing' => "Warten Sie bitte, whrend wir verarbeiten Ihre Abbildung....", + + //Error messages + + 'image:none' => "Kein Bilder gefunden.", + 'image:uploadfailed' => "Dateien konnten nicht hochgeladen werden:", + 'image:deletefailed' => "Bild konnte nicht gelöscht werden.", + 'image:downloadfailed' => "Dieses Bild ist nicht diesmal vorhanden.", + + 'image:notimage' => 'Wir akzeptieren nur jpeg, gif, und png Dateien der erlaubten Dateigre an.', + 'images:notedited' => 'Nicht alle Bilder konnten hochgeladen werden', + + 'album:none' => "Keine Alben gefunden.", + 'album:uploadfailed' => "Sorry; Dein Album konnte nicht gespeichert werden.", + 'album:deletefailed' => "Dein Album konnte nicht gelöscht werden.", + 'album:blank' => "Geben Sie diesem Album einen Titel und eine Beschreibung bitte." + ); + + add_translation("de",$german); +?> diff --git a/languages/en.php b/languages/en.php new file mode 100644 index 000000000..2316a9e2f --- /dev/null +++ b/languages/en.php @@ -0,0 +1,115 @@ + "Image", + 'images' => "Images", + 'caption' => "Caption", + 'photos' => "Photos", + 'images:upload' => "Upload Images", + 'album' => "Photo Album", + 'albums' => "Photo Albums", + 'album:yours' => "Your photo albums", + 'album:yours:friends' => "Your friends' photo albums", + 'album:user' => "%s's photo albums", + 'album:friends' => "%s's friends' photo albums", + 'album:all' => "All site photo albums", + 'album:group' => "Group albums", + 'item:object:image' => "Photos", + 'item:object:album' => "Albums", + 'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):", + + //actions + + 'album:create' => "New Album", + 'album:add' => "Add Photo Album", + 'album:addpix' => "Add photos", + 'album:edit' => "Edit album", + 'album:delete' => "Delete album", + + 'image:edit' => "Edit image", + 'image:delete' => "Delete image", + 'image:download' => "Download image", + + //forms + + 'album:title' => "Title", + 'album:desc' => "Description", + 'album:tags' => "Tags", + 'album:cover' => "Make image album cover?", + 'album:cover:yes' => "Yes", + 'image:access:note' => "(view access is inherited from the album)", + + //views + + 'image:total' => "Images in album:", + 'image:by' => "Image added by", + 'album:by' => "Album created by", + 'album:created:on' => "Created", + 'image:none' => "No images have been added yet.", + 'image:back' => "Back", + 'image:next' => "Next", + + //widgets + + 'album:widget' => "Photo Albums", + 'album:more' => "View all albums", + 'album:widget:description' => "Showcase your latest photo albums", + 'album:display:number' => "Number of albums to display", + 'album:num_albums' => "Number of albums to display", + + // river + + //images + 'image:river:created' => "%s uploaded", + 'image:river:item' => "an image", + 'image:river:annotate' => "%s commented on", + + //albums + 'album:river:created' => "%s created", + 'album:river:item' => "an album", + 'album:river:annotate' => "%s commented on", + + // Status messages + + 'image:saved' => "Your image was successfully saved.", + 'images:saved' => "All images were successfully saved.", + 'image:deleted' => "Your image was successfully deleted.", + 'image:delete:confirm' => "Are you sure you want to delete this image?", + + 'images:edited' => "Your images were successfully updated.", + 'album:edited' => "Your album was successfully updated.", + 'album:saved' => "Your album was successfully saved.", + 'album:deleted' => "Your album was successfully deleted.", + 'album:delete:confirm' => "Are you sure you want to delete this album?", + 'album:created' => "Your new album has been created.", + 'tidypics:status:processing' => "Please wait while we process your picture....", + + //Error messages + + 'image:none' => "We could not find any images at the moment.", + 'image:uploadfailed' => "Files not uploaded:", + 'image:deletefailed' => "Your image could not be deleted at this time.", + 'image:downloadfailed' => "Sorry; this image is not available at this time.", + + 'image:notimage' => "We only accept jpeg, gif, or png images of the allowed file size.", + 'images:notedited' => "Not all images were successfully updated", + + 'album:none' => "We could not find any albums at the moment.", + 'album:uploadfailed' => "Sorry; we could not save your album.", + 'album:deletefailed' => "Your album could not be deleted at this time.", + 'album:blank' => "Please give this album a title and description." + ); + + add_translation("en",$english); +?> \ No newline at end of file diff --git a/languages/es.php b/languages/es.php new file mode 100644 index 000000000..babb87068 --- /dev/null +++ b/languages/es.php @@ -0,0 +1,115 @@ + "Imagen", + 'images' => "Imágenes", + 'caption' => "Leyenda", + 'photos' => "Fotos", + 'images:upload' => "Subir Imágenes", + 'album' => "Állbum de Fotos", + 'albums' => "Álbums de Fotos", + 'album:yours' => "Tus álbums de fotos", + 'album:yours:friends' => "Álbums de tus amigos", + 'album:user' => "Állbums de %s", + 'album:friends' => "Albums de los amigos de %s", + 'album:all' => "Todos los álbums", + 'album:group' => "Állbums del grupo", + 'item:object:image' => "Fotos", + 'item:object:album' => "Állbums", + 'tidypics:settings:maxfilesize' => "Tamaño máximo en kilo bytes (KB):", + + //actions + + 'album:create' => "Nuevo álbum", + 'album:add' => "Añadir álbum de fotos", + 'album:addpix' => "Añadir fotos", + 'album:edit' => "Modificar álbum", + 'album:delete' => "Eliminar álbum", + + 'image:edit' => "Modificar imagen", + 'image:delete' => "Eliminar imagen", + 'image:download' => "Descargar imagen", + + //forms + + 'album:title' => "Título", + 'album:desc' => "Descripción", + 'album:tags' => "Etiquetas", + 'album:cover' => "¿Hacer portada del álbum?", + 'album:cover:yes' => "Si", + 'image:access:note' => "(los permisos de acceso se heredan del álbum)", + + //views + + 'image:total' => "Imágenes en el álbum:", + 'image:by' => "Imagen añadida por", + 'album:by' => "Album creado por", + 'album:created:on' => "Creado", + 'image:none' => "Todavía no se han añadido imágenes.", + 'image:back' => "Anterior", + 'image:next' => "Siguiente", + + //widgets + + 'album:widget' => "Albums de Fotos", + 'album:more' => "Ver todos los albums", + 'album:widget:description' => "Muestra tus álbums de fotos más recientes", + 'album:display:number' => "Número de albums a mostrar", + 'album:num_albums' => "Número de albums a mostrar", + + // river + + //images + 'image:river:created' => "%s subió", + 'image:river:item' => "una imagen", + 'image:river:annotate' => "%s comentó en", + + //albums + 'album:river:created' => "%s creó", + 'album:river:item' => "un album", + 'album:river:annotate' => "%s comentó en", + + // Status messages + + 'image:saved' => "Tu imagen ha sido guardada.", + 'images:saved' => "Todas tus imágenes han sido guardadas.", + 'image:deleted' => "Tu imagen ha sido borrada.", + 'image:delete:confirm' => "¿Deseas borrar esta imagen?", + + 'images:edited' => "Tus imágenes han sido actualizadas.", + 'album:edited' => "Tu álbum ha sido actualizado.", + 'album:saved' => "Tu álbum ha sido guardado.", + 'album:deleted' => "Tu álbum ha sido borrado con éxito.", + 'album:delete:confirm' => "¿Deseas borrar este álbum?", + 'album:created' => "Tu nuevo álbum ha sido creado.", + 'tidypics:status:processing' => "Por favor espera mientras procesamos tu imagen....", + + //Error messages + + 'image:none' => "No ha sido psible encontrar ninguna imagen en este momento.", + 'image:uploadfailed' => "Algunos ficheros no se pudieron subir:", + 'image:deletefailed' => "Tu imagen no ha podido ser borrada en este momento.", + 'image:downloadfailed' => "Esta imagen no se encuentra disponible en este momento.", + + 'image:notimage' => "Sólo se aceptan imágenes jpeg, gif, o png del tamaño permitido.", + 'images:notedited' => "No se pudieron actualizar todas las imágenes.", + + 'album:none' => "Actualmente no hay ningún álbum de fotos.", + 'album:uploadfailed' => "No se ha podido guardar el álbum.", + 'album:deletefailed' => "En este momento no se ha podido borrar el álbum.", + 'album:blank' => "Por favor entra un título y descripción para tu nuevo álbum." + ); + + add_translation("es",$spanish); +?> \ No newline at end of file diff --git a/languages/pl.php b/languages/pl.php new file mode 100644 index 000000000..047b17220 --- /dev/null +++ b/languages/pl.php @@ -0,0 +1,115 @@ + "Obrazek", + 'images' => "Obrazki", + 'caption' => "Opis", + 'photos' => "Zdjęcia", + 'images:upload' => "Dodaj obrazki", + 'album' => "Album zdjęciowy", + 'albums' => "Albumy zdjęciowe", + 'album:yours' => "Twoje albumy", + 'album:yours:friends' => "Albumy twoich znajomych", + 'album:user' => "Albumy użytkownika %s", + 'album:friends' => "Albumy przyjaciół użytkownika %s", + 'album:all' => "Wszystkie publiczne albumy", + 'album:group' => "Albumy rejsu", + 'item:object:image' => "Zdjęcia", + 'item:object:album' => "Albumy", + 'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):", + + //actions + + 'album:create' => "Nowy album", + 'album:add' => "Dodaj album zdjęciowy", + 'album:addpix' => "Dodaj zdjęcia", + 'album:edit' => "Edytuj album", + 'album:delete' => "Skasuj album", + + 'image:edit' => "Edytuj obrazek", + 'image:delete' => "Skasuj obrazek", + 'image:download' => "Pobierz obrazek", + + //forms + + 'album:title' => "Tytuł albumu", + 'album:desc' => "Opis (widoczny tylko dla twórcy)", + 'album:tags' => "Tagi", + 'album:cover' => "Ustaw jako okładkę albumu?", + 'album:cover:yes' => "Tak", + 'image:access:note' => "(prawa dostępu pobierane są z ustawień albumu)", + + //views + + 'image:total' => "Obrazki w albumie:", + 'image:by' => "Obrazek dodany przez", + 'album:by' => "Album stworzony przez", + 'album:created:on' => "Stworzono", + 'image:none' => "Nie dodano jeszcze żadnych obrazków.", + 'image:back' => "Poprzednia", + 'image:next' => "Kolejna", + + //widgets + + 'album:widget' => "Albumy zdjęciowe", + 'album:more' => "Pokaż wszystkie albumy", + 'album:widget:description' => "Pokazuje twoje ostatnie albumy zdjęciowe", + 'album:display:number' => "Liczba wyświetlanych albumów", + 'album:num_albums' => "Liczba wyświetlanych albumów", + + // river + + //images + 'image:river:created' => "wgrano %s", + 'image:river:item' => "obrazek", + 'image:river:annotate' => "%s skomentował", + + //albums + 'album:river:created' => "Stworzono %s", + 'album:river:item' => "album", + 'album:river:annotate' => "%s skomentował", + + // Status messages + + 'image:saved' => "Twój obrazek został pomyślnie zapisany.", + 'images:saved' => "Wszystkie obrazki zostały pomyślnie zapisane.", + 'image:deleted' => "Twój obrazek został pomyślnie skasowany.", + 'image:delete:confirm' => "Czy jesteś pewien że chcesz skasować ten obrazek?", + + 'images:edited' => "Twoje obrazki zostały pomyślnie zapisane.", + 'album:edited' => "Twój album został pomyślnie zapisany.", + 'album:saved' => "Twój album został pomyślnie zapisany.", + 'album:deleted' => "Twój album został skasowany.", + 'album:delete:confirm' => "Na pewno chcesz skasować ten album?", + 'album:created' => "Stworzono nowy album.", + 'tidypics:status:processing' => "Please wait while we process your picture....", + + //Error messages + + 'image:none' => "Jeszcze nie dodano żadnych obrazków.", + 'image:uploadfailed' => "Pliki nie zapisane:", + 'image:deletefailed' => "Nie udało się skasować obrazka.", + 'image:downloadfailed' => "Nie udało się ściągnąć albumu.", + + 'image:notimage' => "Akceptowane formaty to tylko: jpeg, gif i png, and the allowed file size.", + 'images:notedited' => "Nie wszystkie obrazki zostały zapisane", + + 'album:none' => "Jeszcze nie dodano żadnych albumów.", + 'album:uploadfailed' => "Nie udało się zapisać twojego albumu.", + 'album:deletefailed' => "Nie udało się usunąć twojego albumu.", + 'album:blank' => "Please give this albumu a tytuł and opis." + ); + + add_translation("pl",$polish); +?> \ No newline at end of file diff --git a/manifest.xml b/manifest.xml new file mode 100644 index 000000000..1dfd9b7a7 --- /dev/null +++ b/manifest.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/newalbum.php b/newalbum.php new file mode 100644 index 000000000..8df0ec019 --- /dev/null +++ b/newalbum.php @@ -0,0 +1,31 @@ + + * @copyright Curverider Ltd 2008 + * @link http://elgg.com/ + */ + + // Load Elgg engine + require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); + gatekeeper(); + + // Get the current page's owner + $page_owner = page_owner_entity(); + if ($page_owner === false || is_null($page_owner)) { + $page_owner = $_SESSION['user']; + set_page_owner($_SESSION['guid']); + } + + $area2 = elgg_view_title(elgg_echo('album:add')); + $area2 .= elgg_view("tidypics/forms/edit"); + + // Display page + page_draw(elgg_echo('album:add'),elgg_view_layout("two_column_left_sidebar", $area1, $area2, $area3 )); + + +?> \ No newline at end of file diff --git a/start.php b/start.php new file mode 100644 index 000000000..f3c675d52 --- /dev/null +++ b/start.php @@ -0,0 +1,174 @@ +wwwroot . "pg/photos/owned/" . $_SESSION['user']->username); + } + + // Extend CSS + extend_view('css', 'tidypics/css'); + + // Extend hover-over and profile menu + extend_view('profile/menu/links','tidypics/menu'); + + //group view ** psuedo widget view for group pages** + extend_view('groups/right_column','tidypics/groupprofile_albums'); + + // Register a page handler, so we can have nice URLs + register_page_handler('photos','tidypics_page_handler'); + + // Add a new tidypics widget + add_widget_type('album_view',elgg_echo("album:widget"),elgg_echo("album:widget:description"), 'profile'); + + // Register a URL handler for files + register_entity_url_handler('image_url','object','image'); + register_entity_url_handler('album_url','object','album'); + + // Register entity type + register_entity_type('object','image'); + register_entity_type('object','album'); + + } + + /** + * Sets up submenus for tidypics. Triggered on pagesetup. + */ + function tidypics_submenus() { + + global $CONFIG; + + $page_owner = page_owner_entity(); + + // General submenu options + if (get_context() == "photos") { + if (isloggedin() && (page_owner() == $_SESSION['guid'] || !page_owner())) { + add_submenu_item(sprintf(elgg_echo("album:yours"),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/owned/" . page_owner_entity()->username, '1view'); + add_submenu_item(sprintf(elgg_echo('album:yours:friends'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/friends/". page_owner_entity()->username, '1view'); + add_submenu_item(sprintf(elgg_echo('album:all'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/world/", '1view'); + } else if (page_owner() && $page_owner instanceof ElggUser) { + add_submenu_item(sprintf(elgg_echo('album:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username,'1view'); + add_submenu_item(sprintf(elgg_echo('album:all'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/world/", '1view'); + } + } + if (isloggedin() && ($page_owner instanceof ElggGroup)) { + add_submenu_item(sprintf(elgg_echo("album:user"),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/owned/" . page_owner_entity()->username, 'photo_albums'); + } + } + + /** + * tidypics page handler + * + * @param array $page Array of page elements, forwarded by the page handling mechanism + */ + function tidypics_page_handler($page) { + + global $CONFIG; + + if (isset($page[0])) + { + switch($page[0]) + { + case "owned": //view list of albums owned by container + if (isset($page[1])) set_input('username',$page[1]); + + /* if you want to put new album action in the submenu, just do it like this ---------> + if(can_write_to_container($_SESSION['guid'], page_owner())){ + add_submenu_item(elgg_echo('album:create'), $CONFIG->wwwroot . "pg/photos/new/". page_owner_entity()->username, 'pagesactions'); + } + */ + include($CONFIG->pluginspath . "tidypics/index.php"); + break; + + case "view": //view an image individually + set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/view.php"); + break; + + case "album": //view an album individually + set_input('guid',$page[1]); + @include(dirname(dirname(dirname(__FILE__))) . "/entities/index.php"); + break; + + case "new": //create new album + if (isset($page[1])) set_input('username',$page[1]); + include($CONFIG->pluginspath . "tidypics/newalbum.php"); + break; + + case "upload": //upload images to album + if (isset($page[1])) set_input('container_guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/upload.php"); + break; + + case "friends": + if (isset($page[1])) set_input('username',$page[1]); + include($CONFIG->pluginspath . "tidypics/friends.php"); + break; + + case "world": + include($CONFIG->pluginspath . "tidypics/world.php"); + break; + + } + } + else + { + // Include the standard profile index + if (isset($page[1])) set_input('username',$page[1]); + include($CONFIG->pluginspath . "tidypics/index.php"); + } + + } + + /** + * Populates the ->getUrl() method for file objects + * + * @param ElggEntity $entity album/image entity + * @return string File URL + */ + function image_url($entity) { + global $CONFIG; + $title = $entity->title; + $title = friendly_title($title); + return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title; + + } + + function album_url($entity) { + global $CONFIG; + $title = $entity->title; + $title = friendly_title($title); + return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title; + + } + + // Make sure tidypics_init is called on initialisation + register_elgg_event_handler('init','system','tidypics_init'); + register_elgg_event_handler('pagesetup','system','tidypics_submenus'); + + // Register actions + register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php"); + register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php"); + register_action("tidypics/editalbum", false, $CONFIG->pluginspath. "tidypics/actions/editalbum.php"); + register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php"); + register_action("tidypics/icon", true, $CONFIG->pluginspath. "tidypics/actions/icon.php"); + register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php"); + register_action("tidypics/download", true, $CONFIG->pluginspath . "tidypics/actions/download.php"); + +?> \ No newline at end of file diff --git a/tasks.txt b/tasks.txt new file mode 100644 index 000000000..879d8cb42 --- /dev/null +++ b/tasks.txt @@ -0,0 +1,66 @@ + +Tasks: + + -> DONE --clean up css + -> DONE -- test river views + -> DONE -- enable widget views + -> DONE -- multi image uploader form. + + -> DONE -- Album covers: implement cover option for NEW uploaded images @ upload.php action + i want to enable multi uploader so better to put it in there. + (radio box so only one image can be the cover) + + -> DONE -- /pg/photos/owned + Edit the way album list is presented (make it nicer) + -> DONE -- when adding or editing album -> + saving the album's view access should also edit + all containing image view access + if add new album + -> all image uploads default to albums current access + -> all image edits can not change access + if edit album + -> change access of album and cycle through all current images. + + -> DONE -- Album covers: implemented edit image screen to specify album cover + -> DONE -- allow photo albums for users + -> DONE -- internationalize all text + -> DONE -- clean up unecessary functions from file plugin + -> DONE -- limit uploader to image only mimetype + -> DONE -- (for now) see if i can get rid of any unecessary meta + -> DONE -- create friends views and world views + -> DONE -- add breadcrumb + -> DONE -- (but optimize) add thumbnail icons for listings + + + + --------- CAVEATS ----------- + + + -> SOLVED -- (just clear the pagination css class) problem: + when viewing an indie album, the images are floated. + if the pagination is enabled the bottom bar does not clear the + floated images + +Problem: +the delete action does not delete any actual images +the current method should work, but it doesnt +look for clues in engine/lib/filestore.php +when deleting an album, easy way to delete all images +is just to find the albums folder and delete it. + +Problem: +when defining covers for album , i need to edit the input/checkboxes view +in order submit correctly. Remove the [] as part of the name + +-------------------- +my differences due to theme +------------------------ +My customizations: + +in the controls i am added to submenu +edit this out when packaging + + -> if i add album actions to submenu i lose "js confirm" on delete + -> change the album access permissions for groups to have + only 3 choices (logged in , everyone, or group only) + \ No newline at end of file diff --git a/thumbnail.php b/thumbnail.php new file mode 100644 index 000000000..0e6142cbb --- /dev/null +++ b/thumbnail.php @@ -0,0 +1,55 @@ +getSubtype() == "image") { + // Get file thumbnail + if ($size == "small") { + $thumbfile = $file->smallthumb; + } else { + $thumbfile = $file->largethumb; + } + + // Grab the file + if ($thumbfile && !empty($thumbfile)) { + $readfile = new ElggFile(); + $readfile->owner_guid = $file->owner_guid; + $readfile->setFilename($thumbfile); + //$mime = $file->getMimeType(); + $contents = $readfile->grabFile(); + } + } //end subtype comparison + } //end get_entity + + // Open error image if file was not found + if (!isset($contents) || is_null($contents) || $file->getSubtype()!='image') { + //$vars['url'].'mod/tidypics/graphics/img_error.jpg + forward('mod/tidypics/graphics/img_error.jpg'); + } //end of default error image + + // Return the thumbnail and exit + header("Content-type: image"); + echo $contents; + exit; +?> \ No newline at end of file diff --git a/tidypics_user_instructions_.txt b/tidypics_user_instructions_.txt new file mode 100644 index 000000000..eb2c2a809 --- /dev/null +++ b/tidypics_user_instructions_.txt @@ -0,0 +1,71 @@ +-------------------------------------------- +Tidypics Photo Gallery plugin version 1.05 +Release #5. +Release Date: October 27, 2008 +-------------------------------------------- + +Installation +------------------ +1. Drop into root/mod/ +2. Enable plugin via admin panel. +3. Done + + + +Requirements +------------------------ +Will function with all versions of elgg, but current SVN build is needed +for consistency. +Reason: +Updating the album access persmissions will auto-update the access for all +images contained in the album, but when updating each image entity, +the metadata for that entity also needs to be updated. The function that accomplishes +this is only in the current SVN build. +If you do not use the current SVN build of elgg, you will likely get incorrectly +synced access permissions. Just wait for elg 1.1 and all will be dandy. +No changes need to be made to tidypics since the function is called via hook. + + + +Recorded problems: +---------------------------- +1. when viewing an individual album, the image gallery displayed is a collection + of floated divs. If pagination is enabled the bottom pagination bar does not + clear the floated images and you will get a messy display. I did not yet + research a better way to create a gallery view while being inline with elggs listing functions. + +2. The delete action does not delete any actual . + The current method should work, but it does not. + I am quite sure this is unintended, but we will have to wait till the core + gets updated. + Currently NO IMAGES will ever be deleted from your serverspace. + +3. The groups view is a little odd because all other content like blogs, pages, are in list view. + I refuse to put albums in list view, so if you want that, sorry! (just steal the list view from object/albums.php) + + +Cost to use this plugin: +---------------------------------- + + Participation in the tidypics group on community.elgg.org + + We need: + ------------------------ + 1. User testing + 2. Bug reports + 3. Functionality, usability, feature requests/discussions + 4. Developers: Feature enhancements. + + If you do not pay the advertised cost of tidypics, you are stealing this plugin! + Don't be a taker!! + + Bye! + + - Jade + + + + + + + \ No newline at end of file diff --git a/upload.php b/upload.php new file mode 100644 index 000000000..320c5ce6d --- /dev/null +++ b/upload.php @@ -0,0 +1,49 @@ +canEdit()) + forward('pg/photos/owned/'); + + //set group to "real" container + $container = $album_entity->container_guid; + set_page_owner($container); + } + else + forward('pg/photos/owned/'); + + $page_owner = page_owner_entity(); + if ($page_owner === false || is_null($page_owner)) { + $page_owner = $_SESSION['user']; + set_page_owner($page_owner->getGUID()); + } + + set_context('photos'); + $title = elgg_echo('album:addpix'); + $area2 .= elgg_view_title($title); + + $area2 .= '

'. $album_entity->title. '

'; + + $area2 .= elgg_view("tidypics/forms/upload", array('album' => $album ) ); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2, $area3); + + page_draw($title, $body); +?> \ No newline at end of file diff --git a/view.php b/view.php new file mode 100644 index 000000000..e0121baae --- /dev/null +++ b/view.php @@ -0,0 +1,62 @@ +container_guid)->container_guid; + + if ($top_container) { + set_page_owner($top_container); + } else { + set_page_owner($entity->owner_guid); + } + + // Set the body to be the full view of the entity, and the title to be its title + $area2 = elgg_view_entity($entity,true); + if ($shell) { + $body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2); + } else { + $body = $area2; + } + + } else { + $body = elgg_echo('notfound'); + } + + // Display the page + if ($shell) { + page_draw("", $body); + } else { + header("Content-type: text/html; charset=UTF-8"); + echo $body; + } + +?> \ No newline at end of file diff --git a/views/default/input/accessRead.php b/views/default/input/accessRead.php new file mode 100644 index 000000000..81392b19f --- /dev/null +++ b/views/default/input/accessRead.php @@ -0,0 +1,61 @@ + 0) + { + + /* my hacks (pay no attention please =D ) + //allow showing of group for write access + if($vars['group_write']) $vars['options'] = trigger_plugin_hook('access:collections:write','user',array('user_id' => $_SESSION['guid'], 'site_id' => 0),$vars['options']); + */ + + //developer check - to check the value being sent initially + //echo 'given value: '.$vars['value'].'
'; + + //if no value currently set - specify default + if (empty($vars['value']) && $vars['value'] != '0') + $vars['value'] = 2; + + + foreach($vars['options'] as $key => $option) { + if ($key == $vars['value']) { +?> + + class=""> + + \ No newline at end of file diff --git a/views/default/input/cover_checkbox.php b/views/default/input/cover_checkbox.php new file mode 100644 index 000000000..48c7d51cc --- /dev/null +++ b/views/default/input/cover_checkbox.php @@ -0,0 +1,45 @@ + $option) { + + if ($option != $vars['value']) { + $selected = ""; + } else { + $selected = "checked = \"checked\""; + } + + $labelint = (int) $label; + if ("{$label}" == "{$labelint}") { + $label = $option; + } + + $disabled = ""; + if ($vars['disabled']) $disabled = ' disabled="yes" '; + echo "
"; + } + +?> \ No newline at end of file diff --git a/views/default/input/multi_radio.php b/views/default/input/multi_radio.php new file mode 100644 index 000000000..11f4c13b8 --- /dev/null +++ b/views/default/input/multi_radio.php @@ -0,0 +1,42 @@ + $option) { + + if ($vars['set'] != $vars['value']) { + $selected = ""; + } else { + $selected = "checked = \"checked\""; + } + + $labelint = (int) $label; + if ("{$label}" == "{$labelint}") { + $label = $option; + } + + $disabled = ""; + if ($vars['disabled']) $disabled = ' disabled="yes" '; + echo "
"; + } + +?> \ No newline at end of file diff --git a/views/default/object/album.php b/views/default/object/album.php new file mode 100644 index 000000000..b95d55eed --- /dev/null +++ b/views/default/object/album.php @@ -0,0 +1,137 @@ +getGUID(); + $tags = $file->tags; + $title = $file->title; + $desc = $file->description; + $owner = $vars['entity']->getOwnerEntity(); + $friendlytime = friendly_time($vars['entity']->time_created); + $mime = $file->mimetype; + + if (get_context() == "search") { + + if (get_input('search_viewtype') == "gallery") { + //default gallery view for album listing @ /photos/owned/ + + //get album cover if one was set + if($file->cover) + $album_cover = 'thumbnail'; + else + $album_cover = 'new album'; + + ?> +
+
+
+ name;?>
+ getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")"; + ?> + +
+ + '.$title.'

'; + $info .= "

username}\">{$owner->name} {$friendlytime}"; + $numcomments = elgg_count_comments($file); + if ($numcomments) + $info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")"; + $info .= "

"; + + $icon = "getURL()}\">" . elgg_view("tidypics/icon", array('album' => true, 'size' => 'small')) . ""; + + echo elgg_view_listing($icon, $info); + + } + + } else { + // individual album view +?> +
+username) || empty(page_owner_entity()->username)) { //when no owner available, link to world photos +?> +  >  + + name); ?> >  + + +
+ +'.$title.''; + echo '
'.autop($desc).'
'; + + if ($file->canEdit()) { // add edits + // specific to my theme only + //add_submenu_item(elgg_echo('album:addpix'), $vars['url'] . "pg/photos/upload/". $file_guid , '', 'jade'); + //add_submenu_item(elgg_echo('album:edit'), $vars['url'] . "mod/tidypics/edit.php?file_guid=". $file_guid , '', 'jade'); + //add_submenu_item(elgg_echo('album:delete'), $vars['url'] . "action/tidypics/delete?file=". $file_guid , '', 'jade'); + +?> +
+ "> +   + + $vars['url'] . "action/tidypics/delete?file=" . $file->getGUID(), + 'text' => elgg_echo("album:delete"), + 'confirm' => elgg_echo("album:delete:confirm"), + )); + ?> +
+guid); + } + + if(count($count) > 0) + echo list_entities("object","image", $file_guid, 24, false); + else + echo elgg_echo('image:none'); + +?> +
+
+
$tags));?>
+ name; ?>
+
+
+ + diff --git a/views/default/object/image.php b/views/default/object/image.php new file mode 100644 index 000000000..063ad09cb --- /dev/null +++ b/views/default/object/image.php @@ -0,0 +1,130 @@ +getGUID(); + $tags = $file->tags; + $title = $file->title; + $desc = $file->description; + $owner = $vars['entity']->getOwnerEntity(); + $friendlytime = friendly_time($vars['entity']->time_created); + + $mime = $file->mimetype; + +if (get_context() == "search") { //if this is the search view + + + if (get_input('search_viewtype') == "gallery") { + ?> +
+ thumbnail +
+ '.$title.'

'; + $info .= "

username}\">{$owner->name} {$friendlytime}"; + $numcomments = elgg_count_comments($file); + if ($numcomments) + $info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")"; + $info .= "

"; + $icon = "getURL()}\">" . elgg_view("tidypics/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'small')) . ""; + + echo elgg_view_listing($icon, $info); + } +} +else { //tidypics image display + + if (!$vars['full']) { //simple gallery view + +?> +
+ thumbnail +
+container_guid); + + //compile back | next links + $current = array_search($file_guid, $_SESSION['image_sort']); + + if(!$current){ // means we are no longer using the correct album array + + //rebuild the array -> + $count = get_entities("object","image", $album->guid, '', 999); + $_SESSION['image_sort'] = array(); + + foreach($count as $image){ + array_push($_SESSION['image_sort'], $image->guid); + } + + $current = array_search($file_guid, $_SESSION['image_sort']); + } + + if(!$current == 0) + $back = '<<' . elgg_echo('image:back') . '  '; + + if(array_key_exists(($current+1), $_SESSION['image_sort'])) + $next = '  ' . elgg_echo('image:next') . '>>'; + +?> +
+username) || empty(page_owner_entity()->username)) { //when no owner available, link to world photos +?> +  >  + + name); ?> >  + + title; ?> >  + +
+' . $title . ''; + echo '
' . autop($desc) . '
'; + echo '
'; + echo '
' . $back . $next . '
'; + if($next) echo ''; + echo '' . $title . ''; + if($next) echo ''; + echo '
'; +?> +
+   +canEdit()) { // add edit controls +?> +   + $vars['url'] . "action/tidypics/delete?file=" . $file->getGUID(), + 'text' => elgg_echo("image:delete"), + 'confirm' => elgg_echo("image:delete:confirm"), + )); + } + ?> +
+ +
+
$tags));?>
+ name; ?>
+
+ \ No newline at end of file diff --git a/views/default/river/object/album/annotate.php b/views/default/river/object/album/annotate.php new file mode 100644 index 000000000..691b0c7ec --- /dev/null +++ b/views/default/river/object/album/annotate.php @@ -0,0 +1,13 @@ +getSubject(); + $object = $statement->getObject(); + + $url = "getURL()}\">{$performed_by->name}"; + $string = sprintf(elgg_echo("album:river:annotate"),$url) . " "; + $string .= "getURL() . "\">" . elgg_echo("album:river:item") . ""; + + echo $string; + +?> \ No newline at end of file diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php new file mode 100644 index 000000000..68553309c --- /dev/null +++ b/views/default/river/object/album/create.php @@ -0,0 +1,13 @@ +getSubject(); + $object = $statement->getObject(); + + $url = "getURL()}\">{$performed_by->name}"; + $string = sprintf(elgg_echo("album:river:created"),$url) . " "; + $string .= "getURL() . "\">" . elgg_echo("album:river:item") . ""; + + echo $string; + +?> \ No newline at end of file diff --git a/views/default/river/object/image/annotate.php b/views/default/river/object/image/annotate.php new file mode 100644 index 000000000..b0b1b8719 --- /dev/null +++ b/views/default/river/object/image/annotate.php @@ -0,0 +1,13 @@ +getSubject(); + $object = $statement->getObject(); + + $url = "getURL()}\">{$performed_by->name}"; + $string = sprintf(elgg_echo("image:river:annotate"),$url) . " "; + $string .= "getURL() . "\">" . elgg_echo("image:river:item") . ""; + + echo $string; + +?> \ No newline at end of file diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php new file mode 100644 index 000000000..3f5bbb5e8 --- /dev/null +++ b/views/default/river/object/image/create.php @@ -0,0 +1,13 @@ +getSubject(); + $object = $statement->getObject(); + + $url = "getURL()}\">{$performed_by->name}"; + $string = sprintf(elgg_echo("image:river:created"),$url) . " "; + $string .= "getURL() . "\">" . elgg_echo("image:river:item") . ""; + + echo $string; + +?> \ No newline at end of file diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php new file mode 100644 index 000000000..2c63edff8 --- /dev/null +++ b/views/default/settings/tidypics/edit.php @@ -0,0 +1,10 @@ +maxfilesize; + if (!$maxfilesize) $maxfilesize = (int) 10240; //set the default maximum file size to 10MB (1024KB * 10 = 10240KB = 10MB) + +?> +

+ + + 'params[maxfilesize]', 'value' => $maxfilesize)); ?> +

\ No newline at end of file diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php new file mode 100644 index 000000000..f9f5b09e6 --- /dev/null +++ b/views/default/tidypics/css.php @@ -0,0 +1,128 @@ + + /* --- independent view for image/album SHARED --- */ + +#tidypics_title{ + font-size:1.2em; + font-weight:bold; +} +#tidypics_desc{ + padding:0 20px; + font-style:italic; +} +#tidypics_info{ + padding:20px; + line-height:1.5em; +} + +#tidypics_controls{ + text-align:center; + margin-bottom:10px; +} + +#tidypics_controls a{ + margin:10px; +} + + /* independent album view only */ + +.album_images{ + float:left; + width:160px; + height:160px; + margin:4px; + padding:5px; + border:1px solid #ccc; + text-align:center; +} + + /* independent image view only */ + +#image_full{ + text-align:center; + margin:10px; +} +#image_full img{ + padding:5px; + border:1px solid #ccc; + margin:7px 0; +} + +/* --- albums gallery view --- */ + +.album_cover{ + padding:2px; + border:1px solid #ccc; + margin:8px 0; +} + + +/* ------ album WIDGET VIEW ------ */ + +#album_widget_container{ + text-align:center; +} + +.album_widget_single_item{ + +} +.album_widget_title{ + +} +.album_widget_timestamp { + color:#666666; + margin:0; +} +.collapsable_box #album_widget_layout { + margin:0; +} + +/* --------- image upload/edit forms ------------ */ + +#image_upload_list li{ + margin:3px 0; +} +.edit_image_container{ + padding:5px; + margin:5px 0; + overflow:auto; +} +.edit_images{ + float:right; + width:160px; + height:160px; + margin:4px; + padding:5px; + border:1px solid #ccc; + text-align:center; +} +.image_info{ + float:left; + width:60%; +} +.image_info label{ + font-size:1em; +} +.edit_image{ + float:right; + border:1px solid #ccc; + width:153px; + height:153px; +} + +/* --------- tidypics river items ------------ */ + +.river_image_create { + background: url(mod/tidypics/graphics/icons/river_icon_image.gif) no-repeat left -1px; +} +.river_album_create { + background: url(mod/tidypics/graphics/icons/river_icon_album.gif) no-repeat left -1px; +} + +.pagination { + clear:both !important; +} + \ No newline at end of file diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php new file mode 100644 index 000000000..efe4aa508 --- /dev/null +++ b/views/default/tidypics/forms/edit.php @@ -0,0 +1,115 @@ +title); + $action = "tidypics/editalbum"; + $title = $vars['entity']->title; + $body = $vars['entity']->description; + $tags = $vars['entity']->tags; + $access_id = $vars['entity']->access_id; + $subtype = $vars['subtype']; + + // if nothing is sent, create new, but only new albums are sent here + // new images are sent to upload.php + } else { + $title = elgg_echo("album:add"); + $action = "tidypics/addalbum"; + $tags = ""; + $title = ""; + $description = ""; + } + + // in case we have some cached details + if (isset($vars['albumtitle'])) { + $title = $vars['albumtitle']; + $body = $vars['albumbody']; + $tags = $vars['albumtags']; + } + + $container_guid = get_input('container_guid'); + if (!$container_guid) $container_guid = page_owner(); + +?> +
+

+ + "albumtitle", "value" => $title,)); ?> +

+ +

+ + "albumbody","value" => $body,)); ?> +

+ +

+ + "albumbody","value" => $body,)); ?> +

+ +

+ + "albumtags","value" => $tags,)); ?> +

+ + guid; + $container_guid = $vars['entity']->container_guid; + $cover_guid = get_entity($container_guid)->cover; + + if($cover_guid == $vars['entity']->guid) + $cover = 'yes'; + + ?> +

+ + "cover", "value" => $cover, 'options' => array(elgg_echo('album:cover:yes')))); ?> +

+

+ + 'access_id','value' => $access_id)); ?> +

+ + +

+ + 'access_id','value' => $access_id)); ?> +

+ + + + + +

+
\ No newline at end of file diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php new file mode 100644 index 000000000..252a660bd --- /dev/null +++ b/views/default/tidypics/forms/edit_multi.php @@ -0,0 +1,44 @@ + +
+cover) $no_cover = true; + + foreach($file_array as $key => $file_guid){ + $entity = get_entity($file_guid); + $guid = $entity->guid; + $body = $entity->description; + $tags = $entity->tags; + $container_guid = $entity->container_guid; + if($no_cover && !$cover) $cover = $guid; + + echo '
'; + echo '' . $title . ''; + echo '
'; + echo '

'; + echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n"; + echo '

'; + echo '

"; + echo elgg_view("input/text",array("internalname" => "caption[$key]", "value" => $body,)) . "\n"; + echo "

"; + echo '

\n"; + echo elgg_view("input/tags", array( "internalname" => "tags[$key]","value" => $tags)) . "\n"; + echo '

'; + echo '' . "\n"; + echo ''; + echo elgg_view("input/multi_radio", array( "internalname" => "cover", "value" => $guid, 'options' => array('yes'), 'set' => $cover)); + echo '
'; + echo '
'; + + } + echo elgg_echo('image:access:note'); +?> + +

+
\ No newline at end of file diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php new file mode 100644 index 000000000..35768f64c --- /dev/null +++ b/views/default/tidypics/forms/upload.php @@ -0,0 +1,79 @@ +access_id; + if (get_plugin_setting('maxfilesize','tidypics')) { + if (((int) get_plugin_setting('maxfilesize','tidypics')) < 1 || ((int) get_plugin_setting('maxfilesize','tidypics')) > 1048576) { + $maxfilesize = 10240; //if file size is less than 1KB or greater than 1GB, default to 10MB + } else { + $maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics'); + } + } else { + $maxfilesize = 10240; //if the file size limit is not set, default to 10MB + } + +?> + +
+

+
+
+

+
    +' . elgg_view("input/file",array('internalname' => "upload_$x")) . "\n"; + } +?> +
+

+ + + 'access_id','value' => $access_id)); ?> + +

+ '; + + ?> + " onclick="showhide('tidypics_loader');" /> +

+ +
\ No newline at end of file diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php new file mode 100644 index 000000000..ea11006fa --- /dev/null +++ b/views/default/tidypics/groupprofile_albums.php @@ -0,0 +1,60 @@ +num_display; + //if no number has been set, default to 5 + if (!$number) + $number = 5; + + $owner = page_owner_entity(); + $owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false); + + echo '
'; + echo '

' . elgg_echo('albums') . '

'; + + if ($owner_albums) { + echo '
'; + foreach($owner_albums as $album){ + + //get album cover if one was set + if($album->cover) + $album_cover = 'album cover'; + else + $album_cover = 'new album'; + + ?> +
+
title;?>
+
time_created);?>
+ getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")
"; + ?> + +
+ username) || empty($owner->username)) { + echo '' . elgg_echo('album:all') . ''; + } else { + echo '' . elgg_echo('album:more') . ''; + } + + //close album_widget_container div + echo "
"; + } else { + + echo '
'; + echo '

'.elgg_echo("album:none").'

'; + if ($owner && ($owner->canWriteToContainer($_SESSION['user']))){ + echo 'username.'>'.elgg_echo("album:add").''; + echo '
'; + } + + } + //close group_albums_widget div + echo "
"; +?> \ No newline at end of file diff --git a/views/default/tidypics/icon.php b/views/default/tidypics/icon.php new file mode 100644 index 000000000..614fa3ad0 --- /dev/null +++ b/views/default/tidypics/icon.php @@ -0,0 +1,41 @@ +wwwroot}mod/tidypics/graphics/icons/album.gif\" border=\"0\" />"; +} +else{ + + $mime = $vars['mimetype']; + if (isset($vars['thumbnail'])) { + $thumbnail = $vars['thumbnail']; + } else { + $thumbnail = false; + } + + $size = $vars['size']; + if ($size != 'large') { + $size = 'small'; + } + + if ($thumbnail && strpos($mime, "image/")!==false) + echo ""; + else + { + if ($size == 'large') + echo "wwwroot}mod/tidypics/graphics/icons/general_lrg.gif\" border=\"0\" />"; + else + echo "wwwroot}mod/tidypics/graphics/icons/general.gif\" border=\"0\" />"; + } +} +?> \ No newline at end of file diff --git a/views/default/tidypics/menu.php b/views/default/tidypics/menu.php new file mode 100644 index 000000000..4368993dd --- /dev/null +++ b/views/default/tidypics/menu.php @@ -0,0 +1,16 @@ + + +

+ +

\ No newline at end of file diff --git a/views/default/widgets/album_view/edit.php b/views/default/widgets/album_view/edit.php new file mode 100644 index 000000000..2d7c7708f --- /dev/null +++ b/views/default/widgets/album_view/edit.php @@ -0,0 +1,21 @@ +

+ : + + num_display == '') $vars['entity']->num_display = 5; + ?> + +

\ No newline at end of file diff --git a/views/default/widgets/album_view/view.php b/views/default/widgets/album_view/view.php new file mode 100644 index 000000000..347332971 --- /dev/null +++ b/views/default/widgets/album_view/view.php @@ -0,0 +1,53 @@ +num_display; + //if no number has been set, default to 5 + if (!$number) + $number = 5; + + $owner = page_owner_entity(); + $owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false); + + if ($owner_albums) { + echo '
'; + + foreach($owner_albums as $album){ + + //get album cover if one was set + if($album->cover) + $album_cover = '' . $album->title . ''; + else + $album_cover = '' . $album->title . ''; + ?> +
+
title;?>
+
time_created);?>
+ getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")
"; + ?> + +
+ username; + echo "" . elgg_echo('album:more') . ""; + echo "
"; + + } else { + + echo '

'.elgg_echo("album:none").'

'; + + //check if owner has write rights. If so, let him edit the album + $container_guid = get_input('container_guid', $_SESSION['user']->getGUID()); + + if ($owner->username == get_entity($container_guid)->username){ + echo '

username.'>'.elgg_echo("album:create").'

'; + } + + } +?> \ No newline at end of file diff --git a/views/rss/object/file.php b/views/rss/object/file.php new file mode 100644 index 000000000..3bd84d076 --- /dev/null +++ b/views/rss/object/file.php @@ -0,0 +1,30 @@ +title; + if (empty($title)) { + $title = substr($vars['entity']->description,0,32); + if (strlen($vars['entity']->description) > 32) + $title .= " ..."; + } + +?> + + + getURL(); ?> + time_created) ?> + getURL(); ?> + <![CDATA[<?php echo $title; ?>]]> + description)); ?>]]> + + diff --git a/world.php b/world.php new file mode 100644 index 000000000..2e80f5393 --- /dev/null +++ b/world.php @@ -0,0 +1,37 @@ +name), $body); +?> \ No newline at end of file -- cgit v1.2.3 From 48c831f882f029768bfe930b7b9734b420830cd8 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 20:30:48 +0000 Subject: Let's get this show on the road --- contributions.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/contributions.txt b/contributions.txt index ff014654c..7b6a073d7 100644 --- a/contributions.txt +++ b/contributions.txt @@ -1,11 +1,14 @@ -Elgg community and users: +Project Lead: +Gabriel Monge-Franco (gabrielinux) +http://gabriel.mongefranco.com - The original author of Tidypics has not been active in the Elgg community lately. Therefore, I took on the task of improving his plug-in and maintaining a log of all changes in this file. If you contribute to this plug-in, please record your changes here and release them under a GPL license. +Original Author: +Jade Dominguez +http://www.tastyseed.com/ -Best regards, -Gabriel Monge-Franco (gabrielinux) -http://gabriel.mongefranco.com +See individual change logs for contributors to those builds + ------------------------------------------------------------------------ -- cgit v1.2.3 From 672eb863f7ef868f3ea61508be88c72a6e703e33 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 20:34:12 +0000 Subject: moving tasks to tracker --- tasks.txt | 66 --------------------------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 tasks.txt diff --git a/tasks.txt b/tasks.txt deleted file mode 100644 index 879d8cb42..000000000 --- a/tasks.txt +++ /dev/null @@ -1,66 +0,0 @@ - -Tasks: - - -> DONE --clean up css - -> DONE -- test river views - -> DONE -- enable widget views - -> DONE -- multi image uploader form. - - -> DONE -- Album covers: implement cover option for NEW uploaded images @ upload.php action - i want to enable multi uploader so better to put it in there. - (radio box so only one image can be the cover) - - -> DONE -- /pg/photos/owned - Edit the way album list is presented (make it nicer) - -> DONE -- when adding or editing album -> - saving the album's view access should also edit - all containing image view access - if add new album - -> all image uploads default to albums current access - -> all image edits can not change access - if edit album - -> change access of album and cycle through all current images. - - -> DONE -- Album covers: implemented edit image screen to specify album cover - -> DONE -- allow photo albums for users - -> DONE -- internationalize all text - -> DONE -- clean up unecessary functions from file plugin - -> DONE -- limit uploader to image only mimetype - -> DONE -- (for now) see if i can get rid of any unecessary meta - -> DONE -- create friends views and world views - -> DONE -- add breadcrumb - -> DONE -- (but optimize) add thumbnail icons for listings - - - - --------- CAVEATS ----------- - - - -> SOLVED -- (just clear the pagination css class) problem: - when viewing an indie album, the images are floated. - if the pagination is enabled the bottom bar does not clear the - floated images - -Problem: -the delete action does not delete any actual images -the current method should work, but it doesnt -look for clues in engine/lib/filestore.php -when deleting an album, easy way to delete all images -is just to find the albums folder and delete it. - -Problem: -when defining covers for album , i need to edit the input/checkboxes view -in order submit correctly. Remove the [] as part of the name - --------------------- -my differences due to theme ------------------------- -My customizations: - -in the controls i am added to submenu -edit this out when packaging - - -> if i add album actions to submenu i lose "js confirm" on delete - -> change the album access permissions for groups to have - only 3 choices (logged in , everyone, or group only) - \ No newline at end of file -- cgit v1.2.3 From 1919b91c1843014e695168999ffca09d7370a458 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 20:35:40 +0000 Subject: removing old instructions --- tidypics_user_instructions_.txt | 71 ----------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 tidypics_user_instructions_.txt diff --git a/tidypics_user_instructions_.txt b/tidypics_user_instructions_.txt deleted file mode 100644 index eb2c2a809..000000000 --- a/tidypics_user_instructions_.txt +++ /dev/null @@ -1,71 +0,0 @@ --------------------------------------------- -Tidypics Photo Gallery plugin version 1.05 -Release #5. -Release Date: October 27, 2008 --------------------------------------------- - -Installation ------------------- -1. Drop into root/mod/ -2. Enable plugin via admin panel. -3. Done - - - -Requirements ------------------------- -Will function with all versions of elgg, but current SVN build is needed -for consistency. -Reason: -Updating the album access persmissions will auto-update the access for all -images contained in the album, but when updating each image entity, -the metadata for that entity also needs to be updated. The function that accomplishes -this is only in the current SVN build. -If you do not use the current SVN build of elgg, you will likely get incorrectly -synced access permissions. Just wait for elg 1.1 and all will be dandy. -No changes need to be made to tidypics since the function is called via hook. - - - -Recorded problems: ----------------------------- -1. when viewing an individual album, the image gallery displayed is a collection - of floated divs. If pagination is enabled the bottom pagination bar does not - clear the floated images and you will get a messy display. I did not yet - research a better way to create a gallery view while being inline with elggs listing functions. - -2. The delete action does not delete any actual . - The current method should work, but it does not. - I am quite sure this is unintended, but we will have to wait till the core - gets updated. - Currently NO IMAGES will ever be deleted from your serverspace. - -3. The groups view is a little odd because all other content like blogs, pages, are in list view. - I refuse to put albums in list view, so if you want that, sorry! (just steal the list view from object/albums.php) - - -Cost to use this plugin: ----------------------------------- - - Participation in the tidypics group on community.elgg.org - - We need: - ------------------------ - 1. User testing - 2. Bug reports - 3. Functionality, usability, feature requests/discussions - 4. Developers: Feature enhancements. - - If you do not pay the advertised cost of tidypics, you are stealing this plugin! - Don't be a taker!! - - Bye! - - - Jade - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 389a15ac797fd5e060631ec9feb1568837c5088f Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 20:41:12 +0000 Subject: assuming minor version tick for release for now - might go to 1.5 --- manifest.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/manifest.xml b/manifest.xml index 1dfd9b7a7..2cdfa8579 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,9 +1,10 @@ - - + + - - + + + -- cgit v1.2.3 From 7550a4521b7f8e0b4a6e76ca109c8a5b5848726c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 20:48:04 +0000 Subject: tweaks to language - english --- languages/en.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/languages/en.php b/languages/en.php index 2316a9e2f..a4b82b6d3 100644 --- a/languages/en.php +++ b/languages/en.php @@ -1,12 +1,4 @@ "Photo Album", 'albums' => "Photo Albums", 'album:yours' => "Your photo albums", - 'album:yours:friends' => "Your friends' photo albums", + 'album:yours:friends' => "Friends' photo albums", 'album:user' => "%s's photo albums", 'album:friends' => "%s's friends' photo albums", 'album:all' => "All site photo albums", -- cgit v1.2.3 From a5202ff8f416b327a26df87d0e92dd4ccdb8c084 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 20:57:15 +0000 Subject: defensive coding for empty album --- views/default/object/album.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/views/default/object/album.php b/views/default/object/album.php index b95d55eed..9d3dc507f 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -111,14 +111,15 @@ //build array for back | next links $_SESSION['image_sort'] = array(); - foreach($count as $image){ - array_push($_SESSION['image_sort'], $image->guid); - } + if(count($count) > 0) { + foreach($count as $image){ + array_push($_SESSION['image_sort'], $image->guid); + } - if(count($count) > 0) echo list_entities("object","image", $file_guid, 24, false); - else + } else { echo elgg_echo('image:none'); + } ?>
-- cgit v1.2.3 From a8176a4e82e5c66b3557ea9d96ac563e4e030e3f Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 21:09:07 +0000 Subject: unnecessary files removed --- graphics/Thumbs.db | Bin 18944 -> 0 bytes graphics/icons/Thumbs.db | Bin 24064 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 graphics/Thumbs.db delete mode 100644 graphics/icons/Thumbs.db diff --git a/graphics/Thumbs.db b/graphics/Thumbs.db deleted file mode 100644 index 46eac31d3..000000000 Binary files a/graphics/Thumbs.db and /dev/null differ diff --git a/graphics/icons/Thumbs.db b/graphics/icons/Thumbs.db deleted file mode 100644 index fb5d56ed3..000000000 Binary files a/graphics/icons/Thumbs.db and /dev/null differ -- cgit v1.2.3 From e5b3b8b9bdd999c1e4c1ac583417340eacb72269 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 21:20:30 +0000 Subject: updated widget for Elgg 1.5 --- languages/en.php | 4 ++-- views/default/widgets/album_view/view.php | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/languages/en.php b/languages/en.php index a4b82b6d3..21fe56f2d 100644 --- a/languages/en.php +++ b/languages/en.php @@ -23,7 +23,7 @@ //actions - 'album:create' => "New Album", + 'album:create' => "Create New Album", 'album:add' => "Add Photo Album", 'album:addpix' => "Add photos", 'album:edit' => "Edit album", @@ -97,7 +97,7 @@ 'image:notimage' => "We only accept jpeg, gif, or png images of the allowed file size.", 'images:notedited' => "Not all images were successfully updated", - 'album:none' => "We could not find any albums at the moment.", + 'album:none' => "No albums have been created yet.", 'album:uploadfailed' => "Sorry; we could not save your album.", 'album:deletefailed' => "Your album could not be deleted at this time.", 'album:blank' => "Please give this album a title and description." diff --git a/views/default/widgets/album_view/view.php b/views/default/widgets/album_view/view.php index 347332971..d56e0c3fc 100644 --- a/views/default/widgets/album_view/view.php +++ b/views/default/widgets/album_view/view.php @@ -1,3 +1,4 @@ +
num_display; @@ -9,7 +10,7 @@ $owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false); if ($owner_albums) { - echo '
'; + echo '
'; foreach($owner_albums as $album){ @@ -40,14 +41,12 @@ } else { - echo '

'.elgg_echo("album:none").'

'; + echo '

' . elgg_echo("album:none") . '

'; - //check if owner has write rights. If so, let him edit the album - $container_guid = get_input('container_guid', $_SESSION['user']->getGUID()); - - if ($owner->username == get_entity($container_guid)->username){ + if (get_loggedin_userid() == page_owner()) { echo '

username.'>'.elgg_echo("album:create").'

'; } } -?> \ No newline at end of file +?> +
\ No newline at end of file -- cgit v1.2.3 From b52a10cf375a85a8c2d0b0e22791ff6e0c6773c1 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 21:27:28 +0000 Subject: updated the edit album form to use default permissions and be better formatted --- views/default/tidypics/forms/edit.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php index efe4aa508..97170163b 100644 --- a/views/default/tidypics/forms/edit.php +++ b/views/default/tidypics/forms/edit.php @@ -25,6 +25,10 @@ $tags = ""; $title = ""; $description = ""; + if (defined('ACCESS_DEFAULT')) + $access_id = ACCESS_DEFAULT; + else + $access_id = 0; } // in case we have some cached details @@ -38,6 +42,7 @@ if (!$container_guid) $container_guid = page_owner(); ?> +

@@ -112,4 +117,5 @@ ?>

-
\ No newline at end of file + +
\ No newline at end of file -- cgit v1.2.3 From 350610666805c76ee736eba0b4b9069cc8d84c52 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 22:13:50 +0000 Subject: I think I have the submenus straightened out --- start.php | 63 ++++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 19 deletions(-) diff --git a/start.php b/start.php index f3c675d52..74d6dd22e 100644 --- a/start.php +++ b/start.php @@ -2,10 +2,6 @@ /** * Elgg tidypics * - * @package ElggFile - * @author Curverider Ltd - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ */ /** @@ -26,7 +22,7 @@ extend_view('css', 'tidypics/css'); // Extend hover-over and profile menu - extend_view('profile/menu/links','tidypics/menu'); + extend_view('profile/menu/links','tidypics/menu'); //group view ** psuedo widget view for group pages** extend_view('groups/right_column','tidypics/groupprofile_albums'); @@ -35,7 +31,7 @@ register_page_handler('photos','tidypics_page_handler'); // Add a new tidypics widget - add_widget_type('album_view',elgg_echo("album:widget"),elgg_echo("album:widget:description"), 'profile'); + add_widget_type('album_view', elgg_echo("album:widget"), elgg_echo("album:widget:description"), 'profile'); // Register a URL handler for files register_entity_url_handler('image_url','object','image'); @@ -56,20 +52,49 @@ $page_owner = page_owner_entity(); - // General submenu options - if (get_context() == "photos") { - if (isloggedin() && (page_owner() == $_SESSION['guid'] || !page_owner())) { - add_submenu_item(sprintf(elgg_echo("album:yours"),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/owned/" . page_owner_entity()->username, '1view'); - add_submenu_item(sprintf(elgg_echo('album:yours:friends'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/friends/". page_owner_entity()->username, '1view'); - add_submenu_item(sprintf(elgg_echo('album:all'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/world/", '1view'); - } else if (page_owner() && $page_owner instanceof ElggUser) { - add_submenu_item(sprintf(elgg_echo('album:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username,'1view'); - add_submenu_item(sprintf(elgg_echo('album:all'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/world/", '1view'); - } - } - if (isloggedin() && ($page_owner instanceof ElggGroup)) { - add_submenu_item(sprintf(elgg_echo("album:user"),page_owner_entity()->name), $CONFIG->wwwroot . "pg/photos/owned/" . page_owner_entity()->username, 'photo_albums'); + // context is only set to photos on individual pages, not on group pages + if (get_context() == "photos") { + + // owner gets "your albumn", "your friends albums" + if (get_loggedin_userid() == $page_owner->guid) { + add_submenu_item( elgg_echo("album:yours"), + $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, + '1view' ); + + add_submenu_item( elgg_echo('album:yours:friends'), + $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, + '1view'); + } else if (isloggedin()) { + // logged nut not owner gets "your albums", "page owners albums", "page owner's friends albums" + add_submenu_item( elgg_echo("album:yours"), + $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, + '1view' ); + add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, + '1view' ); + add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, + '1view'); + } else { + // non logged in user gets "page owners albums", "page owner's friends albums" + add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, + '1view' ); + add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, + '1view'); } + + add_submenu_item( sprintf(elgg_echo('album:all'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/world/", + '1view'); + } + + if (isloggedin() && ($page_owner instanceof ElggGroup)) { + add_submenu_item(sprintf(elgg_echo("album:user"),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, + 'photo_albums'); + } } /** -- cgit v1.2.3 From 85acd20012d7f0364294f33fd3f5f5792aa833bc Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 20 Mar 2009 22:16:31 +0000 Subject: --- contributions.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/contributions.txt b/contributions.txt index 7b6a073d7..65dd95c5a 100644 --- a/contributions.txt +++ b/contributions.txt @@ -10,6 +10,21 @@ http://www.tastyseed.com/ See individual change logs for contributors to those builds +------------------------------------------------------------------------ +Version 1.09 Change List +Release Date: ??/??/2009 +Contributors: + * Gabriel Monge-Franco (http://gabriel.mongefranco.com) + * Cash Costello +------------------------------------------------------------------------ +BEGIN VERSION 1.09 CHANGES +------------------------------------------------------------------------ +* Fixed submenus on sidebar of album pages +------------------------------------------------------------------------ +END VERSION 1.09 CHANGES +------------------------------------------------------------------------ + + ------------------------------------------------------------------------ Version 1.08.2 Change List -- cgit v1.2.3 From effd41e3b327234adf2997895da7e80b88458af1 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 15:28:23 +0000 Subject: moved add album to menu --- index.php | 30 +++++++++------------------- languages/en.php | 2 +- start.php | 59 ++++++++++++++++++++++++++------------------------------ 3 files changed, 37 insertions(+), 54 deletions(-) diff --git a/index.php b/index.php index 00b09d14b..32c389e2e 100644 --- a/index.php +++ b/index.php @@ -2,17 +2,10 @@ /** * Elgg tidypics photo gallery main page * - * @package ElggFile - * @author Curverider Ltd - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ - * - * * */ - //require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); + include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); //get the owner of the current page $owner = page_owner_entity(); @@ -25,21 +18,16 @@ } //set the title - $area2 = elgg_view_title($title = sprintf(elgg_echo('album:user'), "$owner->name")); - - //allow new album creation - if(can_write_to_container($_SESSION['guid'], page_owner())){ - $area2 .= 'username.'">'.elgg_echo('album:create').'

'; - } - + $area2 = elgg_view_title($title = sprintf(elgg_echo('album:user'), "$owner->name")); + // Get objects - set_context('search'); - set_input('search_viewtype', 'gallery'); - $area2 .= list_entities("object","album",page_owner(),10); + set_context('search'); + set_input('search_viewtype', 'gallery'); + $area2 .= list_entities("object","album",page_owner(),10); - set_context('photos'); - $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + set_context('photos'); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); // Finally draw the page - page_draw(sprintf(elgg_echo("album:user"),page_owner_entity()->name), $body); + page_draw(sprintf(elgg_echo("album:user"),page_owner_entity()->name), $body); ?> \ No newline at end of file diff --git a/languages/en.php b/languages/en.php index 21fe56f2d..7e7185c5d 100644 --- a/languages/en.php +++ b/languages/en.php @@ -23,7 +23,7 @@ //actions - 'album:create' => "Create New Album", + 'album:create' => "Create new album", 'album:add' => "Add Photo Album", 'album:addpix' => "Add photos", 'album:edit' => "Edit album", diff --git a/start.php b/start.php index 74d6dd22e..7c3f888e8 100644 --- a/start.php +++ b/start.php @@ -9,7 +9,6 @@ */ function tidypics_init() { - // Get config global $CONFIG; // Set up menu for logged in users @@ -56,38 +55,42 @@ if (get_context() == "photos") { // owner gets "your albumn", "your friends albums" - if (get_loggedin_userid() == $page_owner->guid) { + if (get_loggedin_userid() == $page_owner->guid && get_loggedin_userid()) { + add_submenu_item( elgg_echo('album:create'), + $CONFIG->wwwroot . "pg/photos/new/". $page_owner->username, + 'tidypics' ); + add_submenu_item( elgg_echo("album:yours"), $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, - '1view' ); + 'tidypics' ); add_submenu_item( elgg_echo('album:yours:friends'), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, - '1view'); + 'tidypics'); } else if (isloggedin()) { // logged nut not owner gets "your albums", "page owners albums", "page owner's friends albums" add_submenu_item( elgg_echo("album:yours"), $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, - '1view' ); + 'tidypics' ); add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, - '1view' ); + 'tidypics' ); add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, - '1view'); - } else { + 'tidypics'); + } else if ($page_owner->guid) { // non logged in user gets "page owners albums", "page owner's friends albums" add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, - '1view' ); + 'tidypics' ); add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, - '1view'); + 'tidypics'); } add_submenu_item( sprintf(elgg_echo('album:all'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/world/", - '1view'); + 'tidypics'); } if (isloggedin() && ($page_owner instanceof ElggGroup)) { @@ -112,12 +115,6 @@ { case "owned": //view list of albums owned by container if (isset($page[1])) set_input('username',$page[1]); - - /* if you want to put new album action in the submenu, just do it like this ---------> - if(can_write_to_container($_SESSION['guid'], page_owner())){ - add_submenu_item(elgg_echo('album:create'), $CONFIG->wwwroot . "pg/photos/new/". page_owner_entity()->username, 'pagesactions'); - } - */ include($CONFIG->pluginspath . "tidypics/index.php"); break; @@ -128,7 +125,7 @@ case "album": //view an album individually set_input('guid',$page[1]); - @include(dirname(dirname(dirname(__FILE__))) . "/entities/index.php"); + include(dirname(dirname(dirname(__FILE__))) . "/entities/index.php"); break; case "new": //create new album @@ -167,21 +164,19 @@ * @param ElggEntity $entity album/image entity * @return string File URL */ - function image_url($entity) { - global $CONFIG; - $title = $entity->title; - $title = friendly_title($title); - return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title; - - } + function image_url($entity) { + global $CONFIG; + $title = $entity->title; + $title = friendly_title($title); + return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title; + } - function album_url($entity) { - global $CONFIG; - $title = $entity->title; - $title = friendly_title($title); - return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title; - - } + function album_url($entity) { + global $CONFIG; + $title = $entity->title; + $title = friendly_title($title); + return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title; + } // Make sure tidypics_init is called on initialisation register_elgg_event_handler('init','system','tidypics_init'); -- cgit v1.2.3 From 8b474ce9723b7d717c65415149de947fbedceeba Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 15:44:07 +0000 Subject: updated the upload pages --- languages/en.php | 2 +- upload.php | 4 +--- views/default/tidypics/forms/upload.php | 30 ++++++++++++------------------ 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/languages/en.php b/languages/en.php index 7e7185c5d..bc64fd550 100644 --- a/languages/en.php +++ b/languages/en.php @@ -25,7 +25,7 @@ 'album:create' => "Create new album", 'album:add' => "Add Photo Album", - 'album:addpix' => "Add photos", + 'album:addpix' => "Add photos to", 'album:edit' => "Edit album", 'album:delete' => "Delete album", diff --git a/upload.php b/upload.php index 320c5ce6d..4fcf27695 100644 --- a/upload.php +++ b/upload.php @@ -37,10 +37,8 @@ } set_context('photos'); - $title = elgg_echo('album:addpix'); + $title = elgg_echo('album:addpix') . ' ' . $album_entity->title; $area2 .= elgg_view_title($title); - - $area2 .= '

'. $album_entity->title. '

'; $area2 .= elgg_view("tidypics/forms/upload", array('album' => $album ) ); $body = elgg_view_layout('two_column_left_sidebar', '', $area2, $area3); diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php index 35768f64c..be87c8697 100644 --- a/views/default/tidypics/forms/upload.php +++ b/views/default/tidypics/forms/upload.php @@ -1,27 +1,19 @@ access_id; - if (get_plugin_setting('maxfilesize','tidypics')) { - if (((int) get_plugin_setting('maxfilesize','tidypics')) < 1 || ((int) get_plugin_setting('maxfilesize','tidypics')) > 1048576) { - $maxfilesize = 10240; //if file size is less than 1KB or greater than 1GB, default to 10MB - } else { - $maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics'); - } + $container_guid = get_input('container_guid'); + $access_id = get_entity($vars['album'])->access_id; + if (get_plugin_setting('maxfilesize','tidypics')) { + if (((int) get_plugin_setting('maxfilesize','tidypics')) < 1 || ((int) get_plugin_setting('maxfilesize','tidypics')) > 1048576) { + $maxfilesize = 10240; //if file size is less than 1KB or greater than 1GB, default to 10MB } else { - $maxfilesize = 10240; //if the file size limit is not set, default to 10MB + $maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics'); } + } else { + $maxfilesize = 10240; //if the file size limit is not set, default to 10MB + } ?> +


@@ -76,4 +69,5 @@ function showhide(layer_ref) { " onclick="showhide('tidypics_loader');" />

-
\ No newline at end of file + +
\ No newline at end of file -- cgit v1.2.3 From 450b57bc95f405aebb1dc110bafc1b5def5041f4 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 15:57:48 +0000 Subject: code cleanup --- edit.php | 8 ++----- edit_multi.php | 8 ++----- friends.php | 8 ++----- index.php | 2 +- newalbum.php | 34 +++++++++++--------------- thumbnail.php | 60 ++++++++++++++++++++++------------------------ upload.php | 9 ++----- view.php | 76 +++++++++++++++++++++++++++------------------------------- world.php | 18 ++++++-------- 9 files changed, 93 insertions(+), 130 deletions(-) diff --git a/edit.php b/edit.php index 2c202e402..4e6d0d2ec 100644 --- a/edit.php +++ b/edit.php @@ -1,14 +1,10 @@ - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ */ // Load Elgg engine - require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - gatekeeper(); - + require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); + gatekeeper(); + // Get the current page's owner - $page_owner = page_owner_entity(); - if ($page_owner === false || is_null($page_owner)) { - $page_owner = $_SESSION['user']; - set_page_owner($_SESSION['guid']); - } - - $area2 = elgg_view_title(elgg_echo('album:add')); - $area2 .= elgg_view("tidypics/forms/edit"); - + $page_owner = page_owner_entity(); + if ($page_owner === false || is_null($page_owner)) { + $page_owner = $_SESSION['user']; + set_page_owner($_SESSION['guid']); + } + + $area2 = elgg_view_title(elgg_echo('album:add')); + $area2 .= elgg_view("tidypics/forms/edit"); + // Display page - page_draw(elgg_echo('album:add'),elgg_view_layout("two_column_left_sidebar", $area1, $area2, $area3 )); + page_draw(elgg_echo('album:add'),elgg_view_layout("two_column_left_sidebar", $area1, $area2, $area3 )); - ?> \ No newline at end of file diff --git a/thumbnail.php b/thumbnail.php index 0e6142cbb..b4c745ae2 100644 --- a/thumbnail.php +++ b/thumbnail.php @@ -1,46 +1,42 @@ getSubtype() == "image") { - // Get file thumbnail - if ($size == "small") { - $thumbfile = $file->smallthumb; - } else { - $thumbfile = $file->largethumb; - } + if ($file = get_entity($file_guid)) { + if ($file->getSubtype() == "image") { + // Get file thumbnail + if ($size == "small") { + $thumbfile = $file->smallthumb; + } else { + $thumbfile = $file->largethumb; + } - // Grab the file - if ($thumbfile && !empty($thumbfile)) { - $readfile = new ElggFile(); - $readfile->owner_guid = $file->owner_guid; - $readfile->setFilename($thumbfile); - //$mime = $file->getMimeType(); - $contents = $readfile->grabFile(); - } - } //end subtype comparison - } //end get_entity + // Grab the file + if ($thumbfile && !empty($thumbfile)) { + $readfile = new ElggFile(); + $readfile->owner_guid = $file->owner_guid; + $readfile->setFilename($thumbfile); + //$mime = $file->getMimeType(); + $contents = $readfile->grabFile(); + } + } //end subtype comparison + } //end get_entity // Open error image if file was not found if (!isset($contents) || is_null($contents) || $file->getSubtype()!='image') { @@ -49,7 +45,7 @@ } //end of default error image // Return the thumbnail and exit - header("Content-type: image"); - echo $contents; - exit; + header("Content-type: image"); + echo $contents; + exit; ?> \ No newline at end of file diff --git a/upload.php b/upload.php index 4fcf27695..062fec325 100644 --- a/upload.php +++ b/upload.php @@ -1,15 +1,10 @@ container_guid)->container_guid; - - if ($top_container) { - set_page_owner($top_container); - } else { - set_page_owner($entity->owner_guid); - } + //set "real" container - image container is the album , group/user is the album container + $top_container = get_entity($entity->container_guid)->container_guid; + + if ($top_container) { + set_page_owner($top_container); + } else { + set_page_owner($entity->owner_guid); + } // Set the body to be the full view of the entity, and the title to be its title - $area2 = elgg_view_entity($entity,true); - if ($shell) { - $body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2); - } else { - $body = $area2; - } - - } else { - $body = elgg_echo('notfound'); - } - - // Display the page + $area2 = elgg_view_entity($entity,true); if ($shell) { - page_draw("", $body); + $body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2); } else { - header("Content-type: text/html; charset=UTF-8"); - echo $body; + $body = $area2; } + } else { + $body = elgg_echo('notfound'); + } + + // Display the page + if ($shell) { + page_draw("", $body); + } else { + header("Content-type: text/html; charset=UTF-8"); + echo $body; + } + ?> \ No newline at end of file diff --git a/world.php b/world.php index 2e80f5393..d5dbf1f2a 100644 --- a/world.php +++ b/world.php @@ -1,25 +1,21 @@ Date: Sat, 21 Mar 2009 15:59:18 +0000 Subject: more cleanup --- upload.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/upload.php b/upload.php index 062fec325..dda327ef8 100644 --- a/upload.php +++ b/upload.php @@ -10,26 +10,26 @@ // Get the current page's owner - if ($album = (int) get_input('container_guid')) - { - $album_entity = get_entity($album); - - //if album does not exist or user does not have access - if(!$album_entity || !$album_entity->canEdit()) - forward('pg/photos/owned/'); - - //set group to "real" container - $container = $album_entity->container_guid; - set_page_owner($container); - } - else + if ($album = (int) get_input('container_guid')) + { + $album_entity = get_entity($album); + + //if album does not exist or user does not have access + if(!$album_entity || !$album_entity->canEdit()) forward('pg/photos/owned/'); + + //set group to "real" container + $container = $album_entity->container_guid; + set_page_owner($container); + } + else + forward('pg/photos/owned/'); - $page_owner = page_owner_entity(); - if ($page_owner === false || is_null($page_owner)) { - $page_owner = $_SESSION['user']; - set_page_owner($page_owner->getGUID()); - } + $page_owner = page_owner_entity(); + if ($page_owner === false || is_null($page_owner)) { + $page_owner = $_SESSION['user']; + set_page_owner($page_owner->getGUID()); + } set_context('photos'); $title = elgg_echo('album:addpix') . ' ' . $album_entity->title; -- cgit v1.2.3 From e340946cd80864a9b2c816e2f21a57d934761fcb Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 16:02:37 +0000 Subject: setting page owner --- edit_multi.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/edit_multi.php b/edit_multi.php index c6eb7de88..c4f35bc07 100644 --- a/edit_multi.php +++ b/edit_multi.php @@ -8,16 +8,24 @@ gatekeeper(); set_context('photos'); + + $page_owner = page_owner_entity(); + if ($page_owner === false || is_null($page_owner)) { + $page_owner = $_SESSION['user']; + set_page_owner($page_owner->getGUID()); + } + $file_string = get_input('files'); $file_array_sent = explode('-', $file_string); $new_file_array = array(); - foreach($file_array_sent as $file_guid){ - if ($entity = get_entity($file_guid)){ - if($entity->canEdit()){ + foreach ($file_array_sent as $file_guid) { + if ($entity = get_entity($file_guid)) { + if ($entity->canEdit()){ array_push($new_file_array, $file_guid); } - if(!$album_guid) $album_guid = $entity->container_guid; + if (!$album_guid) + $album_guid = $entity->container_guid; } } -- cgit v1.2.3 From fd2278f46e5123c43343f57cf764d45a0b57ec24 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 16:13:06 +0000 Subject: updated views for edit multiple images --- edit_multi.php | 7 ++++--- languages/en.php | 2 ++ views/default/tidypics/forms/edit_multi.php | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/edit_multi.php b/edit_multi.php index c4f35bc07..dd58759fe 100644 --- a/edit_multi.php +++ b/edit_multi.php @@ -29,9 +29,10 @@ } } - - $area2 .= elgg_view_title($title = elgg_echo('image:edit')); + + $title = elgg_echo('tidypics:editprops'); + $area2 .= elgg_view_title($title); $area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid)); $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); - page_draw(elgg_echo("edit"), $body); + page_draw($title, $body); ?> \ No newline at end of file diff --git a/languages/en.php b/languages/en.php index bc64fd550..7e8d67f39 100644 --- a/languages/en.php +++ b/languages/en.php @@ -20,6 +20,8 @@ 'item:object:image' => "Photos", 'item:object:album' => "Albums", 'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):", + + 'tidypics:editprops' => 'Edit Image Properties', //actions diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php index 252a660bd..ebd2ef11a 100644 --- a/views/default/tidypics/forms/edit_multi.php +++ b/views/default/tidypics/forms/edit_multi.php @@ -3,6 +3,7 @@ * form for mass editing all uploaded images */ ?> +
- -

-
\ No newline at end of file + +

+ +
\ No newline at end of file -- cgit v1.2.3 From ac0e60fd90c55a3a7d4f2001eb9e4cce44a5b259 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 16:57:57 +0000 Subject: cleaning up friends album view and individual album view --- edit.php | 45 ++++++++++++------------- friends.php | 4 +-- index.php | 14 +++++--- views/default/object/album.php | 8 +---- views/default/tidypics/css.php | 10 +++--- views/default/tidypics/forms/edit.php | 63 +++++++++++++++++------------------ 6 files changed, 70 insertions(+), 74 deletions(-) diff --git a/edit.php b/edit.php index 4e6d0d2ec..3e597cf05 100644 --- a/edit.php +++ b/edit.php @@ -10,33 +10,30 @@ set_context('photos'); $file = (int) get_input('file_guid'); - if (!$file = get_entity($file)) - forward(); + if (!$file = get_entity($file)) + forward(); - if(!$file->canEdit()) - forward(); + if (!$file->canEdit()) + forward(); - $subtype = $file->getSubtype(); + $subtype = $file->getSubtype(); - if($subtype == 'album'){ - if($container = $file->container_guid) - set_page_owner($container); - - $area2 .= elgg_view_title($title = elgg_echo('album:edit')); - } - elseif($subtype == 'image'){ - if($container = get_entity($file->container_guid)->container_guid) - set_page_owner($container); + if ($subtype == 'album') { + if($container = $file->container_guid) + set_page_owner($container); - $area2 .= elgg_view_title($title = elgg_echo('image:edit')); - } - else{ - forward(); - } - - $area2 .= elgg_view("tidypics/forms/edit",array('entity' => $file, 'subtype' => $subtype)); - $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); - page_draw(elgg_echo("edit"), $body); - + $title = elgg_echo('album:edit'); + } else if ($subtype == 'image') { + if ($container = get_entity($file->container_guid)->container_guid) + set_page_owner($container); + + $title = elgg_echo('image:edit'); + } else { + forward(); + } + $area2 .= elgg_view_title($title); + $area2 .= elgg_view('tidypics/forms/edit', array('entity' => $file, 'subtype' => $subtype)); + $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); + page_draw($title, $body); ?> \ No newline at end of file diff --git a/friends.php b/friends.php index 50e4aabc3..c9deb4772 100644 --- a/friends.php +++ b/friends.php @@ -24,12 +24,12 @@ if(isloggedin() && (page_owner() == $_SESSION['guid'])) { $area2 = elgg_view_title($title = elgg_echo('album:yours:friends')); } else { - $area2 = elgg_view_title($title = sprintf(elgg_echo('album:friends'), "$friendname")); + $area2 = elgg_view_title($title = sprintf(elgg_echo('album:friends'), $friendname)); } set_context('search'); set_input('search_viewtype', 'gallery'); - $area2 .= list_user_friends_objects(page_owner(), 'album'); + $area2 .= list_user_friends_objects(page_owner(), 'album', 10, true, false); set_context('photos'); $body = elgg_view_layout('two_column_left_sidebar', '', $area2); diff --git a/index.php b/index.php index 8839cd95d..45c849878 100644 --- a/index.php +++ b/index.php @@ -18,16 +18,22 @@ } //set the title - $area2 = elgg_view_title($title = sprintf(elgg_echo('album:user'), "$owner->name")); - + $title = sprintf(elgg_echo('album:user'), "$owner->name"); + $area2 = elgg_view_title($title); + + // temporary code - move to view when cleaned up + //$area2 .= '
'; + // Get objects set_context('search'); set_input('search_viewtype', 'gallery'); - $area2 .= list_entities("object","album",page_owner(),10); + $area2 .= list_entities("object", "album", page_owner(), 10); + + //$area2 .= '
'; set_context('photos'); $body = elgg_view_layout('two_column_left_sidebar', '', $area2); // Finally draw the page - page_draw(sprintf(elgg_echo("album:user"),page_owner_entity()->name), $body); + page_draw($title, $body); ?> \ No newline at end of file diff --git a/views/default/object/album.php b/views/default/object/album.php index 9d3dc507f..464806ca1 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -1,12 +1,6 @@ title); - $action = "tidypics/editalbum"; - $title = $vars['entity']->title; - $body = $vars['entity']->description; - $tags = $vars['entity']->tags; - $access_id = $vars['entity']->access_id; - $subtype = $vars['subtype']; + if (isset($vars['entity'])) { + $title = sprintf(elgg_echo("album:edit"),$object->title); + $action = "tidypics/editalbum"; + $title = $vars['entity']->title; + $body = $vars['entity']->description; + $tags = $vars['entity']->tags; + $access_id = $vars['entity']->access_id; + $subtype = $vars['subtype']; - // if nothing is sent, create new, but only new albums are sent here - // new images are sent to upload.php - } else { - $title = elgg_echo("album:add"); - $action = "tidypics/addalbum"; - $tags = ""; - $title = ""; - $description = ""; - if (defined('ACCESS_DEFAULT')) - $access_id = ACCESS_DEFAULT; - else - $access_id = 0; - } + // if nothing is sent, create new, but only new albums are sent here + // new images are sent to upload.php + } else { + $title = elgg_echo("album:add"); + $action = "tidypics/addalbum"; + $tags = ""; + $title = ""; + $description = ""; + if (defined('ACCESS_DEFAULT')) + $access_id = ACCESS_DEFAULT; + else + $access_id = 0; + } // in case we have some cached details - if (isset($vars['albumtitle'])) { - $title = $vars['albumtitle']; - $body = $vars['albumbody']; - $tags = $vars['albumtags']; - } + if (isset($vars['albumtitle'])) { + $title = $vars['albumtitle']; + $body = $vars['albumbody']; + $tags = $vars['albumtags']; + } - $container_guid = get_input('container_guid'); - if (!$container_guid) $container_guid = page_owner(); - + $container_guid = get_input('container_guid'); + if (!$container_guid) $container_guid = page_owner(); + ?>
@@ -49,8 +49,7 @@ "albumtitle", "value" => $title,)); ?>

-- cgit v1.2.3 From abbcdf538949aed8cc91f65bdf1c563506fc8614 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 17:22:31 +0000 Subject: fixed view album - removed breadcrumbs for now --- index.php | 7 +----- start.php | 2 +- viewalbum.php | 43 ++++++++++++++++++++++++++++++++ views/default/object/album.php | 56 ++++++++++++++---------------------------- 4 files changed, 64 insertions(+), 44 deletions(-) create mode 100644 viewalbum.php diff --git a/index.php b/index.php index 45c849878..6b17e12e8 100644 --- a/index.php +++ b/index.php @@ -20,17 +20,12 @@ //set the title $title = sprintf(elgg_echo('album:user'), "$owner->name"); $area2 = elgg_view_title($title); - - // temporary code - move to view when cleaned up - //$area2 .= '

'; - + // Get objects set_context('search'); set_input('search_viewtype', 'gallery'); $area2 .= list_entities("object", "album", page_owner(), 10); - //$area2 .= '
'; - set_context('photos'); $body = elgg_view_layout('two_column_left_sidebar', '', $area2); diff --git a/start.php b/start.php index 7c3f888e8..9474ed746 100644 --- a/start.php +++ b/start.php @@ -125,7 +125,7 @@ case "album": //view an album individually set_input('guid',$page[1]); - include(dirname(dirname(dirname(__FILE__))) . "/entities/index.php"); + include($CONFIG->pluginspath . "tidypics/viewalbum.php"); break; case "new": //create new album diff --git a/viewalbum.php b/viewalbum.php new file mode 100644 index 000000000..5c8f0b2b9 --- /dev/null +++ b/viewalbum.php @@ -0,0 +1,43 @@ +container_guid) { + set_page_owner($entity->container_guid); + } else { + set_page_owner($entity->owner_guid); + } + + // Set the body to be the full view of the entity, and the title to be its title + if ($entity instanceof ElggObject) { + $title = $entity->title; + } else if ($entity instanceof ElggEntity) { + $title = $entity->name; + } + + $area2 = elgg_view_title($title); + + $area2 .= elgg_view_entity($entity, true); + + // Otherwise? + } else { + } + + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + + // Display the page + page_draw($title, $body); +?> \ No newline at end of file diff --git a/views/default/object/album.php b/views/default/object/album.php index 464806ca1..a1b238812 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -13,7 +13,7 @@ $owner = $vars['entity']->getOwnerEntity(); $friendlytime = friendly_time($vars['entity']->time_created); $mime = $file->mimetype; - + if (get_context() == "search") { if (get_input('search_viewtype') == "gallery") { @@ -59,30 +59,11 @@ } else { // individual album view ?> -
-username) || empty(page_owner_entity()->username)) { //when no owner available, link to world photos -?> -  >  - - name); ?> >  - - -
- +
'.$title.'
'; - echo '
'.autop($desc).'
'; + echo '
'.autop($desc).'
'; - if ($file->canEdit()) { // add edits - // specific to my theme only - //add_submenu_item(elgg_echo('album:addpix'), $vars['url'] . "pg/photos/upload/". $file_guid , '', 'jade'); - //add_submenu_item(elgg_echo('album:edit'), $vars['url'] . "mod/tidypics/edit.php?file_guid=". $file_guid , '', 'jade'); - //add_submenu_item(elgg_echo('album:delete'), $vars['url'] . "action/tidypics/delete?file=". $file_guid , '', 'jade'); + if ($file->canEdit()) { // add controls ?>
@@ -97,23 +78,23 @@ ?>
0) { - foreach($count as $image){ - array_push($_SESSION['image_sort'], $image->guid); - } + if(count($count) > 0) { + foreach($count as $image){ + array_push($_SESSION['image_sort'], $image->guid); + } - echo list_entities("object","image", $file_guid, 24, false); - } else { - echo elgg_echo('image:none'); - } + echo list_entities("object","image", $file_guid, 24, false); + } else { + echo elgg_echo('image:none'); + } ?>
@@ -128,5 +109,6 @@ echo elgg_view_comments($file); } -} + echo '
'; + } // end of individual album view ?> -- cgit v1.2.3 From 9cd649361936640a11c249443c6c8f4e00f2399d Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 17:39:26 +0000 Subject: wrong path on include elgg engine --- viewalbum.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewalbum.php b/viewalbum.php index 5c8f0b2b9..2a5999379 100644 --- a/viewalbum.php +++ b/viewalbum.php @@ -4,7 +4,7 @@ * Tidypics Album View Page */ - include_once(dirname(dirname(__FILE__)) . "/engine/start.php"); + include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); // Get the GUID of the entity we want to view $guid = (int) get_input('guid'); -- cgit v1.2.3 From 26be16aaf2189a4b50b06494aab6c6690480a371 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 17:53:07 +0000 Subject: finished updating display of single image --- start.php | 2 +- view.php | 56 ------------------------ viewimage.php | 42 ++++++++++++++++++ views/default/object/image.php | 97 ++++++++++++++++++------------------------ 4 files changed, 84 insertions(+), 113 deletions(-) delete mode 100644 view.php create mode 100644 viewimage.php diff --git a/start.php b/start.php index 9474ed746..a0162319c 100644 --- a/start.php +++ b/start.php @@ -120,7 +120,7 @@ case "view": //view an image individually set_input('guid',$page[1]); - include($CONFIG->pluginspath . "tidypics/view.php"); + include($CONFIG->pluginspath . "tidypics/viewimage.php"); break; case "album": //view an album individually diff --git a/view.php b/view.php deleted file mode 100644 index 60fb47864..000000000 --- a/view.php +++ /dev/null @@ -1,56 +0,0 @@ -container_guid)->container_guid; - - if ($top_container) { - set_page_owner($top_container); - } else { - set_page_owner($entity->owner_guid); - } - - // Set the body to be the full view of the entity, and the title to be its title - $area2 = elgg_view_entity($entity,true); - if ($shell) { - $body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2); - } else { - $body = $area2; - } - - } else { - $body = elgg_echo('notfound'); - } - - // Display the page - if ($shell) { - page_draw("", $body); - } else { - header("Content-type: text/html; charset=UTF-8"); - echo $body; - } - -?> \ No newline at end of file diff --git a/viewimage.php b/viewimage.php new file mode 100644 index 000000000..85e8d8215 --- /dev/null +++ b/viewimage.php @@ -0,0 +1,42 @@ +container_guid)->container_guid; + + if ($top_container) { + set_page_owner($top_container); + } else { + set_page_owner($entity->owner_guid); + } + + $title = $entity->title; + $area2 = elgg_view_title($title); + $area2 .= elgg_view_entity($entity, true); + + } else { + $body = elgg_echo('notfound'); + } + + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + + // Display the page + page_draw($title, $body); +?> \ No newline at end of file diff --git a/views/default/object/image.php b/views/default/object/image.php index 063ad09cb..97095822e 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -1,10 +1,7 @@ mimetype; -if (get_context() == "search") { //if this is the search view - + if (get_context() == "search") { //if this is the search view if (get_input('search_viewtype') == "gallery") { ?> @@ -40,73 +36,60 @@ if (get_context() == "search") { //if this is the search view echo elgg_view_listing($icon, $info); } -} -else { //tidypics image display + } else { + //tidypics image display - if (!$vars['full']) { //simple gallery view + if (!$vars['full']) { //simple gallery view ?>
thumbnail
container_guid); + echo '
'; + + $album = get_entity($file->container_guid); - //compile back | next links - $current = array_search($file_guid, $_SESSION['image_sort']); + //compile back | next links + $current = array_search($file_guid, $_SESSION['image_sort']); - if(!$current){ // means we are no longer using the correct album array + if (!$current) { // means we are no longer using the correct album array - //rebuild the array -> - $count = get_entities("object","image", $album->guid, '', 999); - $_SESSION['image_sort'] = array(); + //rebuild the array -> + $count = get_entities("object","image", $album->guid, '', 999); + $_SESSION['image_sort'] = array(); - foreach($count as $image){ - array_push($_SESSION['image_sort'], $image->guid); - } + foreach($count as $image){ + array_push($_SESSION['image_sort'], $image->guid); + } - $current = array_search($file_guid, $_SESSION['image_sort']); - } + $current = array_search($file_guid, $_SESSION['image_sort']); + } - if(!$current == 0) - $back = '<<' . elgg_echo('image:back') . '  '; + if (!$current == 0) + $back = '<<' . elgg_echo('image:back') . '  '; - if(array_key_exists(($current+1), $_SESSION['image_sort'])) - $next = '  ' . elgg_echo('image:next') . '>>'; + if (array_key_exists(($current+1), $_SESSION['image_sort'])) + $next = '  ' . elgg_echo('image:next') . '>>'; ?> -
-username) || empty(page_owner_entity()->username)) { //when no owner available, link to world photos -?> -  >  - - name); ?> >  - - title; ?> >  - -
+ ' . $title . '
'; - echo '
' . autop($desc) . '
'; - echo '
'; - echo '
' . $back . $next . '
'; - if($next) echo ''; - echo '' . $title . ''; - if($next) echo ''; - echo '
'; + echo '
' . autop($desc) . '
'; + echo '
'; + echo '
' . $back . $next . '
'; + if ($next) echo ''; + echo '' . $title . ''; + if ($next) echo ''; + echo '
'; ?>
  canEdit()) { // add edit controls + if ($file->canEdit()) { // add edit controls ?>   elgg_echo("image:delete"), 'confirm' => elgg_echo("image:delete:confirm"), )); - } + } ?>
@@ -123,8 +106,10 @@ else { //tidypics image display name; ?>
'; + } -} + } // end of tidypics image display ?> \ No newline at end of file -- cgit v1.2.3 From 7acd3a2947f7bd92ded5bc5f02baa5db87f6b212 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 18:12:50 +0000 Subject: cleaned up actions - formatting --- actions/addalbum.php | 100 +++++++++++++++++++++------------------------ actions/delete.php | 6 +-- actions/download.php | 7 +--- actions/edit_multi.php | 58 +++++++++++++------------- actions/editalbum.php | 108 +++++++++++++++++++++++-------------------------- actions/icon.php | 13 ++---- actions/upload.php | 33 ++++++++++----- 7 files changed, 156 insertions(+), 169 deletions(-) diff --git a/actions/addalbum.php b/actions/addalbum.php index 127885270..f2d423abd 100644 --- a/actions/addalbum.php +++ b/actions/addalbum.php @@ -1,72 +1,66 @@ - * @copyright Curverider Ltd 2008 - * @link http://elgg.org/ */ // Make sure we're logged in (send us to the front page if not) - if (!isloggedin()) forward(); + if (!isloggedin()) forward(); // Get input data - $title = get_input('albumtitle'); - $body = get_input('albumbody'); - $tags = get_input('albumtags'); - $access = get_input('access_id'); - $container_guid = get_input('container_guid', $_SESSION['user']->getGUID()); - $back_url = 'pg/photos/new/' . get_entity($container_guid)->username; + $title = get_input('albumtitle'); + $body = get_input('albumbody'); + $tags = get_input('albumtags'); + $access = get_input('access_id'); + $container_guid = get_input('container_guid', $_SESSION['user']->getGUID()); + $back_url = 'pg/photos/new/' . get_entity($container_guid)->username; // Cache to the session - $_SESSION['albumtitle'] = $title; - $_SESSION['albumbody'] = $body; - $_SESSION['albumtags'] = $tags; + $_SESSION['albumtitle'] = $title; + $_SESSION['albumbody'] = $body; + $_SESSION['albumtags'] = $tags; // Convert string of tags into a preformatted array - $tagarray = string_to_tag_array($tags); + $tagarray = string_to_tag_array($tags); // Make sure the title / description aren't blank - if (empty($title) || empty($body)) { - register_error(elgg_echo("album:blank")); - forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page + if (empty($title) || empty($body)) { + register_error(elgg_echo("album:blank")); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page - // Otherwise, save the blog post - } else { + // Otherwise, save the album + } else { - // Initialise a new ElggObject - $album = new ElggObject(); - // Tell the system it's an album - $album->subtype = "album"; + // 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(); - // For now, set its access to public (we'll add an access dropdown shortly) - $album->access_id = $access; - // Set its title and description appropriately - $album->title = $title; - $album->description = $body; - // Before we can set metadata, we need to save the blog post - if (!$album->save()) { - register_error(elgg_echo("album:error")); - forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page - } - // Now let's add tags. We can pass an array directly to the object property! Easy. - if (is_array($tagarray)) { - $album->tags = $tagarray; - } - // Success message - system_message(elgg_echo("album:created")); - // Remove the blog post cache - unset($_SESSION['albumtitle']); - unset($_SESSION['albumbody']); - unset($_SESSION['albumtags']); - // Forward to the main blog page - - forward("pg/photos/upload/" . $album->guid); - + // Set its owner to the current user + $album->container_guid = $container_guid; + $album->owner_guid = $_SESSION['user']->getGUID(); + // For now, set its access to public (we'll add an access dropdown shortly) + $album->access_id = $access; + // Set its title and description appropriately + $album->title = $title; + $album->description = $body; + // Before we can set metadata, we need to save the blog post + if (!$album->save()) { + register_error(elgg_echo("album:error")); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page } + // Now let's add tags. We can pass an array directly to the object property! Easy. + if (is_array($tagarray)) { + $album->tags = $tagarray; + } + // Success message + system_message(elgg_echo("album:created")); + // Remove the album post cache + unset($_SESSION['albumtitle']); + unset($_SESSION['albumbody']); + unset($_SESSION['albumtags']); + + forward("pg/photos/upload/" . $album->guid); + } + ?> \ No newline at end of file diff --git a/actions/delete.php b/actions/delete.php index 6b8789fb4..e142e9660 100644 --- a/actions/delete.php +++ b/actions/delete.php @@ -1,12 +1,8 @@ $im){ + foreach($image_guid_array as $key => $im) { $image = get_entity($im); - if ($image->canEdit()){ + if ($image->canEdit()) { - // Convert string of tags into a preformatted array + // Convert string of tags into a preformatted array $tagarray = string_to_tag_array($tags_array[$key]); - //set description appropriately + //set description appropriately $image->title = $title_array[$key]; - //set description appropriately + //set description appropriately $image->description = $caption_array[$key]; - // Before we can set metadata, we need to save the image + // Before we can set metadata, we need to save the image if (!$image->save()) { array_push($not_updated, $image->guid); } - // Now let's add tags. We can pass an array directly to the object property! Easy. + // Now let's add tags. We can pass an array directly to the object property! Easy. $image->clearMetadata('tags'); if (is_array($tagarray)) { $image->tags = $tagarray; } - //if cover meta is sent from image save as metadata - if($cover == $im){ + //if cover meta is sent from image save as metadata + if ($cover == $im) { $album_entity->cover = $im; } } - } - // Success message - if (count($not_updated) > 0) { - register_error(elgg_echo("images:notedited")); - } else { - system_message(elgg_echo("images:edited")); - } + } + + // Success message + if (count($not_updated) > 0) { + register_error(elgg_echo("images:notedited")); + } else { + system_message(elgg_echo("images:edited")); + } - // Forward to the main album page - forward($album_entity->getURL()); - + // Forward to the main album page + forward($album_entity->getURL()); ?> \ No newline at end of file diff --git a/actions/editalbum.php b/actions/editalbum.php index 36b0f7379..78b1f1653 100644 --- a/actions/editalbum.php +++ b/actions/editalbum.php @@ -1,91 +1,85 @@ - * @copyright Curverider Ltd 2008 - * @link http://elgg.org/ */ // Make sure we're logged in (send us to the front page if not) - if (!isloggedin()) forward(); + if (!isloggedin()) forward(); // Get input data - $guid = (int) get_input('albumpost'); - $title = get_input('albumtitle'); - $body = get_input('albumbody'); - $access = get_input('access_id'); - $tags = get_input('albumtags'); - $back_url = 'mod/tidypics/edit.php?file_guid=' . $guid; + $guid = (int) get_input('albumpost'); + $title = get_input('albumtitle'); + $body = get_input('albumbody'); + $access = get_input('access_id'); + $tags = get_input('albumtags'); + $back_url = 'mod/tidypics/edit.php?file_guid=' . $guid; // Make sure we actually have permission to edit - $album = get_entity($guid); - if ($album->canEdit()) - { + $album = get_entity($guid); + if ($album->canEdit()) + { - // Cache to the session - $_SESSION['albumtitle'] = $title; - $_SESSION['albumbody'] = $body; - $_SESSION['albumtags'] = $tags; + // Cache to the session + $_SESSION['albumtitle'] = $title; + $_SESSION['albumbody'] = $body; + $_SESSION['albumtags'] = $tags; - // Convert string of tags into a preformatted array - $tagarray = string_to_tag_array($tags); + // Convert string of tags into a preformatted array + $tagarray = string_to_tag_array($tags); - // Get owning user - $owner = get_entity($album->getOwner()); + // Get owning user + $owner = get_entity($album->getOwner()); - // edit access only if access is different from current - - if($album->access_id != $access) - { - $album->access_id = $access; + // edit access only if access is different from current + if ($album->access_id != $access) + { + $album->access_id = $access; - //get images from album and update access on image entities - $images = get_entities("object","image", $guid, '', 999, '', false); - foreach($images as $im){ - $im->access_id = $access; - $im->save(); - //new core updates all metadata access as well! - } + //get images from album and update access on image entities + $images = get_entities("object","image", $guid, '', 999, '', false); + foreach ($images as $im) { + $im->access_id = $access; + $im->save(); + //new core updates all metadata access as well! } + } // Set its title and description appropriately - $album->title = $title; - $album->description = $body; + $album->title = $title; + $album->description = $body; // Before we can set metadata, we need to save the image - if (!$album->save()) { - register_error(elgg_echo("album:error")); - $album->delete(); - forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page - } + if (!$album->save()) { + register_error(elgg_echo("album:error")); + $album->delete(); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page + } // Now let's add tags. We can pass an array directly to the object property! Easy. - $album->clearMetadata('tags'); - if (is_array($tagarray)) { - $album->tags = $tagarray; - } + $album->clearMetadata('tags'); + if (is_array($tagarray)) { + $album->tags = $tagarray; + } //if cover meta is sent from image save as metadata - if(get_input('cover') == elgg_echo('album:cover:yes')){ - $container = get_entity($album->container_guid); - $container->cover = $album->guid; - } + if (get_input('cover') == elgg_echo('album:cover:yes')) { + $container = get_entity($album->container_guid); + $container->cover = $album->guid; + } // Success message - system_message(elgg_echo("album:edited")); + system_message(elgg_echo("album:edited")); // Remove the image cache - unset($_SESSION['albumtitle']); - unset($_SESSION['albumbody']); - unset($_SESSION['albumtags']); + unset($_SESSION['albumtitle']); + unset($_SESSION['albumbody']); + unset($_SESSION['albumtags']); // Forward to the main blog page - forward($album->getURL()); + forward($album->getURL()); - } + } ?> \ No newline at end of file diff --git a/actions/icon.php b/actions/icon.php index 718425819..bfc18198a 100644 --- a/actions/icon.php +++ b/actions/icon.php @@ -1,18 +1,13 @@ thumbnail; $mime = $file->mimetype; @@ -35,7 +30,7 @@ echo $contents; exit; - } - else + } else { register_error(elgg_echo("file:downloadfailed")); + } ?> \ No newline at end of file diff --git a/actions/upload.php b/actions/upload.php index f969f6f40..896cce8e7 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -17,12 +17,12 @@ $uploaded_images = array(); foreach($_FILES as $key => $sent_file) { - if(!empty($sent_file['name'])) { + if (!empty($sent_file['name'])) { $name = $_FILES[$key]['name']; $mime = $_FILES[$key]['type']; - //make sure file is an image - if($mime == 'image/jpeg' || $mime == 'image/gif' || $mime == 'image/png' || $mime == 'image/pjpeg') { + //make sure file is an image + if ($mime == 'image/jpeg' || $mime == 'image/gif' || $mime == 'image/png' || $mime == 'image/pjpeg') { //this will save to users folder in /image/ and organize by photo album $prefix = "image/" . $container_guid . "/"; $file = new ElggFile(); @@ -52,18 +52,27 @@ $maxfilesize = 10240; //if the file size limit is not set, default to 10MB } $maxfilesize = 1024 * $maxfilesize; //convert to bytes - + //check file size and remove picture if it exceeds the maximum if (filesize($file->getFilenameOnFilestore())<= $maxfilesize) { array_push($uploaded_images, $file->guid); - + // Generate thumbnail //TODO: REMOVE THE BELOW IF STATEMENT ONCE get_resized_image_from_existing_file() ACCEPTS IMAGES OVER 0.9MB IN SIZE if (filesize($file->getFilenameOnFilestore())<= 943718) { //create thumbnails if file size < 0.9MB - try {$thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false); } catch (Exception $e) { $thumblarge = false; } - try {$thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true); } catch (Exception $e) { $thumbsmall = false; } - try {$thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true); } catch (Exception $e) { $thumbnail = false; } + try { + $thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false); + } catch (Exception $e) { $thumblarge = false; } + + try { + $thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true); + } catch (Exception $e) { $thumbsmall = false; } + + try { + $thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true); + } catch (Exception $e) { $thumbnail = false; } } + if ($thumbnail) { $thumb = new ElggFile(); $thumb->setMimeType($mime); @@ -76,6 +85,7 @@ } $thumb->close(); } + if ($thumbsmall) { $thumb = new ElggFile(); $thumb->setMimeType($mime); @@ -88,6 +98,7 @@ } $thumb->close(); } + if ($thumblarge) { $thumb = new ElggFile(); $thumb->setMimeType($mime); @@ -107,11 +118,11 @@ } else { //file was not saved for some unknown reason array_push($not_uploaded, $name); } //end of file saved check and thumbnail creation - } else { // file is not a supported image type + } else { // file is not a supported image type array_push($not_uploaded, $name); - } //end of mimetype block + } //end of mimetype block } //end of file name empty check - } //end of loop + } //end of for loop if (count($not_uploaded) == 0) { system_message(elgg_echo("images:saved")); -- cgit v1.2.3 From 3b5ce30c7f4c2158f26c8ebb7e7bef3e19ece9e9 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 21 Mar 2009 18:50:27 +0000 Subject: added river integration for 1.5 - did not add update album or create/update image --- actions/addalbum.php | 10 ++++++++-- languages/en.php | 6 +++--- views/default/river/object/album/create.php | 15 ++++++++++++--- views/default/tidypics/css.php | 9 +++++++++ 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/actions/addalbum.php b/actions/addalbum.php index f2d423abd..23fdfd22d 100644 --- a/actions/addalbum.php +++ b/actions/addalbum.php @@ -38,12 +38,12 @@ // Set its owner to the current user $album->container_guid = $container_guid; $album->owner_guid = $_SESSION['user']->getGUID(); - // For now, set its access to public (we'll add an access dropdown shortly) $album->access_id = $access; // Set its title and description appropriately $album->title = $title; $album->description = $body; - // Before we can set metadata, we need to save the blog post + + // 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 @@ -53,8 +53,14 @@ if (is_array($tagarray)) { $album->tags = $tagarray; } + + // add to river (check to make sure we're running > Elgg 1.5 first) + if (function_exists('add_to_river')) + add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); + // Success message system_message(elgg_echo("album:created")); + // Remove the album post cache unset($_SESSION['albumtitle']); unset($_SESSION['albumbody']); diff --git a/languages/en.php b/languages/en.php index 7e8d67f39..90c2c8b5a 100644 --- a/languages/en.php +++ b/languages/en.php @@ -67,12 +67,12 @@ //images 'image:river:created' => "%s uploaded", 'image:river:item' => "an image", - 'image:river:annotate' => "%s commented on", + 'image:river:annotate' => "a comment on the image", //albums - 'album:river:created' => "%s created", + 'album:river:created' => "%s created a new photo album: ", 'album:river:item' => "an album", - 'album:river:annotate' => "%s commented on", + 'album:river:annotate' => "a comment on the photo album", // Status messages diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php index 68553309c..fcc87277d 100644 --- a/views/default/river/object/album/create.php +++ b/views/default/river/object/album/create.php @@ -1,13 +1,22 @@ subject_guid); + $album = get_entity($vars['item']->object_guid); + + $url = "getURL()}\">{$performed_by->name}"; + $string = sprintf(elgg_echo("album:river:created"),$url) . " "; + $string .= "getURL() . "\">" . $album->title . ""; +} else { // Elgg 1.2 $statement = $vars['statement']; $performed_by = $statement->getSubject(); $object = $statement->getObject(); - + $url = "getURL()}\">{$performed_by->name}"; $string = sprintf(elgg_echo("album:river:created"),$url) . " "; - $string .= "getURL() . "\">" . elgg_echo("album:river:item") . ""; + $string .= "getURL() . "\">" . $object->title . ""; +} - echo $string; +echo $string; ?> \ No newline at end of file diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index a682ff677..c1957d5d9 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -121,6 +121,15 @@ .river_album_create { background: url(mod/tidypics/graphics/icons/river_icon_album.gif) no-repeat left -1px; } +.river_object_album_create { + background: url(mod/tidypics/graphics/icons/river_icon_album.gif) no-repeat left -1px; +} +.river_object_image_comment { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} +.river_object_album_comment { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} .pagination { clear:both !important; -- cgit v1.2.3 From 744f81dbf2ad98e61dddba8fa21cf74ee7c60989 Mon Sep 17 00:00:00 2001 From: alfalive Date: Sun, 22 Mar 2009 18:36:14 +0000 Subject: FIXED problem for german letters umlaute äöü and ÄÖÜ Importand! (File is stored in UTF-8 Without BOM) by alfalive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- languages/de.php | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/languages/de.php b/languages/de.php index 2d668f72f..5a2d57df5 100644 --- a/languages/de.php +++ b/languages/de.php @@ -5,6 +5,8 @@ * @author Curverider Ltd * @copyright Curverider Ltd 2008 * @link http://elgg.com/ + * + * FIXED problem for german letters umlaute äöü and ÄÖÜ Importand! (File is stored in UTF-8 Without BOM) */ $german = array( @@ -26,37 +28,37 @@ 'album:group' => "Alben der Gruppe", 'item:object:image' => "Photos", 'item:object:album' => "Alben", - 'tidypics:settings:maxfilesize' => "Maximale Dateigre in den Kilobytes (KB):", + 'tidypics:settings:maxfilesize' => "Maximale Dateigröße in den Kilobytes (KB):", //actions 'album:create' => "Neues Album", - 'album:add' => "Fotoalbum hinzufügen", - 'album:addpix' => "Fotos hinzufügen", + 'album:add' => "Fotoalbum hinzufügen", + 'album:addpix' => "Fotos hinzufügen", 'album:edit' => "Album bearbeiten", - 'album:delete' => "Album löschen", + 'album:delete' => "Album löschen", 'image:edit' => "Bild bearbeiten", - 'image:delete' => "Bild löschen", + 'image:delete' => "Bild löschen", 'image:download' => "Download Bild", //forms 'album:title' => "Titel", 'album:desc' => "Beschreibung", - 'album:tags' => "Stichwörter", + 'album:tags' => "Stichwörter", 'album:cover' => "Albumcover erstellen?", 'album:cover:yes' => "Ja", - 'image:access:note' => "(Zugriffsberechtigung wird vom Album übernommen)", + 'image:access:note' => "(Zugriffsberechtigung wird vom Album übernommen)", //views 'image:total' => "Bilder im Album:", - 'image:by' => "Bild hinzugefügt von", + 'image:by' => "Bild hinzugefügt von", 'album:by' => "Album erstellt von:", 'album:created:on' => "Verursacht", - 'image:none' => "Noch keine Bilder hinzugefügt.", - 'image:back' => "Zurück", + 'image:none' => "Noch keine Bilder hinzugefügt.", + 'image:back' => "Zurück", 'image:next' => "Weiter", //widgets @@ -83,30 +85,30 @@ 'image:saved' => "Dein Bild wurde gespeichert.", 'images:saved' => "Alle Bilder wurden gespeichert.", - 'image:deleted' => "Dein Bild wurde gelöscht.", - 'image:delete:confirm' => "Willst Du das Bild wirklich löschen?", + 'image:deleted' => "Dein Bild wurde gelöscht.", + 'image:delete:confirm' => "Willst Du das Bild wirklich löschen?", 'images:edited' => "Dein Bild wurde aktualisiert.", 'album:edited' => "Dein Album wurde aktualisiert.", 'album:saved' => "Dein Album wurde gespeichert.", - 'album:deleted' => "Dein Album wurde gelöscht.", - 'album:delete:confirm' => "Willst Du das Album wirklich löschen?", + 'album:deleted' => "Dein Album wurde gelöscht.", + 'album:delete:confirm' => "Willst Du das Album wirklich löschen?", 'album:created' => "Ihr neues Album ist hergestellt worden.", - 'tidypics:status:processing' => "Warten Sie bitte, whrend wir verarbeiten Ihre Abbildung....", + 'tidypics:status:processing' => "Warten Sie bitte, während wir verarbeiten Ihre Abbildung....", //Error messages 'image:none' => "Kein Bilder gefunden.", 'image:uploadfailed' => "Dateien konnten nicht hochgeladen werden:", - 'image:deletefailed' => "Bild konnte nicht gelöscht werden.", + 'image:deletefailed' => "Bild konnte nicht gelöscht werden.", 'image:downloadfailed' => "Dieses Bild ist nicht diesmal vorhanden.", - 'image:notimage' => 'Wir akzeptieren nur jpeg, gif, und png Dateien der erlaubten Dateigre an.', + 'image:notimage' => 'Wir akzeptieren nur jpeg, gif, und png Dateien der erlaubten Dateigröße an.', 'images:notedited' => 'Nicht alle Bilder konnten hochgeladen werden', 'album:none' => "Keine Alben gefunden.", 'album:uploadfailed' => "Sorry; Dein Album konnte nicht gespeichert werden.", - 'album:deletefailed' => "Dein Album konnte nicht gelöscht werden.", + 'album:deletefailed' => "Dein Album konnte nicht gelöscht werden.", 'album:blank' => "Geben Sie diesem Album einen Titel und eine Beschreibung bitte." ); -- cgit v1.2.3 From 1cfccdbc80a77a8c8713684758b24cd4c06ea136 Mon Sep 17 00:00:00 2001 From: alfalive Date: Wed, 25 Mar 2009 09:39:09 +0000 Subject: Some improvements for better understanding. v1.3 --- languages/de.php | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/languages/de.php b/languages/de.php index 5a2d57df5..08ba226cc 100644 --- a/languages/de.php +++ b/languages/de.php @@ -1,12 +1,13 @@ "Alben der Gruppe", 'item:object:image' => "Photos", 'item:object:album' => "Alben", - 'tidypics:settings:maxfilesize' => "Maximale Dateigröße in den Kilobytes (KB):", + 'tidypics:settings:maxfilesize' => "Maximale Dateigröße in Kilobytes (KB):", //actions @@ -40,7 +41,7 @@ 'image:edit' => "Bild bearbeiten", 'image:delete' => "Bild löschen", - 'image:download' => "Download Bild", + 'image:download' => "Bild herunterladen", //forms @@ -49,14 +50,14 @@ 'album:tags' => "Stichwörter", 'album:cover' => "Albumcover erstellen?", 'album:cover:yes' => "Ja", - 'image:access:note' => "(Zugriffsberechtigung wird vom Album übernommen)", + 'image:access:note' => "Info: Zugriffsberechtigung wird vom Album übernommen", //views 'image:total' => "Bilder im Album:", 'image:by' => "Bild hinzugefügt von", 'album:by' => "Album erstellt von:", - 'album:created:on' => "Verursacht", + 'album:created:on' => "Erstellt", 'image:none' => "Noch keine Bilder hinzugefügt.", 'image:back' => "Zurück", 'image:next' => "Weiter", @@ -86,13 +87,13 @@ 'image:saved' => "Dein Bild wurde gespeichert.", 'images:saved' => "Alle Bilder wurden gespeichert.", 'image:deleted' => "Dein Bild wurde gelöscht.", - 'image:delete:confirm' => "Willst Du das Bild wirklich löschen?", + 'image:delete:confirm' => "Willst du das Bild wirklich löschen?", 'images:edited' => "Dein Bild wurde aktualisiert.", 'album:edited' => "Dein Album wurde aktualisiert.", 'album:saved' => "Dein Album wurde gespeichert.", 'album:deleted' => "Dein Album wurde gelöscht.", - 'album:delete:confirm' => "Willst Du das Album wirklich löschen?", + 'album:delete:confirm' => "Willst du das Album wirklich löschen?", 'album:created' => "Ihr neues Album ist hergestellt worden.", 'tidypics:status:processing' => "Warten Sie bitte, während wir verarbeiten Ihre Abbildung....", @@ -107,9 +108,9 @@ 'images:notedited' => 'Nicht alle Bilder konnten hochgeladen werden', 'album:none' => "Keine Alben gefunden.", - 'album:uploadfailed' => "Sorry; Dein Album konnte nicht gespeichert werden.", + 'album:uploadfailed' => "Dein Album konnte nicht gespeichert werden.", 'album:deletefailed' => "Dein Album konnte nicht gelöscht werden.", - 'album:blank' => "Geben Sie diesem Album einen Titel und eine Beschreibung bitte." + 'album:blank' => "Gib diesem Album einen Titel und eine Beschreibung bitte." ); add_translation("de",$german); -- cgit v1.2.3 From ae5398025febddb796cefeff8075f520de42f00a Mon Sep 17 00:00:00 2001 From: alfalive Date: Wed, 25 Mar 2009 11:08:23 +0000 Subject: Issue 8: Fixed. Language Files updated --- edit_multi.php | 5 ++--- languages/de.php | 4 +++- languages/es.php | 4 +++- languages/pl.php | 2 ++ views/default/tidypics/forms/edit_multi.php | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/edit_multi.php b/edit_multi.php index dd58759fe..161822769 100644 --- a/edit_multi.php +++ b/edit_multi.php @@ -29,9 +29,8 @@ } } - - $title = elgg_echo('tidypics:editprops'); - $area2 .= elgg_view_title($title); + + $area2 .= elgg_view_title(elgg_echo('tidypics:editprops')); $area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid)); $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); page_draw($title, $body); diff --git a/languages/de.php b/languages/de.php index 08ba226cc..ace7dcd6c 100644 --- a/languages/de.php +++ b/languages/de.php @@ -2,7 +2,7 @@ /** * Elgg tidypics plugin german language pack * - * @version 1.3 (Changes in this version: Improvements for better understanding) + * @version 1.2 * @author Modified and fixed by Dieter Konrad aka alfalive * @contact http://community.elgg.org/pg/profile/alfalive * @copyright Curverider Ltd 2008 @@ -30,6 +30,8 @@ 'item:object:image' => "Photos", 'item:object:album' => "Alben", 'tidypics:settings:maxfilesize' => "Maximale Dateigröße in Kilobytes (KB):", + + 'tidypics:editprops' => "Bildeigenschaften Bearbeiten", //actions diff --git a/languages/es.php b/languages/es.php index babb87068..11a787ae4 100644 --- a/languages/es.php +++ b/languages/es.php @@ -28,7 +28,9 @@ 'item:object:image' => "Fotos", 'item:object:album' => "Állbums", 'tidypics:settings:maxfilesize' => "Tamaño máximo en kilo bytes (KB):", - + + 'tidypics:editprops' => "Editar propiedades de imagen", + //actions 'album:create' => "Nuevo álbum", diff --git a/languages/pl.php b/languages/pl.php index 047b17220..280e3f859 100644 --- a/languages/pl.php +++ b/languages/pl.php @@ -28,6 +28,8 @@ 'item:object:image' => "Zdjęcia", 'item:object:album' => "Albumy", 'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):", + + 'tidypics:editprops' => 'Edycja obrazu Właściwości', //actions diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php index ebd2ef11a..8b239b12e 100644 --- a/views/default/tidypics/forms/edit_multi.php +++ b/views/default/tidypics/forms/edit_multi.php @@ -33,7 +33,7 @@ echo '

'; echo '' . "\n"; echo ''; - echo elgg_view("input/multi_radio", array( "internalname" => "cover", "value" => $guid, 'options' => array('yes'), 'set' => $cover)); + echo elgg_view("input/multi_radio", array( "internalname" => "cover", "value" => $guid, 'options' => array(elgg_echo('album:cover:yes')), 'set' => $cover)); echo '
'; echo ''; -- cgit v1.2.3 From 8c059e6c1413d82b556aa54de3fc9c2ed6a0e01b Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 27 Mar 2009 11:10:40 +0000 Subject: fix for previous --- edit_multi.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/edit_multi.php b/edit_multi.php index 161822769..5b78e6691 100644 --- a/edit_multi.php +++ b/edit_multi.php @@ -30,8 +30,9 @@ } } - $area2 .= elgg_view_title(elgg_echo('tidypics:editprops')); - $area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid)); + $title = elgg_echo('tidypics:editprops'); + $area2 .= elgg_view_title($title); + $area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid)); $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); page_draw($title, $body); ?> \ No newline at end of file -- cgit v1.2.3 From 43b593441635366a0cc4ebc530a9d5ec43facc8f Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 27 Mar 2009 11:24:37 +0000 Subject: This will be 1.5 version --- contributions.txt | 11 ++++++++--- manifest.xml | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contributions.txt b/contributions.txt index 65dd95c5a..0097069eb 100644 --- a/contributions.txt +++ b/contributions.txt @@ -11,17 +11,22 @@ See individual change logs for contributors to those builds ------------------------------------------------------------------------ -Version 1.09 Change List +Version 1.5 Change List Release Date: ??/??/2009 Contributors: * Gabriel Monge-Franco (http://gabriel.mongefranco.com) * Cash Costello + * alfalive (http://community.elgg.org/pg/profile/alfalive) ------------------------------------------------------------------------ -BEGIN VERSION 1.09 CHANGES +BEGIN VERSION 1.5 CHANGES ------------------------------------------------------------------------ * Fixed submenus on sidebar of album pages +* Fixed display issues for Elgg 1.5 +* Using default site access now +* Pushing new album creation to river +* Fixed German language file ------------------------------------------------------------------------ -END VERSION 1.09 CHANGES +END VERSION 1.5 CHANGES ------------------------------------------------------------------------ diff --git a/manifest.xml b/manifest.xml index 2cdfa8579..4778c13c6 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,7 +1,7 @@ - + -- cgit v1.2.3 From 569d4dce1dc656b90b5c5ac193785570c75dcecf Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 27 Mar 2009 11:43:18 +0000 Subject: not displaying readonly access levels on individual albums anymore (I think it was ugly) --- views/default/tidypics/forms/edit.php | 5 ----- views/default/tidypics/forms/edit_multi.php | 1 - views/default/tidypics/forms/upload.php | 3 --- 3 files changed, 9 deletions(-) diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php index bef87c64b..08fe5cc81 100644 --- a/views/default/tidypics/forms/edit.php +++ b/views/default/tidypics/forms/edit.php @@ -90,11 +90,6 @@ "cover", "value" => $cover, 'options' => array(elgg_echo('album:cover:yes')))); ?>

-

- - 'access_id','value' => $access_id)); ?> -

- '; } - echo elgg_echo('image:access:note'); ?>

diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php index be87c8697..8cc9af897 100644 --- a/views/default/tidypics/forms/upload.php +++ b/views/default/tidypics/forms/upload.php @@ -57,9 +57,6 @@ function showhide(layer_ref) {

- - 'access_id','value' => $access_id)); ?> -

Date: Fri, 27 Mar 2009 12:00:43 +0000 Subject: can now enable/disable photo albums for groups --- languages/en.php | 2 +- start.php | 9 ++++++--- views/default/tidypics/groupprofile_albums.php | 4 ++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/languages/en.php b/languages/en.php index 90c2c8b5a..0ba223a8c 100644 --- a/languages/en.php +++ b/languages/en.php @@ -20,7 +20,7 @@ 'item:object:image' => "Photos", 'item:object:album' => "Albums", 'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):", - + 'tidypics:enablephotos' => 'Enable Group Photo Albums', 'tidypics:editprops' => 'Edit Image Properties', //actions diff --git a/start.php b/start.php index a0162319c..660e20de5 100644 --- a/start.php +++ b/start.php @@ -40,6 +40,7 @@ register_entity_type('object','image'); register_entity_type('object','album'); + add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true); } /** @@ -94,9 +95,11 @@ } if (isloggedin() && ($page_owner instanceof ElggGroup)) { - add_submenu_item(sprintf(elgg_echo("album:user"),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, - 'photo_albums'); + if ($page_owner->photos_enable != "no") { + add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, + 'photo_albums'); + } } } diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php index ea11006fa..ff63a38d1 100644 --- a/views/default/tidypics/groupprofile_albums.php +++ b/views/default/tidypics/groupprofile_albums.php @@ -1,4 +1,7 @@ photos_enable != 'no') { + //the number of files to display $number = (int) $vars['entity']->num_display; //if no number has been set, default to 5 @@ -57,4 +60,5 @@ } //close group_albums_widget div echo ""; +} ?> \ No newline at end of file -- cgit v1.2.3 From d17f91a236cd3008aa888736db894b1e898e91d5 Mon Sep 17 00:00:00 2001 From: alfalive Date: Fri, 27 Mar 2009 21:48:27 +0000 Subject: Added: string 'tidypics:enablephotos' => "Erlaube Gruppen-Galerie", --- languages/de.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/languages/de.php b/languages/de.php index ace7dcd6c..c92bf7c0e 100644 --- a/languages/de.php +++ b/languages/de.php @@ -30,7 +30,7 @@ 'item:object:image' => "Photos", 'item:object:album' => "Alben", 'tidypics:settings:maxfilesize' => "Maximale Dateigröße in Kilobytes (KB):", - + 'tidypics:enablephotos' => "Erlaube Gruppen-Galerie", 'tidypics:editprops' => "Bildeigenschaften Bearbeiten", //actions -- cgit v1.2.3 From 4e5bdc632ed8d27d42b4213cdb654e759255c1a1 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 02:31:16 +0000 Subject: major cleanup of view album --- viewalbum.php | 50 +++++++++++++++++++------------------------------- 1 file changed, 19 insertions(+), 31 deletions(-) diff --git a/viewalbum.php b/viewalbum.php index 2a5999379..092ad76a8 100644 --- a/viewalbum.php +++ b/viewalbum.php @@ -6,38 +6,26 @@ include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - // Get the GUID of the entity we want to view - $guid = (int) get_input('guid'); - - $context = get_input('context'); - if ($context) set_context($context); - - // Get the entity, if possible - if ($entity = get_entity($guid)) { - - if ($entity->container_guid) { - set_page_owner($entity->container_guid); - } else { - set_page_owner($entity->owner_guid); - } - - // Set the body to be the full view of the entity, and the title to be its title - if ($entity instanceof ElggObject) { - $title = $entity->title; - } else if ($entity instanceof ElggEntity) { - $title = $entity->name; - } - - $area2 = elgg_view_title($title); - - $area2 .= elgg_view_entity($entity, true); - - // Otherwise? - } else { - } - + // get the album entity + $album_guid = (int) get_input('guid'); + $album = get_entity($album_guid); + + // panic if we can't get it + if (!$album) forward(); + + // container should always be set, but just in case + if ($album->container_guid) + set_page_owner($album->container_guid); + else + set_page_owner($album->owner_guid); + + $owner = page_owner_entity(); + + // set title and body + $title = $album->title; + $area2 = elgg_view_title($title); + $area2 .= elgg_view_entity($album, true); $body = elgg_view_layout('two_column_left_sidebar', '', $area2); - // Display the page page_draw($title, $body); ?> \ No newline at end of file -- cgit v1.2.3 From 8275ddfe8ebe821f1062f280696d475940461ba9 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 02:34:37 +0000 Subject: starting to work on group menus - what a mess --- start.php | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/start.php b/start.php index 660e20de5..16923787e 100644 --- a/start.php +++ b/start.php @@ -20,7 +20,7 @@ // Extend CSS extend_view('css', 'tidypics/css'); - // Extend hover-over and profile menu + // Extend hover-over and profile menu extend_view('profile/menu/links','tidypics/menu'); //group view ** psuedo widget view for group pages** @@ -52,8 +52,14 @@ $page_owner = page_owner_entity(); + if ($page_owner instanceof ElggGroup) { + if ($page_owner->photos_enable != "no") { + add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); + } + } // context is only set to photos on individual pages, not on group pages - if (get_context() == "photos") { + else if (get_context() == "photos") { // owner gets "your albumn", "your friends albums" if (get_loggedin_userid() == $page_owner->guid && get_loggedin_userid()) { @@ -67,7 +73,7 @@ add_submenu_item( elgg_echo('album:yours:friends'), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, - 'tidypics'); + 'tidypics'); } else if (isloggedin()) { // logged nut not owner gets "your albums", "page owners albums", "page owner's friends albums" add_submenu_item( elgg_echo("album:yours"), @@ -75,32 +81,25 @@ 'tidypics' ); add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, - 'tidypics' ); + 'tidypics' ); add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, - 'tidypics'); + 'tidypics'); } else if ($page_owner->guid) { // non logged in user gets "page owners albums", "page owner's friends albums" add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, - 'tidypics' ); + 'tidypics' ); add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, - 'tidypics'); + 'tidypics'); } add_submenu_item( sprintf(elgg_echo('album:all'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/world/", - 'tidypics'); + 'tidypics'); } - if (isloggedin() && ($page_owner instanceof ElggGroup)) { - if ($page_owner->photos_enable != "no") { - add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, - 'photo_albums'); - } - } } /** @@ -116,27 +115,27 @@ { switch($page[0]) { - case "owned": //view list of albums owned by container - if (isset($page[1])) set_input('username',$page[1]); - include($CONFIG->pluginspath . "tidypics/index.php"); + case "owned": //view list of albums owned by container + if (isset($page[1])) set_input('username',$page[1]); + include($CONFIG->pluginspath . "tidypics/index.php"); break; - case "view": //view an image individually + case "view": //view an image individually set_input('guid',$page[1]); - include($CONFIG->pluginspath . "tidypics/viewimage.php"); + include($CONFIG->pluginspath . "tidypics/viewimage.php"); break; - case "album": //view an album individually + case "album": //view an album individually set_input('guid',$page[1]); include($CONFIG->pluginspath . "tidypics/viewalbum.php"); break; - case "new": //create new album + case "new": //create new album if (isset($page[1])) set_input('username',$page[1]); include($CONFIG->pluginspath . "tidypics/newalbum.php"); break; - case "upload": //upload images to album + case "upload": //upload images to album if (isset($page[1])) set_input('container_guid',$page[1]); include($CONFIG->pluginspath . "tidypics/upload.php"); break; @@ -167,14 +166,14 @@ * @param ElggEntity $entity album/image entity * @return string File URL */ - function image_url($entity) { + function image_url($entity) { global $CONFIG; $title = $entity->title; $title = friendly_title($title); return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title; } - function album_url($entity) { + function album_url($entity) { global $CONFIG; $title = $entity->title; $title = friendly_title($title); -- cgit v1.2.3 From 09619e09ed4544a0529231bfc8dd81ec719f2810 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 03:01:00 +0000 Subject: moved edit and delete to page handler - need to update links --- actions/delete.php | 4 ++-- edit.php | 30 +++++++++++++++------------ start.php | 59 +++++++++++++++++++++++++++++++----------------------- viewalbum.php | 17 ++++++++++++++++ 4 files changed, 70 insertions(+), 40 deletions(-) diff --git a/actions/delete.php b/actions/delete.php index e142e9660..5c275003e 100644 --- a/actions/delete.php +++ b/actions/delete.php @@ -8,8 +8,8 @@ //if not logged in, see world pictures instead if (!isloggedin()) forward('pg/photos/world'); - $guid = (int) get_input('file'); - $forward_url = 'pg/photos/world'; //forward to world pictures if there is an unknown error + $guid = (int) get_input('guid'); + $forward_url = 'pg/photos/world'; //forward to world pictures if there is an unknown error if ($photoObject = get_entity($guid)) { if ($photoObject->canEdit()) { diff --git a/edit.php b/edit.php index 3e597cf05..b84d74724 100644 --- a/edit.php +++ b/edit.php @@ -1,39 +1,43 @@ canEdit()) + if (!$entity->canEdit()) forward(); - $subtype = $file->getSubtype(); + $subtype = $entity->getSubtype(); if ($subtype == 'album') { - if($container = $file->container_guid) - set_page_owner($container); - $title = elgg_echo('album:edit'); + + if ($container = $entity->container_guid) + set_page_owner($container); + } else if ($subtype == 'image') { - if ($container = get_entity($file->container_guid)->container_guid) - set_page_owner($container); - $title = elgg_echo('image:edit'); + + if ($container = get_entity($entity->container_guid)->container_guid) + set_page_owner($container); + } else { forward(); } $area2 .= elgg_view_title($title); - $area2 .= elgg_view('tidypics/forms/edit', array('entity' => $file, 'subtype' => $subtype)); + $area2 .= elgg_view('tidypics/forms/edit', array('entity' => $entity, 'subtype' => $subtype)); $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); + page_draw($title, $body); ?> \ No newline at end of file diff --git a/start.php b/start.php index 16923787e..798becce4 100644 --- a/start.php +++ b/start.php @@ -113,48 +113,57 @@ if (isset($page[0])) { - switch($page[0]) - { + switch($page[0]) + { case "owned": //view list of albums owned by container if (isset($page[1])) set_input('username',$page[1]); include($CONFIG->pluginspath . "tidypics/index.php"); - break; - - case "view": //view an image individually - set_input('guid',$page[1]); + break; + + case "view": //view an image individually + if (isset($page[1])) set_input('guid',$page[1]); include($CONFIG->pluginspath . "tidypics/viewimage.php"); break; case "album": //view an album individually - set_input('guid',$page[1]); + if (isset($page[1])) set_input('guid',$page[1]); include($CONFIG->pluginspath . "tidypics/viewalbum.php"); break; case "new": //create new album if (isset($page[1])) set_input('username',$page[1]); - include($CONFIG->pluginspath . "tidypics/newalbum.php"); - break; - - case "upload": //upload images to album + include($CONFIG->pluginspath . "tidypics/newalbum.php"); + break; + + case "upload": //upload images to album if (isset($page[1])) set_input('container_guid',$page[1]); - include($CONFIG->pluginspath . "tidypics/upload.php"); - break; - - case "friends": + include($CONFIG->pluginspath . "tidypics/upload.php"); + break; + + case "edit": //edit image or album + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/edit.php"); + break; + + case "delete": //edit image or album + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/actions/delete.php"); + break; + + case "friends": if (isset($page[1])) set_input('username',$page[1]); - include($CONFIG->pluginspath . "tidypics/friends.php"); - break; - - case "world": - include($CONFIG->pluginspath . "tidypics/world.php"); - break; - - } + include($CONFIG->pluginspath . "tidypics/friends.php"); + break; + + case "world": + include($CONFIG->pluginspath . "tidypics/world.php"); + break; + + } } else { - // Include the standard profile index - if (isset($page[1])) set_input('username',$page[1]); + // going to the index because something is wrong with the page handler include($CONFIG->pluginspath . "tidypics/index.php"); } diff --git a/viewalbum.php b/viewalbum.php index 092ad76a8..d80a3d8e6 100644 --- a/viewalbum.php +++ b/viewalbum.php @@ -21,6 +21,23 @@ $owner = page_owner_entity(); + // setup group menu + if ($owner instanceof ElggGroup) { + add_submenu_item( elgg_echo('album:create'), + $CONFIG->wwwroot . 'pg/photos/new/' . $owner->username, + 'tidypics'); + add_submenu_item( elgg_echo('album:addpix'), + $CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid, + 'tidypics'); + add_submenu_item( elgg_echo('album:edit'), + $CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid, + 'tidypics'); + add_submenu_item( elgg_echo('album:delete'), + $CONFIG->wwwroot . 'pg/photos/delete/' . $album_guid, + 'tidypics', + true); + } + // set title and body $title = $album->title; $area2 = elgg_view_title($title); -- cgit v1.2.3 From c7b327cf230a19358e6bc78b9782627839f2d9f7 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 03:07:41 +0000 Subject: better menus for view album for both group and individuals --- viewalbum.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/viewalbum.php b/viewalbum.php index d80a3d8e6..c216273cd 100644 --- a/viewalbum.php +++ b/viewalbum.php @@ -25,19 +25,20 @@ if ($owner instanceof ElggGroup) { add_submenu_item( elgg_echo('album:create'), $CONFIG->wwwroot . 'pg/photos/new/' . $owner->username, - 'tidypics'); - add_submenu_item( elgg_echo('album:addpix'), - $CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid, - 'tidypics'); - add_submenu_item( elgg_echo('album:edit'), - $CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid, - 'tidypics'); - add_submenu_item( elgg_echo('album:delete'), - $CONFIG->wwwroot . 'pg/photos/delete/' . $album_guid, - 'tidypics', - true); + 'photos'); } + add_submenu_item( elgg_echo('album:addpix'), + $CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid, + 'photos'); + add_submenu_item( elgg_echo('album:edit'), + $CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid, + 'photos'); + add_submenu_item( elgg_echo('album:delete'), + $CONFIG->wwwroot . 'pg/photos/delete/' . $album_guid, + 'photos', + true); + // set title and body $title = $album->title; $area2 = elgg_view_title($title); -- cgit v1.2.3 From e0eebd803e76bae0d7aa6456427667c90b4e2368 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 03:11:11 +0000 Subject: better english string for add photos --- languages/en.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/en.php b/languages/en.php index 0ba223a8c..e076ee8de 100644 --- a/languages/en.php +++ b/languages/en.php @@ -27,8 +27,8 @@ 'album:create' => "Create new album", 'album:add' => "Add Photo Album", - 'album:addpix' => "Add photos to", - 'album:edit' => "Edit album", + 'album:addpix' => "Add photos to album", + 'album:edit' => "Edit album", 'album:delete' => "Delete album", 'image:edit' => "Edit image", -- cgit v1.2.3 From 5107faa7e96efd940ce28da9f46508298759c189 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 03:34:25 +0000 Subject: --- viewimage.php | 53 +++++++++++++------------- views/default/object/album.php | 17 --------- views/default/object/image.php | 13 +------ views/default/tidypics/css.php | 29 ++++++++++++++ views/default/tidypics/groupprofile_albums.php | 10 ++--- 5 files changed, 62 insertions(+), 60 deletions(-) diff --git a/viewimage.php b/viewimage.php index 85e8d8215..8231bef3d 100644 --- a/viewimage.php +++ b/viewimage.php @@ -9,34 +9,35 @@ // Load Elgg engine include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - // Get the GUID of the entity we want to view - $guid = (int) get_input('guid'); - - $context = get_input('context'); - if ($context) set_context($context); - - // Get the entity, if possible - if ($entity = get_entity($guid)) { - - //set "real" container - image container is the album , group/user is the album container - $top_container = get_entity($entity->container_guid)->container_guid; - - if ($top_container) { - set_page_owner($top_container); - } else { - set_page_owner($entity->owner_guid); - } - - $title = $entity->title; - $area2 = elgg_view_title($title); - $area2 .= elgg_view_entity($entity, true); - - } else { - $body = elgg_echo('notfound'); + // get the album entity + $photo_guid = (int) get_input('guid'); + $photo = get_entity($photo_guid); + + // panic if we can't get it + if (!$photo) forward(); + + // container of photo should always be set, but just in case + set_page_owner($photo->owner_guid); + $album = get_entity($photo->container_guid); + if ($album) { + $owner_guid = $album->container_guid; + if ($owner_guid) + set_page_owner($owner_guid); } - + + add_submenu_item( elgg_echo('image:edit'), + $CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid, + 'photos'); + add_submenu_item( elgg_echo('image:delete'), + $CONFIG->wwwroot . 'pg/photos/delete/' . $photo_guid, + 'photos', + true); + + $title = $photo->title; + $area2 = elgg_view_title($title); + $area2 .= elgg_view_entity($photo, true); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); - // Display the page page_draw($title, $body); ?> \ No newline at end of file diff --git a/views/default/object/album.php b/views/default/object/album.php index a1b238812..a94f12590 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -63,23 +63,6 @@ '.autop($desc).''; - if ($file->canEdit()) { // add controls - -?> -

- "> -   - - $vars['url'] . "action/tidypics/delete?file=" . $file->getGUID(), - 'text' => elgg_echo("album:delete"), - 'confirm' => elgg_echo("album:delete:confirm"), - )); - ?> -
-'; ?>
-   -canEdit()) { // add edit controls -?> -   - $vars['url'] . "action/tidypics/delete?file=" . $file->getGUID(), - 'text' => elgg_echo("image:delete"), - 'confirm' => elgg_echo("image:delete:confirm"), - )); - } - ?> +

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index c1957d5d9..3c935e8c5 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -27,6 +27,35 @@ margin:10px; } +#group_albums_widget { +-webkit-border-radius: 8px; +-moz-border-radius: 8px; +background:white none repeat scroll 0 0; +margin:0 0 20px; +padding:0 0 5px; +} + +.tidypics_download a { + font: 12px/100% Arial, Helvetica, sans-serif; + font-weight: bold; + color: white; + background:#4690d6; + border:none; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + width: auto; + height: 25px; + padding: 3px 6px 3px 6px; + margin:10px 0 10px 0; + cursor: pointer; +} +.tidypics_download a:hover { + background: black; + color:white; + text-decoration: none; +} + + /* independent album view only */ .album_images{ diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php index ff63a38d1..d975f5f99 100644 --- a/views/default/tidypics/groupprofile_albums.php +++ b/views/default/tidypics/groupprofile_albums.php @@ -11,7 +11,7 @@ if ($vars['entity']->photos_enable != 'no') { $owner = page_owner_entity(); $owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false); - echo '
'; + echo '
'; echo '

' . elgg_echo('albums') . '

'; if ($owner_albums) { @@ -50,11 +50,11 @@ if ($vars['entity']->photos_enable != 'no') { echo "
"; } else { - echo '
'; - echo '

'.elgg_echo("album:none").'

'; + //echo '
'; + //echo '

'.elgg_echo("album:none").'

'; if ($owner && ($owner->canWriteToContainer($_SESSION['user']))){ - echo 'username.'>'.elgg_echo("album:add").''; - echo '
'; + //echo 'username.'>'.elgg_echo("album:add").''; + //echo '
'; } } -- cgit v1.2.3 From 9e4cce719aafe736f784a3b7a886e5b5ba3c9ae8 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 03:35:06 +0000 Subject: added a menu option to group album listing --- index.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 6b17e12e8..ac480b528 100644 --- a/index.php +++ b/index.php @@ -13,10 +13,19 @@ //if page owner cannot be found, forward to user's pictures instead (or world if not logged in) if (is_null($owner->username) || empty($owner->username)) { //if not logged in, see world pictures instead - if (!isloggedin()) forward('pg/photos/world'); + if (!isloggedin()) + forward('pg/photos/world'); + forward('pg/photos/owned/' . $_SESSION['user']->username); } + // setup group menu for album index + if ($owner instanceof ElggGroup) { + add_submenu_item( elgg_echo('album:create'), + $CONFIG->wwwroot . 'pg/photos/new/' . $owner->username, + 'tidypics'); + } + //set the title $title = sprintf(elgg_echo('album:user'), "$owner->name"); $area2 = elgg_view_title($title); -- cgit v1.2.3 From 6b8b1e26a6bc0e0ee0f0970f430e9240f23bd0d1 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 03:45:20 +0000 Subject: setting owner correctly for edit multi --- edit_multi.php | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/edit_multi.php b/edit_multi.php index 5b78e6691..501e23102 100644 --- a/edit_multi.php +++ b/edit_multi.php @@ -8,17 +8,26 @@ gatekeeper(); set_context('photos'); - - $page_owner = page_owner_entity(); - if ($page_owner === false || is_null($page_owner)) { - $page_owner = $_SESSION['user']; - set_page_owner($page_owner->getGUID()); - } - + + // parse out photo guids $file_string = get_input('files'); $file_array_sent = explode('-', $file_string); $new_file_array = array(); - + + // set owner of page based on first photo guid + $photo_guid = (int)$file_array_sent[0]; + $photo = get_entity($photo_guid); + error_log($photo_guid); + + // set page owner based on owner of photo album + set_page_owner($photo->owner_guid); + $album = get_entity($photo->container_guid); + if ($album) { + $owner_guid = $album->container_guid; + if ($owner_guid) + set_page_owner($owner_guid); + } + foreach ($file_array_sent as $file_guid) { if ($entity = get_entity($file_guid)) { if ($entity->canEdit()){ -- cgit v1.2.3 From 770ba36d1a9c7aba5eb232f7b694e8a597dab33c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 03:48:30 +0000 Subject: updated comment --- viewimage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewimage.php b/viewimage.php index 8231bef3d..6734fdffd 100644 --- a/viewimage.php +++ b/viewimage.php @@ -16,7 +16,7 @@ // panic if we can't get it if (!$photo) forward(); - // container of photo should always be set, but just in case + // set page owner based on owner of photo album set_page_owner($photo->owner_guid); $album = get_entity($photo->container_guid); if ($album) { -- cgit v1.2.3 From af9554060b79fbfecbc8583e4e4d6e69dd7ea06f Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 12:44:59 +0000 Subject: cleaned up upload page handler --- upload.php | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/upload.php b/upload.php index dda327ef8..48a8ea522 100644 --- a/upload.php +++ b/upload.php @@ -8,35 +8,30 @@ gatekeeper(); global $CONFIG; + $album_guid = (int) get_input('container_guid'); + if (!$album_guid) + forward(); + + $album = get_entity($album_guid); - // Get the current page's owner - if ($album = (int) get_input('container_guid')) - { - $album_entity = get_entity($album); - - //if album does not exist or user does not have access - if(!$album_entity || !$album_entity->canEdit()) - forward('pg/photos/owned/'); - - //set group to "real" container - $container = $album_entity->container_guid; - set_page_owner($container); + //if album does not exist or user does not have access + if (!$album || !$album->canEdit()) { + // throw warning and forward to previous page + forward($_SERVER['HTTP_REFERER']); } - else - forward('pg/photos/owned/'); - + + // set page owner based on container (user or group) + $container = $album->container_guid; + set_page_owner($container); + $page_owner = page_owner_entity(); - if ($page_owner === false || is_null($page_owner)) { - $page_owner = $_SESSION['user']; - set_page_owner($page_owner->getGUID()); - } - + set_context('photos'); - $title = elgg_echo('album:addpix') . ' ' . $album_entity->title; + $title = elgg_echo('album:addpix') . ': ' . $album->title; $area2 .= elgg_view_title($title); - $area2 .= elgg_view("tidypics/forms/upload", array('album' => $album ) ); - $body = elgg_view_layout('two_column_left_sidebar', '', $area2, $area3); + $area2 .= elgg_view("tidypics/forms/upload", array('album' => $album_guid ) ); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); page_draw($title, $body); ?> \ No newline at end of file -- cgit v1.2.3 From 91f0c4a6d70d50de603b01ffb72b36e04122e29d Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 12:55:35 +0000 Subject: fixed access id bug on upload --- views/default/tidypics/forms/upload.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php index 8cc9af897..f430fb04f 100644 --- a/views/default/tidypics/forms/upload.php +++ b/views/default/tidypics/forms/upload.php @@ -5,6 +5,7 @@ $container_guid = get_input('container_guid'); $access_id = get_entity($vars['album'])->access_id; + if (get_plugin_setting('maxfilesize','tidypics')) { if (((int) get_plugin_setting('maxfilesize','tidypics')) < 1 || ((int) get_plugin_setting('maxfilesize','tidypics')) > 1048576) { $maxfilesize = 10240; //if file size is less than 1KB or greater than 1GB, default to 10MB @@ -60,8 +61,9 @@ function showhide(layer_ref) {

'; - + echo ''; + if ($access_id) + echo ''; ?> " onclick="showhide('tidypics_loader');" />

-- cgit v1.2.3 From d66faaf360f2f629fa96dd5e04ff0c6e38eb8213 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 13:03:15 +0000 Subject: changing name of edit action since it works for both images and albums --- actions/edit.php | 85 +++++++++++++++++++++++++++++++++++ actions/editalbum.php | 85 ----------------------------------- start.php | 2 +- views/default/tidypics/forms/edit.php | 2 +- 4 files changed, 87 insertions(+), 87 deletions(-) create mode 100644 actions/edit.php delete mode 100644 actions/editalbum.php diff --git a/actions/edit.php b/actions/edit.php new file mode 100644 index 000000000..78b1f1653 --- /dev/null +++ b/actions/edit.php @@ -0,0 +1,85 @@ +canEdit()) + { + + // Cache to the session + $_SESSION['albumtitle'] = $title; + $_SESSION['albumbody'] = $body; + $_SESSION['albumtags'] = $tags; + + // Convert string of tags into a preformatted array + $tagarray = string_to_tag_array($tags); + + // Get owning user + $owner = get_entity($album->getOwner()); + + // edit access only if access is different from current + if ($album->access_id != $access) + { + $album->access_id = $access; + + //get images from album and update access on image entities + $images = get_entities("object","image", $guid, '', 999, '', false); + foreach ($images as $im) { + $im->access_id = $access; + $im->save(); + //new core updates all metadata access as well! + } + } + + + // Set its title and description appropriately + $album->title = $title; + $album->description = $body; + + // Before we can set metadata, we need to save the image + if (!$album->save()) { + register_error(elgg_echo("album:error")); + $album->delete(); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page + } + + // Now let's add tags. We can pass an array directly to the object property! Easy. + $album->clearMetadata('tags'); + if (is_array($tagarray)) { + $album->tags = $tagarray; + } + + //if cover meta is sent from image save as metadata + if (get_input('cover') == elgg_echo('album:cover:yes')) { + $container = get_entity($album->container_guid); + $container->cover = $album->guid; + } + + // Success message + system_message(elgg_echo("album:edited")); + + // Remove the image cache + unset($_SESSION['albumtitle']); + unset($_SESSION['albumbody']); + unset($_SESSION['albumtags']); + + // Forward to the main blog page + forward($album->getURL()); + + } +?> \ No newline at end of file diff --git a/actions/editalbum.php b/actions/editalbum.php deleted file mode 100644 index 78b1f1653..000000000 --- a/actions/editalbum.php +++ /dev/null @@ -1,85 +0,0 @@ -canEdit()) - { - - // Cache to the session - $_SESSION['albumtitle'] = $title; - $_SESSION['albumbody'] = $body; - $_SESSION['albumtags'] = $tags; - - // Convert string of tags into a preformatted array - $tagarray = string_to_tag_array($tags); - - // Get owning user - $owner = get_entity($album->getOwner()); - - // edit access only if access is different from current - if ($album->access_id != $access) - { - $album->access_id = $access; - - //get images from album and update access on image entities - $images = get_entities("object","image", $guid, '', 999, '', false); - foreach ($images as $im) { - $im->access_id = $access; - $im->save(); - //new core updates all metadata access as well! - } - } - - - // Set its title and description appropriately - $album->title = $title; - $album->description = $body; - - // Before we can set metadata, we need to save the image - if (!$album->save()) { - register_error(elgg_echo("album:error")); - $album->delete(); - forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page - } - - // Now let's add tags. We can pass an array directly to the object property! Easy. - $album->clearMetadata('tags'); - if (is_array($tagarray)) { - $album->tags = $tagarray; - } - - //if cover meta is sent from image save as metadata - if (get_input('cover') == elgg_echo('album:cover:yes')) { - $container = get_entity($album->container_guid); - $container->cover = $album->guid; - } - - // Success message - system_message(elgg_echo("album:edited")); - - // Remove the image cache - unset($_SESSION['albumtitle']); - unset($_SESSION['albumbody']); - unset($_SESSION['albumtags']); - - // Forward to the main blog page - forward($album->getURL()); - - } -?> \ No newline at end of file diff --git a/start.php b/start.php index 798becce4..f9df12603 100644 --- a/start.php +++ b/start.php @@ -196,7 +196,7 @@ // Register actions register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php"); register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php"); - register_action("tidypics/editalbum", false, $CONFIG->pluginspath. "tidypics/actions/editalbum.php"); + register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php"); register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php"); register_action("tidypics/icon", true, $CONFIG->pluginspath. "tidypics/actions/icon.php"); register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php"); diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php index 08fe5cc81..d59d029cc 100644 --- a/views/default/tidypics/forms/edit.php +++ b/views/default/tidypics/forms/edit.php @@ -10,7 +10,7 @@ //set stuff if we are editing existing album or image if (isset($vars['entity'])) { $title = sprintf(elgg_echo("album:edit"),$object->title); - $action = "tidypics/editalbum"; + $action = "tidypics/edit"; $title = $vars['entity']->title; $body = $vars['entity']->description; $tags = $vars['entity']->tags; -- cgit v1.2.3 From 871395b74470a70e37aeb684b820e289b0930cba Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 14:10:18 +0000 Subject: fixed bug with access levels and improved image and album editing --- actions/edit.php | 121 ++++++++++++++++------------------ views/default/tidypics/forms/edit.php | 82 ++++++++++------------- 2 files changed, 91 insertions(+), 112 deletions(-) diff --git a/actions/edit.php b/actions/edit.php index 78b1f1653..a5d84bc18 100644 --- a/actions/edit.php +++ b/actions/edit.php @@ -1,7 +1,7 @@ canEdit()) - { + $guid = (int) get_input('guid'); // guid of image or album + $title = get_input('title'); + $body = get_input('descript'); + $access = get_input('access_id'); + $tags = get_input('tags'); + $subtype = get_input('subtype'); - // Cache to the session - $_SESSION['albumtitle'] = $title; - $_SESSION['albumbody'] = $body; - $_SESSION['albumtags'] = $tags; - - // Convert string of tags into a preformatted array - $tagarray = string_to_tag_array($tags); - - // Get owning user - $owner = get_entity($album->getOwner()); - - // edit access only if access is different from current - if ($album->access_id != $access) - { - $album->access_id = $access; + $container_guid = get_input('container_guid'); + error_log('container_guid is ' . $container_guid); + + // Make sure we actually have permission to edit + $entity = get_entity($guid); + if (!$entity->canEdit()) { + forward(); + } + + // Get owning user/group + error_log("owning user is " . $entity->getOwner()); + $owner = get_entity($entity->getOwner()); + + // change access only if access is different from current + if ($subtype == 'album' && $entity->access_id != $access) { + $entity->access_id = $access; - //get images from album and update access on image entities - $images = get_entities("object","image", $guid, '', 999, '', false); - foreach ($images as $im) { - $im->access_id = $access; - $im->save(); - //new core updates all metadata access as well! - } + //get images from album and update access on image entities + $images = get_entities("object","image", $guid, '', 999, '', false); + foreach ($images as $im) { + $im->access_id = $access; + $im->save(); } + } - // Set its title and description appropriately - $album->title = $title; - $album->description = $body; + // Set its title and description appropriately + $entity->title = $title; + $entity->description = $body; - // Before we can set metadata, we need to save the image - if (!$album->save()) { - register_error(elgg_echo("album:error")); - $album->delete(); - forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page - } + // Before we can set metadata, we need to save the entity + if (!$entity->save()) { + register_error(elgg_echo("album:error")); + $entity->delete(); + forward($_SERVER['HTTP_REFERER']); //failed, so forward to previous page + } - // Now let's add tags. We can pass an array directly to the object property! Easy. - $album->clearMetadata('tags'); - if (is_array($tagarray)) { - $album->tags = $tagarray; - } - - //if cover meta is sent from image save as metadata - if (get_input('cover') == elgg_echo('album:cover:yes')) { - $container = get_entity($album->container_guid); - $container->cover = $album->guid; - } - - // Success message + // Now let's add tags + $tagarray = string_to_tag_array($tags); + $entity->clearMetadata('tags'); + if (is_array($tagarray)) { + $entity->tags = $tagarray; + } + + //if cover meta is sent from image save as metadata + if ($subtype == 'image' && get_input('cover') == elgg_echo('album:cover:yes')) { + $album = get_entity($container_guid); + $album->cover = $entity->guid; + } + + // Success message + if ($subtype == 'album') system_message(elgg_echo("album:edited")); - - // Remove the image cache - unset($_SESSION['albumtitle']); - unset($_SESSION['albumbody']); - unset($_SESSION['albumtags']); - - // Forward to the main blog page - forward($album->getURL()); + else + system_message(elgg_echo('images:edited')); - } + forward($entity->getURL()); ?> \ No newline at end of file diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php index d59d029cc..0ed8cffab 100644 --- a/views/default/tidypics/forms/edit.php +++ b/views/default/tidypics/forms/edit.php @@ -1,26 +1,24 @@ title); $action = "tidypics/edit"; $title = $vars['entity']->title; $body = $vars['entity']->description; $tags = $vars['entity']->tags; $access_id = $vars['entity']->access_id; $subtype = $vars['subtype']; - + // if nothing is sent, create new, but only new albums are sent here // new images are sent to upload.php } else { - $title = elgg_echo("album:add"); $action = "tidypics/addalbum"; $tags = ""; $title = ""; @@ -29,87 +27,77 @@ $access_id = ACCESS_DEFAULT; else $access_id = 0; + $subtype = 'album'; } - - // in case we have some cached details - if (isset($vars['albumtitle'])) { - $title = $vars['albumtitle']; - $body = $vars['albumbody']; - $tags = $vars['albumtags']; - } - - $container_guid = get_input('container_guid'); - if (!$container_guid) $container_guid = page_owner(); + + // group or individual + $container_guid = page_owner(); ?>

- "albumtitle", "value" => $title,)); ?> + "title", "value" => $title,)); ?>

-

- "albumbody","value" => $body,)); ?> + "descript","value" => $body,)); ?>

- "albumbody","value" => $body,)); ?> + "descript","value" => $body,)); ?>

- "albumtags","value" => $tags,)); ?> + "tags","value" => $tags,)); ?>

- guid; $container_guid = $vars['entity']->container_guid; $cover_guid = get_entity($container_guid)->cover; - if($cover_guid == $vars['entity']->guid) $cover = 'yes'; - ?> +?>

"cover", "value" => $cover, 'options' => array(elgg_echo('album:cover:yes')))); ?>

- +

- - 'access_id','value' => $access_id)); ?> -

- - + 'access_id','value' => $access_id)); ?> +

+ + - - + + - +?> + +

\ No newline at end of file -- cgit v1.2.3 From 2f94fa464bdc62e4e4a394f231df88ee84b33502 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 14:29:55 +0000 Subject: trying to make menus more consistent --- edit.php | 7 +++++++ index.php | 15 ++++++++++++++- newalbum.php | 5 +++++ start.php | 8 +++++--- upload.php | 4 ++++ viewalbum.php | 2 ++ viewimage.php | 6 ++++++ 7 files changed, 43 insertions(+), 4 deletions(-) diff --git a/edit.php b/edit.php index b84d74724..0f099a9ad 100644 --- a/edit.php +++ b/edit.php @@ -35,6 +35,13 @@ forward(); } + $page_owner = page_owner_entity(); + if ($page_owner instanceof ElggGroup) { + add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); + } + + $area2 .= elgg_view_title($title); $area2 .= elgg_view('tidypics/forms/edit', array('entity' => $entity, 'subtype' => $subtype)); $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); diff --git a/index.php b/index.php index ac480b528..fb3e94dd4 100644 --- a/index.php +++ b/index.php @@ -10,6 +10,14 @@ //get the owner of the current page $owner = page_owner_entity(); + //$album + + if ($owner instanceof ElggGroup) { + + } + + error_log($owner->guid); + //if page owner cannot be found, forward to user's pictures instead (or world if not logged in) if (is_null($owner->username) || empty($owner->username)) { //if not logged in, see world pictures instead @@ -21,6 +29,8 @@ // setup group menu for album index if ($owner instanceof ElggGroup) { + add_submenu_item( sprintf(elgg_echo('album:group'),$owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $owner->username); add_submenu_item( elgg_echo('album:create'), $CONFIG->wwwroot . 'pg/photos/new/' . $owner->username, 'tidypics'); @@ -33,7 +43,10 @@ // Get objects set_context('search'); set_input('search_viewtype', 'gallery'); - $area2 .= list_entities("object", "album", page_owner(), 10); + if ($owner instanceof ElggGroup) + $area2 .= list_entities_groups("album", 0, $owner->guid, 10); + else + $area2 .= list_entities("object", "album", $owner->guid, 10); set_context('photos'); $body = elgg_view_layout('two_column_left_sidebar', '', $area2); diff --git a/newalbum.php b/newalbum.php index 95cdb7860..44e0e07a7 100644 --- a/newalbum.php +++ b/newalbum.php @@ -16,6 +16,11 @@ set_page_owner($_SESSION['guid']); } + if ($page_owner instanceof ElggGroup) { + add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); + } + $area2 = elgg_view_title(elgg_echo('album:add')); $area2 .= elgg_view("tidypics/forms/edit"); diff --git a/start.php b/start.php index f9df12603..e2fbbe15e 100644 --- a/start.php +++ b/start.php @@ -53,9 +53,11 @@ $page_owner = page_owner_entity(); if ($page_owner instanceof ElggGroup) { - if ($page_owner->photos_enable != "no") { - add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); + if (get_context() == "groups") { + if ($page_owner->photos_enable != "no") { + add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); + } } } // context is only set to photos on individual pages, not on group pages diff --git a/upload.php b/upload.php index 48a8ea522..71beb8752 100644 --- a/upload.php +++ b/upload.php @@ -25,6 +25,10 @@ set_page_owner($container); $page_owner = page_owner_entity(); + if ($page_owner instanceof ElggGroup) { + add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); + } set_context('photos'); $title = elgg_echo('album:addpix') . ': ' . $album->title; diff --git a/viewalbum.php b/viewalbum.php index c216273cd..2a89742a1 100644 --- a/viewalbum.php +++ b/viewalbum.php @@ -23,6 +23,8 @@ // setup group menu if ($owner instanceof ElggGroup) { + add_submenu_item( sprintf(elgg_echo('album:group'),$owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $owner->username); add_submenu_item( elgg_echo('album:create'), $CONFIG->wwwroot . 'pg/photos/new/' . $owner->username, 'photos'); diff --git a/viewimage.php b/viewimage.php index 6734fdffd..a303fbe3c 100644 --- a/viewimage.php +++ b/viewimage.php @@ -25,6 +25,12 @@ set_page_owner($owner_guid); } + $page_owner = page_owner_entity(); + if ($page_owner instanceof ElggGroup) { + add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); + } + add_submenu_item( elgg_echo('image:edit'), $CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid, 'photos'); -- cgit v1.2.3 From bdf0d61336b878f2e26fc42f98327834423fb409 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 14:43:48 +0000 Subject: not including tag area if no tags --- views/default/object/image.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index 79939bfbb..67fd87bfb 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -91,7 +91,13 @@
-
$tags));?>
+ +
$tags));?>
+ name; ?>
Date: Sat, 28 Mar 2009 14:46:35 +0000 Subject: not displaying edit menus for those without group membership --- index.php | 9 ++------- viewalbum.php | 30 +++++++++++++++++------------- viewimage.php | 16 +++++++++------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/index.php b/index.php index fb3e94dd4..0ba8a6c51 100644 --- a/index.php +++ b/index.php @@ -10,13 +10,6 @@ //get the owner of the current page $owner = page_owner_entity(); - //$album - - if ($owner instanceof ElggGroup) { - - } - - error_log($owner->guid); //if page owner cannot be found, forward to user's pictures instead (or world if not logged in) if (is_null($owner->username) || empty($owner->username)) { @@ -31,9 +24,11 @@ if ($owner instanceof ElggGroup) { add_submenu_item( sprintf(elgg_echo('album:group'),$owner->name), $CONFIG->wwwroot . "pg/photos/owned/" . $owner->username); + if (can_write_to_container(0, $owner->guid)) { add_submenu_item( elgg_echo('album:create'), $CONFIG->wwwroot . 'pg/photos/new/' . $owner->username, 'tidypics'); + } } //set the title diff --git a/viewalbum.php b/viewalbum.php index 2a89742a1..4bdd1a2c7 100644 --- a/viewalbum.php +++ b/viewalbum.php @@ -25,21 +25,25 @@ if ($owner instanceof ElggGroup) { add_submenu_item( sprintf(elgg_echo('album:group'),$owner->name), $CONFIG->wwwroot . "pg/photos/owned/" . $owner->username); - add_submenu_item( elgg_echo('album:create'), - $CONFIG->wwwroot . 'pg/photos/new/' . $owner->username, - 'photos'); } - add_submenu_item( elgg_echo('album:addpix'), - $CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid, - 'photos'); - add_submenu_item( elgg_echo('album:edit'), - $CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid, - 'photos'); - add_submenu_item( elgg_echo('album:delete'), - $CONFIG->wwwroot . 'pg/photos/delete/' . $album_guid, - 'photos', - true); + if (can_write_to_container(0, $album->container_guid)) { + if ($owner instanceof ElggGroup) { + add_submenu_item( elgg_echo('album:create'), + $CONFIG->wwwroot . 'pg/photos/new/' . $owner->username, + 'photos'); + } + add_submenu_item( elgg_echo('album:addpix'), + $CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid, + 'photos'); + add_submenu_item( elgg_echo('album:edit'), + $CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid, + 'photos'); + add_submenu_item( elgg_echo('album:delete'), + $CONFIG->wwwroot . 'pg/photos/delete/' . $album_guid, + 'photos', + true); + } // set title and body $title = $album->title; diff --git a/viewimage.php b/viewimage.php index a303fbe3c..fa05bda00 100644 --- a/viewimage.php +++ b/viewimage.php @@ -31,13 +31,15 @@ $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); } - add_submenu_item( elgg_echo('image:edit'), - $CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid, - 'photos'); - add_submenu_item( elgg_echo('image:delete'), - $CONFIG->wwwroot . 'pg/photos/delete/' . $photo_guid, - 'photos', - true); + if (can_write_to_container(0, $album->container_guid)) { + add_submenu_item( elgg_echo('image:edit'), + $CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid, + 'photos'); + add_submenu_item( elgg_echo('image:delete'), + $CONFIG->wwwroot . 'pg/photos/delete/' . $photo_guid, + 'photos', + true); + } $title = $photo->title; $area2 = elgg_view_title($title); -- cgit v1.2.3 From a9010a793da35f76d01edbca97ec40079cc0a9e2 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 15:20:08 +0000 Subject: group members can now work with photo albums --- edit.php | 2 +- start.php | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/edit.php b/edit.php index 0f099a9ad..b61f6ba0f 100644 --- a/edit.php +++ b/edit.php @@ -6,7 +6,7 @@ include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - gatekeeper(); + gatekeeper(); // make sure the user is logged_in set_context('photos'); $guid = (int) get_input('guid'); diff --git a/start.php b/start.php index e2fbbe15e..dc1456a57 100644 --- a/start.php +++ b/start.php @@ -41,6 +41,8 @@ register_entity_type('object','album'); add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true); + + register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override'); } /** @@ -170,7 +172,29 @@ } } + + /** + * Override permissions for group albums and images + * + */ + function tidypics_permission_override($hook, $entity_type, $returnvalue, $params) + { + $entity = $params['entity']; + $user = $params['user']; + if ($entity->subtype == get_subtype_id('object', 'album')) { + // test that the user can edit the container + return can_write_to_container(0, $entity->container_guid); + } + + if ($entity->subtype == get_subtype_id('object', 'image')) { + // test that the user can edit the container + return can_write_to_container(0, $entity->container_guid); + } + + return false; + } + /** * Populates the ->getUrl() method for file objects * -- cgit v1.2.3 From 5ef1dd4c79fd5413a1983a4faf96cf3a44c024ba Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 16:31:12 +0000 Subject: removed unnecessary quotes --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 0ba8a6c51..721e91866 100644 --- a/index.php +++ b/index.php @@ -32,7 +32,7 @@ } //set the title - $title = sprintf(elgg_echo('album:user'), "$owner->name"); + $title = sprintf(elgg_echo('album:user'), $owner->name); $area2 = elgg_view_title($title); // Get objects -- cgit v1.2.3 From e45a654715c5db44e60527513d7d8255f8d20221 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 17:46:24 +0000 Subject: cleaned up and standardized the css markup --- views/default/object/album.php | 4 +- views/default/object/image.php | 8 +- views/default/tidypics/css.php | 198 +++++++++++-------------- views/default/tidypics/forms/edit_multi.php | 6 +- views/default/tidypics/forms/upload.php | 2 +- views/default/tidypics/groupprofile_albums.php | 12 +- views/default/widgets/album_view/view.php | 14 +- 7 files changed, 112 insertions(+), 132 deletions(-) diff --git a/views/default/object/album.php b/views/default/object/album.php index a94f12590..63e60a339 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -21,9 +21,9 @@ //get album cover if one was set if($file->cover) - $album_cover = 'thumbnail'; + $album_cover = 'thumbnail'; else - $album_cover = 'new album'; + $album_cover = 'new album'; ?>
diff --git a/views/default/object/image.php b/views/default/object/image.php index 67fd87bfb..3aa9bab8e 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -19,7 +19,7 @@ if (get_input('search_viewtype') == "gallery") { ?> -
+
thumbnail
-
+
thumbnail
' . autop($desc) . '
'; - echo '
'; - echo '
' . $back . $next . '
'; + echo '
'; + echo '
' . $back . $next . '
'; if ($next) echo ''; echo '' . $title . ''; if ($next) echo ''; diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 3c935e8c5..44590b676 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -3,145 +3,130 @@ * tidypics CSS extender */ ?> - /* --- independent view for image/album SHARED --- */ - -#tidypics_title{ - font-size:1.2em; - font-weight:bold; -} -#tidypics_desc{ - padding:0 20px; - font-style:italic; -} -#tidypics_info{ - padding:20px; - line-height:1.5em; +/* ---- tidypics object views ---- */ + +#tidypics_desc { +padding:0 20px; +font-style:italic; } -#tidypics_controls{ - text-align:center; - margin-bottom:10px; +#tidypics_info { +padding:20px; } -#tidypics_controls a{ - margin:10px; +#tidypics_controls { +text-align:center; +margin-bottom:10px; } -#group_albums_widget { --webkit-border-radius: 8px; --moz-border-radius: 8px; -background:white none repeat scroll 0 0; -margin:0 0 20px; -padding:0 0 5px; +#tidypics_controls a { +margin:10px; } .tidypics_download a { - font: 12px/100% Arial, Helvetica, sans-serif; - font-weight: bold; - color: white; - background:#4690d6; - border:none; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - width: auto; - height: 25px; - padding: 3px 6px 3px 6px; - margin:10px 0 10px 0; - cursor: pointer; +font:12px/100% Arial, Helvetica, sans-serif; +font-weight:bold; +color:white; +background:#4690d6; +border:none; +-webkit-border-radius: 5px; +-moz-border-radius: 5px; +width:auto; +height:25px; +padding:3px 6px 3px 6px; +margin:10px 0 10px 0; +cursor:pointer; } + .tidypics_download a:hover { - background: black; - color:white; - text-decoration: none; +background:black; +color:white; +text-decoration:none; } - - /* independent album view only */ - -.album_images{ - float:left; - width:160px; - height:160px; - margin:4px; - padding:5px; - border:1px solid #cccccc; - text-align:center; +.tidypics_album_images { +float:left; +width:153px; +height:153px; +margin:3px; +padding:4px; +border:1px solid #dedede; +text-align:center; } - /* independent image view only */ - -#image_full{ - text-align:center; - margin:10px; -} -#image_full img{ - padding:5px; - border:1px solid #cccccc; - margin:7px 0; +#tidypics_image_full { +text-align:center; +margin:10px; } -/* --- albums gallery view --- */ - -.album_cover{ - padding:2px; - border:1px solid #cccccc; - margin:8px 0; +#tidypics_image_full img { +padding:5px; +border:1px solid #dedede; +margin:7px 0; } +.tidypics_album_cover { +padding:2px; +border:1px solid #dedede; +margin:8px 0; +} -/* ------ album WIDGET VIEW ------ */ - -#album_widget_container{ - text-align:center; +.tidypics_album_widget_single_item { +margin-bottom:8px; } -.album_widget_single_item{ +/* ------ tidypics widget view ------ */ +#tidypics_album_widget_container { +text-align:center; } -.album_widget_title{ -} -.album_widget_timestamp { - color:#666666; - margin:0; -} -.collapsable_box #album_widget_layout { - margin:0; +.tidypics_album_widget_timestamp { +color:#333333; } /* --------- image upload/edit forms ------------ */ -#image_upload_list li{ - margin:3px 0; +#tidpics_image_upload_list li { +margin:3px 0; } -.edit_image_container{ - padding:5px; - margin:5px 0; - overflow:auto; + +.tidypics_edit_image_container { +padding:5px; +margin:5px 0; +overflow:auto; } -.edit_images{ - float:right; - width:160px; - height:160px; - margin:4px; - padding:5px; - border:1px solid #cccccc; - text-align:center; + +.tidypics_edit_images { +float:right; +width:160px; +height:160px; +margin:4px; +padding:5px; +border:1px solid #dedede; +text-align:center; } -.image_info{ - float:left; - width:60%; + +.tidypics_image_info { +float:left; +width:60%; } -.image_info label{ - font-size:1em; + +.tidypics_image_info label { +font-size:1em; } -.edit_image{ - float:right; - border:1px solid #cccccc; - width:153px; - height:153px; + +/* ---- tidypics group css ----- */ + +#group_albums_widget { +-webkit-border-radius: 8px; +-moz-border-radius: 8px; +background:white none repeat scroll 0 0; +margin:0 0 20px; +padding:0 0 5px; } + /* --------- tidypics river items ------------ */ .river_image_create { @@ -158,9 +143,4 @@ padding:0 0 5px; } .river_object_album_comment { background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; -} - -.pagination { - clear:both !important; -} - \ No newline at end of file +} \ No newline at end of file diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php index 354600798..24755e9cf 100644 --- a/views/default/tidypics/forms/edit_multi.php +++ b/views/default/tidypics/forms/edit_multi.php @@ -19,9 +19,9 @@ $container_guid = $entity->container_guid; if($no_cover && !$cover) $cover = $guid; - echo '
'; - echo '' . $title . ''; - echo '
'; + echo '
'; + echo '' . $title . ''; + echo '
'; echo '

'; echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n"; echo '

'; diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php index f430fb04f..e93d3f5ba 100644 --- a/views/default/tidypics/forms/upload.php +++ b/views/default/tidypics/forms/upload.php @@ -49,7 +49,7 @@ function showhide(layer_ref) {

-
    +
      ' . elgg_view("input/file",array('internalname' => "upload_$x")) . "\n"; diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php index d975f5f99..de61b0845 100644 --- a/views/default/tidypics/groupprofile_albums.php +++ b/views/default/tidypics/groupprofile_albums.php @@ -15,19 +15,19 @@ if ($vars['entity']->photos_enable != 'no') { echo '

      ' . elgg_echo('albums') . '

      '; if ($owner_albums) { - echo '
      '; + echo '
      '; foreach($owner_albums as $album){ //get album cover if one was set if($album->cover) - $album_cover = 'album cover'; + $album_cover = 'album cover'; else - $album_cover = 'new album'; + $album_cover = 'new album'; ?> -
      -
      title;?>
      -
      time_created);?>
      +
      +
      title;?>
      +
      time_created);?>
      '; - + echo '
      '; + foreach($owner_albums as $album){ //get album cover if one was set if($album->cover) - $album_cover = '' . $album->title . ''; + $album_cover = '' . $album->title . ''; else - $album_cover = '' . $album->title . ''; + $album_cover = '' . $album->title . ''; ?> -
      -
      title;?>
      -
      time_created);?>
      +
      +
      title;?>
      +
      time_created);?>
      Date: Sat, 28 Mar 2009 18:14:57 +0000 Subject: condensed group "widget" and profile widget to one view --- views/default/tidypics/albums.php | 45 +++++++++++++++++++ views/default/tidypics/groupprofile_albums.php | 61 ++------------------------ views/default/widgets/album_view/view.php | 43 +----------------- 3 files changed, 50 insertions(+), 99 deletions(-) create mode 100644 views/default/tidypics/albums.php diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php new file mode 100644 index 000000000..de56f08e1 --- /dev/null +++ b/views/default/tidypics/albums.php @@ -0,0 +1,45 @@ +'; + foreach($owner_albums as $album) { + + if($album->cover) + $album_cover = '' . $album->title . ''; + else + $album_cover = '' . $album->title . ''; +?> +
      +
      title;?>
      +
      time_created);?>
      +getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")
      "; +?> + +
      +username) || empty($owner->username)) { + echo '' . elgg_echo('album:all') . ''; + } else { + echo '' . elgg_echo('album:more') . ''; + } + + //close album_widget_container div + echo "
      "; + + } +?> \ No newline at end of file diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php index de61b0845..060c540d4 100644 --- a/views/default/tidypics/groupprofile_albums.php +++ b/views/default/tidypics/groupprofile_albums.php @@ -1,64 +1,9 @@ photos_enable != 'no') { - - //the number of files to display - $number = (int) $vars['entity']->num_display; - //if no number has been set, default to 5 - if (!$number) - $number = 5; - - $owner = page_owner_entity(); - $owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false); - echo '
      '; - echo '

      ' . elgg_echo('albums') . '

      '; - - if ($owner_albums) { - echo '
      '; - foreach($owner_albums as $album){ - - //get album cover if one was set - if($album->cover) - $album_cover = 'album cover'; - else - $album_cover = 'new album'; - - ?> -
      -
      title;?>
      -
      time_created);?>
      - getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")
      "; - ?> - -
      - username) || empty($owner->username)) { - echo '' . elgg_echo('album:all') . ''; - } else { - echo '' . elgg_echo('album:more') . ''; - } - - //close album_widget_container div - echo "
      "; - } else { - - //echo '
      '; - //echo '

      '.elgg_echo("album:none").'

      '; - if ($owner && ($owner->canWriteToContainer($_SESSION['user']))){ - //echo 'username.'>'.elgg_echo("album:add").''; - //echo '
      '; - } - - } - //close group_albums_widget div - echo "
      "; + echo '

      ' . elgg_echo('album:group') . '

      '; + echo elgg_view('tidypics/albums', array('num_albums' => 5)); + echo '
      '; } ?> \ No newline at end of file diff --git a/views/default/widgets/album_view/view.php b/views/default/widgets/album_view/view.php index b8b206b22..b4248df35 100644 --- a/views/default/widgets/album_view/view.php +++ b/views/default/widgets/album_view/view.php @@ -1,52 +1,13 @@
      num_display; //if no number has been set, default to 5 if (!$number) $number = 5; - - $owner = page_owner_entity(); - $owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false); - if ($owner_albums) { - echo '
      '; - - foreach($owner_albums as $album){ - - //get album cover if one was set - if($album->cover) - $album_cover = '' . $album->title . ''; - else - $album_cover = '' . $album->title . ''; - ?> -
      -
      title;?>
      -
      time_created);?>
      - getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")
      "; - ?> - -
      - username; - echo "" . elgg_echo('album:more') . ""; - echo "
      "; - - } else { - - echo '

      ' . elgg_echo("album:none") . '

      '; + echo elgg_view('tidypics/albums', array('num_albums' => $number)); - if (get_loggedin_userid() == page_owner()) { - echo '

      username.'>'.elgg_echo("album:create").'

      '; - } - - } ?>
      \ No newline at end of file -- cgit v1.2.3 From 0618c124e147cae2b11a229b21a8d0d03ed9eb61 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 18:22:41 +0000 Subject: going back to individual entity call since group call is partially broken in elgg core --- index.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 721e91866..6ac4ca7a5 100644 --- a/index.php +++ b/index.php @@ -39,7 +39,8 @@ set_context('search'); set_input('search_viewtype', 'gallery'); if ($owner instanceof ElggGroup) - $area2 .= list_entities_groups("album", 0, $owner->guid, 10); + $area2 .= list_entities("object", "album", $owner->guid, 10); + //$area2 .= list_entities_groups("album", 0, $owner->guid, 10); else $area2 .= list_entities("object", "album", $owner->guid, 10); -- cgit v1.2.3 From 38335addc0fdcf3d798bfc783b0f159eb5c5c2d6 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 18:23:01 +0000 Subject: minor css tweak --- views/default/object/album.php | 2 +- views/default/tidypics/css.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/views/default/object/album.php b/views/default/object/album.php index 63e60a339..3507e6047 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -26,7 +26,7 @@ $album_cover = 'new album'; ?> -
      +


      name;?>
      diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 44590b676..f9163ce08 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -75,6 +75,10 @@ margin:8px 0; margin-bottom:8px; } +.tidypics_album_gallery_item { +text-align:center; +} + /* ------ tidypics widget view ------ */ #tidypics_album_widget_container { -- cgit v1.2.3 From 51bdec218af83488cd15a05c8d731e67fdd22264 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 18:44:25 +0000 Subject: fixed sticky form for album creation --- actions/addalbum.php | 40 +++++++++++++++++------------------ actions/edit.php | 10 ++++----- views/default/tidypics/forms/edit.php | 18 +++++++++++----- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/actions/addalbum.php b/actions/addalbum.php index 23fdfd22d..b9954f1c6 100644 --- a/actions/addalbum.php +++ b/actions/addalbum.php @@ -8,32 +8,30 @@ if (!isloggedin()) forward(); // Get input data - $title = get_input('albumtitle'); - $body = get_input('albumbody'); - $tags = get_input('albumtags'); + $title = get_input('tidypicstitle'); + $body = get_input('tidypicsbody'); + $tags = get_input('tidypicstags'); $access = get_input('access_id'); $container_guid = get_input('container_guid', $_SESSION['user']->getGUID()); - $back_url = 'pg/photos/new/' . get_entity($container_guid)->username; - + // Cache to the session - $_SESSION['albumtitle'] = $title; - $_SESSION['albumbody'] = $body; - $_SESSION['albumtags'] = $tags; - + $_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 / description aren't blank - if (empty($title) || empty($body)) { - register_error(elgg_echo("album:blank")); - forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //failed, so forward to previous page - + $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"; + $album->subtype = "album"; // Set its owner to the current user $album->container_guid = $container_guid; @@ -62,11 +60,11 @@ system_message(elgg_echo("album:created")); // Remove the album post cache - unset($_SESSION['albumtitle']); - unset($_SESSION['albumbody']); - unset($_SESSION['albumtags']); + unset($_SESSION['tidypicstitle']); + unset($_SESSION['tidypicsbody']); + unset($_SESSION['tidypicstags']); - forward("pg/photos/upload/" . $album->guid); + forward("pg/photos/upload/" . $album->guid); } - + ?> \ No newline at end of file diff --git a/actions/edit.php b/actions/edit.php index a5d84bc18..5eab8caff 100644 --- a/actions/edit.php +++ b/actions/edit.php @@ -10,14 +10,13 @@ // Get input data $guid = (int) get_input('guid'); // guid of image or album - $title = get_input('title'); - $body = get_input('descript'); + $title = get_input('tidypicstitle'); + $body = get_input('tidypicsbody'); $access = get_input('access_id'); - $tags = get_input('tags'); + $tags = get_input('tidypicstags'); $subtype = get_input('subtype'); $container_guid = get_input('container_guid'); - error_log('container_guid is ' . $container_guid); // Make sure we actually have permission to edit $entity = get_entity($guid); @@ -26,7 +25,6 @@ } // Get owning user/group - error_log("owning user is " . $entity->getOwner()); $owner = get_entity($entity->getOwner()); // change access only if access is different from current @@ -73,4 +71,4 @@ system_message(elgg_echo('images:edited')); forward($entity->getURL()); -?> \ No newline at end of file +?> diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php index 0ed8cffab..d7df138b4 100644 --- a/views/default/tidypics/forms/edit.php +++ b/views/default/tidypics/forms/edit.php @@ -22,12 +22,20 @@ $action = "tidypics/addalbum"; $tags = ""; $title = ""; - $description = ""; + $body = ""; if (defined('ACCESS_DEFAULT')) $access_id = ACCESS_DEFAULT; else $access_id = 0; $subtype = 'album'; + + $title = $_SESSION['tidypicstitle']; + $body = $_SESSION['tidypicsbody']; + $tags = $_SESSION['tidypicstags']; + + unset($_SESSION['tidypicstitle']); + unset($_SESSION['tidypicsbody']); + unset($_SESSION['tidypicstags']); } // group or individual @@ -38,28 +46,28 @@

      - "title", "value" => $title,)); ?> + "tidypicstitle", "value" => $title,)); ?>

      - "descript","value" => $body,)); ?> + "tidypicsbody","value" => $body,)); ?>

      - "descript","value" => $body,)); ?> + "tidypicsbody","value" => $body,)); ?>

      - "tags","value" => $tags,)); ?> + "tidypicstags","value" => $tags,)); ?>

      Date: Sat, 28 Mar 2009 18:54:18 +0000 Subject: moved river create new album event to first upload so people don't see the new album in activity before any photos have been uploaded --- actions/addalbum.php | 6 +++--- actions/upload.php | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/actions/addalbum.php b/actions/addalbum.php index b9954f1c6..3e7a12e87 100644 --- a/actions/addalbum.php +++ b/actions/addalbum.php @@ -52,9 +52,9 @@ $album->tags = $tagarray; } - // add to river (check to make sure we're running > Elgg 1.5 first) - if (function_exists('add_to_river')) - add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); + // we catch the adding images to new albums in the upload action and throw a river new album event + $album->new_album = 1; + // Success message system_message(elgg_echo("album:created")); diff --git a/actions/upload.php b/actions/upload.php index 896cce8e7..b506cde5b 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -131,11 +131,19 @@ foreach($not_uploaded as $im_name){ $error .= ' [' . $im_name . '] '; } - $error .= ' ' . elgg_echo("image:notimage"); + $error .= ' ' . elgg_echo("image:notimage"); register_error($error); } //end of upload check if (count($uploaded_images)>0) { + // successful upload so check if this is a new album and throw river event if so + $album = get_entity($container_guid); + if ($album->new_album == 1) { + if (function_exists('add_to_river')) + add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); + $album->new_album = 0; + } + forward($CONFIG->wwwroot . 'mod/tidypics/edit_multi.php?files=' . implode('-', $uploaded_images)); //forward to multi-image edit page } else { forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page -- cgit v1.2.3 From 803d32e0a49325ad961161be193a9ad73e3dc211 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 19:12:34 +0000 Subject: added basic notifications on album creation --- edit_multi.php | 3 +-- languages/en.php | 6 +++++- start.php | 28 ++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/edit_multi.php b/edit_multi.php index 501e23102..570245595 100644 --- a/edit_multi.php +++ b/edit_multi.php @@ -17,7 +17,6 @@ // set owner of page based on first photo guid $photo_guid = (int)$file_array_sent[0]; $photo = get_entity($photo_guid); - error_log($photo_guid); // set page owner based on owner of photo album set_page_owner($photo->owner_guid); @@ -44,4 +43,4 @@ $area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid)); $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2); page_draw($title, $body); -?> \ No newline at end of file +?> diff --git a/languages/en.php b/languages/en.php index e076ee8de..6b2d51374 100644 --- a/languages/en.php +++ b/languages/en.php @@ -72,7 +72,11 @@ //albums 'album:river:created' => "%s created a new photo album: ", 'album:river:item' => "an album", - 'album:river:annotate' => "a comment on the photo album", + 'album:river:annotate' => "a comment on the photo album", + + // notifications + 'tidypics:newalbum' => 'New photo album', + // Status messages diff --git a/start.php b/start.php index dc1456a57..abf285f7e 100644 --- a/start.php +++ b/start.php @@ -43,6 +43,13 @@ add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true); register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override'); + + // Register for notifications + if (is_callable('register_notification_object')) { + register_notification_object('object', 'album', elgg_echo('tidypics:newalbum')); + + register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message'); + } } /** @@ -195,6 +202,27 @@ return false; } + + /** + * Notification message handler + */ + function tidypics_notify_message($hook, $entity_type, $returnvalue, $params) + { + $entity = $params['entity']; + $to_entity = $params['to_entity']; + $method = $params['method']; + if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'album')) + { + $descr = $entity->description; + $title = $entity->title; + if ($method == 'email') { + $owner = $entity->getOwnerEntity(); + return sprintf(elgg_echo('album:river:created'), $owner->username) . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); + } + } + return null; + } + /** * Populates the ->getUrl() method for file objects * -- cgit v1.2.3 From 6d809ea91c1898e0dfe169bc470f099072f88652 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 19:17:28 +0000 Subject: just need to track down one more bug before releasing --- contributions.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/contributions.txt b/contributions.txt index 0097069eb..706f51e8c 100644 --- a/contributions.txt +++ b/contributions.txt @@ -12,19 +12,28 @@ See individual change logs for contributors to those builds ------------------------------------------------------------------------ Version 1.5 Change List -Release Date: ??/??/2009 +Release Date: 03/28/2009 Contributors: * Gabriel Monge-Franco (http://gabriel.mongefranco.com) * Cash Costello * alfalive (http://community.elgg.org/pg/profile/alfalive) + * VeniVidiVinco (http://community.elgg.org/pg/profile/VeniVidiVinco) + +Also thank you to those who tested the code in svn and provided feedback ------------------------------------------------------------------------ BEGIN VERSION 1.5 CHANGES ------------------------------------------------------------------------ -* Fixed submenus on sidebar of album pages +* Fixed submenus on sidebar of album pages to make them consistent * Fixed display issues for Elgg 1.5 * Using default site access now * Pushing new album creation to river * Fixed German language file +* Added Turkish +* Added notifications for new album creation +* Rewrote most of the page handlers to make cleaner +* Fixed the access level bug on images +* Cleaned up css +* Fixed the group access bug on albums ------------------------------------------------------------------------ END VERSION 1.5 CHANGES ------------------------------------------------------------------------ -- cgit v1.2.3 From 655bc813115b65cb9caf8913cf8b6891b00cedb9 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 19:19:13 +0000 Subject: forgot to add Turkish language file --- languages/tr.php | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 languages/tr.php diff --git a/languages/tr.php b/languages/tr.php new file mode 100644 index 000000000..795b6ec95 --- /dev/null +++ b/languages/tr.php @@ -0,0 +1,76 @@ + "Resim" , + 'images' => "Resimler" , + 'caption' => "Açıklama" , + 'photos' => "Resimler" , + 'images:upload' => "Resimleri Yükle" , + 'album' => "Fotoğraf Albümü" , + 'albums' => "Fotoğraf Albümleri" , + 'album:yours' => "Senin Fotoğraf Albümlerin" , + 'album:yours:friends' => "Arkadaşlarının Fotoğraf Albümleri" , + 'album:user' => "%s adlı üyenin fotoğraf albümleri" , + 'album:friends' => "%s adlı üyenin arkadaşlarının fotoğraf albümleri" , + 'album:all' => "Tüm sitenin fotoğraf albümleri" , + 'album:group' => "Grubun Albümleri" , + 'item:object:image' => "Fotoğraflar" , + 'item:object:album' => "Albümler" , + 'tidypics:settings:maxfilesize' => "Bir fotoğrafın maksimum büyüklüğü (kilobyte):" , + 'album:create' => "Yeni Albüm" , + 'album:add' => "Yeni Fotoğraf Albümü Ekle" , + 'album:addpix' => "Fotoğraf ekle" , + 'album:edit' => "Albümü Düzenle" , + 'album:delete' => "Albümü Sil" , + 'image:edit' => "Resmi Düzenle" , + 'image:delete' => "Resmi Sil" , + 'image:download' => "Resmi İndir" , + 'album:title' => "Başlık" , + 'album:desc' => "Tanım" , + 'album:tags' => "Tagler" , + 'album:cover' => "Bu resim albüm fotoğrafı olsun mu ?" , + 'album:cover:yes' => "Evet" , + 'image:total' => "Albümdeki fotoğraflar" , + 'image:by' => "Fotoğrafı ekleyen " , + 'album:by' => "Albümü oluşturan" , + 'album:created:on' => "Oluşturuldu" , + 'image:none' => "Şuan görünülenecek fotoğraf bulunamadı" , + 'image:back' => "Geri" , + 'image:next' => "İleri" , + 'album:widget' => "Fotoğraf Albümleri" , + 'album:more' => "Tüm albümleri gör" , + 'album:widget:description' => "Son albümleri göster" , + 'album:display:number' => "Gösterilecek albüm sayısı" , + 'album:num_albums' => "Gösterilecek albüm sayısı" , + 'image:river:created' => "%s upload edildi" , + 'image:river:item' => "resim" , + 'image:river:annotate' => "%s yorum yapıldı" , + 'album:river:created' => "%s oluşturuldu" , + 'album:river:item' => "albüm" , + 'album:river:annotate' => "%s yorum yapıldı" , + 'image:saved' => "Fotoğrafınız başarıyla kaydedildi." , + 'images:saved' => "Tüm fotoğraflarınız başarıyla kaydedildi." , + 'image:deleted' => "Fotoğrafınız başarıyla silindi." , + 'image:delete:confirm' => "Bu fotoğrafı silmek istediğinizden emin misiniz ?" , + 'images:edited' => "Fotoğraflarınız başarıyla yüklendi" , + 'album:edited' => "Albümünüz başarıyla güncellendi." , + 'album:saved' => "Albümünüz başarıyla kaydedildi." , + 'album:deleted' => "Albümünüz başarıyla silindi." , + 'album:delete:confirm' => "Albümü silmek istediğinizden emin misiniz ?" , + 'album:created' => "Yeni albümünüz oluşturuldu." , + 'image:uploadfailed' => "Fotoğraflar yüklenemedi :" , + 'image:deletefailed' => "Fotoğrafınız şuan silinemiyor." , + 'image:downloadfailed' => "Üzgünüz, bu fotoğraf şuan uygun değil." , + 'image:notimage' => "Sadece jpeg, gif veya png uzantılı fotoğraflar kabul edilir." , + 'images:notedited' => "Tüm fotoğraflar başarıyla güncellenemedi." , + 'album:none' => "Şuan herhangi bir albüm bulunamadı." , + 'album:uploadfailed' => "Üzgünüm, albümünüz kaydolmadı." , + 'album:deletefailed' => "Albümünüz silinemedi." , + 'album:blank' => "Lütfen albümünüze başlık ve tanım giriniz." +); + +add_translation('tr', $turkish); + +?> \ No newline at end of file -- cgit v1.2.3 From dd2256c12a2d9a74fc4023ec37d2dcf0443b31c7 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 19:27:11 +0000 Subject: fix for people running Elgg 1.2 --- start.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/start.php b/start.php index abf285f7e..cc7299bfc 100644 --- a/start.php +++ b/start.php @@ -40,7 +40,8 @@ register_entity_type('object','image'); register_entity_type('object','album'); - add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true); + if (function_exists('add_group_tool_option')) + add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true); register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override'); -- cgit v1.2.3 From 14c26b398bfc50f9607ba38b23290f469f3c6462 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 28 Mar 2009 19:28:17 +0000 Subject: making the lives of people easier when using Elgg 1.2 --- views/default/tidypics/forms/edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php index d7df138b4..533852413 100644 --- a/views/default/tidypics/forms/edit.php +++ b/views/default/tidypics/forms/edit.php @@ -26,7 +26,7 @@ if (defined('ACCESS_DEFAULT')) $access_id = ACCESS_DEFAULT; else - $access_id = 0; + $access_id = 1; // logged_in by default $subtype = 'album'; $title = $_SESSION['tidypicstitle']; -- cgit v1.2.3 From c53476fb51f021230b03bab66e068dd1ac6b4791 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 29 Mar 2009 22:13:55 +0000 Subject: fixed permissions problem caused by override --- start.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/start.php b/start.php index cc7299bfc..1b9ce7b5e 100644 --- a/start.php +++ b/start.php @@ -199,8 +199,6 @@ // test that the user can edit the container return can_write_to_container(0, $entity->container_guid); } - - return false; } -- cgit v1.2.3 From 525a4f58f0a0e6dae8f7b26811cebf33a2ac0b89 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 29 Mar 2009 22:18:21 +0000 Subject: updated language files - spanish is corrupted --- languages/de.php | 2 - languages/es.php | 4 -- languages/pl.php | 4 -- languages/tr.php | 162 +++++++++++++++++++++++++++++-------------------------- 4 files changed, 87 insertions(+), 85 deletions(-) diff --git a/languages/de.php b/languages/de.php index c92bf7c0e..25604f1d6 100644 --- a/languages/de.php +++ b/languages/de.php @@ -5,8 +5,6 @@ * @version 1.2 * @author Modified and fixed by Dieter Konrad aka alfalive * @contact http://community.elgg.org/pg/profile/alfalive - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ * */ diff --git a/languages/es.php b/languages/es.php index 11a787ae4..b9b0ab61d 100644 --- a/languages/es.php +++ b/languages/es.php @@ -2,10 +2,6 @@ /** * Elgg tidypics plugin language pack * - * @package ElggFile - * @author Curverider Ltd - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ */ $spanish = array( diff --git a/languages/pl.php b/languages/pl.php index 280e3f859..7f48b488b 100644 --- a/languages/pl.php +++ b/languages/pl.php @@ -2,10 +2,6 @@ /** * Elgg tidypics plugin language pack * - * @package ElggFile - * @author Curverider Ltd - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ */ $polish = array( diff --git a/languages/tr.php b/languages/tr.php index 795b6ec95..fff696c47 100644 --- a/languages/tr.php +++ b/languages/tr.php @@ -1,76 +1,88 @@ - "Resim" , - 'images' => "Resimler" , - 'caption' => "Açıklama" , - 'photos' => "Resimler" , - 'images:upload' => "Resimleri Yükle" , - 'album' => "Fotoğraf Albümü" , - 'albums' => "Fotoğraf Albümleri" , - 'album:yours' => "Senin Fotoğraf Albümlerin" , - 'album:yours:friends' => "Arkadaşlarının Fotoğraf Albümleri" , - 'album:user' => "%s adlı üyenin fotoğraf albümleri" , - 'album:friends' => "%s adlı üyenin arkadaşlarının fotoğraf albümleri" , - 'album:all' => "Tüm sitenin fotoğraf albümleri" , - 'album:group' => "Grubun Albümleri" , - 'item:object:image' => "Fotoğraflar" , - 'item:object:album' => "Albümler" , - 'tidypics:settings:maxfilesize' => "Bir fotoğrafın maksimum büyüklüğü (kilobyte):" , - 'album:create' => "Yeni Albüm" , - 'album:add' => "Yeni Fotoğraf Albümü Ekle" , - 'album:addpix' => "Fotoğraf ekle" , - 'album:edit' => "Albümü Düzenle" , - 'album:delete' => "Albümü Sil" , - 'image:edit' => "Resmi Düzenle" , - 'image:delete' => "Resmi Sil" , - 'image:download' => "Resmi İndir" , - 'album:title' => "Başlık" , - 'album:desc' => "Tanım" , - 'album:tags' => "Tagler" , - 'album:cover' => "Bu resim albüm fotoğrafı olsun mu ?" , - 'album:cover:yes' => "Evet" , - 'image:total' => "Albümdeki fotoğraflar" , - 'image:by' => "Fotoğrafı ekleyen " , - 'album:by' => "Albümü oluşturan" , - 'album:created:on' => "Oluşturuldu" , - 'image:none' => "Şuan görünülenecek fotoğraf bulunamadı" , - 'image:back' => "Geri" , - 'image:next' => "İleri" , - 'album:widget' => "Fotoğraf Albümleri" , - 'album:more' => "Tüm albümleri gör" , - 'album:widget:description' => "Son albümleri göster" , - 'album:display:number' => "Gösterilecek albüm sayısı" , - 'album:num_albums' => "Gösterilecek albüm sayısı" , - 'image:river:created' => "%s upload edildi" , - 'image:river:item' => "resim" , - 'image:river:annotate' => "%s yorum yapıldı" , - 'album:river:created' => "%s oluşturuldu" , - 'album:river:item' => "albüm" , - 'album:river:annotate' => "%s yorum yapıldı" , - 'image:saved' => "Fotoğrafınız başarıyla kaydedildi." , - 'images:saved' => "Tüm fotoğraflarınız başarıyla kaydedildi." , - 'image:deleted' => "Fotoğrafınız başarıyla silindi." , - 'image:delete:confirm' => "Bu fotoğrafı silmek istediğinizden emin misiniz ?" , - 'images:edited' => "Fotoğraflarınız başarıyla yüklendi" , - 'album:edited' => "Albümünüz başarıyla güncellendi." , - 'album:saved' => "Albümünüz başarıyla kaydedildi." , - 'album:deleted' => "Albümünüz başarıyla silindi." , - 'album:delete:confirm' => "Albümü silmek istediğinizden emin misiniz ?" , - 'album:created' => "Yeni albümünüz oluşturuldu." , - 'image:uploadfailed' => "Fotoğraflar yüklenemedi :" , - 'image:deletefailed' => "Fotoğrafınız şuan silinemiyor." , - 'image:downloadfailed' => "Üzgünüz, bu fotoğraf şuan uygun değil." , - 'image:notimage' => "Sadece jpeg, gif veya png uzantılı fotoğraflar kabul edilir." , - 'images:notedited' => "Tüm fotoğraflar başarıyla güncellenemedi." , - 'album:none' => "Şuan herhangi bir albüm bulunamadı." , - 'album:uploadfailed' => "Üzgünüm, albümünüz kaydolmadı." , - 'album:deletefailed' => "Albümünüz silinemedi." , - 'album:blank' => "Lütfen albümünüze başlık ve tanım giriniz." -); - -add_translation('tr', $turkish); - + "Resim" , + 'image:access:note' => "Görüntüleme izni albümden tevarüs edildi." , + 'images' => "Resimler" , + 'caption' => "Açıklama" , + 'photos' => "Resimler" , + 'images:upload' => "Resimleri Yükle" , + 'album' => "Fotoğraf Albümü" , + 'albums' => "Fotoğraf Albümleri" , + 'album:yours' => "Senin Fotoğraf Albümlerin" , + 'album:yours:friends' => "Arkadaşlarının Fotoğraf Albümleri" , + 'album:user' => "%s adlı üyenin fotoğraf albümleri" , + 'album:friends' => "%s adlı üyenin arkadaşlarının fotoğraf albümleri" , + 'album:all' => "Tüm sitenin fotoğraf albümleri" , + 'album:group' => "Grubun Albümleri" , + 'item:object:image' => "Fotoğraflar" , + 'item:object:album' => "Albümler" , + 'tidypics:settings:maxfilesize' => "Bir fotoğrafın maksimum büyüklüğü (kilobyte):" , + 'tidypics:enablephotos' => 'Grup Albümlerini Aktif Et', + 'tidypics:editprops' => 'Fotoğrafın özelliklerini Düzenle', + 'tidypics:newalbum' => 'Yeni Fotoğraf Albümü', + 'album:create' => "Yeni Albüm" , + 'album:add' => "Yeni Fotoğraf Albümü Ekle" , + 'album:addpix' => "Fotoğraf ekle" , + 'album:edit' => "Albümü Düzenle" , + 'album:delete' => "Albümü Sil" , + 'image:edit' => "Resmi Düzenle" , + 'image:delete' => "Resmi Sil" , + 'image:download' => "Resmi İndir" , + 'album:title' => "Başlık" , + 'album:desc' => "Tanım" , + 'album:tags' => "Tagler" , + 'album:cover' => "Bu resim albüm fotoğrafı olsun mu ?" , + 'album:cover:yes' => "Evet" , + 'image:total' => "Albümdeki fotoğraflar" , + 'image:by' => "Fotoğrafı ekleyen " , + 'album:by' => "Albümü oluşturan" , + 'album:created:on' => "Oluşturuldu" , + 'image:none' => "Şuan görünülenecek fotoğraf bulunamadı" , + 'image:back' => "Geri" , + 'image:next' => "İleri" , + 'album:widget' => "Fotoğraf Albümleri" , + 'album:more' => "Tüm albümleri gör" , + 'album:widget:description' => "Son albümleri göster" , + 'album:display:number' => "Gösterilecek albüm sayısı" , + 'album:num_albums' => "Gösterilecek albüm sayısı" , + 'image:river:created' => "%s upload edildi" , + 'image:river:item' => "resim" , + 'image:river:annotate' => "%s yorum yapıldı" , + 'album:river:created' => "%s oluşturuldu" , + 'album:river:item' => "albüm" , + 'album:river:annotate' => "%s yorum yapıldı" , + 'image:saved' => "Fotoğrafınız başarıyla kaydedildi." , + 'images:saved' => "Tüm fotoğraflarınız başarıyla kaydedildi." , + 'image:deleted' => "Fotoğrafınız başarıyla silindi." , + 'image:delete:confirm' => "Bu fotoğrafı silmek istediğinizden emin misiniz ?" , + 'images:edited' => "Fotoğraflarınız başarıyla yüklendi" , + 'album:edited' => "Albümünüz başarıyla güncellendi." , + 'album:saved' => "Albümünüz başarıyla kaydedildi." , + 'album:deleted' => "Albümünüz başarıyla silindi." , + 'album:delete:confirm' => "Albümü silmek istediğinizden emin misiniz ?" , + 'album:created' => "Yeni albümünüz oluşturuldu." , + 'image:uploadfailed' => "Fotoğraflar yüklenemedi :" , + 'image:deletefailed' => "Fotoğrafınız şuan silinemiyor." , + 'image:downloadfailed' => "Üzgünüz, bu fotoğraf şuan uygun değil." , + 'image:notimage' => "Sadece jpeg, gif veya png uzantılı fotoğraflar kabul edilir." , + 'images:notedited' => "Tüm fotoğraflar başarıyla güncellenemedi." , + 'album:none' => "Şuan herhangi bir albüm bulunamadı." , + 'album:uploadfailed' => "Üzgünüm, albümünüz kaydolmadı." , + 'album:deletefailed' => "Albümünüz silinemedi." , + 'tidypics:status:processing' => "Fotoğrafınız işlenirken lütfen bekleyiniz." , + 'album:blank' => "Lütfen albümünüze başlık ve tanım giriniz." + + +); + +add_translation('tr', $turkish); + ?> \ No newline at end of file -- cgit v1.2.3 From 1f25e8176e5e025ca6a1adbefca1bf939e9f4760 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 29 Mar 2009 22:21:44 +0000 Subject: raised file limit for image resizing to 2.5 MB from .9 MB --- actions/upload.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index b506cde5b..ba9d005c8 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -58,8 +58,8 @@ array_push($uploaded_images, $file->guid); // Generate thumbnail - //TODO: REMOVE THE BELOW IF STATEMENT ONCE get_resized_image_from_existing_file() ACCEPTS IMAGES OVER 0.9MB IN SIZE - if (filesize($file->getFilenameOnFilestore())<= 943718) { //create thumbnails if file size < 0.9MB + //TODO: This code needs a complete rewrite - hardcoded to ~2.5 MB + if (filesize($file->getFilenameOnFilestore())<= 2500000) { try { $thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false); } catch (Exception $e) { $thumblarge = false; } -- cgit v1.2.3 From a028f361b4aeca2d3abaed0a6ddf444f0d654403 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 29 Mar 2009 22:58:45 +0000 Subject: added add album button when the owner is viewing group/widget --- views/default/tidypics/albums.php | 16 +++++++++++----- views/default/tidypics/css.php | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php index de56f08e1..ba75760c6 100644 --- a/views/default/tidypics/albums.php +++ b/views/default/tidypics/albums.php @@ -8,8 +8,9 @@ $owner = page_owner_entity(); $owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false); + echo '
      '; + if ($owner_albums) { - echo '
      '; foreach($owner_albums as $album) { if($album->cover) @@ -33,13 +34,18 @@ // bottom link to all group/user albums if (is_null($owner->username) || empty($owner->username)) { - echo '' . elgg_echo('album:all') . ''; + echo '

      ' . elgg_echo('album:all') . '

      '; } else { - echo '' . elgg_echo('album:more') . ''; + echo '

      ' . elgg_echo('album:more') . '

      '; } - //close album_widget_container div - echo "
      "; + } + if (can_write_to_container(0, $owner->guid)) { + echo '

      username . '>' . elgg_echo("album:create") . '

      '; } + + + //close album_widget_container div + echo "
      "; ?> \ No newline at end of file diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index f9163ce08..6559ec5be 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -39,7 +39,7 @@ cursor:pointer; } .tidypics_download a:hover { -background:black; +background:#0054a7; color:white; text-decoration:none; } -- cgit v1.2.3 From 0075c37dd23e8a7beae50fa84e0817aa6472a77c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 29 Mar 2009 23:04:48 +0000 Subject: 1.5.1 --- contributions.txt | 18 ++++++++++++++++++ manifest.xml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/contributions.txt b/contributions.txt index 706f51e8c..06f7918df 100644 --- a/contributions.txt +++ b/contributions.txt @@ -10,6 +10,24 @@ http://www.tastyseed.com/ See individual change logs for contributors to those builds +------------------------------------------------------------------------ +Version 1.5.1 Change List +Release Date: 03/29/2009 +Contributors: + * Gabriel Monge-Franco (http://gabriel.mongefranco.com) + * Cash Costello + * VeniVidiVinco (http://community.elgg.org/pg/profile/VeniVidiVinco) +------------------------------------------------------------------------ +BEGIN VERSION 1.5.1 CHANGES +------------------------------------------------------------------------ +* Updated Turkish language file +* Fixed permissions bug on all content caused by group override +* Added back the create album button to widgets +------------------------------------------------------------------------ +END VERSION 1.5.1 CHANGES +------------------------------------------------------------------------ + + ------------------------------------------------------------------------ Version 1.5 Change List Release Date: 03/28/2009 diff --git a/manifest.xml b/manifest.xml index 4778c13c6..67858103d 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,7 +1,7 @@ - + -- cgit v1.2.3 From ef2e4a3c7733ba624af4501cf3a9be5e0c480904 Mon Sep 17 00:00:00 2001 From: alfalive Date: Tue, 31 Mar 2009 20:39:07 +0000 Subject: Italian Language added --- languages/it.php | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 languages/it.php diff --git a/languages/it.php b/languages/it.php new file mode 100644 index 000000000..36863851c --- /dev/null +++ b/languages/it.php @@ -0,0 +1,113 @@ + "Immagine", + 'images' => "Immagini", + 'caption' => "Caption", + 'photos' => "Foto", + 'images:upload' => "Carica Immagine", + 'album' => "Album fotografico", + 'albums' => "Album fotografici", + 'album:yours' => "Il tuo Album fotografico", + 'album:yours:friends' => "Album Foto degli amici", + 'album:user' => "Album foto di %s", + 'album:friends' => "Album foto degli amici di %s", + 'album:all' => "Tutti gli album di foto", + 'album:group' => "Gruppi di album", + 'item:object:image' => "Foto", + 'item:object:album' => "Album", + 'tidypics:settings:maxfilesize' => "Dimensione massima dei file in kilo bytes (KB):", + 'tidypics:enablephotos' => 'Attiva Group Photo Albums', + 'tidypics:editprops' => 'Modifica le propriet della immagine', + + //actions + + 'album:create' => "Crea un nuovo album", + 'album:add' => "Aggiungi un foto Album", + 'album:addpix' => "Aggiungi foto all'album", + 'album:edit' => "Modifica album", + 'album:delete' => "Cancella album", + + 'image:edit' => "Modifica immagine", + 'image:delete' => "Cancella immagine", + 'image:download' => "Download immagine", + + //forms + + 'album:title' => "Titolo", + 'album:desc' => "Descrizione", + 'album:tags' => "Tags", + 'album:cover' => "Copertina dell'album?", + 'album:cover:yes' => "Si", + 'image:access:note' => "(view access is inherited from the album)", + + //views + + 'image:total' => "immagini nell'album:", + 'image:by' => "immagini aggiunte da", + 'album:by' => "Album creato da", + 'album:created:on' => "Creato", + 'image:none' => "Non sono ancora state aggiunte immagini.", + 'image:back' => "Indietro", + 'image:next' => "Avanti", + + //widgets + + 'album:widget' => "Album Fotografici", + 'album:more' => "Vedi tutti gli albums", + 'album:widget:description' => "Visualizza il tuo ultimo album fotografico", + 'album:display:number' => "Numero di album da mostrare", + 'album:num_albums' => "Numero di album da mostrare", + + // river + + //images + 'image:river:created' => "%s uploaded", + 'image:river:item' => "una immagine", + 'image:river:annotate' => "a comment on the image", + + //albums + 'album:river:created' => "%s created a new photo album: ", + 'album:river:item' => "an album", + 'album:river:annotate' => "un commento nel foto album", + + // notifications + 'tidypics:newalbum' => 'Nuovo album di foto', + + + // Status messages + + 'image:saved' => "Immagine salvata.", + 'images:saved' => "Tutte le immagini sono state salvate.", + 'image:deleted' => "Immagine cancellata.", + 'image:delete:confirm' => "Sei sicuro di volerla cancellare?", + + 'images:edited' => "Immagini modificate.", + 'album:edited' => "Album fotografico aggiornato.", + 'album:saved' => "Album fotografico salvato.", + 'album:deleted' => "L'album stato cancellato.", + 'album:delete:confirm' => "Sei sicuro di voler cancellare questo album?", + 'album:created' => "Nuovo Album creato.", + 'tidypics:status:processing' => "Attendere ....", + + //Error messages + + 'image:none' => "Non ci sono immagini.", + 'image:uploadfailed' => "il file non stato caricato:", + 'image:deletefailed' => "L'immagine non puo essere cancellata in questo momento.", + 'image:downloadfailed' => "Spiacente; questa immagine non attualmente disponibile.", + + 'image:notimage' => "Sono accettate immagini jpg, gif o png delle dimensioni entro i limiti.", + 'images:notedited' => "Non tutte le immagini sono state caricate", + + 'album:none' => "Nessun album stato ancora creato.", + 'album:uploadfailed' => "Spiacente; non possibile salvare l'album.", + 'album:deletefailed' => "L'album non pu essere cancellato.", + 'album:blank' => "Dai a quest'album un titolo e una descrizione." + ); + + add_translation("it",$italian); +?> \ No newline at end of file -- cgit v1.2.3 From 37349d19e336a5d60578969ba156e45e707c40cf Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 1 Apr 2009 00:43:41 +0000 Subject: Predro's spanish translation --- languages/es.php | 182 +++++++++++++++++++++++-------------------------------- 1 file changed, 75 insertions(+), 107 deletions(-) diff --git a/languages/es.php b/languages/es.php index b9b0ab61d..f42fded0b 100644 --- a/languages/es.php +++ b/languages/es.php @@ -1,113 +1,81 @@ "Imagen", - 'images' => "Imágenes", - 'caption' => "Leyenda", - 'photos' => "Fotos", - 'images:upload' => "Subir Imágenes", - 'album' => "Állbum de Fotos", - 'albums' => "Álbums de Fotos", - 'album:yours' => "Tus álbums de fotos", - 'album:yours:friends' => "Álbums de tus amigos", - 'album:user' => "Állbums de %s", - 'album:friends' => "Albums de los amigos de %s", - 'album:all' => "Todos los álbums", - 'album:group' => "Állbums del grupo", - 'item:object:image' => "Fotos", - 'item:object:album' => "Állbums", - 'tidypics:settings:maxfilesize' => "Tamaño máximo en kilo bytes (KB):", +// Generado por translationbrowser - 'tidypics:editprops' => "Editar propiedades de imagen", +$spanish = array( + 'image' => "Imagen" , + 'images' => "Imágenes" , + 'caption' => "Leyenda" , + 'photos' => "Fotos" , + 'images:upload' => "Subir Imágenes" , + 'album' => "Állbum de Fotos" , + 'albums' => "Álbums de Fotos" , + 'album:yours' => "Tus álbums de fotos" , + 'album:yours:friends' => "Álbums de tus amigos" , + 'album:user' => "Állbums de %s" , + 'album:friends' => "Albums de los amigos de %s" , + 'album:all' => "Todos los álbums" , + 'album:group' => "Állbums del grupo" , + 'item:object:image' => "Fotos" , + 'item:object:album' => "Állbums" , + 'tidypics:settings:maxfilesize' => "Tamaño máximo en kilo bytes (KB):" , + 'album:create' => "Nuevo álbum" , + 'album:add' => "Añadir álbum de fotos" , + 'album:addpix' => "Añadir fotos" , + 'album:edit' => "Modificar álbum" , + 'album:delete' => "Eliminar álbum" , + 'image:edit' => "Modificar imagen" , + 'image:delete' => "Eliminar imagen" , + 'image:download' => "Descargar imagen" , + 'album:title' => "Título" , + 'album:desc' => "Descripción" , + 'album:tags' => "Etiquetas" , + 'album:cover' => "¿Hacer portada del álbum?" , + 'album:cover:yes' => "Si" , + 'image:access:note' => "(los permisos de acceso se heredan del álbum)" , + 'image:total' => "Imágenes en el álbum:" , + 'image:by' => "Imagen añadida por" , + 'album:by' => "Album creado por" , + 'album:created:on' => "Creado" , + 'image:none' => "No ha sido psible encontrar ninguna imagen en este momento." , + 'image:back' => "Anterior" , + 'image:next' => "Siguiente" , + 'album:widget' => "Albums de Fotos" , + 'album:more' => "Ver todos los albums" , + 'album:widget:description' => "Muestra tus álbums de fotos más recientes" , + 'album:display:number' => "Número de albums a mostrar" , + 'album:num_albums' => "Número de albums a mostrar" , + 'image:river:created' => "%s subió" , + 'image:river:item' => "una imagen" , + 'image:river:annotate' => "%s comentó en" , + 'album:river:created' => "%s creó" , + 'album:river:item' => "un album" , + 'album:river:annotate' => "%s comentó en" , + 'image:saved' => "Tu imagen ha sido guardada." , + 'images:saved' => "Todas tus imágenes han sido guardadas." , + 'image:deleted' => "Tu imagen ha sido borrada." , + 'image:delete:confirm' => "¿Deseas borrar esta imagen?" , + 'images:edited' => "Tus imágenes han sido actualizadas." , + 'album:edited' => "Tu álbum ha sido actualizado." , + 'album:saved' => "Tu álbum ha sido guardado." , + 'album:deleted' => "Tu álbum ha sido borrado con éxito." , + 'album:delete:confirm' => "¿Deseas borrar este álbum?" , + 'album:created' => "Tu nuevo álbum ha sido creado." , + 'tidypics:status:processing' => "Por favor espera mientras procesamos tu imagen...." , + 'image:uploadfailed' => "Algunos ficheros no se pudieron subir:" , + 'image:deletefailed' => "Tu imagen no ha podido ser borrada en este momento." , + 'image:downloadfailed' => "Esta imagen no se encuentra disponible en este momento." , + 'image:notimage' => "Sólo se aceptan imágenes jpeg, gif, o png del tamaño permitido." , + 'images:notedited' => "No se pudieron actualizar todas las imágenes." , + 'album:none' => "Actualmente no hay ningún álbum de fotos." , + 'album:uploadfailed' => "No se ha podido guardar el álbum." , + 'album:deletefailed' => "En este momento no se ha podido borrar el álbum." , + 'album:blank' => "Por favor entra un título y descripción para tu nuevo álbum." , + 'image:tools' => "Herramientas" , + 'image:inthisphoto' => "En esta foto" , + 'yes' => "Si " +); - //actions - - 'album:create' => "Nuevo álbum", - 'album:add' => "Añadir álbum de fotos", - 'album:addpix' => "Añadir fotos", - 'album:edit' => "Modificar álbum", - 'album:delete' => "Eliminar álbum", +add_translation('es', $spanish); - 'image:edit' => "Modificar imagen", - 'image:delete' => "Eliminar imagen", - 'image:download' => "Descargar imagen", - - //forms - - 'album:title' => "Título", - 'album:desc' => "Descripción", - 'album:tags' => "Etiquetas", - 'album:cover' => "¿Hacer portada del álbum?", - 'album:cover:yes' => "Si", - 'image:access:note' => "(los permisos de acceso se heredan del álbum)", - - //views - - 'image:total' => "Imágenes en el álbum:", - 'image:by' => "Imagen añadida por", - 'album:by' => "Album creado por", - 'album:created:on' => "Creado", - 'image:none' => "Todavía no se han añadido imágenes.", - 'image:back' => "Anterior", - 'image:next' => "Siguiente", - - //widgets - - 'album:widget' => "Albums de Fotos", - 'album:more' => "Ver todos los albums", - 'album:widget:description' => "Muestra tus álbums de fotos más recientes", - 'album:display:number' => "Número de albums a mostrar", - 'album:num_albums' => "Número de albums a mostrar", - - // river - - //images - 'image:river:created' => "%s subió", - 'image:river:item' => "una imagen", - 'image:river:annotate' => "%s comentó en", - - //albums - 'album:river:created' => "%s creó", - 'album:river:item' => "un album", - 'album:river:annotate' => "%s comentó en", - - // Status messages - - 'image:saved' => "Tu imagen ha sido guardada.", - 'images:saved' => "Todas tus imágenes han sido guardadas.", - 'image:deleted' => "Tu imagen ha sido borrada.", - 'image:delete:confirm' => "¿Deseas borrar esta imagen?", - - 'images:edited' => "Tus imágenes han sido actualizadas.", - 'album:edited' => "Tu álbum ha sido actualizado.", - 'album:saved' => "Tu álbum ha sido guardado.", - 'album:deleted' => "Tu álbum ha sido borrado con éxito.", - 'album:delete:confirm' => "¿Deseas borrar este álbum?", - 'album:created' => "Tu nuevo álbum ha sido creado.", - 'tidypics:status:processing' => "Por favor espera mientras procesamos tu imagen....", - - //Error messages - - 'image:none' => "No ha sido psible encontrar ninguna imagen en este momento.", - 'image:uploadfailed' => "Algunos ficheros no se pudieron subir:", - 'image:deletefailed' => "Tu imagen no ha podido ser borrada en este momento.", - 'image:downloadfailed' => "Esta imagen no se encuentra disponible en este momento.", - - 'image:notimage' => "Sólo se aceptan imágenes jpeg, gif, o png del tamaño permitido.", - 'images:notedited' => "No se pudieron actualizar todas las imágenes.", - - 'album:none' => "Actualmente no hay ningún álbum de fotos.", - 'album:uploadfailed' => "No se ha podido guardar el álbum.", - 'album:deletefailed' => "En este momento no se ha podido borrar el álbum.", - 'album:blank' => "Por favor entra un título y descripción para tu nuevo álbum." - ); - - add_translation("es",$spanish); ?> \ No newline at end of file -- cgit v1.2.3 From 74f7d6c4109851a83a2310900ac15e29e4254aea Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 1 Apr 2009 12:00:19 +0000 Subject: The first part of Pedro's tagging code --- languages/en.php | 6 + vendors/jquery.imgareaselect-0.6.2.js | 554 ++++++++++++++++++++++++++++++++++ vendors/jquery.quicksearch.js | 345 +++++++++++++++++++++ views/default/object/image.php | 309 ++++++++++++++++++- views/default/tidypics/css.php | 43 ++- 5 files changed, 1247 insertions(+), 10 deletions(-) create mode 100644 vendors/jquery.imgareaselect-0.6.2.js create mode 100644 vendors/jquery.quicksearch.js diff --git a/languages/en.php b/languages/en.php index 6b2d51374..20c1f3cee 100644 --- a/languages/en.php +++ b/languages/en.php @@ -53,6 +53,12 @@ 'image:none' => "No images have been added yet.", 'image:back' => "Back", 'image:next' => "Next", + + // tagging + 'image:doclickfortag' => 'Click on the faces of people to label them.', + 'image:finish_tagging' => 'Stop labeling', + 'image:tagthisphoto' => 'Tag this photo', + 'image:actiontag' => 'Tag', //widgets diff --git a/vendors/jquery.imgareaselect-0.6.2.js b/vendors/jquery.imgareaselect-0.6.2.js new file mode 100644 index 000000000..76f77ee98 --- /dev/null +++ b/vendors/jquery.imgareaselect-0.6.2.js @@ -0,0 +1,554 @@ +/* + * imgAreaSelect jQuery plugin + * version 0.6.2 + * + * Copyright (c) 2008 Michal Wojciechowski (odyniec.net) + * + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * http://odyniec.net/projects/imgareaselect/ + * + */ + +jQuery.imgAreaSelect = { onKeyPress: null }; + +jQuery.imgAreaSelect.init = function (img, options) { + var $area = jQuery('
      '), + $border1 = jQuery('
      '), + $border2 = jQuery('
      '), + $outLeft = jQuery('
      '), + $outTop = jQuery('
      '), + $outRight = jQuery('
      '), + $outBottom = jQuery('
      '), + left, top, imgOfs, imgWidth, imgHeight, parent, parOfs, parScroll, + adjusted, zIndex = 0, fixed, $p, startX, startY, moveX, moveY, + resizeMargin = 10, resize = [ ], V = 0, H = 1, + keyDown, d, aspectRatio, x1, x2, y1, y2, x, y, + selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 }; + + var $a = $area.add($border1).add($border2); + var $o = $outLeft.add($outTop).add($outRight).add($outBottom); + + function viewX(x) + { + return x + imgOfs.left + parScroll.left - parOfs.left; + } + + function viewY(y) + { + return y + imgOfs.top + parScroll.top - parOfs.top; + } + + function selX(x) + { + return x - imgOfs.left - parScroll.left + parOfs.left; + } + + function selY(y) + { + return y - imgOfs.top - parScroll.top + parOfs.top; + } + + function evX(event) + { + return event.pageX + parScroll.left - parOfs.left; + } + + function evY(event) + { + return event.pageY + parScroll.top - parOfs.top; + } + + function adjust() + { + imgOfs = jQuery(img).offset(); + imgWidth = jQuery(img).width(); + imgHeight = jQuery(img).height(); + + if (jQuery(parent).is('body')) + parOfs = parScroll = { left: 0, top: 0 }; + else { + parOfs = jQuery(parent).offset(); + parScroll = { left: parent.scrollLeft, top: parent.scrollTop }; + } + + left = viewX(0); + top = viewY(0); + } + + function update(resetKeyPress) + { + $a.css({ + left: viewX(selection.x1) + 'px', + top: viewY(selection.y1) + 'px', + width: Math.max(selection.width - options.borderWidth * 2, 0) + 'px', + height: Math.max(selection.height - options.borderWidth * 2, 0) + 'px' + }); + $outLeft.css({ left: left + 'px', top: top + 'px', + width: selection.x1 + 'px', height: imgHeight + 'px' }); + $outTop.css({ left: left + selection.x1 + 'px', top: top + 'px', + width: selection.width + 'px', height: selection.y1 + 'px' }); + $outRight.css({ left: left + selection.x2 + 'px', top: top + 'px', + width: imgWidth - selection.x2 + 'px', height: imgHeight + 'px' }); + $outBottom.css({ left: left + selection.x1 + 'px', top: top + selection.y2 + 'px', + width: selection.width + 'px', height: imgHeight - selection.y2 + 'px' }); + + if (resetKeyPress !== false) { + if (jQuery.imgAreaSelect.keyPress != docKeyPress) + jQuery(document).unbind(jQuery.imgAreaSelect.keyPress, + jQuery.imgAreaSelect.onKeyPress); + + if (options.keys) + jQuery(document).bind(jQuery.imgAreaSelect.keyPress, + jQuery.imgAreaSelect.onKeyPress = docKeyPress); + } + } + + function areaMouseMove(event) + { + if (!adjusted) { + adjust(); + adjusted = true; + + $a.one('mouseout', function () { adjusted = false; }); + } + + x = selX(evX(event)) - selection.x1; + y = selY(evY(event)) - selection.y1; + + resize = [ ]; + + if (options.resizable) { + if (y <= resizeMargin) + resize[V] = 'n'; + else if (y >= selection.height - resizeMargin) + resize[V] = 's'; + if (x <= resizeMargin) + resize[H] = 'w'; + else if (x >= selection.width - resizeMargin) + resize[H] = 'e'; + } + + $border2.css('cursor', resize.length ? resize.join('') + '-resize' : + options.movable ? 'move' : ''); + } + + function areaMouseDown(event) + { + if (event.which != 1) return false; + + adjust(); + + if (options.resizable && resize.length > 0) { + jQuery('body').css('cursor', resize.join('') + '-resize'); + + x1 = viewX(resize[H] == 'w' ? selection.x2 : selection.x1); + y1 = viewY(resize[V] == 'n' ? selection.y2 : selection.y1); + + jQuery(document).mousemove(selectingMouseMove); + $border2.unbind('mousemove', areaMouseMove); + + jQuery(document).one('mouseup', function () { + resize = [ ]; + + jQuery('body').css('cursor', ''); + + if (options.autoHide) + $a.add($o).hide(); + + options.onSelectEnd(img, selection); + + jQuery(document).unbind('mousemove', selectingMouseMove); + $border2.mousemove(areaMouseMove); + }); + } + else if (options.movable) { + moveX = selection.x1 + left; + moveY = selection.y1 + top; + startX = evX(event); + startY = evY(event); + + jQuery(document).mousemove(movingMouseMove) + .one('mouseup', function () { + options.onSelectEnd(img, selection); + + jQuery(document).unbind('mousemove', movingMouseMove); + }); + } + else + jQuery(img).mousedown(event); + + return false; + } + + function aspectRatioXY() + { + x2 = Math.max(left, Math.min(left + imgWidth, + x1 + Math.abs(y2 - y1) * aspectRatio * (x2 >= x1 ? 1 : -1))); + y2 = Math.round(Math.max(top, Math.min(top + imgHeight, + y1 + Math.abs(x2 - x1) / aspectRatio * (y2 >= y1 ? 1 : -1)))); + x2 = Math.round(x2); + } + + function aspectRatioYX() + { + y2 = Math.max(top, Math.min(top + imgHeight, + y1 + Math.abs(x2 - x1) / aspectRatio * (y2 >= y1 ? 1 : -1))); + x2 = Math.round(Math.max(left, Math.min(left + imgWidth, + x1 + Math.abs(y2 - y1) * aspectRatio * (x2 >= x1 ? 1 : -1)))); + y2 = Math.round(y2); + } + + function doResize(newX2, newY2) + { + x2 = newX2; + y2 = newY2; + + if (options.minWidth && Math.abs(x2 - x1) < options.minWidth) { + x2 = x1 - options.minWidth * (x2 < x1 ? 1 : -1); + + if (x2 < left) + x1 = left + options.minWidth; + else if (x2 > left + imgWidth) + x1 = left + imgWidth - options.minWidth; + } + + if (options.minHeight && Math.abs(y2 - y1) < options.minHeight) { + y2 = y1 - options.minHeight * (y2 < y1 ? 1 : -1); + + if (y2 < top) + y1 = top + options.minHeight; + else if (y2 > top + imgHeight) + y1 = top + imgHeight - options.minHeight; + } + + x2 = Math.max(left, Math.min(x2, left + imgWidth)); + y2 = Math.max(top, Math.min(y2, top + imgHeight)); + + if (aspectRatio) + if (Math.abs(x2 - x1) / aspectRatio > Math.abs(y2 - y1)) + aspectRatioYX(); + else + aspectRatioXY(); + + if (options.maxWidth && Math.abs(x2 - x1) > options.maxWidth) { + x2 = x1 - options.maxWidth * (x2 < x1 ? 1 : -1); + if (aspectRatio) aspectRatioYX(); + } + + if (options.maxHeight && Math.abs(y2 - y1) > options.maxHeight) { + y2 = y1 - options.maxHeight * (y2 < y1 ? 1 : -1); + if (aspectRatio) aspectRatioXY(); + } + + selection.x1 = selX(Math.min(x1, x2)); + selection.x2 = selX(Math.max(x1, x2)); + selection.y1 = selY(Math.min(y1, y2)); + selection.y2 = selY(Math.max(y1, y2)); + selection.width = Math.abs(x2 - x1); + selection.height = Math.abs(y2 - y1); + + update(); + + options.onSelectChange(img, selection); + } + + function selectingMouseMove(event) + { + x2 = !resize.length || resize[H] || aspectRatio ? evX(event) : viewX(selection.x2); + y2 = !resize.length || resize[V] || aspectRatio ? evY(event) : viewY(selection.y2); + + doResize(x2, y2); + + return false; + } + + function doMove(newX1, newY1) + { + x2 = (x1 = newX1) + selection.width; + y2 = (y1 = newY1) + selection.height; + + selection.x1 = selX(x1); + selection.y1 = selY(y1); + selection.x2 = selX(x2); + selection.y2 = selY(y2); + + update(); + + options.onSelectChange(img, selection); + } + + function movingMouseMove(event) + { + var newX1 = Math.max(left, Math.min(moveX + evX(event) - startX, + left + imgWidth - selection.width)); + var newY1 = Math.max(top, Math.min(moveY + evY(event) - startY, + top + imgHeight - selection.height)); + + doMove(newX1, newY1); + + event.preventDefault(); + return false; + } + + function startSelection(event) + { + sizePredef = 70; + + adjust(); + + selection.x1 = selX(startX = x1 = x2 = evX(event)) - parseInt(sizePredef/2); + selection.y1 = selY(startY = y1 = y2 = evY(event)) - parseInt(sizePredef/2); + + selection.x2 = selection.x1 + sizePredef; + selection.y2 = selection.y1 + sizePredef; + + selection.width = 70; + selection.height = 70; + + console.log(selection); + + resize = [ ]; + + update(); + $a.add($o).show(); + + jQuery(document).unbind('mouseup', cancelSelection) + .mousemove(selectingMouseMove); + $border2.unbind('mousemove', areaMouseMove); + + options.onSelectStart(img, selection); + + jQuery(document).one('mouseup', function () { + if (options.autoHide || (selection.width * selection.height == 0)) + $a.add($o).hide(); + + options.onSelectEnd(img, selection); + + jQuery(document).unbind('mousemove', selectingMouseMove); + $border2.mousemove(areaMouseMove); + }); + } + + function cancelSelection() + { + //Ocultamos cualquier menu + jQuery('#cont-menu').hide(); + jQuery(document).unbind('mousemove', startSelection); + $a.add($o).hide(); + + selection.x1 = selection.y1 = selection.x2 = selection.y2 = + selection.width = selection.height = 0; + + options.onSelectChange(img, selection); + options.onSelectEnd(img, selection); + } + + function imgMouseDown(event) + { + if (event.which != 1) return false; + + jQuery(document).one('mousemove', startSelection) + .one('mouseup', cancelSelection); + + jQuery(document).trigger('mousemove',event); + + return false; + } + + function windowResize() + { + adjust(); + update(false); + x1 = viewX(selection.x1); + y1 = viewY(selection.y1); + x2 = viewX(selection.x2); + y2 = viewY(selection.y2); + } + + var docKeyPress = function(event) { + var k = options.keys, d = 10, t, + key = event.keyCode || event.which; + + if (!isNaN(k.arrows)) d = k.arrows; + if (!isNaN(k.shift) && event.shiftKey) d = k.shift; + if (!isNaN(k.ctrl) && event.ctrlKey) d = k.ctrl; + if (!isNaN(k.alt) && (event.altKey || event.originalEvent.altKey)) d = k.alt; + + if (k.arrows == 'resize' || (k.shift == 'resize' && event.shiftKey) || + (k.ctrl == 'resize' && event.ctrlKey) || + (k.alt == 'resize' && (event.altKey || event.originalEvent.altKey))) + { + switch (key) { + case 37: + d = -d; + case 39: + t = Math.max(x1, x2); + x1 = Math.min(x1, x2); + x2 = Math.max(t + d, x1); + if (aspectRatio) aspectRatioYX(); + break; + case 38: + d = -d; + case 40: + t = Math.max(y1, y2); + y1 = Math.min(y1, y2); + y2 = Math.max(t + d, y1); + if (aspectRatio) aspectRatioXY(); + break; + default: + return; + } + + doResize(x2, y2); + } + else { + x1 = Math.min(x1, x2); + y1 = Math.min(y1, y2); + + switch (key) { + case 37: + doMove(Math.max(x1 - d, left), y1); + break; + case 38: + doMove(x1, Math.max(y1 - d, top)); + break; + case 39: + doMove(x1 + Math.min(d, imgWidth - selX(x2)), y1); + break; + case 40: + doMove(x1, y1 + Math.min(d, imgHeight - selY(y2))); + break; + default: + return; + } + } + + return false; + }; + + this.setOptions = function(newOptions) + { + options = jQuery.extend(options, newOptions); + + if (newOptions.x1 != null) { + selection.x1 = newOptions.x1; + selection.y1 = newOptions.y1; + selection.x2 = newOptions.x2; + selection.y2 = newOptions.y2; + newOptions.show = true; + } + + if (newOptions.keys) + options.keys = jQuery.extend({ shift: 1, ctrl: 'resize' }, + newOptions.keys === true ? { } : newOptions.keys); + + parent = jQuery(options.parent).get(0); + + adjust(); + + $p = jQuery(img); + + while ($p.length && !$p.is('body')) { + if (!isNaN($p.css('z-index')) && $p.css('z-index') > zIndex) + zIndex = $p.css('z-index'); + if ($p.css('position') == 'fixed') fixed = true; + + $p = $p.parent(); + } + + x1 = viewX(selection.x1); + y1 = viewY(selection.y1); + x2 = viewX(selection.x2); + y2 = viewY(selection.y2); + selection.width = x2 - x1; + selection.height = y2 - y1; + + update(); + + if (newOptions.hide) + $a.add($o).hide(); + else if (newOptions.show) + $a.add($o).show(); + + $o.addClass(options.classPrefix + '-outer'); + $area.addClass(options.classPrefix + '-selection'); + $border1.addClass(options.classPrefix + '-border1'); + $border2.addClass(options.classPrefix + '-border2'); + + $a.css({ borderWidth: options.borderWidth + 'px' }); + $area.css({ backgroundColor: options.selectionColor, opacity: options.selectionOpacity }); + $border1.css({ borderStyle: 'solid', borderColor: options.borderColor1 }); + $border2.css({ borderStyle: 'dashed', borderColor: options.borderColor2 }); + $o.css({ opacity: options.outerOpacity, backgroundColor: options.outerColor }); + + aspectRatio = options.aspectRatio && (d = options.aspectRatio.split(/:/)) ? + d[0] / d[1] : null; + + if (options.disable || options.enable === false) { + $a.unbind('mousemove', areaMouseMove).unbind('mousedown', areaMouseDown); + jQuery(img).add($o).unbind('mousedown', imgMouseDown); + jQuery(window).unbind('resize', windowResize); + } + else if (options.enable || options.disable === false) { + if (options.resizable || options.movable) + $a.mousemove(areaMouseMove).mousedown(areaMouseDown); + + if (!options.persistent) + jQuery(img).add($o).mousedown(imgMouseDown); + jQuery(window).resize(windowResize); + } + + jQuery(options.parent).append($o.add($a)); + + options.enable = options.disable = undefined; + }; + + if (jQuery.browser.msie) + jQuery(img).attr('unselectable', 'on'); + + jQuery.imgAreaSelect.keyPress = jQuery.browser.msie || + jQuery.browser.safari ? 'keydown' : 'keypress'; + + $a.add($o).css({ display: 'none', position: fixed ? 'fixed' : 'absolute', + overflow: 'hidden', zIndex: zIndex > 0 ? zIndex : '0' }); + $area.css({ borderStyle: 'solid' }); + + initOptions = { + borderColor1: '#000', + borderColor2: '#fff', + borderWidth: 1, + classPrefix: 'imgareaselect', + movable: true, + resizable: true, + selectionColor: '#fff', + selectionOpacity: 0.2, + outerColor: '#000', + outerOpacity: 0.2, + parent: 'body', + onSelectStart: function () {}, + onSelectChange: function () {}, + onSelectEnd: function () {} + }; + + options = jQuery.extend(initOptions, options); + this.setOptions(options); +}; + +jQuery.fn.imgAreaSelect = function (options) { + options = options || {}; + + this.each(function () { + if (jQuery(this).data('imgAreaSelect')) + jQuery(this).data('imgAreaSelect').setOptions(options); + else { + if (options.enable === undefined && options.disable === undefined) + options.enable = true; + + jQuery(this).data('imgAreaSelect', new jQuery.imgAreaSelect.init(this, options)); + } + }); + + return this; +}; diff --git a/vendors/jquery.quicksearch.js b/vendors/jquery.quicksearch.js new file mode 100644 index 000000000..d572514e7 --- /dev/null +++ b/vendors/jquery.quicksearch.js @@ -0,0 +1,345 @@ +jQuery(function ($) { + $.fn.quicksearch = function (opt) { + + function is_empty(i) + { + return (i === null || i === undefined || i === false) ? true: false; + } + + function strip_html(input) + { + var regexp = new RegExp(/\<[^\<]+\>/g); + var output = input.replace(regexp, ""); + output = $.trim(output.toLowerCase().replace(/\n/, '').replace(/\s{2,}/, ' ')); + return output; + } + + function get_key() + { + var input = strip_html($('input[rel="' + options.randomElement + '"]').val()); + + if (input.indexOf(' ') === -1) + { + return input; + } + else + { + return input.split(" "); + } + } + + function test_key(k, value, type) + { + if (type === "string") + { + return test_key_string(k, value); + } + else + { + return test_key_arr(k, value); + } + } + + function test_key_string(k, value) + { + return (value.indexOf(k) > -1); + } + + function test_key_arr(k, value) + { + for (var i = 0; i < k.length; i++) { + var test = value.indexOf(k[i]); + if (test === -1) { + return false; + } + } + return true; + } + + function select_element(el) + { + if (options.hideElement === "grandparent") + { + return $(el).parent().parent(); + } + else if (options.hideElement === "parent") + { + return $(el).parent(); + } + else + { + return $(el); + } + } + + function stripe(el) + { + if (doStripe) + { + var i = 0; + select_element(el).filter(':visible').each(function () { + + for (var j = 0; j < stripeRowLength; j++) + { + if (i === j) + { + $(this).addClass(options.stripeRowClass[i]); + + } + else + { + $(this).removeClass(options.stripeRowClass[j]); + } + } + i = (i + 1) % stripeRowLength; + }); + } + } + + function fix_widths(el) + { + $(el).find('td').each(function () { + $(this).attr('width', parseInt($(this).css('width'))); + }); + } + + function loader(o) { + if (options.loaderId) + { + var l = $('input[rel="' + options.randomElement + '"]').parent().find('.loader'); + if (o === 'hide') + { + l.hide(); + } + else + { + l.show(); + } + } + } + + function place_form() { + var formPosition = options.position; + var formAttached = options.attached; + + if (formPosition === 'before') { + $(formAttached).before(make_form()); + } else if (formPosition === 'prepend') { + $(formAttached).prepend(make_form()); + } else if (formPosition === 'append') { + $(formAttached).append(make_form()); + } else { + $(formAttached).after(make_form()); + } + } + + function make_form_label() + { + if (!is_empty(options.labelText)) { + return ' '; + } + return ''; + } + + function make_form_input() + { + var val = (!is_empty(options.inputText)) ? options.inputText : "" + return ' '; + } + + function make_form_loader() + { + if (!is_empty(options.loaderImg)) { + return 'Loading'; + } else { + return '' + options.loaderText + ''; + } + } + + function make_form() + { + var f = (!options.isFieldset) ? 'form' : 'fieldset'; + /*return '<' + f + ' action="#" ' + 'id="'+ options.formId + '" ' + 'class="quicksearch">' + + make_form_label() + make_form_input() + make_form_loader() + + '';*/ + return make_form_label() + make_form_input() + make_form_loader() + } + + function focus_on_load() + { + $('input[rel="' + options.randomElement + '"]').get(0).focus(); + } + + function toggle_text() { + $('input[rel="' + options.randomElement + '"]').focus(function () { + if ($(this).val() === options.inputText) { + $(this).val(''); + } + }); + $('input[rel="' + options.randomElement + '"]').blur(function () { + if ($(this).val() === "") { + $(this).val(options.inputText); + } + }); + } + + function get_cache(el) + { + return $(el).map(function(){ + return strip_html(this.innerHTML); + }); + } + + function init() + { + place_form(); + if (options.fixWidths) fix_widths(el); + if (options.focusOnLoad) focus_on_load(); + if (options.inputText != "" && options.inputText != null) toggle_text(); + + cache = get_cache(el); + + stripe(el); + loader('hide'); + } + + function qs() + { + clearTimeout(timeout); + timeout = setTimeout(function () { + + loader('show'); + + setTimeout(function () { + options.onBefore(); + + var k = get_key(); + var k_type = (typeof k); + var i = 0; + + k = options.filter(k); + + if (k != "") + { + if (typeof score[k] === "undefined") + { + score[k] = new Array(); + cache.each(function (i) { + if (test_key(k, cache[i], k_type)) + { + score[k][i] = true; + } + }); + } + + if (score[k].length === 0) + { + select_element(el).hide(); + } + else + { + /*console.log(score[k].length); + if(score[k].length==1) + { + //$(el).parents('ul').find('li:visible:eq(0) a').addClass('selected'); + } + else + { + //$(el).parents('ul').find('li:visible:eq(0) a').removeClass('selected') + }*/ + + $(el).each(function (i) { + if (score[k][i]) + { + select_element(this).show(); + } + else + { + select_element(this).hide(); + } + } + ); + + if($(el).parents('ul').find('li:visible').length==1) + $(el).parents('ul').find('li:visible:eq(0) a').addClass('selected'); + else + $(el).parents('ul').find('li:visible:eq(0) a').removeClass('selected'); + + } + } + else + { + select_element(el).show(); + } + + stripe(el); + }, options.delay/2); + + setTimeout( function () { + loader('hide'); + }, options.delay/2); + + options.onAfter(); + + }, options.delay/2); + } + + var options = $.extend({ + position: 'prepend', + attached: 'body', + formId: 'quicksearch', + labelText: 'Quick Search', + labelClass: 'qs_label', + inputText: null, + inputClass: 'qs_input', + loaderId: 'loader', + loaderClass: 'loader', + loaderImg: null, + loaderText: 'Loading...', + stripeRowClass: null, + hideElement: null, + delay: 500, + focusOnLoad: false, + onBefore: function () { }, + onAfter: function () { }, + filter: function (i) { + return i; + }, + randomElement: 'qs' + Math.floor(Math.random() * 1000000), + isFieldset: false, + fixWidths: false + }, opt); + + var timeout; + var score = {}; + var stripeRowLength = (!is_empty(options.stripeRowClass)) ? options.stripeRowClass.length : 0; + var doStripe = (stripeRowLength > 0) ? true : false; + var el = this; + var cache; + var selector = $(this).selector; + + $.fn.extend({ + reset_cache: function () { + el = $(selector); + cache = get_cache(el); + } + }); + + init(); + + $('input[rel="' + options.randomElement + '"]').keydown(function (e) { + var keycode = e.keyCode; + if (!(keycode === 9 || keycode === 13 || keycode === 16 || keycode === 17 || keycode === 18 || keycode === 38 || keycode === 40 || keycode === 224)) + { + qs(); + } + }); + + //$('#quicksearch').submit( function () { addTag()}); + + return this; + }; +}); \ No newline at end of file diff --git a/views/default/object/image.php b/views/default/object/image.php index 3aa9bab8e..e4401a950 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -81,16 +81,147 @@ echo '
      ' . autop($desc) . '
      '; echo '
      '; echo '
      ' . $back . $next . '
      '; - if ($next) echo ''; - echo '' . $title . ''; - if ($next) echo ''; - echo '
      '; ?> -
      -

      -
      +
      + + + + + + + +
      +
      + +getGUID(), false, 'user', '', 0); -
      +?> +
      +
      +"; + $content .= ""; + + $content .= " +
      + +
      "; + + echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/phototagging", 'body' => $content)) +?> +
      +value); + + + if($data_tag->type == 'user') + $data_tag->data = get_entity($data_tag->value); + else + $data_tag->data = $data_tag->value; + + echo "
      "; + if($data_tag->type == 'user') + echo "{$data_tag->data->name}"; + else + echo "{$data_tag->data}"; + echo ""; + echo "
      "; +}else +{ + echo "
      "; +} + + if ($next) + $click = "onclick='toggleLink()'"; + + echo '' . $title . ''; + +?> +
      + +
      + +
      +
        +
        • +
        • +
      +
      + + +
      +

      +
        +value); + + $name = ""; + + $object = new stdClass(); + + if($data_tag->type == 'user') + { + $data_tag->data = get_entity($data_tag->value); + $object->img = elgg_view("profile/icon",array('entity' => $data_tag->data, 'size' => 'topbar', 'override' => true)); + $object->name = $data_tag->data->name; + $object->rel = $data_tag->data->getUrl(); + }else + { + $data_tag->data = $data_tag->value; + $object->img = ""; + $object->name = $data_tag->data; + $object->rel = "#"; + } + + $object->html = "
      • $object->img{$object->name}
        • "; + + if($data_tag->type == 'user') + $users[] = $object; + + else + $objects[] = $object; + } + + if(!empty($users)) foreach ($users as $user) + echo $user->html; + + if(!empty($objects)) foreach ($objects as $object) + echo $object->html; + +?> +
      +
      + + + +
      @@ -107,4 +238,164 @@ } } // end of tidypics image display -?> \ No newline at end of file +?> + + + + \ No newline at end of file diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 6559ec5be..0f5b8baeb 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -23,6 +23,18 @@ margin-bottom:10px; margin:10px; } +#tidypics_controls ul { +list-style:none; +margin:0px; +padding:8px; +} + +#tidypics_controls ul li { +padding:2px 10px 2px 22px; +margin:2px 0px; +display:inline; +} +/* .tidypics_download a { font:12px/100% Arial, Helvetica, sans-serif; font-weight:bold; @@ -43,7 +55,7 @@ background:#0054a7; color:white; text-decoration:none; } - +*/ .tidypics_album_images { float:left; width:153px; @@ -147,4 +159,33 @@ padding:0 0 5px; } .river_object_album_comment { background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} + +/* ----------- tagging ---------------- */ +#tagging_instructions { +background:#FFFBE2 none repeat scroll 0 0; +border:1px solid #FFE222; +margin:10px; +padding:10px; +display:none; +} + +#cont-image { +margin:0px auto; +background:white none repeat scroll 0 0; +border:1px solid #DDDDDD; +padding:10px; +overflow:hidden; +} + +#cont-menu { +border:1px solid #3B5999; +width:200px; +position:absolute; +z-index:10000; +display:none; +background:#fff; +padding:5px; +font-size:12px; +text-align:left; } \ No newline at end of file -- cgit v1.2.3 From 9adff06c774ed66b99f9754263642fcf84b1dec4 Mon Sep 17 00:00:00 2001 From: alfalive Date: Fri, 3 Apr 2009 19:14:32 +0000 Subject: Added String tidypics:newalbum' => 'New photo album', --- languages/de.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/languages/de.php b/languages/de.php index 25604f1d6..582590c7f 100644 --- a/languages/de.php +++ b/languages/de.php @@ -1,12 +1,12 @@ "ein Bild", 'image:river:annotate' => "%s kommentierte", - //albums + //albums 'album:river:created' => "%s erstellte", 'album:river:item' => "ein Album", 'album:river:annotate' => "%s kommentierte", + + //Benachrichtigungen + 'tidypics:newalbum' => 'Neues Foto-Album', + // Status messages -- cgit v1.2.3 From 6352944c967045ac53b9ae12d8cc6b8f50063c45 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 4 Apr 2009 00:21:14 +0000 Subject: grrrr....stupid debug statement was crashing the image select - integrating other people's code can be annoying --- vendors/jquery.imgareaselect-0.6.2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendors/jquery.imgareaselect-0.6.2.js b/vendors/jquery.imgareaselect-0.6.2.js index 76f77ee98..d33e38b8d 100644 --- a/vendors/jquery.imgareaselect-0.6.2.js +++ b/vendors/jquery.imgareaselect-0.6.2.js @@ -307,7 +307,7 @@ jQuery.imgAreaSelect.init = function (img, options) { selection.width = 70; selection.height = 70; - console.log(selection); + //console.log(selection); resize = [ ]; -- cgit v1.2.3 From 6c62395ebff1177b3b124ec3ea6b793bcbf6808d Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 4 Apr 2009 00:46:51 +0000 Subject: making progress on integrating the image area select --- views/default/object/image.php | 290 +++++++++++++++++++++-------------------- 1 file changed, 146 insertions(+), 144 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index e4401a950..c7bf408d5 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -239,163 +239,165 @@ if ($photo_tags) foreach ($photo_tags as $photo_tag) } // end of tidypics image display ?> - - - - + + + \ No newline at end of file + jQuery('div.phototag[rel*='+ iRel + ']').find("em").stop(true, true).animate({opacity: "show"}, "fast").css({'display':'block','-moz-border-radius-topleft':'2px','-moz-border-radius-topright':'2px','-moz-border-radius-bottomleft':'0px','-moz-border-radius-bottomright':'0px'}); + jQuery('div.phototag[rel*='+ iRel + ']').find("span").css({'border':'1px solid white','border-top':'none'} ); + }, function() { + iRel = jQuery(this).attr('rel'); + jQuery('div.phototag[rel*='+ iRel + ']').find("em").animate({opacity: "hide"}, "fast"); + jQuery('div.phototag[rel*='+ iRel + ']').find("span").css("border","none"); + + }); +*/ + \ No newline at end of file -- cgit v1.2.3 From 1e6769307f0784c249cd98b857085adbca039627 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 4 Apr 2009 14:35:09 +0000 Subject: trying to cleanup select area code --- views/default/object/image.php | 279 ++++++++++++++--------------------------- views/default/tidypics/css.php | 17 +++ 2 files changed, 109 insertions(+), 187 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index c7bf408d5..383af4b4d 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -15,7 +15,7 @@ $mime = $file->mimetype; - if (get_context() == "search") { //if this is the search view + if (get_context() == "search") { //if this is the search view if (get_input('search_viewtype') == "gallery") { ?> @@ -36,52 +36,88 @@ echo elgg_view_listing($icon, $info); } - } else { - //tidypics image display - - if (!$vars['full']) { //simple gallery view - + } else { + + if (!$vars['full']) { + +//simple gallery view ?> -
      - thumbnail -
      +
      + thumbnail +
      '; - + } else { + +//////////////////////////////////////////////////////// +// +// tidypics individual image display +// +//////////////////////////////////////////////////////// + + + // Build back and next links + + $back = ''; + $next = ''; + $album = get_entity($file->container_guid); - - //compile back | next links + $current = array_search($file_guid, $_SESSION['image_sort']); - + if (!$current) { // means we are no longer using the correct album array - - //rebuild the array -> + + //rebuild the array $count = get_entities("object","image", $album->guid, '', 999); $_SESSION['image_sort'] = array(); - - foreach($count as $image){ + + foreach ($count as $image) { array_push($_SESSION['image_sort'], $image->guid); - } + } - $current = array_search($file_guid, $_SESSION['image_sort']); + $current = array_search($file_guid, $_SESSION['image_sort']); } - if (!$current == 0) - $back = '<<' . elgg_echo('image:back') . '  '; + if ($current != 0) + $back = '<<' . elgg_echo('image:back') . ''; - if (array_key_exists(($current+1), $_SESSION['image_sort'])) - $next = '  ' . elgg_echo('image:next') . '>>'; + if (sizeof($_SESSION['image_sort']) > $current) + $next = '' . elgg_echo('image:next') . '>>'; + -?> +?> +
      +
      -' . autop($desc) . '
      '; - echo '
      '; - echo '
      ' . $back . $next . '
      '; +
      + +
      +
      + +
      +
      +
      + '; ?>
      +
      +
      +
      +
      +
        +
        • +
        • +
      +
      +
      + +
      $tags));?>
      + name; ?> +
      +
      @@ -93,155 +129,20 @@
      -getGUID(), false, 'user', '', 0); - -?> -
      -
      -"; - $content .= ""; - - $content .= " -
      - -
      "; - - echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/phototagging", 'body' => $content)) -?> -
      - -if ($photo_tags) foreach ($photo_tags as $photo_tag) -{ - $data_tag = unserialize($photo_tag->value); - - - if($data_tag->type == 'user') - $data_tag->data = get_entity($data_tag->value); - else - $data_tag->data = $data_tag->value; - - echo "
      "; - if($data_tag->type == 'user') - echo "{$data_tag->data->name}"; - else - echo "{$data_tag->data}"; - echo ""; - echo "
      "; -}else -{ - echo "
      "; -} - - if ($next) - $click = "onclick='toggleLink()'"; - - echo '' . $title . ''; - -?> -
      - -
      - -
      -
        -
        • -
        • -
      -
      - - -
      -

      -
        -value); - - $name = ""; - - $object = new stdClass(); - - if($data_tag->type == 'user') - { - $data_tag->data = get_entity($data_tag->value); - $object->img = elgg_view("profile/icon",array('entity' => $data_tag->data, 'size' => 'topbar', 'override' => true)); - $object->name = $data_tag->data->name; - $object->rel = $data_tag->data->getUrl(); - }else - { - $data_tag->data = $data_tag->value; - $object->img = ""; - $object->name = $data_tag->data; - $object->rel = "#"; - } - - $object->html = "
      • $object->img{$object->name}
        • "; - - if($data_tag->type == 'user') - $users[] = $object; - - else - $objects[] = $object; - } - - if(!empty($users)) foreach ($users as $user) - echo $user->html; - - if(!empty($objects)) foreach ($objects as $object) - echo $object->html; - -?> -
      -
      - - - -
      - -
      $tags));?>
      - - name; ?>
      -
      '; - } - - } // end of tidypics image display + echo '
      '; // content wrapper + } // // end of individual image display + + } ?> - - + + @@ -240,8 +267,7 @@ imgOffset = $(image).offset(); - // hard coded for testing - tags = [{"x1":"10","y1":"10","height":"150","width":"50","text":"George"}, {"x1":"25","y1":"25","height":"70","width":"80","text":"Ed"}]; + tags = ; $(tags).each(function(){ appendTag(imgOffset, this); -- cgit v1.2.3 From 706480c069b5396504b4cbc7375f45f34c73268e Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 4 Apr 2009 20:40:01 +0000 Subject: adding unique id to each tag div --- views/default/object/image.php | 121 +++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 76 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index cd3d8fe53..17e1a2974 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -34,13 +34,12 @@ if ($photo_tags) { $phototag_text = "unknown user"; } - $photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '"},'; + $photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},'; } $photo_tags_json = rtrim($photo_tags_json,','); $photo_tags_json .= ']'; } - if (get_context() == "search") { //if this is the search view if (get_input('search_viewtype') == "gallery") { @@ -124,68 +123,6 @@ if ($photo_tags) {
      '; ?>
      -
      -getGUID(), false, 'user', '', 0); - - $content = ""; - $content .= ""; - $content .= ""; - $content .= ""; - - $content .= ""; - - $content .= "
      "; - - echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content)); - -?> -
      - -value); - $data_tag->type = 'word'; - $data_tag->value = 'Test tag'; - $data_tag->id = 32; - $data_tag->x1 = 73; - $data_tag->y1 = 56; - $data_tag->width = 100; - $data_tag->height = 32; - - if($data_tag->type == 'user') - $data_tag->data = get_entity($data_tag->value); - else - $data_tag->data = $data_tag->value; - - echo "
      "; - - if($data_tag->type == 'user') - echo "{$data_tag->data->name}"; - else - echo "{$data_tag->data}"; - - echo ""; - echo "
      "; -// } -//} -?> -
      @@ -194,17 +131,33 @@ if ($photo_tags) {
      2. + +
      +

      +
        +
      +
      + +
      - +
      $tags));?>
      - + name; ?>
      +
      +'; // content wrapper + } // // end of individual image display + + } + +?>
      @@ -217,18 +170,34 @@ if ($photo_tags) {
      -
      +
      +getGUID(), false, 'user', '', 0); - echo elgg_view_comments($file); + $content = ""; + $content .= ""; + $content .= ""; + $content .= ""; - echo '
      '; // content wrapper - } // // end of individual image display + $content .= ""; + + $content .= "
      "; + + echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content)); + ?> +
      @@ -304,7 +273,7 @@ if ($photo_tags) { tag_top = parseInt(imgOffset.top) + parseInt(tag.y1); tag_left = parseInt(imgOffset.left) + parseInt(tag.x1); - tag_div = $('
      ').css({ left: tag_left + 'px', top: tag_top + 'px', width: tag.width + 'px', height: tag.height + 'px' }); + tag_div = $('
      ').css({ left: tag_left + 'px', top: tag_top + 'px', width: tag.width + 'px', height: tag.height + 'px' }); tag_text_div = $('
      '+tag.text+'
      ').css({ left: tag_left + 'px', top: tag_top + 'px', width: tag.width + 'px', height: 20 + 'px' }); -- cgit v1.2.3 From 50069fe90b72af415146c6e1dbd72b89c8703dc3 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 4 Apr 2009 21:37:58 +0000 Subject: added mouseover on tag links --- views/default/object/image.php | 59 ++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 39 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index 17e1a2974..0fe69a7aa 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -17,6 +17,7 @@ // photo tags +$photo_tag_links = array(); $photo_tags_json = ""; $photo_tags = get_annotations($file_guid,'object','image','phototag'); @@ -35,6 +36,8 @@ if ($photo_tags) { } $photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},'; + + $photo_tag_links[] = array($p->id, $phototag_text); // gave up on associative array for now } $photo_tags_json = rtrim($photo_tags_json,','); $photo_tags_json .= ']'; @@ -133,8 +136,13 @@ if ($photo_tags) {
      -

      +

      @@ -252,7 +260,17 @@ if ($photo_tags) { ); addTagEvents(); - + + $('.phototag-links').hover( + function(){ + code = this.id.substr(7); // cut off taglink to get unique id + $('#tag'+code).show(); + }, + function(){ + code = this.id.substr(7); + $('#tag'+code).hide(); + } + ); // make sure we catch and handle when the browser is resized $(window).resize(function () { @@ -391,41 +409,4 @@ if ($photo_tags) { */ } - -/* - $(".phototag span").hover( function() { - - jQuery(this).prev("em").stop(true, true).animate({opacity: "show"}, "fast").css( - { 'display':'block', - '-moz-border-radius-topleft':'2px', - '-moz-border-radius-topright':'2px', - '-moz-border-radius-bottomleft':'2px', - '-moz-border-radius-bottomright':'2px'} - ); - jQuery(this).css({'border':'1px solid black','border-top':'none'} ); - }, function() { - jQuery(this).prev("em").animate({opacity: "hide"}, "fast"); - } - ); -*/ -/* - - function fixContImage() - { - jQuery('#cont-image').width(jQuery('#cont-image img').width()); - jQuery('#cont-image').height(jQuery('#cont-image img').height()); - setTimeout("if(jQuery('#cont-image').width() < jQuery('#cont-image img').width()) setTimeout(\"fixContImage()\",500);",300); - } - - jQuery('a.phototag-links').hover(function() { - iRel = jQuery(this).attr('rel'); - jQuery('div.phototag[rel*='+ iRel + ']').find("em").stop(true, true).animate({opacity: "show"}, "fast").css({'display':'block','-moz-border-radius-topleft':'2px','-moz-border-radius-topright':'2px','-moz-border-radius-bottomleft':'0px','-moz-border-radius-bottomright':'0px'}); - jQuery('div.phototag[rel*='+ iRel + ']').find("span").css({'border':'1px solid white','border-top':'none'} ); - }, function() { - iRel = jQuery(this).attr('rel'); - jQuery('div.phototag[rel*='+ iRel + ']').find("em").animate({opacity: "hide"}, "fast"); - jQuery('div.phototag[rel*='+ iRel + ']').find("span").css("border","none"); - - }); -*/ \ No newline at end of file -- cgit v1.2.3 From 34abd270e64ba82e8cf67d1a9843682e6b8e6cca Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 4 Apr 2009 21:40:14 +0000 Subject: added string for in this photo tags --- languages/en.php | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/en.php b/languages/en.php index 20c1f3cee..b0f358910 100644 --- a/languages/en.php +++ b/languages/en.php @@ -59,6 +59,7 @@ 'image:finish_tagging' => 'Stop labeling', 'image:tagthisphoto' => 'Tag this photo', 'image:actiontag' => 'Tag', + 'image:inthisphoto' => 'In this photo', //widgets -- cgit v1.2.3 From b3e57c7d259f274ca880e45a937f0b5d6c510c10 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 4 Apr 2009 22:00:26 +0000 Subject: better location for tag menu popup --- views/default/object/image.php | 44 +++++++++++++++++++++++------------------- views/default/tidypics/css.php | 4 ---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index 0fe69a7aa..3cb1e7ee3 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -341,8 +341,10 @@ if ($photo_tags) { borderWidth: 2, borderColor1: 'white', borderColor2: 'white', - onSelectEnd: showMenu, - onSelectStart: hideMenu + disable: false, + hide: false, + onSelectEnd: showTagMenu, + onSelectStart: hideTagMenu } ); } @@ -352,7 +354,7 @@ if ($photo_tags) { { $('#tagging_instructions').hide(); $('#tag_menu').hide(); - $('img#tidypics_image').imgAreaSelect( {hide: true} ); + $('img#tidypics_image').imgAreaSelect( {hide: true, disable: true} ); $('#tidypics_image').hover( function(){ @@ -364,31 +366,36 @@ if ($photo_tags) { ); } - - function hideMenu() + function showTagMenu(oObject, oCoordenates) { - $('#tag_menu').hide(); - coordinates = ""; - } + offsetX = -100; - function showMenu(oObject, oCoordenates) - { - constX = 0; - constY = 0; + imgOffset = $('#tidypics_image').offset(); // show the list of friends if (oCoordenates.width != 0 && oCoordenates.height != 0) { coordinates = oCoordenates; + + top = imgOffset.top + oCoordenates.y2; + left = imgOffset.left + oCoordenates.x2 + offsetX; $('#tag_menu').show().css({ - "top": oCoordenates.y2+constY + "px", - "left": oCoordenates.x2+constX + "px" + "top": top + "px", + "left": left + "px" }); $(".input-filter").focus(); } } + + function hideTagMenu() + { + $('#tag_menu').hide(); + coordinates = ""; + } + + function addTag() { // do I need a catch for no tag? @@ -402,11 +409,8 @@ if ($photo_tags) { coord_string += '"height":"' + coordinates.height + '"'; $("input#coordinates").val(coord_string); -/* - //Show loading - jQuery("#cont-menu label, #cont-menu input, #cont-menu p, #cont-menu span, #cont-menu button, #cont-menu ul, #cont-menu fieldset").hide(); - jQuery("#cont-menu ").append('
      '); - -*/ + + //Show loading + //$("#tag_menu").replaceWith('
      '); } \ No newline at end of file diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 83421de74..f9f57ceab 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -78,7 +78,6 @@ margin:10px; #tidypics_image_wrapper { margin:10px 0 10px 0; text-align:center; -position: relative; } /* @@ -210,9 +209,6 @@ font-size:12px; text-align:left; } -div.phototag {height:140px; position:absolute; text-align:center;} -div.phototag span {margin:0px; display:block;} -div.phototag em {background:#EFFEFF; border:none; color: #61A6DF; opacity:0.8;position: relative;text-align: center; z-index: 2; display: none; font-size:10px; font-style:normal; padding:3px 0px; margin:-20px auto 0px; font-weight:bolder; -moz-border-radius:2px;} .tidypics_tag { display: none; -- cgit v1.2.3 From 35d2a5a1ef97b890b5d11930637c7c68ece22ad1 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 4 Apr 2009 22:26:24 +0000 Subject: starting and stopping tagging can be down through same button now --- views/default/object/image.php | 84 +++++++++++++++++++++++++++++------------- views/default/tidypics/css.php | 45 +++++++++------------- 2 files changed, 77 insertions(+), 52 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index 3cb1e7ee3..e11dfe31a 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -130,7 +130,7 @@ if ($photo_tags) {
        -
        • +
      @@ -214,6 +214,7 @@ if ($photo_tags) { var coordinates = ""; var user_id = 0; + var tagging = 0; // add to DOM as soon as ready $(document).ready(function () { @@ -324,38 +325,52 @@ if ($photo_tags) { function startTagging() { - if ( $('#tagging_instructions').is(':hidden') ) + if (tagging != 0) { - $('#tagging_instructions').show(); - - $('#tidypics_image').hover( - function(){ - $('.tidypics_tag').hide(); - }, - function(){ - $('.tidypics_tag').hide(); - } + stopTagging(); + return; + } + + tagging = 1; + + $('#tag_control').text("Stop Tagging"); + + showTagInstruct(); + + + $('#tidypics_image').hover( + function(){ + $('.tidypics_tag').hide(); + }, + function(){ + $('.tidypics_tag').hide(); + } ); - $('img#tidypics_image').imgAreaSelect( { - borderWidth: 2, - borderColor1: 'white', - borderColor2: 'white', - disable: false, - hide: false, - onSelectEnd: showTagMenu, - onSelectStart: hideTagMenu - } - ); - } + $('img#tidypics_image').imgAreaSelect( { + borderWidth: 2, + borderColor1: 'white', + borderColor2: 'white', + disable: false, + hide: false, + onSelectEnd: showTagMenu, + onSelectStart: hideTagMenu + } + ); } function stopTagging() { - $('#tagging_instructions').hide(); - $('#tag_menu').hide(); + tagging = 0; + + hideTagInstruct(); + hideTagMenu(); + + $('#tag_control').text("Tag this photo"); + $('img#tidypics_image').imgAreaSelect( {hide: true, disable: true} ); + // restart tag hovering $('#tidypics_image').hover( function(){ $('.tidypics_tag').show(); @@ -392,9 +407,28 @@ if ($photo_tags) { function hideTagMenu() { $('#tag_menu').hide(); - coordinates = ""; } + function showTagInstruct() + { + offsetY = -60; + + imgOffset = $('#tidypics_image').offset(); + imgWidth = $('#tidypics_image').width(); + + top = imgOffset.top + offsetY; + left = imgOffset.left; + + $('#tagging_instructions').show().css({ + "top": top + "px", + "left": left + "px" + }); + } + + function hideTagInstruct() + { + $('#tagging_instructions').hide(); + } function addTag() { diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index f9f57ceab..00fbb38de 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -182,19 +182,15 @@ padding:0 0 5px; /* ----------- tagging ---------------- */ #tagging_instructions { -background:#FFFBE2 none repeat scroll 0 0; -border:1px solid #FFE222; -margin:10px; +background:#FFFBE2; +border:1px solid #FFE222; padding:10px; +height:30px; +width:400px; display:none; -} - -#cont-image { -margin:0px auto; -background:white none repeat scroll 0 0; -border:1px solid #DDDDDD; -padding:10px; -overflow:hidden; +overflow:hidden; +position:absolute; +z-index:10000; } #tag_menu { @@ -203,29 +199,24 @@ width:200px; position:absolute; z-index:10000; display:none; -background:#fff; +background:#ffffff; padding:5px; font-size:12px; text-align:left; } - .tidypics_tag { - display: none; - background: url(spacer.gif); - border: 2px solid rgb(255, 255, 255); - overflow: hidden; - position: absolute; - z-index: 0; - cursor: text; +display:none; +border:2px solid #ffffff; +overflow:hidden; +position:absolute; +z-index:0; } .tidypics_tag_text { - display: none; - background: url(spacer.gif); - border: 2px solid rgb(255, 255, 255); - overflow: hidden; - position: absolute; - z-index: 0; - cursor: text; +display:none; +border:2px solid #ffffff; +overflow:hidden; +position:absolute; +z-index:0; } -- cgit v1.2.3 From 36c4e40fee8f698fde36b6e083290c8d877f456e Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 5 Apr 2009 00:52:30 +0000 Subject: whoops - need to include hidden menus just for image view --- views/default/object/image.php | 14 +++++++++----- views/default/tidypics/css.php | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index e11dfe31a..81e25f915 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -161,12 +161,7 @@ if ($photo_tags) { echo elgg_view_comments($file); echo '
      '; // content wrapper - } // // end of individual image display - - } - ?> -
      @@ -207,6 +202,15 @@ if ($photo_tags) { ?> + + + diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 00fbb38de..0d4c6b046 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -219,4 +219,4 @@ border:2px solid #ffffff; overflow:hidden; position:absolute; z-index:0; -} +} \ No newline at end of file -- cgit v1.2.3 From 9081cb8734afab7b31e6f30739fe11c747789450 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 5 Apr 2009 01:05:51 +0000 Subject: pushed the tidypics javascript to a view --- views/default/js/tidypics.php | 244 +++++++++++++++++++++++++++++++++++++++++ views/default/object/image.php | 243 +--------------------------------------- 2 files changed, 246 insertions(+), 241 deletions(-) create mode 100644 views/default/js/tidypics.php diff --git a/views/default/js/tidypics.php b/views/default/js/tidypics.php new file mode 100644 index 000000000..22815aa5a --- /dev/null +++ b/views/default/js/tidypics.php @@ -0,0 +1,244 @@ + + + + + \ No newline at end of file diff --git a/views/default/object/image.php b/views/default/object/image.php index 81e25f915..ec87aa248 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -204,6 +204,8 @@ if ($photo_tags) { $photo_tags_json,) ); + } // // end of individual image display } @@ -211,244 +213,3 @@ if ($photo_tags) { ?> - - - - \ No newline at end of file -- cgit v1.2.3 From f52d481c6ae6c790db4dde27044ea401d0b2b713 Mon Sep 17 00:00:00 2001 From: dkotrada Date: Thu, 23 Apr 2009 17:43:48 +0000 Subject: now when you click on Back and Next link image appears alway on top. --- views/default/object/image.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index ec87aa248..3bbee049d 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -4,7 +4,7 @@ * Tidypics image object views */ - global $CONFIG; + global $CONFIG; $file = $vars['entity']; $file_guid = $file->getGUID(); $tags = $file->tags; @@ -36,7 +36,7 @@ if ($photo_tags) { } $photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},'; - + $photo_tag_links[] = array($p->id, $phototag_text); // gave up on associative array for now } $photo_tags_json = rtrim($photo_tags_json,','); @@ -44,9 +44,9 @@ if ($photo_tags) { } if (get_context() == "search") { //if this is the search view - + if (get_input('search_viewtype') == "gallery") { - ?> + ?>
      thumbnail
      @@ -59,17 +59,17 @@ if ($photo_tags) { $numcomments = elgg_count_comments($file); if ($numcomments) $info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")"; - $info .= "

      "; + $info .= "

      "; $icon = "getURL()}\">" . elgg_view("tidypics/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'small')) . ""; - + echo elgg_view_listing($icon, $info); } } else { - if (!$vars['full']) { + if (!$vars['full']) { //simple gallery view -?> +?>
      thumbnail
      @@ -101,15 +101,15 @@ if ($photo_tags) { foreach ($count as $image) { array_push($_SESSION['image_sort'], $image->guid); } - + $current = array_search($file_guid, $_SESSION['image_sort']); } if ($current != 0) - $back = '<<' . elgg_echo('image:back') . ''; + $back = '<<' . elgg_echo('image:back') . ''; if (sizeof($_SESSION['image_sort']) > $current + 1) - $next = '' . elgg_echo('image:next') . '>>'; + $next = '' . elgg_echo('image:next') . '>>'; ?> @@ -117,7 +117,7 @@ if ($photo_tags) {
      - +
      @@ -152,11 +152,11 @@ if ($photo_tags) {
      $tags));?>
      name; ?> name; ?>
      -{$friend->name}"; + $content .= "
    2. {$friend->name}
      3. "; } } - $content .= ""; + $content .= ""; $content .= "
      "; -- cgit v1.2.3 From 0df1cfb94d9f70994e02521c4bd41a73a8cda822 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 13:15:59 +0000 Subject: now handling Pedro Prez's tagging format --- views/default/object/image.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index 3bbee049d..b456fdebc 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -18,13 +18,14 @@ // photo tags $photo_tag_links = array(); -$photo_tags_json = ""; +$photo_tags_json = "\"\""; $photo_tags = get_annotations($file_guid,'object','image','phototag'); if ($photo_tags) { $photo_tags_json = "["; foreach ($photo_tags as $p) { $photo_tag = unserialize($p->value); + $phototag_text = $photo_tag->value; if ($photo_tag->type === 'user') { @@ -35,8 +36,13 @@ if ($photo_tags) { $phototag_text = "unknown user"; } - $photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},'; - + // hack to handle format of Pedro Prez's tags - ugh + if (isset($photo_tag->x1)) { + $photo_tag->coords = "\"x1\":\"{$photo_tag->x1}\",\"y1\":\"{$photo_tag->y1}\",\"width\":\"{$photo_tag->width}\",\"height\":\"{$photo_tag->height}\""; + $photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},'; + } else + $photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},'; + $photo_tag_links[] = array($p->id, $phototag_text); // gave up on associative array for now } $photo_tags_json = rtrim($photo_tags_json,','); -- cgit v1.2.3 From 02b84ae0ddc11385de5495c5f0de056255b2a4be Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 13:16:32 +0000 Subject: tweak to the css for images --- views/default/tidypics/css.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 0d4c6b046..314f73b0c 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -96,6 +96,11 @@ border:1px solid #dedede; margin:7px 0; } +#tidypics_image { +padding:5px; +border:1px solid #dedede; +} + .tidypics_album_cover { padding:2px; border:1px solid #dedede; -- cgit v1.2.3 From 896610c152dde74488a01acb6a3e5beda6cde04d Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 13:17:30 +0000 Subject: added a hack to image area select js to work around offset due to border --- vendors/jquery.imgareaselect-0.7.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendors/jquery.imgareaselect-0.7.js b/vendors/jquery.imgareaselect-0.7.js index a60edf79b..781e73949 100644 --- a/vendors/jquery.imgareaselect-0.7.js +++ b/vendors/jquery.imgareaselect-0.7.js @@ -76,8 +76,8 @@ jQuery.imgAreaSelect.init = function (img, options) { function adjust() { imgOfs = $img.offset(); - imgOfs.left = parseInt(imgOfs.left); - imgOfs.top = parseInt(imgOfs.top); + imgOfs.left = parseInt(imgOfs.left) + parseInt($img.css("border-left-width")) + parseInt($img.css("padding-left")); + imgOfs.top = parseInt(imgOfs.top) + parseInt($img.css("border-top-width")) + parseInt($img.css("padding-top")); imgWidth = $img.width(); imgHeight = $img.height(); -- cgit v1.2.3 From 37a556d955f2e18f83d239733963527cd573c233 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 13:32:37 +0000 Subject: admins can now override download link --- views/default/object/image.php | 2 +- views/default/tidypics/download.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 views/default/tidypics/download.php diff --git a/views/default/object/image.php b/views/default/object/image.php index b456fdebc..16ec74868 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -137,7 +137,7 @@ if ($photo_tags) {
        • -
        • + $file_guid,) ); ?>
      diff --git a/views/default/tidypics/download.php b/views/default/tidypics/download.php new file mode 100644 index 000000000..becb4b5fe --- /dev/null +++ b/views/default/tidypics/download.php @@ -0,0 +1,4 @@ + +
      4. \ No newline at end of file -- cgit v1.2.3 From e2538c6210711f1061962294d9476bfdfb992a36 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 14:01:34 +0000 Subject: tweaked css for tag text --- views/default/tidypics/css.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 314f73b0c..1f9d54cc7 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -224,4 +224,7 @@ border:2px solid #ffffff; overflow:hidden; position:absolute; z-index:0; +background: #ffffff; +text-align: center; +color: #4690d6; } \ No newline at end of file -- cgit v1.2.3 From 40c43b204903a03c63f7b9911b27717547ff5aa5 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 14:12:55 +0000 Subject: tweaked the photo tag list css --- views/default/tidypics/css.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 1f9d54cc7..8bac4346c 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -227,4 +227,20 @@ z-index:0; background: #ffffff; text-align: center; color: #4690d6; +} + +#tidypics_phototags_list { +padding:20px; +} + +#tidypics_phototags_list ul { +list-style:none; +margin:0px; +padding:8px; +} + +#tidypics_phototags_list ul li { +padding-right:10px; +margin:2px 0px; +display:inline; } \ No newline at end of file -- cgit v1.2.3 From 991bfbb05dbfe4919f1ef1be4feb359f4815a77c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 15:09:28 +0000 Subject: added a check so that normal tags are created for photo tags that are not users --- actions/addtag.php | 34 ++++++++++++++++++++++++++-------- languages/en.php | 2 ++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/actions/addtag.php b/actions/addtag.php index 309058e1c..562d53882 100644 --- a/actions/addtag.php +++ b/actions/addtag.php @@ -8,33 +8,51 @@ action_gatekeeper(); $coordinates_str = get_input('coordinates'); - error_log($coordinates_str); $user_id = get_input('user_id'); $image_guid = get_input('image_guid'); $word = get_input('word'); - error_log($word); - error_log($user_id); - if ($image_guid == 0) { - register_error("error"); + register_error(elgg_echo("tidypics:phototagging:error")); forward($_SERVER['HTTP_REFERER']); } $image = get_entity($image_guid); if (!$image) { - register_error(elgg_echo("image:phototagging:notexists")); + register_error(elgg_echo("tidypics:phototagging:error")); forward($_SERVER['HTTP_REFERER']); } + $new_word_tag = false; if ($user_id != 0) { $relationships_type = 'user'; $value = $user_id; } else { $relationships_type = 'word'; $value = $word; + + // check to see if the photo has this tag and add if not + if (!is_array($image->tags)) { + if ($image->tags != $word) { + $new_word_tag = true; + $tagarray = $image->tags . ',' . $word; + $tagarray = string_to_tag_array($tagarray); + } + } else { + if (!in_array($word, $image->tags)) { + $new_word_tag = true; + $tagarray = $image->tags; + $tagarray[] = $word; + } + } + } + + // add new tag now so it is available in search + if ($new_word_tag) { + $image->clearMetadata('tags'); + $image->tags = $tagarray; } // test for empty tag @@ -49,10 +67,10 @@ //Save annotation if ($image->annotate('phototag', serialize($tag), $access_id, $owner_id)) { - system_message(elgg_echo("image:tagged")); + system_message(elgg_echo("tidypics:phototagging:success")); } forward($_SERVER['HTTP_REFERER']); -?> \ No newline at end of file +?> diff --git a/languages/en.php b/languages/en.php index b0f358910..e3631532d 100644 --- a/languages/en.php +++ b/languages/en.php @@ -60,6 +60,8 @@ 'image:tagthisphoto' => 'Tag this photo', 'image:actiontag' => 'Tag', 'image:inthisphoto' => 'In this photo', + 'tidypics:phototagging:success' => 'Photo tag was successfully added', + 'tidypics:phototagging:error' => 'Unexpected error occurred during tagging', //widgets -- cgit v1.2.3 From a9352fbfb62cebabb29fac26c971ace49ff92be9 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 15:16:41 +0000 Subject: starting process of moving all language strings to beginning with tidypics --- languages/en.php | 10 +++++----- views/default/object/image.php | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/languages/en.php b/languages/en.php index e3631532d..538a46c60 100644 --- a/languages/en.php +++ b/languages/en.php @@ -55,11 +55,11 @@ 'image:next' => "Next", // tagging - 'image:doclickfortag' => 'Click on the faces of people to label them.', - 'image:finish_tagging' => 'Stop labeling', - 'image:tagthisphoto' => 'Tag this photo', - 'image:actiontag' => 'Tag', - 'image:inthisphoto' => 'In this photo', + 'tidypics:taginstruct' => 'Select area that you want to tag', + 'tidypics:finish_tagging' => 'Stop tagging', + 'tidypics:tagthisphoto' => 'Tag this photo', + 'tidypics:actiontag' => 'Tag', + 'tidypics:inthisphoto' => 'In this photo', 'tidypics:phototagging:success' => 'Photo tag was successfully added', 'tidypics:phototagging:error' => 'Unexpected error occurred during tagging', diff --git a/views/default/object/image.php b/views/default/object/image.php index 16ec74868..df00d752e 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -136,13 +136,13 @@ if ($photo_tags) {
        -
        • +
        • $file_guid,) ); ?>
      -

      +

      - - + +
      @@ -201,7 +201,7 @@ if ($photo_tags) { $content .= ""; - $content .= "
      "; + $content .= "
      "; echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content)); -- cgit v1.2.3 From ba7c75f865065caa6910578e0ca9bab6937ca293 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 15:33:14 +0000 Subject: updated tagging instructions --- views/default/object/image.php | 10 ++-------- views/default/tidypics/css.php | 22 ++++++++++++++++++---- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index df00d752e..03d7190f3 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -169,14 +169,8 @@ if ($photo_tags) { echo '
      '; // content wrapper ?>
      - - - - - - - -
      +
      +
      diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 8bac4346c..7cafa44f2 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -187,17 +187,31 @@ padding:0 0 5px; /* ----------- tagging ---------------- */ #tagging_instructions { -background:#FFFBE2; -border:1px solid #FFE222; +background:#BBDAF7; +border:1px solid #4690D6; padding:10px; -height:30px; -width:400px; +height:25px; +width:360px; display:none; overflow:hidden; position:absolute; z-index:10000; } +#tag_instruct_text { +padding-top: 3px; +float: left; +} + +#tag_instruct_button_div { +float: left; +margin-left: 15px; +} + +#tag_instruct_button { +margin:0; +} + #tag_menu { border:1px solid #3B5999; width:200px; -- cgit v1.2.3 From e1a3b7d713858303f7e763fd29f7c01e847b0b06 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 15:42:13 +0000 Subject: tweaked the tag menu box --- views/default/js/tidypics.php | 2 +- views/default/tidypics/css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/views/default/js/tidypics.php b/views/default/js/tidypics.php index 22815aa5a..c3520842a 100644 --- a/views/default/js/tidypics.php +++ b/views/default/js/tidypics.php @@ -17,7 +17,7 @@ attached: 'ul#phototagging-menu', loaderText: '', inputClass: 'input-filter', - labelText: "

      Insert tag

      ", + labelText: "

      ", delay: 100 }); diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 7cafa44f2..ea16c95b9 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -219,7 +219,7 @@ position:absolute; z-index:10000; display:none; background:#ffffff; -padding:5px; +padding:10px; font-size:12px; text-align:left; } -- cgit v1.2.3 From e9685e67ecaa4105d125c4e520017fe784aa6a55 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 17:22:33 +0000 Subject: tweaked image frame --- views/default/object/image.php | 2 -- views/default/tidypics/css.php | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index 03d7190f3..6bb33b8bd 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -129,9 +129,7 @@ if ($photo_tags) {
      -
      '; ?> -
      diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index ea16c95b9..638dddd6d 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -97,8 +97,9 @@ margin:7px 0; } #tidypics_image { +background:#EEEEEE none repeat scroll 0 0; +border:2px solid #999999; padding:5px; -border:1px solid #dedede; } .tidypics_album_cover { -- cgit v1.2.3 From 9df7b2f7875d6c26d02d398d17f5fade118673ca Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 18:31:57 +0000 Subject: breadcrumb view has been added --- views/default/object/album.php | 3 +++ views/default/object/image.php | 4 ++++ views/default/tidypics/breadcrumbs.php | 22 ++++++++++++++++++++++ views/default/tidypics/css.php | 8 ++++++++ 4 files changed, 37 insertions(+) create mode 100644 views/default/tidypics/breadcrumbs.php diff --git a/views/default/object/album.php b/views/default/object/album.php index 3507e6047..bee379666 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -60,6 +60,9 @@ // individual album view ?>
      +
      + +
      '.autop($desc).'
      '; diff --git a/views/default/object/image.php b/views/default/object/image.php index 6bb33b8bd..8fd4dca9a 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -122,6 +122,10 @@ if ($photo_tags) {
      +
      + $album,) ); ?> +
      +
      diff --git a/views/default/tidypics/breadcrumbs.php b/views/default/tidypics/breadcrumbs.php new file mode 100644 index 000000000..d24f39f38 --- /dev/null +++ b/views/default/tidypics/breadcrumbs.php @@ -0,0 +1,22 @@ +wwwroot . "pg/photos/owned/" . $page_owner->username; + if (get_loggedin_userid() == $page_owner->guid) + $first_level_text = elgg_echo('album:yours'); + else + $first_level_text = sprintf(elgg_echo('album:user'), $page_owner->name); +?> + +title; + $second_level_link = $vars['album']->getURL(); +?> +>> + diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 638dddd6d..56d4efcad 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -5,6 +5,14 @@ ?> /* ---- tidypics object views ---- */ +#tidypics_wrapper { +} + +#tidypics_breadcrumbs { +margin:5px 0 25px 0; +font-size:80%; +} + #tidypics_desc { padding:0 20px; font-style:italic; -- cgit v1.2.3 From fe1cce6c8cbf2ee781619ff21b571518aa1a28e9 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 9 May 2009 22:22:51 +0000 Subject: started adding images to activity river --- thumbnail.php | 10 ++++++---- views/default/river/object/album/create.php | 7 ++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/thumbnail.php b/thumbnail.php index b4c745ae2..fe8ca8bab 100644 --- a/thumbnail.php +++ b/thumbnail.php @@ -13,15 +13,17 @@ // Get file thumbnail size $size = get_input('size','small'); - if ($size != 'small') { + if ($size != 'small' && $size != 'thumb') { $size = 'large'; } // Get file entity if ($file = get_entity($file_guid)) { - if ($file->getSubtype() == "image") { + if ($file->getSubtype() == "image") { // Get file thumbnail - if ($size == "small") { + if ($size === "thumb") { + $thumbfile = $file->thumbnail; + } else if ($size === "small") { $thumbfile = $file->smallthumb; } else { $thumbfile = $file->largethumb; @@ -48,4 +50,4 @@ header("Content-type: image"); echo $contents; exit; -?> \ No newline at end of file +?> diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php index fcc87277d..300062b5a 100644 --- a/views/default/river/object/album/create.php +++ b/views/default/river/object/album/create.php @@ -7,6 +7,11 @@ if (function_exists('add_to_river')) { // Elgg 1.5 $url = "getURL()}\">{$performed_by->name}"; $string = sprintf(elgg_echo("album:river:created"),$url) . " "; $string .= "getURL() . "\">" . $album->title . ""; + + if ($album->cover) { + $string .= "
      wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover" alt="thumbnail"/>' . "
      "; + } + } else { // Elgg 1.2 $statement = $vars['statement']; $performed_by = $statement->getSubject(); @@ -19,4 +24,4 @@ if (function_exists('add_to_river')) { // Elgg 1.5 echo $string; -?> \ No newline at end of file +?> -- cgit v1.2.3 From 0911bafdcddddd2104e696e6fb44cd77247ade7b Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Sun, 10 May 2009 23:36:42 +0000 Subject: adding in most viewed and recent images pages --- mostrecentimages.php | 20 ++++++++++++++++++++ mostviewedimages.php | 33 +++++++++++++++++++++++++++++++++ start.php | 34 ++++++++++++++++++++++++++++------ viewimage.php | 19 ++++++++++++++++++- views/default/object/image.php | 29 +++++++++++++++-------------- 5 files changed, 114 insertions(+), 21 deletions(-) create mode 100644 mostrecentimages.php create mode 100644 mostviewedimages.php diff --git a/mostrecentimages.php b/mostrecentimages.php new file mode 100644 index 000000000..8cc4a1f51 --- /dev/null +++ b/mostrecentimages.php @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/mostviewedimages.php b/mostviewedimages.php new file mode 100644 index 000000000..0de7c626f --- /dev/null +++ b/mostviewedimages.php @@ -0,0 +1,33 @@ +entity_guid); + } + + $title = "Most viewed images"; + $area2 = elgg_view_title($title); + $area2 .= elgg_view_entity_list($entities, $max, 0, $max); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + page_draw($title, $body); +?> \ No newline at end of file diff --git a/start.php b/start.php index 0d1b167d4..bbe665229 100644 --- a/start.php +++ b/start.php @@ -91,12 +91,14 @@ add_submenu_item( elgg_echo("album:yours"), $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, 'tidypics' ); - add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, - 'tidypics' ); - add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, - 'tidypics'); + if($page_owner->name) { + add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, + 'tidypics' ); + add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, + 'tidypics'); + } } else if ($page_owner->guid) { // non logged in user gets "page owners albums", "page owner's friends albums" add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), @@ -110,6 +112,11 @@ add_submenu_item( sprintf(elgg_echo('album:all'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/world/", 'tidypics'); + add_submenu_item( "Most Viewed Images", + $CONFIG->wwwroot . 'pg/photos/mostviewed'); + + add_submenu_item( "Most Recent Images", + $CONFIG->wwwroot . 'pg/photos/mostrecent'); } } @@ -170,7 +177,21 @@ case "world": include($CONFIG->pluginspath . "tidypics/world.php"); break; + + case "rate": //rate image + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/actions/rate.php"); + break; + case "mostviewed": //view an image individually + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/mostviewedimages.php"); + break; + + case "mostrecent": //view an image individually + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/mostrecentimages.php"); + break; } } else @@ -255,5 +276,6 @@ register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php"); register_action("tidypics/download", true, $CONFIG->pluginspath . "tidypics/actions/download.php"); register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php"); + register_action("tidypics/rate", true, $CONFIG->pluginspath . "tidypics/actions/rate.php"); ?> \ No newline at end of file diff --git a/viewimage.php b/viewimage.php index fa05bda00..5b51725d7 100644 --- a/viewimage.php +++ b/viewimage.php @@ -31,6 +31,21 @@ $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); } + $views = get_metadata_byname($photo_guid, "tp_views"); + if(!$views || intval($views["value"] == 0)) $views["value"] = 0; + $views["value"] = $views["value"] + 1; //TODO: only add views for non-owner + create_metadata($photo_guid, "tp_views", $views["value"], "integer", 0, 2); + + $viewer = get_loggedin_user(); + + $metadatas = get_metadata_for_entity($photo_guid); + $rating = 0; + foreach($metadatas as $metadata) { + if($metadata["owner_guid"] == $viewer["guid"]) { + if($metadata["name"] == "rating") $rating = $metadata["value"]; + } + } + if (can_write_to_container(0, $album->container_guid)) { add_submenu_item( elgg_echo('image:edit'), $CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid, @@ -41,9 +56,11 @@ true); } - $title = $photo->title; + + $title = $photo->title . " - views: $views[value]"; $area2 = elgg_view_title($title); $area2 .= elgg_view_entity($photo, true); + $area2 .= "Rate *"; $body = elgg_view_layout('two_column_left_sidebar', '', $area2); diff --git a/views/default/object/image.php b/views/default/object/image.php index 8fd4dca9a..09a121256 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -179,22 +179,23 @@ if ($photo_tags) { getGUID(), false, 'user', '', 0); - - $content = ""; - $content .= ""; - $content .= ""; - $content .= ""; - - $content .= "
        "; - $content .= "
      • {$viewer->name} (" . elgg_echo('me') . ")
        • "; - - if ($friends) { - foreach($friends as $friend) { - $content .= "
      • {$friend->name}
        • "; + if($viewer) { + $friends = get_entities_from_relationship('friend', $viewer->getGUID(), false, 'user', '', 0); + + $content = ""; + $content .= ""; + $content .= ""; + $content .= ""; + + $content .= ""; $content .= "
        "; -- cgit v1.2.3 From 076994be737bc012ea0017c2a5fa2af842911cce Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Sun, 10 May 2009 23:39:20 +0000 Subject: commented rating code - not used yet --- viewimage.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/viewimage.php b/viewimage.php index 5b51725d7..8534e3d30 100644 --- a/viewimage.php +++ b/viewimage.php @@ -38,6 +38,7 @@ $viewer = get_loggedin_user(); + /* $metadatas = get_metadata_for_entity($photo_guid); $rating = 0; foreach($metadatas as $metadata) { @@ -45,6 +46,7 @@ if($metadata["name"] == "rating") $rating = $metadata["value"]; } } + */ if (can_write_to_container(0, $album->container_guid)) { add_submenu_item( elgg_echo('image:edit'), @@ -60,7 +62,7 @@ $title = $photo->title . " - views: $views[value]"; $area2 = elgg_view_title($title); $area2 .= elgg_view_entity($photo, true); - $area2 .= "Rate *"; +// $area2 .= "Rate *"; $body = elgg_view_layout('two_column_left_sidebar', '', $area2); -- cgit v1.2.3 From d9964ef61832a507ed78a0e4bf4208700cb16f9f Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Mon, 11 May 2009 05:44:02 +0000 Subject: imagemagick support for creating thumbnails and watermarking --- actions/resize.php | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++ actions/upload.php | 65 ++++++++++++++++++++++++++++++-- 2 files changed, 170 insertions(+), 4 deletions(-) create mode 100644 actions/resize.php diff --git a/actions/resize.php b/actions/resize.php new file mode 100644 index 000000000..8a8a5bb34 --- /dev/null +++ b/actions/resize.php @@ -0,0 +1,109 @@ +$input_name, + "output_name"=>$output_name, + "maxwidth"=>$maxwidth, + "maxheight"=>$maxheight, + "square"=>$square, + "x1"=>$x1, + "y1"=>$y1, + "x2"=>$x2, + "y2"=>$y2); + + $path = pathinfo($input_name); + $output_name = $path["dirname"] . "/$prefix" . $path["filename"] . "." . $path["extension"]; + + // Get the size information from the image + if ($imgsizearray = getimagesize($input_name)) { + + // Get width and height + $width = $imgsizearray[0]; + $height = $imgsizearray[1]; + $newwidth = $width; + $newheight = $height; + + // Square the image dimensions if we're wanting a square image + if ($square) { + if ($width < $height) { + $height = $width; + } else { + $width = $height; + } + + $newwidth = $width; + $newheight = $height; + + } + + if ($width > $maxwidth) { + $newheight = floor($height * ($maxwidth / $width)); + $newwidth = $maxwidth; + } + if ($newheight > $maxheight) { + $newwidth = floor($newwidth * ($maxheight / $newheight)); + $newheight = $maxheight; + } + + $accepted_formats = array( + 'image/jpeg' => 'jpeg', + 'image/png' => 'png', + 'image/gif' => 'gif' + ); + // If it's a file we can manipulate ... + if (array_key_exists($imgsizearray['mime'],$accepted_formats)) { + +// $function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']]; +// $newimage = imagecreatetruecolor($newwidth,$newheight); + +// if (is_callable($function) && $oldimage = $function($input_name)) { + // Crop the image if we need a square + if ($square) { + if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { + $widthoffset = floor(($imgsizearray[0] - $width) / 2); + $heightoffset = floor(($imgsizearray[1] - $height) / 2); + } else { + $widthoffset = $x1; + $heightoffset = $y1; + $width = ($x2 - $x1); + $height = $width; + } + } else { + if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { + $widthoffset = 0; + $heightoffset = 0; + } else { + $widthoffset = $x1; + $heightoffset = $y1; + $width = ($x2 - $x1); + $height = ($y2 - $y1); + } + }//else { + // Resize and return the image contents! + if ($square) { + $newheight = $maxheight; + $newwidth = $maxwidth; + } + $command = "convert $input_name -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." $output_name"; + system($command); + return $output_name; + + } + } + + return false; + } + +?> diff --git a/actions/upload.php b/actions/upload.php index ba9d005c8..89e66ca31 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -6,6 +6,7 @@ */ global $CONFIG; + require_once(dirname(__FILE__)."/resize.php"); // Get common variables $access_id = (int) get_input("access_id"); @@ -61,18 +62,26 @@ //TODO: This code needs a complete rewrite - hardcoded to ~2.5 MB if (filesize($file->getFilenameOnFilestore())<= 2500000) { try { - $thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false); + //$thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false); } catch (Exception $e) { $thumblarge = false; } try { - $thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true); + //$thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true); } catch (Exception $e) { $thumbsmall = false; } try { - $thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true); + //$thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true); } catch (Exception $e) { $thumbnail = false; } } + // gfroese: i'm just faking this out so the proper records are created for the thumbnails + // I don't understand what $thumb->write does but it seems to actually create the file so + // I had to move the imagemagick call beneath this. I'm sure someone else can make this + // much better. + $thumbnail = true; + $thumblarge = true; + $thumbsmall = true; + if ($thumbnail) { $thumb = new ElggFile(); $thumb->setMimeType($mime); @@ -111,6 +120,54 @@ } $thumb->close(); } + + //gfroese: build the actual thumbnails now + $album = get_entity($container_guid); + $user = get_user_entity_as_row($album->owner_guid); + $username = $user->username; + + try { + $thumblarge = tp_resize($file->getFilenameOnFilestore(), "largethumb", 600, 600, false); + } catch (Exception $e) { $thumblarge = false; } + try { + $thumbsmall = tp_resize($file->getFilenameOnFilestore(), "smallthumb", 153, 153, false); + } catch (Exception $e) { $thumbsmall = false; } + try { + $thumbnail = tp_resize($file->getFilenameOnFilestore(), "thumb", 60, 60, true); + } catch (Exception $e) { $thumbnail = false; } + + + $watermark = true; //gfroese - this should come from the plugin settings + $watermark_text = $username . " - shutterpeg.com"; + if( $watermark ) { //get this value from the plugin settings + if( $thumblarge ) { + $ext = ".png"; + $user_stamp_base = dirname(__FILE__) . "/" . $username . "_stamp"; + if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist + $commands = array(); + $commands[] = 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; + $commands[] = 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; + $commands[] = 'composite -compose CopyOpacity ' . $user_stamp_base . "_mask" . $ext . ' ' . $user_stamp_base . '_fgnd' . $ext . ' ' . $user_stamp_base . $ext; + $commands[] = 'mogrify -trim +repage ' . $user_stamp_base . $ext; + $commands[] = 'rm ' . $user_stamp_base . '_mask' . $ext; + $commands[] = 'rm ' . $user_stamp_fgnd . '_mask' . $ext; + + foreach( $commands as $command ) { + file_put_contents("/home/gfroese/debug.txt", $command . "\n", FILE_APPEND); + exec( $command ); + } + } + //apply the watermark + $commands = array(); + $commands[] = 'composite -gravity south -geometry +0+10 ' . $user_stamp_base . $ext . ' ' . $thumblarge . ' ' . $thumblarge . '_watermarked'; + $commands[] = "mv $thumblarge" . "_watermarked $thumblarge"; + foreach( $commands as $command ) { + file_put_contents("/home/gfroese/debug.txt", $command . "\n", FILE_APPEND); + exec( $command ); + } + } + } + } else { //file exceeds file size limit, so delete it $file->delete(); array_push($not_uploaded, $name); @@ -149,4 +206,4 @@ forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page } -?> \ No newline at end of file +?> -- cgit v1.2.3 From 5bce7bbbf5ede5b6e4a2db367ba995c33ea4e458 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Mon, 11 May 2009 12:16:11 +0000 Subject: beginning to fix recent/most viewed - this commit uses elgg_echo for display strings on menu --- languages/en.php | 2 ++ start.php | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/languages/en.php b/languages/en.php index 538a46c60..c36ecd25e 100644 --- a/languages/en.php +++ b/languages/en.php @@ -22,6 +22,8 @@ 'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):", 'tidypics:enablephotos' => 'Enable Group Photo Albums', 'tidypics:editprops' => 'Edit Image Properties', + 'tidypics:mostviewed' => 'Most viewed images', + 'tidypics:mostrecent' => 'Most recent images', //actions diff --git a/start.php b/start.php index bbe665229..1f05f03da 100644 --- a/start.php +++ b/start.php @@ -87,11 +87,11 @@ $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, 'tidypics'); } else if (isloggedin()) { - // logged nut not owner gets "your albums", "page owners albums", "page owner's friends albums" + // logged in not owner gets "your albums", "page owners albums", "page owner's friends albums" add_submenu_item( elgg_echo("album:yours"), $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, 'tidypics' ); - if($page_owner->name) { + if($page_owner->name) { // check to make sure the owner set their display name add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, 'tidypics' ); @@ -112,11 +112,12 @@ add_submenu_item( sprintf(elgg_echo('album:all'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/world/", 'tidypics'); - add_submenu_item( "Most Viewed Images", - $CONFIG->wwwroot . 'pg/photos/mostviewed'); - - add_submenu_item( "Most Recent Images", - $CONFIG->wwwroot . 'pg/photos/mostrecent'); + add_submenu_item( elgg_echo('tidypics:mostviewed'), + $CONFIG->wwwroot . 'pg/photos/mostviewed', + 'tidypics'); + add_submenu_item( elgg_echo('tidypics:mostrecent'), + $CONFIG->wwwroot . 'pg/photos/mostrecent', + 'tidypics'); } } @@ -183,12 +184,12 @@ include($CONFIG->pluginspath . "tidypics/actions/rate.php"); break; - case "mostviewed": //view an image individually + case "mostviewed": if (isset($page[1])) set_input('guid',$page[1]); include($CONFIG->pluginspath . "tidypics/mostviewedimages.php"); break; - case "mostrecent": //view an image individually + case "mostrecent": if (isset($page[1])) set_input('guid',$page[1]); include($CONFIG->pluginspath . "tidypics/mostrecentimages.php"); break; -- cgit v1.2.3 From 501af5b28c7fb2ec36658df16849572c14d050a4 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Mon, 11 May 2009 15:04:43 +0000 Subject: added most viewed and recent for friends and 'yourss' --- friendmostrecent.php | 44 +++++++++++++++++++++++++++++++++++ friendmostviewed.php | 55 ++++++++++++++++++++++++++++++++++++++++++++ languages/en.php | 4 ++++ start.php | 65 +++++++++++++++++++++++++++++++++++++++++++--------- yourmostrecent.php | 33 ++++++++++++++++++++++++++ yourmostviewed.php | 36 +++++++++++++++++++++++++++++ 6 files changed, 226 insertions(+), 11 deletions(-) create mode 100644 friendmostrecent.php create mode 100644 friendmostviewed.php create mode 100644 yourmostrecent.php create mode 100644 yourmostviewed.php diff --git a/friendmostrecent.php b/friendmostrecent.php new file mode 100644 index 000000000..9c6eb8ed0 --- /dev/null +++ b/friendmostrecent.php @@ -0,0 +1,44 @@ +name) || page_owner_entity()->name == '') { + $friendname = get_input('username'); + } else { + $friendname = page_owner_entity()->name; + }; + + //there has to be a better way to do this + if(!$friendname) { + $page = get_input("page"); + list($pagename, $friendname) = split("/", $page); + } + $user = get_user_by_username($friendname); + + $prefix = "my_elgg"; //how do you get the global default? + $max = 24; + //grab the top views (metadata 'tp_views') for $max number of entities + //ignores entity subtypes + + $sql = "SELECT ent.guid as entity_guid FROM " . $prefix . "entities ent + INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id AND sub.subtype = 'image' + WHERE ent.owner_guid = " . $user->guid . " + ORDER BY ent.guid DESC + LIMIT $max"; + $result = get_data($sql); + $entities = array(); + foreach($result as $entity) { + $entities[] = get_entity($entity->entity_guid); + } + + $title = sprintf(elgg_echo("tidypics:friendmostrecent"), $friendname); + $area2 = elgg_view_title($title); + $area2 .= elgg_view_entity_list($entities, $max, 0, $max); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + page_draw($title, $body); + +?> \ No newline at end of file diff --git a/friendmostviewed.php b/friendmostviewed.php new file mode 100644 index 000000000..300c3ccb5 --- /dev/null +++ b/friendmostviewed.php @@ -0,0 +1,55 @@ +username); + } + }*/ + + if (is_null(page_owner_entity()->name) || page_owner_entity()->name == '') { + $friendname = get_input('username'); + } else { + $friendname = page_owner_entity()->name; + }; + + //there has to be a better way to do this + if(!$friendname) { + $page = get_input("page"); + list($pagename, $friendname) = split("/", $page); + } + $user = get_user_by_username($friendname); + + $prefix = "my_elgg"; //how do you get the global default? + $max = 24; + //grab the top views (metadata 'tp_views') for $max number of entities + //ignores entity subtypes + $sql = "SELECT md.entity_guid, md.owner_guid, md.enabled, ms.string AS views from " . $prefix . "entities ent + INNER JOIN " . $prefix . "metadata md ON md.entity_guid = ent.guid + INNER JOIN " . $prefix . "metastrings ms ON md.value_id = ms.id + INNER JOIN " . $prefix . "metastrings ms2 ON md.name_id = ms2.id AND ms2.string = 'tp_views' + WHERE ent.owner_guid = " . $user->guid . " + ORDER BY views DESC LIMIT $max"; + + $result = get_data($sql); + + $entities = array(); + foreach($result as $entity) { + $entities[] = get_entity($entity->entity_guid); + } + + $title = sprintf(elgg_echo("tidypics:friendmostviewed"), $friendname); + $area2 = elgg_view_title($title); + $area2 .= elgg_view_entity_list($entities, $max, 0, $max); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + page_draw($title, $body); + +?> \ No newline at end of file diff --git a/languages/en.php b/languages/en.php index c36ecd25e..61345174b 100644 --- a/languages/en.php +++ b/languages/en.php @@ -24,6 +24,10 @@ 'tidypics:editprops' => 'Edit Image Properties', 'tidypics:mostviewed' => 'Most viewed images', 'tidypics:mostrecent' => 'Most recent images', + 'tidypics:yourmostviewed' => 'Your most viewed images', + 'tidypics:yourmostrecent' => 'Your most recent images', + 'tidypics:friendmostviewed' => "%s's most viewed images", + 'tidypics:friendmostrecent' => "%s's most recent images", //actions diff --git a/start.php b/start.php index 1f05f03da..5091a4200 100644 --- a/start.php +++ b/start.php @@ -73,31 +73,53 @@ // context is only set to photos on individual pages, not on group pages else if (get_context() == "photos") { - // owner gets "your albumn", "your friends albums" + // owner gets "your albumn", "your friends albums", "your most viewed", "your most recent" if (get_loggedin_userid() == $page_owner->guid && get_loggedin_userid()) { add_submenu_item( elgg_echo('album:create'), $CONFIG->wwwroot . "pg/photos/new/". $page_owner->username, - 'tidypics' ); + 'tidypics-a' ); add_submenu_item( elgg_echo("album:yours"), $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, - 'tidypics' ); + 'tidypics-a' ); add_submenu_item( elgg_echo('album:yours:friends'), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, - 'tidypics'); + 'tidypics-a'); + + add_submenu_item( elgg_echo('tidypics:yourmostviewed'), + $CONFIG->wwwroot . 'pg/photos/yourmostviewed', + 'tidypics-a'); + + add_submenu_item( elgg_echo('tidypics:yourmostrecent'), + $CONFIG->wwwroot . 'pg/photos/yourmostrecent', + 'tidypics-a'); } else if (isloggedin()) { - // logged in not owner gets "your albums", "page owners albums", "page owner's friends albums" + // logged in not owner gets "your albums", "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent" add_submenu_item( elgg_echo("album:yours"), $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, - 'tidypics' ); + 'tidypics-b' ); + add_submenu_item( elgg_echo('tidypics:yourmostviewed'), + $CONFIG->wwwroot . 'pg/photos/yourmostviewed', + 'tidypics-b'); + + add_submenu_item( elgg_echo('tidypics:yourmostrecent'), + $CONFIG->wwwroot . 'pg/photos/yourmostrecent', + 'tidypics-b'); + if($page_owner->name) { // check to make sure the owner set their display name add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, - 'tidypics' ); + 'tidypics-a' ); add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, - 'tidypics'); + 'tidypics-a'); + add_submenu_item( sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/friendmostviewed/". $page_owner->username, + 'tidypics-a'); + add_submenu_item( sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/friendmostrecent/". $page_owner->username, + 'tidypics-a'); } } else if ($page_owner->guid) { // non logged in user gets "page owners albums", "page owner's friends albums" @@ -111,13 +133,14 @@ add_submenu_item( sprintf(elgg_echo('album:all'),$page_owner->name), $CONFIG->wwwroot . "pg/photos/world/", - 'tidypics'); + 'tidypics-z'); add_submenu_item( elgg_echo('tidypics:mostviewed'), $CONFIG->wwwroot . 'pg/photos/mostviewed', - 'tidypics'); + 'tidypics-z'); add_submenu_item( elgg_echo('tidypics:mostrecent'), $CONFIG->wwwroot . 'pg/photos/mostrecent', - 'tidypics'); + 'tidypics-z'); + } } @@ -193,6 +216,26 @@ if (isset($page[1])) set_input('guid',$page[1]); include($CONFIG->pluginspath . "tidypics/mostrecentimages.php"); break; + + case "yourmostviewed": + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/yourmostviewed.php"); + break; + + case "yourmostrecent": + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/yourmostrecent.php"); + break; + + case "friendmostviewed": + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/friendmostviewed.php"); + break; + + case "friendmostrecent": + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/friendmostrecent.php"); + break; } } else diff --git a/yourmostrecent.php b/yourmostrecent.php new file mode 100644 index 000000000..68c83cd7e --- /dev/null +++ b/yourmostrecent.php @@ -0,0 +1,33 @@ +guid . " + ORDER BY ent.guid DESC + LIMIT $max"; + + $result = get_data($sql); + $entities = array(); + foreach($result as $entity) { + $entities[] = get_entity($entity->entity_guid); + } + + $title = elgg_echo("tidypics:yourmostrecent"); + $area2 = elgg_view_title($title); + $area2 .= elgg_view_entity_list($entities, $max, 0, $max); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + page_draw($title, $body); + +?> \ No newline at end of file diff --git a/yourmostviewed.php b/yourmostviewed.php new file mode 100644 index 000000000..193464c04 --- /dev/null +++ b/yourmostviewed.php @@ -0,0 +1,36 @@ +guid . " + ORDER BY views DESC LIMIT $max"; + + $result = get_data($sql); + + $entities = array(); + foreach($result as $entity) { + $entities[] = get_entity($entity->entity_guid); + } + + $title = elgg_echo("tidypics:yourmostviewed"); + $area2 = elgg_view_title($title); + $area2 .= elgg_view_entity_list($entities, $max, 0, $max); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + page_draw($title, $body); +?> \ No newline at end of file -- cgit v1.2.3 From 3eb517748157da5d94efc1e6a58e42a55c7e1d0c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 12 May 2009 01:48:53 +0000 Subject: Add setting to select between GD and ImageMagick - not using setting yet --- languages/en.php | 3 +++ views/default/settings/tidypics/edit.php | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/languages/en.php b/languages/en.php index 61345174b..068616b6d 100644 --- a/languages/en.php +++ b/languages/en.php @@ -29,6 +29,9 @@ 'tidypics:friendmostviewed' => "%s's most viewed images", 'tidypics:friendmostrecent' => "%s's most recent images", + //settings + 'tidypics:image_lib' => "Image Library", + //actions 'album:create' => "Create new album", diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php index 2c63edff8..455be9bd3 100644 --- a/views/default/settings/tidypics/edit.php +++ b/views/default/settings/tidypics/edit.php @@ -1,3 +1,22 @@ +image_lib; + if (!$image_lib) $image_lib = 'GD'; +?> +

        + + + 'params[image_lib]', + 'options_values' => array( + 'weekly' => 'GD', + 'monthly' => 'ImageMagick', + ), + 'value' => $image_lib + )); + ?> +

        + maxfilesize; if (!$maxfilesize) $maxfilesize = (int) 10240; //set the default maximum file size to 10MB (1024KB * 10 = 10240KB = 10MB) -- cgit v1.2.3 From a5311a04c7a1b4deb6904a3f781c43bcbceca782 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 12 May 2009 02:07:59 +0000 Subject: well, how about a settings that actually works this time --- views/default/settings/tidypics/edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php index 455be9bd3..57c63683f 100644 --- a/views/default/settings/tidypics/edit.php +++ b/views/default/settings/tidypics/edit.php @@ -9,8 +9,8 @@ echo elgg_view('input/pulldown', array( 'internalname' => 'params[image_lib]', 'options_values' => array( - 'weekly' => 'GD', - 'monthly' => 'ImageMagick', + 'GD' => 'GD', + 'ImageMagick' => 'ImageMagick', ), 'value' => $image_lib )); -- cgit v1.2.3 From a8f616e81ba48583540d65102471644547e64af8 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Tue, 12 May 2009 02:50:55 +0000 Subject: used proper dbprefix --- friendmostrecent.php | 3 ++- friendmostviewed.php | 3 ++- mostrecentimages.php | 1 + mostviewedimages.php | 3 ++- yourmostrecent.php | 3 ++- yourmostviewed.php | 3 ++- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/friendmostrecent.php b/friendmostrecent.php index 9c6eb8ed0..10d99251a 100644 --- a/friendmostrecent.php +++ b/friendmostrecent.php @@ -19,7 +19,8 @@ } $user = get_user_by_username($friendname); - $prefix = "my_elgg"; //how do you get the global default? + global $CONFIG; + $prefix = $CONFIG->dbprefix; $max = 24; //grab the top views (metadata 'tp_views') for $max number of entities //ignores entity subtypes diff --git a/friendmostviewed.php b/friendmostviewed.php index 300c3ccb5..901a8ff08 100644 --- a/friendmostviewed.php +++ b/friendmostviewed.php @@ -28,7 +28,8 @@ } $user = get_user_by_username($friendname); - $prefix = "my_elgg"; //how do you get the global default? + global $CONFIG; + $prefix = $CONFIG->dbprefix; $max = 24; //grab the top views (metadata 'tp_views') for $max number of entities //ignores entity subtypes diff --git a/mostrecentimages.php b/mostrecentimages.php index 8cc4a1f51..53d8ef236 100644 --- a/mostrecentimages.php +++ b/mostrecentimages.php @@ -17,4 +17,5 @@ $area2 .= $images; $body = elgg_view_layout('two_column_left_sidebar', '', $area2); page_draw($title, $body); + ?> \ No newline at end of file diff --git a/mostviewedimages.php b/mostviewedimages.php index 0de7c626f..caf755193 100644 --- a/mostviewedimages.php +++ b/mostviewedimages.php @@ -9,7 +9,8 @@ // Load Elgg engine include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - $prefix = "my_elgg"; //how do you get the global default? + global $CONFIG; + $prefix = $CONFIG->dbprefix; $max = 24; //grab the top views (metadata 'tp_views') for $max number of entities //ignores entity subtypes diff --git a/yourmostrecent.php b/yourmostrecent.php index 68c83cd7e..69b4b93e9 100644 --- a/yourmostrecent.php +++ b/yourmostrecent.php @@ -6,8 +6,9 @@ include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); + global $CONFIG; $viewer = get_loggedin_user(); - $prefix = "my_elgg"; //how do you get the global default? + $prefix = $CONFIG->dbprefix; $max = 24; //grab the top views (metadata 'tp_views') for $max number of entities //ignores entity subtypes diff --git a/yourmostviewed.php b/yourmostviewed.php index 193464c04..40d05c038 100644 --- a/yourmostviewed.php +++ b/yourmostviewed.php @@ -10,7 +10,8 @@ include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); $viewer = get_loggedin_user(); - $prefix = "my_elgg"; //how do you get the global default? + global $CONFIG; + $prefix = $CONFIG->dbprefix; $max = 24; //grab the top views (metadata 'tp_views') for $max number of entities //ignores entity subtypes -- cgit v1.2.3 From 2a92f73496399ee651dc23543ec2616b87adeb04 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 12 May 2009 11:39:51 +0000 Subject: acting on image library selector in settings - can pick between GD php and ImageMagick system calls now --- actions/upload.php | 155 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 89 insertions(+), 66 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index 89e66ca31..3049d027d 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -57,86 +57,109 @@ //check file size and remove picture if it exceeds the maximum if (filesize($file->getFilenameOnFilestore())<= $maxfilesize) { array_push($uploaded_images, $file->guid); - - // Generate thumbnail - //TODO: This code needs a complete rewrite - hardcoded to ~2.5 MB - if (filesize($file->getFilenameOnFilestore())<= 2500000) { + + + $image_lib = get_plugin_setting('image_lib', 'tidypics'); + + if ($image_lib === 'GD') { + + // Generate thumbnail + //TODO: This code needs a complete rewrite - hardcoded to ~2.5 MB + if (filesize($file->getFilenameOnFilestore())<= 2500000) { + try { + $thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false); + } catch (Exception $e) { $thumblarge = false; } + + try { + $thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true); + } catch (Exception $e) { $thumbsmall = false; } + + try { + $thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true); + } catch (Exception $e) { $thumbnail = false; } + } + + + if ($thumbnail) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."thumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumbnail)) { + $file->thumbnail = $prefix."thumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + } + + if ($thumbsmall) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."smallthumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumbsmall)) { + $file->smallthumb = $prefix."smallthumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + } + + if ($thumblarge) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."largethumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumblarge)) { + $file->largethumb = $prefix."largethumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + } + + } else { + + //gfroese: build the actual thumbnails now + $album = get_entity($container_guid); + $user = get_user_entity_as_row($album->owner_guid); + $username = $user->username; + try { - //$thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false); + $thumblarge = tp_resize($file->getFilenameOnFilestore(), "largethumb", 600, 600, false); } catch (Exception $e) { $thumblarge = false; } - try { - //$thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true); + $thumbsmall = tp_resize($file->getFilenameOnFilestore(), "smallthumb", 153, 153, false); } catch (Exception $e) { $thumbsmall = false; } - try { - //$thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true); + $thumbnail = tp_resize($file->getFilenameOnFilestore(), "thumb", 60, 60, true); } catch (Exception $e) { $thumbnail = false; } - } - - // gfroese: i'm just faking this out so the proper records are created for the thumbnails - // I don't understand what $thumb->write does but it seems to actually create the file so - // I had to move the imagemagick call beneath this. I'm sure someone else can make this - // much better. - $thumbnail = true; - $thumblarge = true; - $thumbsmall = true; - if ($thumbnail) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."thumb".$filestorename); - $thumb->open("write"); - if ($thumb->write($thumbnail)) { + if ($thumbnail) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."thumb".$filestorename); $file->thumbnail = $prefix."thumb".$filestorename; - } else { - $thumb->delete(); } - $thumb->close(); - } - - if ($thumbsmall) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."smallthumb".$filestorename); - $thumb->open("write"); - if ($thumb->write($thumbsmall)) { + + if ($thumbsmall) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."smallthumb".$filestorename); $file->smallthumb = $prefix."smallthumb".$filestorename; - } else { - $thumb->delete(); } - $thumb->close(); - } - - if ($thumblarge) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."largethumb".$filestorename); - $thumb->open("write"); - if ($thumb->write($thumblarge)) { + + if ($thumblarge) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."largethumb".$filestorename); $file->largethumb = $prefix."largethumb".$filestorename; - } else { - $thumb->delete(); } - $thumb->close(); + } - //gfroese: build the actual thumbnails now - $album = get_entity($container_guid); - $user = get_user_entity_as_row($album->owner_guid); - $username = $user->username; - - try { - $thumblarge = tp_resize($file->getFilenameOnFilestore(), "largethumb", 600, 600, false); - } catch (Exception $e) { $thumblarge = false; } - try { - $thumbsmall = tp_resize($file->getFilenameOnFilestore(), "smallthumb", 153, 153, false); - } catch (Exception $e) { $thumbsmall = false; } - try { - $thumbnail = tp_resize($file->getFilenameOnFilestore(), "thumb", 60, 60, true); - } catch (Exception $e) { $thumbnail = false; } - - +/* $watermark = true; //gfroese - this should come from the plugin settings $watermark_text = $username . " - shutterpeg.com"; if( $watermark ) { //get this value from the plugin settings @@ -167,7 +190,7 @@ } } } - +*/ } else { //file exceeds file size limit, so delete it $file->delete(); array_push($not_uploaded, $name); -- cgit v1.2.3 From 2e28deb303d73fa2ec9be90dbd223f54765503f6 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 12 May 2009 11:51:32 +0000 Subject: added tidypics_ to url functions so we don't have a function collision --- start.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/start.php b/start.php index 5091a4200..85e4929bc 100644 --- a/start.php +++ b/start.php @@ -33,8 +33,8 @@ add_widget_type('album_view', elgg_echo("album:widget"), elgg_echo("album:widget:description"), 'profile'); // Register a URL handler for files - register_entity_url_handler('image_url','object','image'); - register_entity_url_handler('album_url','object','album'); + register_entity_url_handler('tidypics_image_url', 'object', 'image'); + register_entity_url_handler('tidypics_album_url', 'object', 'album'); // Register entity type register_entity_type('object','image'); @@ -289,24 +289,26 @@ /** * Populates the ->getUrl() method for file objects + * Registered in the init function * * @param ElggEntity $entity album/image entity * @return string File URL */ - function image_url($entity) { + function tidypics_image_url($entity) { global $CONFIG; $title = $entity->title; $title = friendly_title($title); return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title; } - - function album_url($entity) { + + function tidypics_album_url($entity) { global $CONFIG; $title = $entity->title; $title = friendly_title($title); - return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title; + return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title; } - + + // Make sure tidypics_init is called on initialisation register_elgg_event_handler('init','system','tidypics_init'); register_elgg_event_handler('pagesetup','system','tidypics_submenus'); -- cgit v1.2.3 From 7e944576f4bce2fb95718d0a233af438a7bf9cd8 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 12 May 2009 11:52:20 +0000 Subject: Placeholders for library functions --- lib/resize.php | 8 ++++++++ lib/tidypics.php | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 lib/resize.php create mode 100644 lib/tidypics.php diff --git a/lib/resize.php b/lib/resize.php new file mode 100644 index 000000000..657e56824 --- /dev/null +++ b/lib/resize.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/lib/tidypics.php b/lib/tidypics.php new file mode 100644 index 000000000..0a9db4f5d --- /dev/null +++ b/lib/tidypics.php @@ -0,0 +1,8 @@ + \ No newline at end of file -- cgit v1.2.3 From 36dbbe5be6781b3816283a35054067c99bb5cc10 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Tue, 12 May 2009 13:52:21 +0000 Subject: added watermark option and re-enabled the code for watermarks if one is set in settings --- actions/upload.php | 50 +++++++++++++++----------------- languages/en.php | 1 + views/default/settings/tidypics/edit.php | 8 +++++ 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index 3049d027d..797a4dfce 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -156,41 +156,37 @@ $thumb->setFilename($prefix."largethumb".$filestorename); $file->largethumb = $prefix."largethumb".$filestorename; } - - } - -/* - $watermark = true; //gfroese - this should come from the plugin settings - $watermark_text = $username . " - shutterpeg.com"; - if( $watermark ) { //get this value from the plugin settings - if( $thumblarge ) { - $ext = ".png"; - $user_stamp_base = dirname(__FILE__) . "/" . $username . "_stamp"; - if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist + + $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); + if( $watermark_text ) { //get this value from the plugin settings + if( $thumblarge ) { + $ext = ".png"; + $user_stamp_base = dirname(__FILE__) . "/" . $username . "_stamp"; + if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist + $commands = array(); + $commands[] = 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; + $commands[] = 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; + $commands[] = 'composite -compose CopyOpacity ' . $user_stamp_base . "_mask" . $ext . ' ' . $user_stamp_base . '_fgnd' . $ext . ' ' . $user_stamp_base . $ext; + $commands[] = 'mogrify -trim +repage ' . $user_stamp_base . $ext; + $commands[] = 'rm ' . $user_stamp_base . '_mask' . $ext; + $commands[] = 'rm ' . $user_stamp_fgnd . '_mask' . $ext; + + foreach( $commands as $command ) { + file_put_contents("/home/gfroese/debug.txt", $command . "\n", FILE_APPEND); + exec( $command ); + } + } + //apply the watermark $commands = array(); - $commands[] = 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; - $commands[] = 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; - $commands[] = 'composite -compose CopyOpacity ' . $user_stamp_base . "_mask" . $ext . ' ' . $user_stamp_base . '_fgnd' . $ext . ' ' . $user_stamp_base . $ext; - $commands[] = 'mogrify -trim +repage ' . $user_stamp_base . $ext; - $commands[] = 'rm ' . $user_stamp_base . '_mask' . $ext; - $commands[] = 'rm ' . $user_stamp_fgnd . '_mask' . $ext; - + $commands[] = 'composite -gravity south -geometry +0+10 ' . $user_stamp_base . $ext . ' ' . $thumblarge . ' ' . $thumblarge . '_watermarked'; + $commands[] = "mv $thumblarge" . "_watermarked $thumblarge"; foreach( $commands as $command ) { file_put_contents("/home/gfroese/debug.txt", $command . "\n", FILE_APPEND); exec( $command ); } } - //apply the watermark - $commands = array(); - $commands[] = 'composite -gravity south -geometry +0+10 ' . $user_stamp_base . $ext . ' ' . $thumblarge . ' ' . $thumblarge . '_watermarked'; - $commands[] = "mv $thumblarge" . "_watermarked $thumblarge"; - foreach( $commands as $command ) { - file_put_contents("/home/gfroese/debug.txt", $command . "\n", FILE_APPEND); - exec( $command ); - } } } -*/ } else { //file exceeds file size limit, so delete it $file->delete(); array_push($not_uploaded, $name); diff --git a/languages/en.php b/languages/en.php index 068616b6d..edf053aa5 100644 --- a/languages/en.php +++ b/languages/en.php @@ -20,6 +20,7 @@ 'item:object:image' => "Photos", 'item:object:album' => "Albums", 'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):", + 'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library", 'tidypics:enablephotos' => 'Enable Group Photo Albums', 'tidypics:editprops' => 'Edit Image Properties', 'tidypics:mostviewed' => 'Most viewed images', diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php index 57c63683f..98f348699 100644 --- a/views/default/settings/tidypics/edit.php +++ b/views/default/settings/tidypics/edit.php @@ -26,4 +26,12 @@ 'params[maxfilesize]', 'value' => $maxfilesize)); ?> +

        +watermark_text; + if(!$watermark_text) $watermark_text = ""; +?> +

        + + 'params[watermark_text]', 'value' => $watermark_text)); ?>

        \ No newline at end of file -- cgit v1.2.3 From 30b3d62f17b48cbc4ce0e9322bb2e1d282a3afcb Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Tue, 12 May 2009 14:34:13 +0000 Subject: tweak to watermark file creation --- actions/upload.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/actions/upload.php b/actions/upload.php index 797a4dfce..2f84a9f6b 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -161,7 +161,12 @@ if( $watermark_text ) { //get this value from the plugin settings if( $thumblarge ) { $ext = ".png"; - $user_stamp_base = dirname(__FILE__) . "/" . $username . "_stamp"; + + $watermark_filename = strtolower($watermark_text); + $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); + $watermark_filename = trim($watermark_filename, '-'); + + $user_stamp_base = dirname(__FILE__) . "/" . $username . "_" . $watermark_filename . "_stamp"; if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist $commands = array(); $commands[] = 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; -- cgit v1.2.3 From a95c6c02347c847aa000d0d8e5db9b7bb3c5b3bd Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Tue, 12 May 2009 18:07:59 +0000 Subject: made small thumbnail square again and put watermarking where it belongs --- actions/resize.php | 65 ++++++++++++++++++++++++++---------------------------- actions/upload.php | 4 ++-- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/actions/resize.php b/actions/resize.php index 8a8a5bb34..5dfc30975 100644 --- a/actions/resize.php +++ b/actions/resize.php @@ -65,40 +65,37 @@ // If it's a file we can manipulate ... if (array_key_exists($imgsizearray['mime'],$accepted_formats)) { -// $function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']]; -// $newimage = imagecreatetruecolor($newwidth,$newheight); - -// if (is_callable($function) && $oldimage = $function($input_name)) { - // Crop the image if we need a square - if ($square) { - if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { - $widthoffset = floor(($imgsizearray[0] - $width) / 2); - $heightoffset = floor(($imgsizearray[1] - $height) / 2); - } else { - $widthoffset = $x1; - $heightoffset = $y1; - $width = ($x2 - $x1); - $height = $width; - } - } else { - if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { - $widthoffset = 0; - $heightoffset = 0; - } else { - $widthoffset = $x1; - $heightoffset = $y1; - $width = ($x2 - $x1); - $height = ($y2 - $y1); - } - }//else { - // Resize and return the image contents! - if ($square) { - $newheight = $maxheight; - $newwidth = $maxwidth; - } - $command = "convert $input_name -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." $output_name"; - system($command); - return $output_name; + // Crop the image if we need a square + if ($square) { + if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { + $widthoffset = floor(($imgsizearray[0] - $width) / 2); + $heightoffset = floor(($imgsizearray[1] - $height) / 2); + } else { + $widthoffset = $x1; + $heightoffset = $y1; + $width = ($x2 - $x1); + $height = $width; + } + } else { + if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { + $widthoffset = 0; + $heightoffset = 0; + } else { + $widthoffset = $x1; + $heightoffset = $y1; + $width = ($x2 - $x1); + $height = ($y2 - $y1); + } + } + + // Resize and return the image contents! + if ($square) { + $newheight = $maxheight; + $newwidth = $maxwidth; + } + $command = "convert $input_name -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." $output_name"; + system($command); + return $output_name; } } diff --git a/actions/upload.php b/actions/upload.php index 2f84a9f6b..de7c35324 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -130,12 +130,12 @@ $thumblarge = tp_resize($file->getFilenameOnFilestore(), "largethumb", 600, 600, false); } catch (Exception $e) { $thumblarge = false; } try { - $thumbsmall = tp_resize($file->getFilenameOnFilestore(), "smallthumb", 153, 153, false); + $thumbsmall = tp_resize($file->getFilenameOnFilestore(), "smallthumb", 153, 153, true); } catch (Exception $e) { $thumbsmall = false; } try { $thumbnail = tp_resize($file->getFilenameOnFilestore(), "thumb", 60, 60, true); } catch (Exception $e) { $thumbnail = false; } - + if ($thumbnail) { $thumb = new ElggFile(); $thumb->setMimeType($mime); -- cgit v1.2.3 From f270541e427fddcfa7afcda0944277d825cafdfd Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 13 May 2009 00:15:49 +0000 Subject: added some framework for a tidypics settings object - this will be for detailed configuration --- settings.php | 2 ++ start.php | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 settings.php diff --git a/settings.php b/settings.php new file mode 100644 index 000000000..a45d44034 --- /dev/null +++ b/settings.php @@ -0,0 +1,2 @@ + \ No newline at end of file diff --git a/start.php b/start.php index 85e4929bc..94fb0440c 100644 --- a/start.php +++ b/start.php @@ -4,6 +4,13 @@ * */ + // setup tidypics settings object + global $CONFIG; + if (!isset($CONFIG->tidypics)) + $CONFIG->tidypics = new stdClass; + include dirname(__FILE__) . "/settings.php"; + + /** * tidypics plugin initialisation functions. */ -- cgit v1.2.3 From a80882a24895f9e2fd7447ca46d089d94d217c46 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 13 May 2009 00:32:08 +0000 Subject: image sizes are now defined in the settings object --- actions/upload.php | 33 +++++++++++++++++++++++++++------ settings.php | 16 ++++++++++++++++ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index de7c35324..b31921483 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -67,15 +67,24 @@ //TODO: This code needs a complete rewrite - hardcoded to ~2.5 MB if (filesize($file->getFilenameOnFilestore())<= 2500000) { try { - $thumblarge = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),600,600, false); + $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_large_width, + $CONFIG->tidypics->image_large_height, + false); } catch (Exception $e) { $thumblarge = false; } try { - $thumbsmall = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),153,153, true); + $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_small_width, + $CONFIG->tidypics->image_small_height, + true); } catch (Exception $e) { $thumbsmall = false; } try { - $thumbnail = get_resized_image_from_existing_file($file->getFilenameOnFilestore(),60,60, true); + $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_thumb_width, + $CONFIG->tidypics->image_thumb_height, + true); } catch (Exception $e) { $thumbnail = false; } } @@ -127,13 +136,25 @@ $username = $user->username; try { - $thumblarge = tp_resize($file->getFilenameOnFilestore(), "largethumb", 600, 600, false); + $thumblarge = tp_resize($file->getFilenameOnFilestore(), + "largethumb", + $CONFIG->tidypics->image_large_width, + $CONFIG->tidypics->image_large_height, + false); } catch (Exception $e) { $thumblarge = false; } try { - $thumbsmall = tp_resize($file->getFilenameOnFilestore(), "smallthumb", 153, 153, true); + $thumbsmall = tp_resize($file->getFilenameOnFilestore(), + "smallthumb", + $CONFIG->tidypics->image_small_width, + $CONFIG->tidypics->image_small_height, + true); } catch (Exception $e) { $thumbsmall = false; } try { - $thumbnail = tp_resize($file->getFilenameOnFilestore(), "thumb", 60, 60, true); + $thumbnail = tp_resize($file->getFilenameOnFilestore(), + "thumb", + $CONFIG->tidypics->image_thumb_width, + $CONFIG->tidypics->image_thumb_height, + true); } catch (Exception $e) { $thumbnail = false; } if ($thumbnail) { diff --git a/settings.php b/settings.php index a45d44034..0367eebff 100644 --- a/settings.php +++ b/settings.php @@ -1,2 +1,18 @@ tidypics->image_large_width = 600; + $CONFIG->tidypics->image_large_height = 600; + + $CONFIG->tidypics->image_small_width = 153; + $CONFIG->tidypics->image_small_height = 153; + + $CONFIG->tidypics->image_thumb_width = 60; + $CONFIG->tidypics->image_thumb_height = 60; + ?> \ No newline at end of file -- cgit v1.2.3 From 6e78b8fb472dc5ff8b586911d5ad06cb12aaea4e Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 13 May 2009 01:02:16 +0000 Subject: added a new plugin that allows users to set an extensive list of (future) parameters and not have to worry about upgrades --- tidypics_settings/manifest.xml | 10 ++++++++++ tidypics_settings/readme.txt | 27 +++++++++++++++++++++++++++ tidypics_settings/start.php | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 tidypics_settings/manifest.xml create mode 100644 tidypics_settings/readme.txt create mode 100644 tidypics_settings/start.php diff --git a/tidypics_settings/manifest.xml b/tidypics_settings/manifest.xml new file mode 100644 index 000000000..3ee22d192 --- /dev/null +++ b/tidypics_settings/manifest.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/tidypics_settings/readme.txt b/tidypics_settings/readme.txt new file mode 100644 index 000000000..2f6ff9cca --- /dev/null +++ b/tidypics_settings/readme.txt @@ -0,0 +1,27 @@ +What is this? +============================= +tidypics_settings is a plugin + + +What does it do? +============================= +It allows you to override settings in tidypics like the size of images or whether images +can be downloaded or not. By changing those settings in this plugin and NOT in the +tidypics plugin, you can upgrade to new versions without worrying about losing your +custom settings. + + +How do I install it? +============================= +1. Copy the tidypics_settings directory to your Elgg mod directory. You should now have +a directory path like this: /mod/tidypics_settings + +2. Under that directory, you should have 2 files: this readme and a start.php file. Edit +this start.php file to change any settings that you want to change (uncomment the setting +and then change its value). + +3. Confirm that this plugin appears below tidypics on the plugin list in Tools Administration. +It does not have to be directly below. Just as long as it is loaded afterwards. + +4. Enable the plugin under Tools Administration in your Elgg install. If you get a misconfigured +plugin error message, you've done something dumb. diff --git a/tidypics_settings/start.php b/tidypics_settings/start.php new file mode 100644 index 000000000..6332050a8 --- /dev/null +++ b/tidypics_settings/start.php @@ -0,0 +1,35 @@ +tidypics)) { + error_log('tidypics_settings: error - not loaded after tidypics plugin!!!'); + } + + +///////////////////////////////////////////////////////////////////// +// Image sizes - Tidypics makes 3 views of an image: +// Large - displayed when viewing the image alone +// Small - displayed on an album page +// Thumb - used for the activity log +// There is also the original image that is available for download +// $CONFIG->tidypics->image_large_width = 600; +// $CONFIG->tidypics->image_large_height = 600; + +// $CONFIG->tidypics->image_small_width = 153; +// $CONFIG->tidypics->image_small_height = 153; + +// $CONFIG->tidypics->image_thumb_width = 60; +// $CONFIG->tidypics->image_thumb_height = 60; + + + + + +?> \ No newline at end of file -- cgit v1.2.3 From fe45d33afc444e0f77d912a65de83ba9f0c92f33 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 13 May 2009 01:03:53 +0000 Subject: added warning to settings file --- settings.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/settings.php b/settings.php index 0367eebff..a18660da0 100644 --- a/settings.php +++ b/settings.php @@ -1,5 +1,13 @@ Date: Wed, 13 May 2009 11:54:48 +0000 Subject: added relationship between user and photo when tagged - this will enable searching for all photos that include user x --- actions/addtag.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/actions/addtag.php b/actions/addtag.php index 562d53882..dc4274728 100644 --- a/actions/addtag.php +++ b/actions/addtag.php @@ -1,6 +1,6 @@ annotate('phototag', serialize($tag), $access_id, $owner_id)) { + // if tag is a user id, add relationship for searching (find all images with user x) + if ($relationships_type === 'user') { + if (!check_entity_relationship($user_id, 'phototag', $image_guid)) + add_entity_relationship($user_id, 'phototag', $image_guid); + } + system_message(elgg_echo("tidypics:phototagging:success")); } -- cgit v1.2.3 From bc21cbc465d9cd4d86265246826ba02515541152 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Wed, 13 May 2009 13:26:12 +0000 Subject: fixed sorting for most viewed and watermarking files to show proper owner when watermarking images in a group album --- actions/upload.php | 3 ++- friendmostviewed.php | 2 +- mostviewedimages.php | 2 +- yourmostviewed.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index b31921483..f114f50ad 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -187,7 +187,8 @@ $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); $watermark_filename = trim($watermark_filename, '-'); - $user_stamp_base = dirname(__FILE__) . "/" . $username . "_" . $watermark_filename . "_stamp"; + $viewer = get_loggedin_user(); + $user_stamp_base = dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"; if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist $commands = array(); $commands[] = 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; diff --git a/friendmostviewed.php b/friendmostviewed.php index 901a8ff08..a196f51af 100644 --- a/friendmostviewed.php +++ b/friendmostviewed.php @@ -38,7 +38,7 @@ INNER JOIN " . $prefix . "metastrings ms ON md.value_id = ms.id INNER JOIN " . $prefix . "metastrings ms2 ON md.name_id = ms2.id AND ms2.string = 'tp_views' WHERE ent.owner_guid = " . $user->guid . " - ORDER BY views DESC LIMIT $max"; + ORDER BY (views+0) DESC LIMIT $max"; $result = get_data($sql); diff --git a/mostviewedimages.php b/mostviewedimages.php index caf755193..8831dc33e 100644 --- a/mostviewedimages.php +++ b/mostviewedimages.php @@ -17,7 +17,7 @@ $sql = "select md.entity_guid, md.owner_guid, md.enabled, ms.string as views from " . $prefix . "metadata md inner join " . $prefix . "metastrings ms on md.value_id = ms.id inner join " . $prefix . "metastrings ms2 on md.name_id = ms2.id and ms2.string = 'tp_views' - order by views desc LIMIT $max"; + order by (views+0) desc LIMIT $max"; $result = get_data($sql); diff --git a/yourmostviewed.php b/yourmostviewed.php index 40d05c038..f9a1af88a 100644 --- a/yourmostviewed.php +++ b/yourmostviewed.php @@ -20,7 +20,7 @@ INNER JOIN " . $prefix . "metastrings ms ON md.value_id = ms.id INNER JOIN " . $prefix . "metastrings ms2 ON md.name_id = ms2.id AND ms2.string = 'tp_views' WHERE ent.owner_guid = " . $viewer->guid . " - ORDER BY views DESC LIMIT $max"; + ORDER BY (views+0) DESC LIMIT $max"; $result = get_data($sql); -- cgit v1.2.3 From 711c6040d3a5e3b479a1326c5afc6c3a689c8ad5 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Wed, 13 May 2009 19:06:38 +0000 Subject: made path to imagemagick a setting --- actions/resize.php | 7 ++++++- actions/upload.php | 18 +++++++++++------- languages/en.php | 1 + views/default/settings/tidypics/edit.php | 7 +++++++ 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/actions/resize.php b/actions/resize.php index 5dfc30975..1c3bf2bad 100644 --- a/actions/resize.php +++ b/actions/resize.php @@ -93,7 +93,12 @@ $newheight = $maxheight; $newwidth = $maxwidth; } - $command = "convert $input_name -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." $output_name"; + $im_path = get_plugin_setting('convert_command', 'tidypics'); + if(!$im_path) { + $im_path = "/usr/bin/"; + } + if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; + $command = $im_path . "convert $input_name -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." $output_name"; system($command); return $output_name; diff --git a/actions/upload.php b/actions/upload.php index f114f50ad..eeb68aba1 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -178,6 +178,12 @@ $file->largethumb = $prefix."largethumb".$filestorename; } + $im_path = get_plugin_setting('convert_command', 'tidypics'); + if(!$im_path) { + $im_path = "/usr/bin/"; + } + if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; + $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); if( $watermark_text ) { //get this value from the plugin settings if( $thumblarge ) { @@ -191,24 +197,22 @@ $user_stamp_base = dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"; if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist $commands = array(); - $commands[] = 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; - $commands[] = 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; - $commands[] = 'composite -compose CopyOpacity ' . $user_stamp_base . "_mask" . $ext . ' ' . $user_stamp_base . '_fgnd' . $ext . ' ' . $user_stamp_base . $ext; - $commands[] = 'mogrify -trim +repage ' . $user_stamp_base . $ext; + $commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; + $commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; + $commands[] = $im_path . 'composite -compose CopyOpacity ' . $user_stamp_base . "_mask" . $ext . ' ' . $user_stamp_base . '_fgnd' . $ext . ' ' . $user_stamp_base . $ext; + $commands[] = $im_path . 'mogrify -trim +repage ' . $user_stamp_base . $ext; $commands[] = 'rm ' . $user_stamp_base . '_mask' . $ext; $commands[] = 'rm ' . $user_stamp_fgnd . '_mask' . $ext; foreach( $commands as $command ) { - file_put_contents("/home/gfroese/debug.txt", $command . "\n", FILE_APPEND); exec( $command ); } } //apply the watermark $commands = array(); - $commands[] = 'composite -gravity south -geometry +0+10 ' . $user_stamp_base . $ext . ' ' . $thumblarge . ' ' . $thumblarge . '_watermarked'; + $commands[] = $im_path . 'composite -gravity south -geometry +0+10 ' . $user_stamp_base . $ext . ' ' . $thumblarge . ' ' . $thumblarge . '_watermarked'; $commands[] = "mv $thumblarge" . "_watermarked $thumblarge"; foreach( $commands as $command ) { - file_put_contents("/home/gfroese/debug.txt", $command . "\n", FILE_APPEND); exec( $command ); } } diff --git a/languages/en.php b/languages/en.php index edf053aa5..5198817b9 100644 --- a/languages/en.php +++ b/languages/en.php @@ -21,6 +21,7 @@ 'item:object:album' => "Albums", 'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):", 'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library", + 'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands", 'tidypics:enablephotos' => 'Enable Group Photo Albums', 'tidypics:editprops' => 'Edit Image Properties', 'tidypics:mostviewed' => 'Most viewed images', diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php index 98f348699..dd2444ac3 100644 --- a/views/default/settings/tidypics/edit.php +++ b/views/default/settings/tidypics/edit.php @@ -15,6 +15,13 @@ 'value' => $image_lib )); ?> +
        + im_path; + if(!$im_path) $im_path = "/usr/bin/"; + ?> + + 'params[im_path]', 'value' => $im_path)); ?>

        Date: Sat, 16 May 2009 00:16:40 +0000 Subject: counting now using annotations --- friendmostviewed.php | 13 +++++++++++++ mostrecentimages.php | 4 ++++ mostviewedimages.php | 22 +++++++++++++++------- viewimage.php | 20 +------------------- views/default/object/image.php | 31 ++++++++++++++++++++++++++++--- yourmostviewed.php | 24 ++++++++++++++---------- 6 files changed, 75 insertions(+), 39 deletions(-) diff --git a/friendmostviewed.php b/friendmostviewed.php index a196f51af..4f832b228 100644 --- a/friendmostviewed.php +++ b/friendmostviewed.php @@ -40,6 +40,19 @@ WHERE ent.owner_guid = " . $user->guid . " ORDER BY (views+0) DESC LIMIT $max"; + + $sql = "SELECT ent.guid, count( * ) AS views + FROM `my_elggentities` ent + INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id + AND sub.subtype = 'image' + INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid + INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id + AND ms.string = 'tp_view' + WHERE ann1.owner_guid = " . $user->guid . " + GROUP BY ent.guid + ORDER BY views DESC + LIMIT $max"; + $result = get_data($sql); $entities = array(); diff --git a/mostrecentimages.php b/mostrecentimages.php index 53d8ef236..e42cea4ae 100644 --- a/mostrecentimages.php +++ b/mostrecentimages.php @@ -8,14 +8,18 @@ // Load Elgg engine include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); + include_once(dirname(__FILE__) . "/notice.php"); $max = 8; $images = list_entities("object", "image", 0, $max, false, false, true); $title = "Most recent images"; $area2 = elgg_view_title($title); + $notice = tp_notice(); + $area2 .= $notice->text; $area2 .= $images; $body = elgg_view_layout('two_column_left_sidebar', '', $area2); page_draw($title, $body); + if($notice->showMessage == true) system_message($notice->text); ?> \ No newline at end of file diff --git a/mostviewedimages.php b/mostviewedimages.php index 8831dc33e..5bbbcf5e7 100644 --- a/mostviewedimages.php +++ b/mostviewedimages.php @@ -12,18 +12,26 @@ global $CONFIG; $prefix = $CONFIG->dbprefix; $max = 24; - //grab the top views (metadata 'tp_views') for $max number of entities - //ignores entity subtypes - $sql = "select md.entity_guid, md.owner_guid, md.enabled, ms.string as views from " . $prefix . "metadata md - inner join " . $prefix . "metastrings ms on md.value_id = ms.id - inner join " . $prefix . "metastrings ms2 on md.name_id = ms2.id and ms2.string = 'tp_views' - order by (views+0) desc LIMIT $max"; + + //this works but is wildly inefficient + //$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000); + + $sql = "SELECT ent.guid, count( * ) AS views + FROM `my_elggentities` ent + INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id + AND sub.subtype = 'image' + INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid + INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id + AND ms.string = 'tp_view' + GROUP BY ent.guid + ORDER BY views DESC + LIMIT $max"; $result = get_data($sql); $entities = array(); foreach($result as $entity) { - $entities[] = get_entity($entity->entity_guid); + $entities[] = get_entity($entity->guid); } $title = "Most viewed images"; diff --git a/viewimage.php b/viewimage.php index 8534e3d30..3a0d42b5d 100644 --- a/viewimage.php +++ b/viewimage.php @@ -31,23 +31,6 @@ $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); } - $views = get_metadata_byname($photo_guid, "tp_views"); - if(!$views || intval($views["value"] == 0)) $views["value"] = 0; - $views["value"] = $views["value"] + 1; //TODO: only add views for non-owner - create_metadata($photo_guid, "tp_views", $views["value"], "integer", 0, 2); - - $viewer = get_loggedin_user(); - - /* - $metadatas = get_metadata_for_entity($photo_guid); - $rating = 0; - foreach($metadatas as $metadata) { - if($metadata["owner_guid"] == $viewer["guid"]) { - if($metadata["name"] == "rating") $rating = $metadata["value"]; - } - } - */ - if (can_write_to_container(0, $album->container_guid)) { add_submenu_item( elgg_echo('image:edit'), $CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid, @@ -59,10 +42,9 @@ } - $title = $photo->title . " - views: $views[value]"; + $title = $photo->title; $area2 = elgg_view_title($title); $area2 .= elgg_view_entity($photo, true); -// $area2 .= "Rate *"; $body = elgg_view_layout('two_column_left_sidebar', '', $area2); diff --git a/views/default/object/image.php b/views/default/object/image.php index 09a121256..13a94fc7d 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -88,7 +88,26 @@ if ($photo_tags) { // //////////////////////////////////////////////////////// - + // Get view information + + $viewer = get_loggedin_user(); + + //who is viewing? + if($viewer->guid) { + $the_viewer = $viewer->guid; + } else { + $the_viewer = 0; + } + + create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, 2); + $views_a = get_annotations($file_guid, "object", "image", "tp_view"); + $views = count($views_a); + + $my_views = 0; + foreach($views_a as $view) { + if($view->owner_guid == $the_viewer && $the_viewer != 0) $my_views++; + } + // Build back and next links $back = ''; @@ -123,17 +142,19 @@ if ($photo_tags) {
        - $album,) ); ?> + $album,) ); ?>
        + Views:
        - +
        '; ?> +
        @@ -159,7 +180,11 @@ if ($photo_tags) {
        $tags));?>
        +
        + $vars['entity'])); ?> +
        name; ?>
        diff --git a/yourmostviewed.php b/yourmostviewed.php index f9a1af88a..84cc2ca10 100644 --- a/yourmostviewed.php +++ b/yourmostviewed.php @@ -13,20 +13,24 @@ global $CONFIG; $prefix = $CONFIG->dbprefix; $max = 24; - //grab the top views (metadata 'tp_views') for $max number of entities - //ignores entity subtypes - $sql = "SELECT md.entity_guid, md.owner_guid, md.enabled, ms.string AS views from " . $prefix . "entities ent - INNER JOIN " . $prefix . "metadata md ON md.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON md.value_id = ms.id - INNER JOIN " . $prefix . "metastrings ms2 ON md.name_id = ms2.id AND ms2.string = 'tp_views' - WHERE ent.owner_guid = " . $viewer->guid . " - ORDER BY (views+0) DESC LIMIT $max"; - + + $sql = "SELECT ent.guid, count( * ) AS views + FROM `my_elggentities` ent + INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id + AND sub.subtype = 'image' + INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid + INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id + AND ms.string = 'tp_view' + WHERE ann1.owner_guid = " . $viewer->guid . " + GROUP BY ent.guid + ORDER BY views DESC + LIMIT $max"; + $result = get_data($sql); $entities = array(); foreach($result as $entity) { - $entities[] = get_entity($entity->entity_guid); + $entities[] = get_entity($entity->guid); } $title = elgg_echo("tidypics:yourmostviewed"); -- cgit v1.2.3 From 3f30c9270e6c279a10025afc67417875eb7b4bab Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 00:48:16 +0000 Subject: work around for IE when no tags present --- views/default/js/tidypics.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/default/js/tidypics.php b/views/default/js/tidypics.php index c3520842a..ec2c5dd98 100644 --- a/views/default/js/tidypics.php +++ b/views/default/js/tidypics.php @@ -83,6 +83,10 @@ function appendTag(offset, tag) { + // catch for IE when no tags available + if (tag.id == undefined) + return; + tag_top = parseInt(imgOffset.top) + parseInt(tag.y1); tag_left = parseInt(imgOffset.left) + parseInt(tag.x1); -- cgit v1.2.3 From 9cd4be689005f6eec063222b7c6ec7ec0e027a22 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 00:56:57 +0000 Subject: another IE javascript change for position elements --- views/default/js/tidypics.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/views/default/js/tidypics.php b/views/default/js/tidypics.php index ec2c5dd98..31ccc57af 100644 --- a/views/default/js/tidypics.php +++ b/views/default/js/tidypics.php @@ -189,12 +189,12 @@ if (oCoordenates.width != 0 && oCoordenates.height != 0) { coordinates = oCoordenates; - top = imgOffset.top + oCoordenates.y2; - left = imgOffset.left + oCoordenates.x2 + offsetX; + _top = imgOffset.top + oCoordenates.y2; + _left = imgOffset.left + oCoordenates.x2 + offsetX; $('#tag_menu').show().css({ - "top": top + "px", - "left": left + "px" + "top": _top + "px", + "left": _left + "px" }); $(".input-filter").focus(); @@ -214,12 +214,12 @@ imgOffset = $('#tidypics_image').offset(); imgWidth = $('#tidypics_image').width(); - top = imgOffset.top + offsetY; - left = imgOffset.left; + _top = imgOffset.top + offsetY; + _left = imgOffset.left; $('#tagging_instructions').show().css({ - "top": top + "px", - "left": left + "px" + "top": _top + "px", + "left": _left + "px" }); } -- cgit v1.2.3 From b624f3bd6e4ddefa08ab9bd002d4504136fa8a4f Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 01:03:16 +0000 Subject: center tagging instructions --- views/default/js/tidypics.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/default/js/tidypics.php b/views/default/js/tidypics.php index 31ccc57af..323c2bf57 100644 --- a/views/default/js/tidypics.php +++ b/views/default/js/tidypics.php @@ -211,11 +211,13 @@ { offsetY = -60; + divWidth = $('#tagging_instructions').width(); imgOffset = $('#tidypics_image').offset(); imgWidth = $('#tidypics_image').width(); + offsetX = parseInt((imgWidth - divWidth)/2); _top = imgOffset.top + offsetY; - _left = imgOffset.left; + _left = imgOffset.left + offsetX; $('#tagging_instructions').show().css({ "top": _top + "px", -- cgit v1.2.3 From dd3fcae605c590c76ebfc5584a9a5e33c7fe2a40 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 15:59:35 +0000 Subject: added screen for viewing server setup to advise on configuring server for better Tidypics performance --- system.php | 42 ++++++++++++++++++++++++++++++++ views/default/settings/tidypics/edit.php | 9 +++++++ 2 files changed, 51 insertions(+) create mode 100644 system.php diff --git a/system.php b/system.php new file mode 100644 index 000000000..d9abcd2e5 --- /dev/null +++ b/system.php @@ -0,0 +1,42 @@ +=')); +$xml_ok = extension_loaded('xml'); +$pcre_ok = extension_loaded('pcre'); +$curl_ok = function_exists('curl_exec'); +$zlib_ok = extension_loaded('zlib'); +$mbstring_ok = extension_loaded('mbstring'); +$iconv_ok = extension_loaded('iconv'); +*/ + ob_start(); + + echo elgg_view_title($title); +?> +
        + +
        + \ No newline at end of file diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php index dd2444ac3..ce06a2a35 100644 --- a/views/default/settings/tidypics/edit.php +++ b/views/default/settings/tidypics/edit.php @@ -1,3 +1,12 @@ +wwwroot . 'mod/tidypics/system.php'; +?> + +

        +Run Server Analysis +

        + image_lib; if (!$image_lib) $image_lib = 'GD'; -- cgit v1.2.3 From a263f54550563810e38de2c56f69e86269db7c80 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 17:05:30 +0000 Subject: added some basic server stats to help guide configuration --- system.php | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 64 insertions(+), 10 deletions(-) diff --git a/system.php b/system.php index d9abcd2e5..0e218d3f3 100644 --- a/system.php +++ b/system.php @@ -16,21 +16,75 @@ $title = 'TidyPics Server Analysis'; -/* -$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '4.3.0', '>=')); -$xml_ok = extension_loaded('xml'); -$pcre_ok = extension_loaded('pcre'); -$curl_ok = function_exists('curl_exec'); -$zlib_ok = extension_loaded('zlib'); -$mbstring_ok = extension_loaded('mbstring'); -$iconv_ok = extension_loaded('iconv'); -*/ + + function tp_readable_size($bytes) + { + $size = $bytes / 1024; + if ($size < 1024) { + $size = number_format($size, 2); + $size .= ' KB'; + } else { + $size = $size / 1024; + if($size < 1024) { + $size = number_format($size, 2); + $size .= ' MB'; + } else { + $size = $size / 1024; + $size = number_format($size, 2); + $size .= ' GB'; + } + } + return $size; + } + + ob_start(); echo elgg_view_title($title); ?>
        - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        PHP version
        GDElgg requires the GD extension to be loaded
        Memory Available to PHPBChange memory_limit to increase
        Memory Used to Load This PageThis is approximately the minimum per page
        Max File Upload SizeMax size of the sum of images uploaded at once
        Max Post SizeMax post size - should be larger than above
        Max Input Time sTime script waits for upload to finish
        Max Execution Time sMax time a script will run
        Date: Sat, 16 May 2009 17:10:10 +0000 Subject: added image magick test to server analysis --- system.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/system.php b/system.php index 0e218d3f3..ed6370149 100644 --- a/system.php +++ b/system.php @@ -54,6 +54,11 @@ Elgg requires the GD extension to be loaded + + ImageMagick + + + Memory Available to PHP B -- cgit v1.2.3 From 4b63b8ad8df01c077d918e2cbe65e0818f971d69 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 17:46:09 +0000 Subject: added check for no images uploaded --- actions/upload.php | 24 +++++++++++++++++++++--- system.php | 4 ++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index eeb68aba1..3357fe469 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -7,21 +7,39 @@ global $CONFIG; require_once(dirname(__FILE__)."/resize.php"); - + // Get common variables $access_id = (int) get_input("access_id"); $container_guid = (int) get_input('container_guid', 0); if (!$container_guid) $container_guid == $_SESSION['user']->getGUID(); - + $not_uploaded = array(); - $uploaded_images = array(); + $uploaded_images = array(); + + // test to make sure at least 1 image was selected by user + $num_images = 0; + foreach($_FILES as $key => $sent_file) { + if (!empty($sent_file['name'])) + $num_images++; + } + if ($num_images == 0) { + // have user try again + register_error('No images were selected. Please try again'); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); + } + foreach($_FILES as $key => $sent_file) { if (!empty($sent_file['name'])) { $name = $_FILES[$key]['name']; $mime = $_FILES[$key]['type']; + //error_log('Name ' . $sent_file['name']); + //error_log('MIME ' . $sent_file['type']); + //error_log('error ' . $sent_file['error']); + //error_log('Size ' . $sent_file['size']); + //make sure file is an image if ($mime == 'image/jpeg' || $mime == 'image/gif' || $mime == 'image/png' || $mime == 'image/pjpeg') { //this will save to users folder in /image/ and organize by photo album diff --git a/system.php b/system.php index ed6370149..82a705932 100644 --- a/system.php +++ b/system.php @@ -72,12 +72,12 @@ Max File Upload Size - Max size of the sum of images uploaded at once + Max size of an uploaded image Max Post Size - Max post size - should be larger than above + Max post size = sum of images + html form Max Input Time -- cgit v1.2.3 From 82519e3e23c5c56db420a64b7d17ca524720d1a2 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 18:33:35 +0000 Subject: cleaning up upload code --- actions/upload.php | 420 ++++++++++++++++++++++++++--------------------------- languages/en.php | 4 +- 2 files changed, 210 insertions(+), 214 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index 3357fe469..3bfd35367 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -14,9 +14,6 @@ if (!$container_guid) $container_guid == $_SESSION['user']->getGUID(); - $not_uploaded = array(); - $uploaded_images = array(); - // test to make sure at least 1 image was selected by user $num_images = 0; foreach($_FILES as $key => $sent_file) { @@ -29,224 +26,223 @@ forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); } - + $not_uploaded = array(); + $uploaded_images = array(); foreach($_FILES as $key => $sent_file) { - if (!empty($sent_file['name'])) { - $name = $_FILES[$key]['name']; - $mime = $_FILES[$key]['type']; - - //error_log('Name ' . $sent_file['name']); - //error_log('MIME ' . $sent_file['type']); - //error_log('error ' . $sent_file['error']); - //error_log('Size ' . $sent_file['size']); + + // skip empty entries + if (empty($sent_file['name'])) + continue; + + $name = $sent_file['name']; + $mime = $sent_file['type']; + + if ($sent_file['error']) { + array_push($not_uploaded, $sent_file['name']); + continue; + } + + //make sure file is an image + if ($mime != 'image/jpeg' && $mime != 'image/gif' && $mime != 'image/png' && $mime != 'image/pjpeg') { + array_push($not_uploaded, $sent_file['name']); + continue; + } - //make sure file is an image - if ($mime == 'image/jpeg' || $mime == 'image/gif' || $mime == 'image/png' || $mime == 'image/pjpeg') { - //this will save to users folder in /image/ and organize by photo album - $prefix = "image/" . $container_guid . "/"; - $file = new ElggFile(); - $filestorename = strtolower(time().$name); - $file->setFilename($prefix.$filestorename); - $file->setMimeType($mime); - $file->originalfilename = $name; - $file->subtype="image"; - $file->access_id = $access_id; - if ($container_guid) { - $file->container_guid = $container_guid; - } - $file->open("write"); - $file->write(get_uploaded_file($key)); - $file->close(); - $result = $file->save(); + // make sure file does not exceed limit + $maxfilesize = get_plugin_setting('maxfilesize','tidypics'); + if (!$maxfilesize) + $maxfilesize = 5; // default to 5 MB if not set + + $maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs + if ($sent_file['size'] > $maxfilesize) { + array_push($not_uploaded, $sent_file['name']); + continue; + } - if ($result) { //file was saved; now create some thumbnails - //get maximum file size from plugin settings - if (get_plugin_setting('maxfilesize','tidypics')) { - if (((int) get_plugin_setting('maxfilesize','tidypics')) < 1 || ((int) get_plugin_setting('maxfilesize','tidypics')) > 1048576) { - $maxfilesize = 10240; //if file size is less than 1KB or greater than 1GB, default to 10MB - } else { - $maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics'); - } - } else { - $maxfilesize = 10240; //if the file size limit is not set, default to 10MB - } - $maxfilesize = 1024 * $maxfilesize; //convert to bytes - - //check file size and remove picture if it exceeds the maximum - if (filesize($file->getFilenameOnFilestore())<= $maxfilesize) { - array_push($uploaded_images, $file->guid); + //this will save to users folder in /image/ and organize by photo album + $prefix = "image/" . $container_guid . "/"; + $file = new ElggFile(); + $filestorename = strtolower(time().$name); + $file->setFilename($prefix.$filestorename); + $file->setMimeType($mime); + $file->originalfilename = $name; + $file->subtype="image"; + $file->access_id = $access_id; + if ($container_guid) { + $file->container_guid = $container_guid; + } + $file->open("write"); + $file->write(get_uploaded_file($key)); + $file->close(); + $result = $file->save(); - $image_lib = get_plugin_setting('image_lib', 'tidypics'); + if (!$result) { + array_push($not_uploaded, $sent_file['name']); + continue; + } + + // successfully saved image + array_push($uploaded_images, $file->guid); - if ($image_lib === 'GD') { - - // Generate thumbnail - //TODO: This code needs a complete rewrite - hardcoded to ~2.5 MB - if (filesize($file->getFilenameOnFilestore())<= 2500000) { - try { - $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_large_width, - $CONFIG->tidypics->image_large_height, - false); - } catch (Exception $e) { $thumblarge = false; } - - try { - $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_small_width, - $CONFIG->tidypics->image_small_height, - true); - } catch (Exception $e) { $thumbsmall = false; } - - try { - $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_thumb_width, - $CONFIG->tidypics->image_thumb_height, - true); - } catch (Exception $e) { $thumbnail = false; } - } - - if ($thumbnail) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."thumb".$filestorename); - $thumb->open("write"); - if ($thumb->write($thumbnail)) { - $file->thumbnail = $prefix."thumb".$filestorename; - } else { - $thumb->delete(); - } - $thumb->close(); - } - - if ($thumbsmall) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."smallthumb".$filestorename); - $thumb->open("write"); - if ($thumb->write($thumbsmall)) { - $file->smallthumb = $prefix."smallthumb".$filestorename; - } else { - $thumb->delete(); - } - $thumb->close(); - } - - if ($thumblarge) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."largethumb".$filestorename); - $thumb->open("write"); - if ($thumb->write($thumblarge)) { - $file->largethumb = $prefix."largethumb".$filestorename; - } else { - $thumb->delete(); - } - $thumb->close(); - } - - } else { + $image_lib = get_plugin_setting('image_lib', 'tidypics'); + + if ($image_lib === 'GD') { + + // Generate thumbnail + //TODO: This code needs a complete rewrite - hardcoded to ~2.5 MB + if (filesize($file->getFilenameOnFilestore())<= 2500000) { + try { + $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_large_width, + $CONFIG->tidypics->image_large_height, + false); + } catch (Exception $e) { $thumblarge = false; } + try { + $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_small_width, + $CONFIG->tidypics->image_small_height, + true); + } catch (Exception $e) { $thumbsmall = false; } + + try { + $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_thumb_width, + $CONFIG->tidypics->image_thumb_height, + true); + } catch (Exception $e) { $thumbnail = false; } + } + - //gfroese: build the actual thumbnails now - $album = get_entity($container_guid); - $user = get_user_entity_as_row($album->owner_guid); - $username = $user->username; - - try { - $thumblarge = tp_resize($file->getFilenameOnFilestore(), - "largethumb", - $CONFIG->tidypics->image_large_width, - $CONFIG->tidypics->image_large_height, - false); - } catch (Exception $e) { $thumblarge = false; } - try { - $thumbsmall = tp_resize($file->getFilenameOnFilestore(), - "smallthumb", - $CONFIG->tidypics->image_small_width, - $CONFIG->tidypics->image_small_height, - true); - } catch (Exception $e) { $thumbsmall = false; } - try { - $thumbnail = tp_resize($file->getFilenameOnFilestore(), - "thumb", - $CONFIG->tidypics->image_thumb_width, - $CONFIG->tidypics->image_thumb_height, - true); - } catch (Exception $e) { $thumbnail = false; } - - if ($thumbnail) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."thumb".$filestorename); - $file->thumbnail = $prefix."thumb".$filestorename; - } - - if ($thumbsmall) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."smallthumb".$filestorename); - $file->smallthumb = $prefix."smallthumb".$filestorename; - } - - if ($thumblarge) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."largethumb".$filestorename); - $file->largethumb = $prefix."largethumb".$filestorename; - } - - $im_path = get_plugin_setting('convert_command', 'tidypics'); - if(!$im_path) { - $im_path = "/usr/bin/"; - } - if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; - - $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); - if( $watermark_text ) { //get this value from the plugin settings - if( $thumblarge ) { - $ext = ".png"; - - $watermark_filename = strtolower($watermark_text); - $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); - $watermark_filename = trim($watermark_filename, '-'); - - $viewer = get_loggedin_user(); - $user_stamp_base = dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"; - if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist - $commands = array(); - $commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; - $commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; - $commands[] = $im_path . 'composite -compose CopyOpacity ' . $user_stamp_base . "_mask" . $ext . ' ' . $user_stamp_base . '_fgnd' . $ext . ' ' . $user_stamp_base . $ext; - $commands[] = $im_path . 'mogrify -trim +repage ' . $user_stamp_base . $ext; - $commands[] = 'rm ' . $user_stamp_base . '_mask' . $ext; - $commands[] = 'rm ' . $user_stamp_fgnd . '_mask' . $ext; - - foreach( $commands as $command ) { - exec( $command ); - } - } - //apply the watermark - $commands = array(); - $commands[] = $im_path . 'composite -gravity south -geometry +0+10 ' . $user_stamp_base . $ext . ' ' . $thumblarge . ' ' . $thumblarge . '_watermarked'; - $commands[] = "mv $thumblarge" . "_watermarked $thumblarge"; - foreach( $commands as $command ) { - exec( $command ); - } - } - } + if ($thumbnail) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."thumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumbnail)) { + $file->thumbnail = $prefix."thumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + } + + if ($thumbsmall) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."smallthumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumbsmall)) { + $file->smallthumb = $prefix."smallthumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + } + + if ($thumblarge) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."largethumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumblarge)) { + $file->largethumb = $prefix."largethumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + } + + } else { + //gfroese: build the actual thumbnails now + $album = get_entity($container_guid); + $user = get_user_entity_as_row($album->owner_guid); + $username = $user->username; + + try { + $thumblarge = tp_resize($file->getFilenameOnFilestore(), + "largethumb", + $CONFIG->tidypics->image_large_width, + $CONFIG->tidypics->image_large_height, + false); + } catch (Exception $e) { $thumblarge = false; } + try { + $thumbsmall = tp_resize($file->getFilenameOnFilestore(), + "smallthumb", + $CONFIG->tidypics->image_small_width, + $CONFIG->tidypics->image_small_height, + true); + } catch (Exception $e) { $thumbsmall = false; } + try { + $thumbnail = tp_resize($file->getFilenameOnFilestore(), + "thumb", + $CONFIG->tidypics->image_thumb_width, + $CONFIG->tidypics->image_thumb_height, + true); + } catch (Exception $e) { $thumbnail = false; } + + if ($thumbnail) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."thumb".$filestorename); + $file->thumbnail = $prefix."thumb".$filestorename; + } + + if ($thumbsmall) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."smallthumb".$filestorename); + $file->smallthumb = $prefix."smallthumb".$filestorename; + } + + if ($thumblarge) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."largethumb".$filestorename); + $file->largethumb = $prefix."largethumb".$filestorename; + } + + $im_path = get_plugin_setting('convert_command', 'tidypics'); + if(!$im_path) { + $im_path = "/usr/bin/"; + } + if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; + + $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); + if( $watermark_text ) { //get this value from the plugin settings + if( $thumblarge ) { + $ext = ".png"; + + $watermark_filename = strtolower($watermark_text); + $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); + $watermark_filename = trim($watermark_filename, '-'); + + $viewer = get_loggedin_user(); + $user_stamp_base = dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"; + if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist + $commands = array(); + $commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; + $commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; + $commands[] = $im_path . 'composite -compose CopyOpacity ' . $user_stamp_base . "_mask" . $ext . ' ' . $user_stamp_base . '_fgnd' . $ext . ' ' . $user_stamp_base . $ext; + $commands[] = $im_path . 'mogrify -trim +repage ' . $user_stamp_base . $ext; + $commands[] = 'rm ' . $user_stamp_base . '_mask' . $ext; + $commands[] = 'rm ' . $user_stamp_fgnd . '_mask' . $ext; + + foreach( $commands as $command ) { + exec( $command ); } - } else { //file exceeds file size limit, so delete it - $file->delete(); - array_push($not_uploaded, $name); - } //end of file size check - } else { //file was not saved for some unknown reason - array_push($not_uploaded, $name); - } //end of file saved check and thumbnail creation - } else { // file is not a supported image type - array_push($not_uploaded, $name); - } //end of mimetype block - } //end of file name empty check + } + //apply the watermark + $commands = array(); + $commands[] = $im_path . 'composite -gravity south -geometry +0+10 ' . $user_stamp_base . $ext . ' ' . $thumblarge . ' ' . $thumblarge . '_watermarked'; + $commands[] = "mv $thumblarge" . "_watermarked $thumblarge"; + foreach( $commands as $command ) { + exec( $command ); + } + } + } + } // end of image library selector } //end of for loop if (count($not_uploaded) == 0) { diff --git a/languages/en.php b/languages/en.php index 5198817b9..70dc57bc5 100644 --- a/languages/en.php +++ b/languages/en.php @@ -6,7 +6,7 @@ 'image' => "Image", 'images' => "Images", - 'caption' => "Caption", + 'caption' => "Caption", 'photos' => "Photos", 'images:upload' => "Upload Images", 'album' => "Photo Album", @@ -19,7 +19,7 @@ 'album:group' => "Group albums", 'item:object:image' => "Photos", 'item:object:album' => "Albums", - 'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):", + 'tidypics:settings:maxfilesize' => "Maximum file size in megabytes (MB):", 'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library", 'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands", 'tidypics:enablephotos' => 'Enable Group Photo Albums', -- cgit v1.2.3 From 5e1e82eb1ad6533b7f1f7560254fb629e0710f47 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 19:33:36 +0000 Subject: forgot to update the default max file size in settings --- views/default/settings/tidypics/edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php index ce06a2a35..f800d313f 100644 --- a/views/default/settings/tidypics/edit.php +++ b/views/default/settings/tidypics/edit.php @@ -35,7 +35,7 @@ maxfilesize; - if (!$maxfilesize) $maxfilesize = (int) 10240; //set the default maximum file size to 10MB (1024KB * 10 = 10240KB = 10MB) + if (!$maxfilesize) $maxfilesize = (int) 5; //set the default maximum file size to 5MB ?>

        -- cgit v1.2.3 From d1a369e67f5166a300cc47f1c41548c75b0b67d9 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 21:31:43 +0000 Subject: reorganized upload a little and added better error handling for a few cases --- actions/upload.php | 85 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 33 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index 3bfd35367..bb59a45a1 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -14,6 +14,22 @@ if (!$container_guid) $container_guid == $_SESSION['user']->getGUID(); + $maxfilesize = get_plugin_setting('maxfilesize','tidypics'); + if (!$maxfilesize) + $maxfilesize = 5; // default to 5 MB if not set + $maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs + + $image_lib = get_plugin_setting('image_lib', 'tidypics'); + if (!$image_lib) + $image_lib = 'GD'; + + // post limit exceeded + if (count($_FILES) == 0) { + trigger_error('Tidypics error: user exceeded post limit on image upload', E_USER_WARNING); + register_error('Too many large images - try to upload fewer or smaller images'); + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); + } + // test to make sure at least 1 image was selected by user $num_images = 0; foreach($_FILES as $key => $sent_file) { @@ -39,6 +55,8 @@ if ($sent_file['error']) { array_push($not_uploaded, $sent_file['name']); + if ($sent_file['error'] == 1) + trigger_error('Tidypics error: image exceed server php upload limit', E_USER_WARNING); continue; } @@ -49,17 +67,11 @@ } // make sure file does not exceed limit - $maxfilesize = get_plugin_setting('maxfilesize','tidypics'); - if (!$maxfilesize) - $maxfilesize = 5; // default to 5 MB if not set - - $maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs if ($sent_file['size'] > $maxfilesize) { array_push($not_uploaded, $sent_file['name']); continue; } - //this will save to users folder in /image/ and organize by photo album $prefix = "image/" . $container_guid . "/"; $file = new ElggFile(); @@ -86,34 +98,15 @@ array_push($uploaded_images, $file->guid); - $image_lib = get_plugin_setting('image_lib', 'tidypics'); - if ($image_lib === 'GD') { - - // Generate thumbnail - //TODO: This code needs a complete rewrite - hardcoded to ~2.5 MB - if (filesize($file->getFilenameOnFilestore())<= 2500000) { - try { - $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_large_width, - $CONFIG->tidypics->image_large_height, - false); - } catch (Exception $e) { $thumblarge = false; } - try { - $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_small_width, - $CONFIG->tidypics->image_small_height, - true); - } catch (Exception $e) { $thumbsmall = false; } - - try { - $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_thumb_width, - $CONFIG->tidypics->image_thumb_height, - true); - } catch (Exception $e) { $thumbnail = false; } - } - + + // Generate thumbnails + try { + $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_thumb_width, + $CONFIG->tidypics->image_thumb_height, + true); + } catch (Exception $e) { $thumbnail = false; error_log('thumbnail ' . $e->getMessage()); } if ($thumbnail) { $thumb = new ElggFile(); @@ -127,6 +120,16 @@ } $thumb->close(); } + unset($thumbnail); + unset($thumb); + + try { + $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_small_width, + $CONFIG->tidypics->image_small_height, + true); + } catch (Exception $e) { $thumbsmall = false; error_log('thumbsmall ' . $e->getMessage());} + if ($thumbsmall) { $thumb = new ElggFile(); @@ -140,6 +143,15 @@ } $thumb->close(); } + unset($thumbsmall); + unset($thumb); + + try { + $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_large_width, + $CONFIG->tidypics->image_large_height, + false); + } catch (Exception $e) { $thumblarge = false; error_log('thumblarge ' . $e->getMessage());} if ($thumblarge) { $thumb = new ElggFile(); @@ -153,6 +165,12 @@ } $thumb->close(); } + unset($thumblarge); + unset($thumb); + + unset($file); + + } else { //gfroese: build the actual thumbnails now @@ -245,6 +263,7 @@ } // end of image library selector } //end of for loop + if (count($not_uploaded) == 0) { system_message(elgg_echo("images:saved")); } else { -- cgit v1.2.3 From 9f1c041a0c958a69bfb44e09d883628c2c97d00e Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 16 May 2009 22:38:41 +0000 Subject: checking approx size in memory to prevent WSOD on resize operations - this is using a very rough estimate --- actions/upload.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/actions/upload.php b/actions/upload.php index bb59a45a1..8015a2ae8 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -66,11 +66,26 @@ continue; } - // make sure file does not exceed limit + // make sure file does not exceed memory limit if ($sent_file['size'] > $maxfilesize) { array_push($not_uploaded, $sent_file['name']); continue; } + + // make sure the in memory image size does not exceed memory available - GD only + $imginfo = getimagesize($sent_file['tmp_name']); + $mem_required = 5 * $imginfo[0] * $imginfo[1]; + $mem_avail = ini_get('memory_limit'); + $mem_avail = rtrim($mem_avail, 'M'); + $mem_avail = $mem_avail * 1024 * 1024; + $mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer + //error_log($mem_required); + //error_log($mem_avail); + if ($image_lib === 'GD' && $mem_required > $mem_avail) { + array_push($not_uploaded, $sent_file['name']); + trigger_error('Tidypics error: image memory size too large for resizing so rejecting', E_USER_WARNING); + continue; + } //this will save to users folder in /image/ and organize by photo album $prefix = "image/" . $container_guid . "/"; -- cgit v1.2.3 From fa25b350b0d0acce58265f4851ed08434ae517c0 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 17 May 2009 01:58:57 +0000 Subject: starting to put into place framework for ImageMagick PHP resizing --- actions/upload.php | 60 +++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index 8015a2ae8..710e35043 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -25,7 +25,7 @@ // post limit exceeded if (count($_FILES) == 0) { - trigger_error('Tidypics error: user exceeded post limit on image upload', E_USER_WARNING); + trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING); register_error('Too many large images - try to upload fewer or smaller images'); forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); } @@ -56,7 +56,7 @@ if ($sent_file['error']) { array_push($not_uploaded, $sent_file['name']); if ($sent_file['error'] == 1) - trigger_error('Tidypics error: image exceed server php upload limit', E_USER_WARNING); + trigger_error('Tidypics warning: image exceed server php upload limit', E_USER_WARNING); continue; } @@ -74,17 +74,27 @@ // make sure the in memory image size does not exceed memory available - GD only $imginfo = getimagesize($sent_file['tmp_name']); - $mem_required = 5 * $imginfo[0] * $imginfo[1]; $mem_avail = ini_get('memory_limit'); $mem_avail = rtrim($mem_avail, 'M'); $mem_avail = $mem_avail * 1024 * 1024; - $mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer - //error_log($mem_required); - //error_log($mem_avail); - if ($image_lib === 'GD' && $mem_required > $mem_avail) { - array_push($not_uploaded, $sent_file['name']); - trigger_error('Tidypics error: image memory size too large for resizing so rejecting', E_USER_WARNING); - continue; + if ($image_lib === 'GD') { + $mem_required = 5 * $imginfo[0] * $imginfo[1]; + $mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer + if ($mem_required > $mem_avail) { + array_push($not_uploaded, $sent_file['name']); + trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING); + continue; + } + } else if ($image_lib === 'ImageMagick') { // this will be for PHP ImageMagick +/* + $mem_required = 5 * $imginfo[0] * $imginfo[1]; + $mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer + if ($mem_required > $mem_avail) { + array_push($not_uploaded, $sent_file['name']); + trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING); + continue; + } +*/ } //this will save to users folder in /image/ and organize by photo album @@ -116,12 +126,10 @@ if ($image_lib === 'GD') { // Generate thumbnails - try { - $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_thumb_width, - $CONFIG->tidypics->image_thumb_height, - true); - } catch (Exception $e) { $thumbnail = false; error_log('thumbnail ' . $e->getMessage()); } + $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_thumb_width, + $CONFIG->tidypics->image_thumb_height, + true); if ($thumbnail) { $thumb = new ElggFile(); @@ -138,12 +146,10 @@ unset($thumbnail); unset($thumb); - try { - $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_small_width, - $CONFIG->tidypics->image_small_height, - true); - } catch (Exception $e) { $thumbsmall = false; error_log('thumbsmall ' . $e->getMessage());} + $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_small_width, + $CONFIG->tidypics->image_small_height, + true); if ($thumbsmall) { @@ -161,12 +167,10 @@ unset($thumbsmall); unset($thumb); - try { - $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_large_width, - $CONFIG->tidypics->image_large_height, - false); - } catch (Exception $e) { $thumblarge = false; error_log('thumblarge ' . $e->getMessage());} + $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_large_width, + $CONFIG->tidypics->image_large_height, + false); if ($thumblarge) { $thumb = new ElggFile(); -- cgit v1.2.3 From fcd9762b51d26998445d7061261d18df70c8941c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 17 May 2009 02:28:58 +0000 Subject: moved code from upload action in resize library --- actions/upload.php | 79 ++++++++++++------------------------------------------ lib/resize.php | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 62 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index 710e35043..295bf9437 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -6,7 +6,8 @@ */ global $CONFIG; - require_once(dirname(__FILE__)."/resize.php"); + include dirname(__FILE__) . "/resize.php"; + include dirname(dirname(__FILE__)) . "/lib/resize.php"; // Get common variables $access_id = (int) get_input("access_id"); @@ -125,73 +126,24 @@ if ($image_lib === 'GD') { - // Generate thumbnails - $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_thumb_width, - $CONFIG->tidypics->image_thumb_height, - true); - - if ($thumbnail) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."thumb".$filestorename); - $thumb->open("write"); - if ($thumb->write($thumbnail)) { - $file->thumbnail = $prefix."thumb".$filestorename; - } else { - $thumb->delete(); - } - $thumb->close(); + if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) { + trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING); } - unset($thumbnail); - unset($thumb); - - $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_small_width, - $CONFIG->tidypics->image_small_height, - true); - - if ($thumbsmall) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."smallthumb".$filestorename); - $thumb->open("write"); - if ($thumb->write($thumbsmall)) { - $file->smallthumb = $prefix."smallthumb".$filestorename; - } else { - $thumb->delete(); - } - $thumb->close(); + } else if ($image_lib === 'ToDo:ImageMagick') { // ImageMagick PHP +/* + if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) { + trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING); } - unset($thumbsmall); - unset($thumb); +*/ + } else { // ImageMagick command line - $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), - $CONFIG->tidypics->image_large_width, - $CONFIG->tidypics->image_large_height, - false); - - if ($thumblarge) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."largethumb".$filestorename); - $thumb->open("write"); - if ($thumb->write($thumblarge)) { - $file->largethumb = $prefix."largethumb".$filestorename; - } else { - $thumb->delete(); - } - $thumb->close(); +/* + if (tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename) != true) { + trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING); } - unset($thumblarge); - unset($thumb); - - unset($file); - +*/ - - } else { //gfroese: build the actual thumbnails now $album = get_entity($container_guid); $user = get_user_entity_as_row($album->owner_guid); @@ -280,6 +232,9 @@ } } } // end of image library selector + + unset($file); // may not be needed but there seems to be a memory leak + } //end of for loop diff --git a/lib/resize.php b/lib/resize.php index 657e56824..daf18efdf 100644 --- a/lib/resize.php +++ b/lib/resize.php @@ -4,5 +4,83 @@ * */ + /** + * Create thumbnails using PHP GD Library + * + * @param ElggFile + * @param string + * @param string + * @return bool + */ + function tp_create_gd_thumbnails($file, $prefix, $filestorename) + { + global $CONFIG; + + $mime = $file->getMimeType(); + + // Generate thumbnails + $thumbnail = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_thumb_width, + $CONFIG->tidypics->image_thumb_height, + true); + + if ($thumbnail) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."thumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumbnail)) { + $file->thumbnail = $prefix."thumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + unset($thumb); + } + unset($thumbnail); + + $thumbsmall = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_small_width, + $CONFIG->tidypics->image_small_height, + true); + + + if ($thumbsmall) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."smallthumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumbsmall)) { + $file->smallthumb = $prefix."smallthumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + unset($thumb); + } + unset($thumbsmall); + + $thumblarge = get_resized_image_from_existing_file( $file->getFilenameOnFilestore(), + $CONFIG->tidypics->image_large_width, + $CONFIG->tidypics->image_large_height, + false); + + if ($thumblarge) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."largethumb".$filestorename); + $thumb->open("write"); + if ($thumb->write($thumblarge)) { + $file->largethumb = $prefix."largethumb".$filestorename; + } else { + $thumb->delete(); + } + $thumb->close(); + unset($thumb); + } + unset($thumblarge); + + return true; + } ?> \ No newline at end of file -- cgit v1.2.3 From 600effcfc450689f3a01788da0fc8ded87bb45ae Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Sun, 17 May 2009 04:55:17 +0000 Subject: fixed views topping out at 10 and made the download link an option --- views/default/object/image.php | 8 ++++++-- views/default/settings/tidypics/edit.php | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index 13a94fc7d..aceac958b 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -100,7 +100,7 @@ if ($photo_tags) { } create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, 2); - $views_a = get_annotations($file_guid, "object", "image", "tp_view"); + $views_a = get_annotations($file_guid, "object", "image", "tp_view", "", 0, 9999); $views = count($views_a); $my_views = 0; @@ -160,7 +160,11 @@ if ($photo_tags) {

          • - $file_guid,) ); ?> + $file_guid,) ); + } + ?>
        diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php index f800d313f..ecfee33bd 100644 --- a/views/default/settings/tidypics/edit.php +++ b/views/default/settings/tidypics/edit.php @@ -43,6 +43,28 @@ 'params[maxfilesize]', 'value' => $maxfilesize)); ?>

        +image_lib; + if (!$image_lib) $image_lib = 'GD'; +?> +

        + download_link; + if (!$download_link) $download_link = 'yes'; + ?> + + 'params[download_link]', + 'options_values' => array( + 'yes' => 'yes', + 'no' => 'no', + ), + 'value' => $download_link)); + ?> +

        + watermark_text; if(!$watermark_text) $watermark_text = ""; -- cgit v1.2.3 From 185ec702edbc5e1f9b636454e5282fa718da7b56 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Sun, 17 May 2009 04:55:50 +0000 Subject: missed language file --- actions/upload.php | 3 ++- languages/en.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/actions/upload.php b/actions/upload.php index 295bf9437..e24b48af8 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -198,7 +198,9 @@ } if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; + $viewer = get_loggedin_user(); $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); + $watermark_text = str_replace("%username%", $viewer->username, $watermark_text); if( $watermark_text ) { //get this value from the plugin settings if( $thumblarge ) { $ext = ".png"; @@ -207,7 +209,6 @@ $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); $watermark_filename = trim($watermark_filename, '-'); - $viewer = get_loggedin_user(); $user_stamp_base = dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"; if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist $commands = array(); diff --git a/languages/en.php b/languages/en.php index 70dc57bc5..a0ede635d 100644 --- a/languages/en.php +++ b/languages/en.php @@ -19,6 +19,7 @@ 'album:group' => "Group albums", 'item:object:image' => "Photos", 'item:object:album' => "Albums", + 'tidypics:settings:download_link' => "Show download link:", 'tidypics:settings:maxfilesize' => "Maximum file size in megabytes (MB):", 'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library", 'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands", -- cgit v1.2.3 From 6e9ec86ca3d512b6f6a2863111488ec995a197d4 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Sun, 17 May 2009 04:59:41 +0000 Subject: commented out a custom call --- mostrecentimages.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mostrecentimages.php b/mostrecentimages.php index e42cea4ae..edceb9cd4 100644 --- a/mostrecentimages.php +++ b/mostrecentimages.php @@ -8,15 +8,17 @@ // Load Elgg engine include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); - include_once(dirname(__FILE__) . "/notice.php"); $max = 8; $images = list_entities("object", "image", 0, $max, false, false, true); $title = "Most recent images"; $area2 = elgg_view_title($title); - $notice = tp_notice(); - $area2 .= $notice->text; + +// include_once(dirname(__FILE__) . "/notice.php"); +// $notice = tp_notice(); +// $area2 .= $notice->text; + $area2 .= $images; $body = elgg_view_layout('two_column_left_sidebar', '', $area2); page_draw($title, $body); -- cgit v1.2.3 From 7e09496c62e79eaaadbfdd2ee8b83602fde50497 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Sun, 17 May 2009 13:24:17 +0000 Subject: support spaces in images for resizing and watermarking, support some basic tags for watermarking --- actions/resize.php | 2 +- actions/upload.php | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/actions/resize.php b/actions/resize.php index 1c3bf2bad..bcb2ba520 100644 --- a/actions/resize.php +++ b/actions/resize.php @@ -98,7 +98,7 @@ $im_path = "/usr/bin/"; } if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; - $command = $im_path . "convert $input_name -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." $output_name"; + $command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\""; system($command); return $output_name; diff --git a/actions/upload.php b/actions/upload.php index e24b48af8..ecdeb27f7 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -201,6 +201,7 @@ $viewer = get_loggedin_user(); $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); $watermark_text = str_replace("%username%", $viewer->username, $watermark_text); + $watermark_text = str_replace("%sitename%", $CONFIG->sitename, $watermark_text); if( $watermark_text ) { //get this value from the plugin settings if( $thumblarge ) { $ext = ".png"; @@ -209,15 +210,18 @@ $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); $watermark_filename = trim($watermark_filename, '-'); - $user_stamp_base = dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"; + $user_stamp_base = strtolower(dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"); + $user_stamp_base = preg_replace("/[^\w-]+/", "-", $user_stamp_base); + $user_stamp_base = trim($user_stamp_base, '-'); + if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist $commands = array(); - $commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" '. $user_stamp_base . '_fgnd' . $ext; + $commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"'; $commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; - $commands[] = $im_path . 'composite -compose CopyOpacity ' . $user_stamp_base . "_mask" . $ext . ' ' . $user_stamp_base . '_fgnd' . $ext . ' ' . $user_stamp_base . $ext; - $commands[] = $im_path . 'mogrify -trim +repage ' . $user_stamp_base . $ext; - $commands[] = 'rm ' . $user_stamp_base . '_mask' . $ext; - $commands[] = 'rm ' . $user_stamp_fgnd . '_mask' . $ext; + $commands[] = $im_path . 'composite -compose CopyOpacity "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"'; + $commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"'; + $commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"'; + $commands[] = 'rm "' . $user_stamp_fgnd . '_mask' . $ext . '"'; foreach( $commands as $command ) { exec( $command ); @@ -225,8 +229,8 @@ } //apply the watermark $commands = array(); - $commands[] = $im_path . 'composite -gravity south -geometry +0+10 ' . $user_stamp_base . $ext . ' ' . $thumblarge . ' ' . $thumblarge . '_watermarked'; - $commands[] = "mv $thumblarge" . "_watermarked $thumblarge"; + $commands[] = $im_path . 'composite -gravity south -geometry +0+10 "' . $user_stamp_base . $ext . '" "' . $thumblarge . '" "' . $thumblarge . '_watermarked"'; + $commands[] = "mv \"$thumblarge" . "_watermarked\" \"$thumblarge\""; foreach( $commands as $command ) { exec( $command ); } -- cgit v1.2.3 From 47a49c851ab285e7e4f48aa29247a8a71fdb9d5c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 17 May 2009 17:45:58 +0000 Subject: moved all resize code into lib/resize.php --- actions/resize.php | 111 ----------------------------------- actions/upload.php | 50 +--------------- lib/resize.php | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 168 insertions(+), 159 deletions(-) delete mode 100644 actions/resize.php diff --git a/actions/resize.php b/actions/resize.php deleted file mode 100644 index bcb2ba520..000000000 --- a/actions/resize.php +++ /dev/null @@ -1,111 +0,0 @@ -$input_name, - "output_name"=>$output_name, - "maxwidth"=>$maxwidth, - "maxheight"=>$maxheight, - "square"=>$square, - "x1"=>$x1, - "y1"=>$y1, - "x2"=>$x2, - "y2"=>$y2); - - $path = pathinfo($input_name); - $output_name = $path["dirname"] . "/$prefix" . $path["filename"] . "." . $path["extension"]; - - // Get the size information from the image - if ($imgsizearray = getimagesize($input_name)) { - - // Get width and height - $width = $imgsizearray[0]; - $height = $imgsizearray[1]; - $newwidth = $width; - $newheight = $height; - - // Square the image dimensions if we're wanting a square image - if ($square) { - if ($width < $height) { - $height = $width; - } else { - $width = $height; - } - - $newwidth = $width; - $newheight = $height; - - } - - if ($width > $maxwidth) { - $newheight = floor($height * ($maxwidth / $width)); - $newwidth = $maxwidth; - } - if ($newheight > $maxheight) { - $newwidth = floor($newwidth * ($maxheight / $newheight)); - $newheight = $maxheight; - } - - $accepted_formats = array( - 'image/jpeg' => 'jpeg', - 'image/png' => 'png', - 'image/gif' => 'gif' - ); - // If it's a file we can manipulate ... - if (array_key_exists($imgsizearray['mime'],$accepted_formats)) { - - // Crop the image if we need a square - if ($square) { - if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { - $widthoffset = floor(($imgsizearray[0] - $width) / 2); - $heightoffset = floor(($imgsizearray[1] - $height) / 2); - } else { - $widthoffset = $x1; - $heightoffset = $y1; - $width = ($x2 - $x1); - $height = $width; - } - } else { - if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { - $widthoffset = 0; - $heightoffset = 0; - } else { - $widthoffset = $x1; - $heightoffset = $y1; - $width = ($x2 - $x1); - $height = ($y2 - $y1); - } - } - - // Resize and return the image contents! - if ($square) { - $newheight = $maxheight; - $newwidth = $maxwidth; - } - $im_path = get_plugin_setting('convert_command', 'tidypics'); - if(!$im_path) { - $im_path = "/usr/bin/"; - } - if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; - $command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\""; - system($command); - return $output_name; - - } - } - - return false; - } - -?> diff --git a/actions/upload.php b/actions/upload.php index ecdeb27f7..7c50b95d4 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -6,7 +6,6 @@ */ global $CONFIG; - include dirname(__FILE__) . "/resize.php"; include dirname(dirname(__FILE__)) . "/lib/resize.php"; // Get common variables @@ -138,60 +137,15 @@ */ } else { // ImageMagick command line -/* + if (tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename) != true) { trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING); } -*/ - //gfroese: build the actual thumbnails now $album = get_entity($container_guid); $user = get_user_entity_as_row($album->owner_guid); $username = $user->username; - - try { - $thumblarge = tp_resize($file->getFilenameOnFilestore(), - "largethumb", - $CONFIG->tidypics->image_large_width, - $CONFIG->tidypics->image_large_height, - false); - } catch (Exception $e) { $thumblarge = false; } - try { - $thumbsmall = tp_resize($file->getFilenameOnFilestore(), - "smallthumb", - $CONFIG->tidypics->image_small_width, - $CONFIG->tidypics->image_small_height, - true); - } catch (Exception $e) { $thumbsmall = false; } - try { - $thumbnail = tp_resize($file->getFilenameOnFilestore(), - "thumb", - $CONFIG->tidypics->image_thumb_width, - $CONFIG->tidypics->image_thumb_height, - true); - } catch (Exception $e) { $thumbnail = false; } - - if ($thumbnail) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."thumb".$filestorename); - $file->thumbnail = $prefix."thumb".$filestorename; - } - - if ($thumbsmall) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."smallthumb".$filestorename); - $file->smallthumb = $prefix."smallthumb".$filestorename; - } - - if ($thumblarge) { - $thumb = new ElggFile(); - $thumb->setMimeType($mime); - $thumb->setFilename($prefix."largethumb".$filestorename); - $file->largethumb = $prefix."largethumb".$filestorename; - } - + $im_path = get_plugin_setting('convert_command', 'tidypics'); if(!$im_path) { $im_path = "/usr/bin/"; diff --git a/lib/resize.php b/lib/resize.php index daf18efdf..bf63db82d 100644 --- a/lib/resize.php +++ b/lib/resize.php @@ -4,6 +4,7 @@ * */ + /** * Create thumbnails using PHP GD Library * @@ -82,5 +83,170 @@ return true; } + + /** + * Create thumbnails using ImageMagick executables + * + * @param ElggFile + * @param string + * @param string + * @return bool + */ + function tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename) + { + global $CONFIG; + + $mime = $file->getMimeType(); + + $thumblarge = tp_imagick_resize($file->getFilenameOnFilestore(), + "largethumb", + $CONFIG->tidypics->image_large_width, + $CONFIG->tidypics->image_large_height, + false); + + $thumbsmall = tp_imagick_resize($file->getFilenameOnFilestore(), + "smallthumb", + $CONFIG->tidypics->image_small_width, + $CONFIG->tidypics->image_small_height, + true); + + $thumbnail = tp_imagick_resize($file->getFilenameOnFilestore(), + "thumb", + $CONFIG->tidypics->image_thumb_width, + $CONFIG->tidypics->image_thumb_height, + true); + + if ($thumbnail) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."thumb".$filestorename); + $file->thumbnail = $prefix."thumb".$filestorename; + } + + if ($thumbsmall) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."smallthumb".$filestorename); + $file->smallthumb = $prefix."smallthumb".$filestorename; + } + + if ($thumblarge) { + $thumb = new ElggFile(); + $thumb->setMimeType($mime); + $thumb->setFilename($prefix."largethumb".$filestorename); + $file->largethumb = $prefix."largethumb".$filestorename; + } + + return true; + } + + /* + * Gets the jpeg contents of the resized version of an already uploaded image + * (Returns false if the uploaded file was not an image) + * + * @param string $input_name The name of the file input field on the submission form + * @param string $prefix The text to prefix to the existing filename + * @param int $maxwidth The maximum width of the resized image + * @param int $maxheight The maximum height of the resized image + * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped. + * @return false|mixed The contents of the resized image, or false on failure + */ + function tp_imagick_resize($input_name, $prefix, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) { + + $params = array( + "input_name"=>$input_name, + "output_name"=>$output_name, + "maxwidth"=>$maxwidth, + "maxheight"=>$maxheight, + "square"=>$square, + "x1"=>$x1, + "y1"=>$y1, + "x2"=>$x2, + "y2"=>$y2); + + $path = pathinfo($input_name); + $output_name = $path["dirname"] . "/$prefix" . $path["filename"] . "." . $path["extension"]; + + // Get the size information from the image + if ($imgsizearray = getimagesize($input_name)) { + + // Get width and height + $width = $imgsizearray[0]; + $height = $imgsizearray[1]; + $newwidth = $width; + $newheight = $height; + + // Square the image dimensions if we're wanting a square image + if ($square) { + if ($width < $height) { + $height = $width; + } else { + $width = $height; + } + + $newwidth = $width; + $newheight = $height; + + } + + if ($width > $maxwidth) { + $newheight = floor($height * ($maxwidth / $width)); + $newwidth = $maxwidth; + } + if ($newheight > $maxheight) { + $newwidth = floor($newwidth * ($maxheight / $newheight)); + $newheight = $maxheight; + } + + $accepted_formats = array( + 'image/jpeg' => 'jpeg', + 'image/png' => 'png', + 'image/gif' => 'gif' + ); + // If it's a file we can manipulate ... + if (array_key_exists($imgsizearray['mime'],$accepted_formats)) { + + // Crop the image if we need a square + if ($square) { + if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { + $widthoffset = floor(($imgsizearray[0] - $width) / 2); + $heightoffset = floor(($imgsizearray[1] - $height) / 2); + } else { + $widthoffset = $x1; + $heightoffset = $y1; + $width = ($x2 - $x1); + $height = $width; + } + } else { + if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) { + $widthoffset = 0; + $heightoffset = 0; + } else { + $widthoffset = $x1; + $heightoffset = $y1; + $width = ($x2 - $x1); + $height = ($y2 - $y1); + } + } + + // Resize and return the image contents! + if ($square) { + $newheight = $maxheight; + $newwidth = $maxwidth; + } + $im_path = get_plugin_setting('convert_command', 'tidypics'); + if(!$im_path) { + $im_path = "/usr/bin/"; + } + if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; + $command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\""; + system($command); + return $output_name; + + } + } + + return false; + } ?> \ No newline at end of file -- cgit v1.2.3 From 82aa80bd54908ec2934f45d1f270de568adc1c97 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 17 May 2009 18:10:56 +0000 Subject: added skeleton for PHP ImageMagick --- lib/resize.php | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/lib/resize.php b/lib/resize.php index bf63db82d..1c28c49de 100644 --- a/lib/resize.php +++ b/lib/resize.php @@ -8,10 +8,10 @@ /** * Create thumbnails using PHP GD Library * - * @param ElggFile - * @param string - * @param string - * @return bool + * @param ElggFile holds the image that was uploaded + * @param string folder to store thumbnail in + * @param string name of the thumbnail + * @return bool true on success */ function tp_create_gd_thumbnails($file, $prefix, $filestorename) { @@ -83,14 +83,32 @@ return true; } - + + /** + * Create thumbnails using PHP ImageMagick Library + * + * @param ElggFile holds the image that was uploaded + * @param string folder to store thumbnail in + * @param string name of the thumbnail + * @return bool true on success + */ + function tp_create_imagick_thumbnails($file, $prefix, $filestorename) + { + global $CONFIG; + + $mime = $file->getMimeType(); + + return false; // not implemented yet + } + + /** * Create thumbnails using ImageMagick executables * - * @param ElggFile - * @param string - * @param string - * @return bool + * @param ElggFile holds the image that was uploaded + * @param string folder to store thumbnail in + * @param string name of the thumbnail + * @return bool true on success */ function tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename) { -- cgit v1.2.3 From d253222f742b74b8fd232fa39c81c6f39e9d6b9a Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 17 May 2009 19:20:18 +0000 Subject: moved tagging from image.php to a view - make sure to refresh view cache when updating to this version --- views/default/js/tagging.php | 250 +++++++++++++++++++++++++++++++++++++ views/default/js/tidypics.php | 250 ------------------------------------- views/default/object/image.php | 80 ++++-------- views/default/tidypics/tagging.php | 57 +++++++++ 4 files changed, 330 insertions(+), 307 deletions(-) create mode 100644 views/default/js/tagging.php delete mode 100644 views/default/js/tidypics.php create mode 100644 views/default/tidypics/tagging.php diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php new file mode 100644 index 000000000..323c2bf57 --- /dev/null +++ b/views/default/js/tagging.php @@ -0,0 +1,250 @@ + + + + + \ No newline at end of file diff --git a/views/default/js/tidypics.php b/views/default/js/tidypics.php deleted file mode 100644 index 323c2bf57..000000000 --- a/views/default/js/tidypics.php +++ /dev/null @@ -1,250 +0,0 @@ - - - - - \ No newline at end of file diff --git a/views/default/object/image.php b/views/default/object/image.php index aceac958b..0da55f795 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -16,7 +16,8 @@ $mime = $file->mimetype; -// photo tags +///////////////////////////////////////////////////// +// get photo tags from database $photo_tag_links = array(); $photo_tags_json = "\"\""; $photo_tags = get_annotations($file_guid,'object','image','phototag'); @@ -49,7 +50,13 @@ if ($photo_tags) { $photo_tags_json .= ']'; } - if (get_context() == "search") { //if this is the search view + +///////////////////////////////////////////////////// +// +// search view of an image +// +///////////////////////////////////////////////////// + if (get_context() == "search") { if (get_input('search_viewtype') == "gallery") { ?> @@ -72,9 +79,12 @@ if ($photo_tags) { } } else { +//////////////////////////////////////////////// +// +// simple gallery view - when is this called? +// +//////////////////////////////////////////////// if (!$vars['full']) { - -//simple gallery view ?>
        thumbnail @@ -108,8 +118,8 @@ if ($photo_tags) { if($view->owner_guid == $the_viewer && $the_viewer != 0) $my_views++; } + // Build back and next links - $back = ''; $next = ''; @@ -150,7 +160,7 @@ if ($photo_tags) {
        - +
        '; ?> @@ -167,18 +177,13 @@ if ($photo_tags) { ?>
      - -
      -

      -
        -{$tag_link[1]}"; - } + $photo_tags, + 'links' => $photo_tag_links, + 'photo_tags_json' => $photo_tags_json, + 'file_guid' => $file_guid, ) ); + ?> -
      -
      -
      @@ -198,47 +203,8 @@ if ($photo_tags) { echo elgg_view_comments($file); echo '
      '; // content wrapper -?> -
      -
      -
      -
      - -
      -getGUID(), false, 'user', '', 0); - - $content = ""; - $content .= ""; - $content .= ""; - $content .= ""; - - $content .= ""; - - $content .= "
      "; - - echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content)); - -?> -
      - - $photo_tags_json,) ); - } // // end of individual image display + } // end of individual image display } diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php new file mode 100644 index 000000000..a97285016 --- /dev/null +++ b/views/default/tidypics/tagging.php @@ -0,0 +1,57 @@ + +
      +

      + +
      + +
      +
      +
      +
      +
      +getGUID(), false, 'user', '', 0); + + $content = ""; + $content .= ""; + $content .= ""; + $content .= ""; + + $content .= ""; + + $content .= "
      "; + + echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content)); + +?> +
      + $photo_tags_json,) ); +?> \ No newline at end of file -- cgit v1.2.3 From 3b796bc5b923899cfec2f81ff9f811a02260a071 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 17 May 2009 21:32:14 +0000 Subject: cleaning up some views moved image controls to separate view so it easier for plugins to extend tidypics --- start.php | 2 +- views/default/object/image.php | 18 +++++++----------- views/default/tidypics/download.php | 4 ---- views/default/tidypics/hover_menu.php | 16 ++++++++++++++++ views/default/tidypics/image_menu.php | 22 ++++++++++++++++++++++ views/default/tidypics/menu.php | 16 ---------------- 6 files changed, 46 insertions(+), 32 deletions(-) delete mode 100644 views/default/tidypics/download.php create mode 100644 views/default/tidypics/hover_menu.php create mode 100644 views/default/tidypics/image_menu.php delete mode 100644 views/default/tidypics/menu.php diff --git a/start.php b/start.php index 94fb0440c..f0c6a22f9 100644 --- a/start.php +++ b/start.php @@ -28,7 +28,7 @@ extend_view('css', 'tidypics/css'); // Extend hover-over and profile menu - extend_view('profile/menu/links','tidypics/menu'); + extend_view('profile/menu/links','tidypics/hover_menu'); //group view ** psuedo widget view for group pages** extend_view('groups/right_column','tidypics/groupprofile_albums'); diff --git a/views/default/object/image.php b/views/default/object/image.php index 0da55f795..f64942b61 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -167,17 +167,13 @@ if ($photo_tags) {
      -
      -
        -
        • - $file_guid,) ); - } - ?> -
      -
      -
        '; + echo elgg_view('tidypics/image_menu', array('file_guid' => $file_guid,) ); + echo '
      '; + + // tagging code echo elgg_view('tidypics/tagging', array( 'photo_tags' => $photo_tags, 'links' => $photo_tag_links, 'photo_tags_json' => $photo_tags_json, diff --git a/views/default/tidypics/download.php b/views/default/tidypics/download.php deleted file mode 100644 index becb4b5fe..000000000 --- a/views/default/tidypics/download.php +++ /dev/null @@ -1,4 +0,0 @@ - -
      5. \ No newline at end of file diff --git a/views/default/tidypics/hover_menu.php b/views/default/tidypics/hover_menu.php new file mode 100644 index 000000000..4368993dd --- /dev/null +++ b/views/default/tidypics/hover_menu.php @@ -0,0 +1,16 @@ + + +

      + +

      \ No newline at end of file diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php new file mode 100644 index 000000000..269fcce8f --- /dev/null +++ b/views/default/tidypics/image_menu.php @@ -0,0 +1,22 @@ + +
      6. + +
      7. + \ No newline at end of file diff --git a/views/default/tidypics/menu.php b/views/default/tidypics/menu.php deleted file mode 100644 index 4368993dd..000000000 --- a/views/default/tidypics/menu.php +++ /dev/null @@ -1,16 +0,0 @@ - - -

      - -

      \ No newline at end of file -- cgit v1.2.3 From 27781e0d8e226b89988e2cf7b8351d1d50cef4b7 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 17 May 2009 21:46:22 +0000 Subject: added events to end of successful actions so plugins can do stuff --- actions/addalbum.php | 3 +++ actions/delete.php | 5 +++-- actions/edit.php | 9 +++++++-- actions/upload.php | 4 +++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/actions/addalbum.php b/actions/addalbum.php index 3e7a12e87..329ebee48 100644 --- a/actions/addalbum.php +++ b/actions/addalbum.php @@ -64,6 +64,9 @@ 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); + forward("pg/photos/upload/" . $album->guid); } diff --git a/actions/delete.php b/actions/delete.php index 5c275003e..ecc5f7ffe 100644 --- a/actions/delete.php +++ b/actions/delete.php @@ -16,7 +16,8 @@ $subtype = $photoObject->getSubtype(); $container = get_entity($photoObject->container_guid); - if ($subtype!='image' && $subtype!='album') forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //back off if not an album or image + if ($subtype!='image' && $subtype!='album') + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //back off if not an album or image if ($subtype == 'image') { //deleting an image $forward_url = $container->getURL(); //forward back to album after deleting pictures @@ -93,7 +94,7 @@ } //end of canEdit() comparison } else { // unable to get Elgg entity - register_error(elgg_echo("file:deletefailed")); + register_error(elgg_echo("file:deletefailed")); } //end of get_entitty() forward($forward_url); diff --git a/actions/edit.php b/actions/edit.php index 5eab8caff..359e83fb0 100644 --- a/actions/edit.php +++ b/actions/edit.php @@ -65,10 +65,15 @@ } // Success message - if ($subtype == 'album') + if ($subtype == 'album') { system_message(elgg_echo("album:edited")); - else + // plugins can register to be told when a Tidypics album has been updated + trigger_elgg_event('update', 'tp_album', $entity); + } else { system_message(elgg_echo('images:edited')); + // plugins can register to be told when a Tidypics image has been updated + trigger_elgg_event('update', 'tp_album', $entity); + } forward($entity->getURL()); ?> diff --git a/actions/upload.php b/actions/upload.php index 7c50b95d4..90711704a 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -216,7 +216,9 @@ add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); $album->new_album = 0; } - + // plugins can register to be told when a Tidypics album has had images added + trigger_elgg_event('upload', 'tp_album', $album); + forward($CONFIG->wwwroot . 'mod/tidypics/edit_multi.php?files=' . implode('-', $uploaded_images)); //forward to multi-image edit page } else { forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page -- cgit v1.2.3 From 3f48d3a3c2d98e8f2b2de9540f3bc5cd5c475dd2 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 17 May 2009 22:11:36 +0000 Subject: reorged delete code to get rid of nested if statements and added trigger event in case a plugin wants to know when an album/image has been deleted --- actions/delete.php | 178 ++++++++++++++++++++++++++++------------------------- 1 file changed, 93 insertions(+), 85 deletions(-) diff --git a/actions/delete.php b/actions/delete.php index ecc5f7ffe..f6b677c55 100644 --- a/actions/delete.php +++ b/actions/delete.php @@ -1,102 +1,110 @@ canEdit()) { - $subtype = $photoObject->getSubtype(); - $container = get_entity($photoObject->container_guid); - - if ($subtype!='image' && $subtype!='album') - forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //back off if not an album or image - - if ($subtype == 'image') { //deleting an image - $forward_url = $container->getURL(); //forward back to album after deleting pictures - $images = array($photoObject); - } else { //deleting an album - $forward_url = 'pg/photos/owned/' . $container->username; - $images = get_entities("object","image", $guid, '', 999); //get all the images from this album, or the image requested - } //end of subtype comparison + $entity = get_entity($guid); + if (!$entity) { // unable to get Elgg entity + register_error(elgg_echo("file:deletefailed")); + forward($forward_url); + } + + if (!$entity->canEdit()) { // user doesn't have permissions + register_error(elgg_echo("file:deletefailed")); + forward($forward_url); + } - //loop through all images and delete them - foreach($images as $im) { - $thumbnail = $im->thumbnail; - $smallthumb = $im->smallthumb; - $largethumb = $im->largethumb; + $subtype = $entity->getSubtype(); + $container = get_entity($entity->container_guid); + + if ($subtype != 'image' && $subtype != 'album') { // how did we even get here? + register_error(elgg_echo("file:deletefailed")); + forward($forward_url); + } + + if ($subtype == 'image') { //deleting an image + $forward_url = $container->getURL(); //forward back to album after deleting pictures + $images = array($entity); + // plugins can register to be told when a Tidypics image has been deleted + trigger_elgg_event('upload', 'tp_album', $entity); + } else { //deleting an album + $forward_url = 'pg/photos/owned/' . $container->username; + //get all the images from this album as long as less than 999 images + $images = get_entities("object", "image", $guid, '', 999); + // plugins can register to be told when a Tidypics album has been deleted + trigger_elgg_event('upload', 'tp_album', $entity); + } - if ($thumbnail) { //delete standard thumbnail image - $delfile = new ElggFile(); - $delfile->owner_guid = $im->getOwner(); - $delfile->setFilename($thumbnail); - $delfile->delete(); - } - if ($smallthumb) { //delete small thumbnail image - $delfile = new ElggFile(); - $delfile->owner_guid = $im->getOwner(); - $delfile->setFilename($smallthumb); - $delfile->delete(); - } - if ($largethumb) { //delete large thumbnail image - $delfile = new ElggFile(); - $delfile->owner_guid = $im->getOwner(); - $delfile->setFilename($largethumb); - $delfile->delete(); - } - if ($im) { //delete actual image file - $delfile = new ElggFile($im->getGUID()); - $delfile->owner_guid = $im->getOwner(); - //$delfile->setFilename($im->originalfilename); - if (!$delfile->delete()) { - if ($subtype=='image') register_error(elgg_echo("file:deletefailed")); //unable to delete object - } else { - if ($subtype=='image') system_message(elgg_echo("file:deleted")); //successfully deleted object - } - } //end delete actual image file - } //end looping through each image to delete it - - //now that all images have been deleted, delete the album - if ($subtype=='album') { - //delete the album's directory manually; first create a temp file to get the directory path - $tmpfile = new ElggFile(); - $tmpfile->setFilename('image/' . $guid . '/._tmp_del_tidypics_album_'); - $tmpfile->subtype = 'image'; - $tmpfile->container_guid = $guid; - $tmpfile->open("write"); - $tmpfile->write(''); - $tmpfile->close(); - $tmpfile->save(); - $albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore()); - $tmpfile->delete(); - if (is_dir($albumdir)) - rmdir($albumdir); - - //delete object from database - if (!$photoObject->delete()) { - register_error(elgg_echo("file:deletefailed")); //unable to delete object - } else { - system_message(elgg_echo("file:deleted")); //successfully deleted object - } - } //end of delete album + //loop through all images and delete them + foreach($images as $im) { + $thumbnail = $im->thumbnail; + $smallthumb = $im->smallthumb; + $largethumb = $im->largethumb; + if ($thumbnail) { //delete standard thumbnail image + $delfile = new ElggFile(); + $delfile->owner_guid = $im->getOwner(); + $delfile->setFilename($thumbnail); + $delfile->delete(); + } + if ($smallthumb) { //delete small thumbnail image + $delfile = new ElggFile(); + $delfile->owner_guid = $im->getOwner(); + $delfile->setFilename($smallthumb); + $delfile->delete(); + } + if ($largethumb) { //delete large thumbnail image + $delfile = new ElggFile(); + $delfile->owner_guid = $im->getOwner(); + $delfile->setFilename($largethumb); + $delfile->delete(); + } + if ($im) { //delete actual image file + $delfile = new ElggFile($im->getGUID()); + $delfile->owner_guid = $im->getOwner(); + //$delfile->setFilename($im->originalfilename); + if (!$delfile->delete()) { + if ($subtype=='image') register_error(elgg_echo("file:deletefailed")); //unable to delete object + } else { + if ($subtype=='image') system_message(elgg_echo("file:deleted")); //successfully deleted object + } + } //end delete actual image file + } //end looping through each image to delete it + + //now that all images have been deleted, delete the album + if ($subtype == 'album') { + //delete the album's directory manually; first create a temp file to get the directory path + $tmpfile = new ElggFile(); + $tmpfile->setFilename('image/' . $guid . '/._tmp_del_tidypics_album_'); + $tmpfile->subtype = 'image'; + $tmpfile->container_guid = $guid; + $tmpfile->open("write"); + $tmpfile->write(''); + $tmpfile->close(); + $tmpfile->save(); + $albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore()); + $tmpfile->delete(); + if (is_dir($albumdir)) + rmdir($albumdir); + + //delete object from database + if (!$entity->delete()) { + register_error(elgg_echo("file:deletefailed")); //unable to delete object + } else { + system_message(elgg_echo("file:deleted")); //successfully deleted object + } + } //end of delete album - } else { //user does not have permissions to delete this image or album - $container = $_SESSION['user']; - register_error(elgg_echo("file:deletefailed")); - } //end of canEdit() comparison - } else { // unable to get Elgg entity - register_error(elgg_echo("file:deletefailed")); - } //end of get_entitty() - forward($forward_url); ?> \ No newline at end of file -- cgit v1.2.3 From 0328eb2da2ce7069df72b2036cf1ee4bda59f264 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 17 May 2009 22:18:47 +0000 Subject: A little cleanup of old stuff --- views/default/input/accessRead.php | 61 ---------------------------------- views/default/input/cover_checkbox.php | 6 ---- views/default/input/multi_radio.php | 10 ++---- views/default/tidypics/hover_menu.php | 4 --- views/default/tidypics/icon.php | 4 --- views/rss/object/file.php | 9 +---- 6 files changed, 3 insertions(+), 91 deletions(-) delete mode 100644 views/default/input/accessRead.php diff --git a/views/default/input/accessRead.php b/views/default/input/accessRead.php deleted file mode 100644 index 81392b19f..000000000 --- a/views/default/input/accessRead.php +++ /dev/null @@ -1,61 +0,0 @@ - 0) - { - - /* my hacks (pay no attention please =D ) - //allow showing of group for write access - if($vars['group_write']) $vars['options'] = trigger_plugin_hook('access:collections:write','user',array('user_id' => $_SESSION['guid'], 'site_id' => 0),$vars['options']); - */ - - //developer check - to check the value being sent initially - //echo 'given value: '.$vars['value'].'
      '; - - //if no value currently set - specify default - if (empty($vars['value']) && $vars['value'] != '0') - $vars['value'] = 2; - - - foreach($vars['options'] as $key => $option) { - if ($key == $vars['value']) { -?> - - class=""> - - \ No newline at end of file diff --git a/views/default/input/cover_checkbox.php b/views/default/input/cover_checkbox.php index 48c7d51cc..04132661d 100644 --- a/views/default/input/cover_checkbox.php +++ b/views/default/input/cover_checkbox.php @@ -7,12 +7,6 @@ * it handles the checkboxes via arrays, but i only need one and i did not want to use time figuring it all out * simple and sweet , one checkbox. * - * @package Elgg - * @subpackage Core - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008 - * @link http://elgg.org/ * * @uses $vars['value'] The current value, if any * @uses $vars['js'] Any Javascript to enter into the input tag diff --git a/views/default/input/multi_radio.php b/views/default/input/multi_radio.php index 11f4c13b8..3e3bb1649 100644 --- a/views/default/input/multi_radio.php +++ b/views/default/input/multi_radio.php @@ -1,15 +1,9 @@ diff --git a/views/default/tidypics/icon.php b/views/default/tidypics/icon.php index 614fa3ad0..c960bc00b 100644 --- a/views/default/tidypics/icon.php +++ b/views/default/tidypics/icon.php @@ -3,10 +3,6 @@ * Elgg tidypic icon * Optionally you can specify a size. * - * @package ElggFile - * @author Curverider Ltd - * @copyright Curverider Ltd 2008 - * @link http://elgg.com/ */ global $CONFIG; diff --git a/views/rss/object/file.php b/views/rss/object/file.php index 3bd84d076..ace3e28e6 100644 --- a/views/rss/object/file.php +++ b/views/rss/object/file.php @@ -1,14 +1,7 @@ title; -- cgit v1.2.3 From dd81b02a85596a913c4a42fba655766b61334eb1 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Mon, 18 May 2009 11:54:31 +0000 Subject: started work on improving upload error messages --- actions/upload.php | 72 ++++++++++++++++++++++++++++++++++-------------------- languages/en.php | 3 ++- 2 files changed, 47 insertions(+), 28 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index 90711704a..7aa87dc2b 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -42,8 +42,9 @@ forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); } - $not_uploaded = array(); $uploaded_images = array(); + $not_uploaded = array(); + $error_msgs = array(); foreach($_FILES as $key => $sent_file) { // skip empty entries @@ -55,20 +56,27 @@ if ($sent_file['error']) { array_push($not_uploaded, $sent_file['name']); - if ($sent_file['error'] == 1) + if ($sent_file['error'] == 1) { trigger_error('Tidypics warning: image exceed server php upload limit', E_USER_WARNING); + array_push($error_msgs, 'Image was too large in MB'); + } + else { + array_push($error_msgs, 'Unknown upload error'); + } continue; } //make sure file is an image if ($mime != 'image/jpeg' && $mime != 'image/gif' && $mime != 'image/png' && $mime != 'image/pjpeg') { array_push($not_uploaded, $sent_file['name']); + array_push($error_msgs, 'Not a known image type'); continue; } // make sure file does not exceed memory limit if ($sent_file['size'] > $maxfilesize) { array_push($not_uploaded, $sent_file['name']); + array_push($error_msgs, 'Image was too large in MB'); continue; } @@ -82,6 +90,7 @@ $mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer if ($mem_required > $mem_avail) { array_push($not_uploaded, $sent_file['name']); + array_push($error_msgs, 'Image was too large in pixels'); trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING); continue; } @@ -116,12 +125,10 @@ if (!$result) { array_push($not_uploaded, $sent_file['name']); + array_push($error_msgs, 'Unknown error saving the image on server'); continue; } - // successfully saved image - array_push($uploaded_images, $file->guid); - if ($image_lib === 'GD') { @@ -192,36 +199,47 @@ } } // end of image library selector + array_push($uploaded_images, $file->guid); + unset($file); // may not be needed but there seems to be a memory leak + } //end of for loop - - if (count($not_uploaded) == 0) { - system_message(elgg_echo("images:saved")); - } else { - $error = elgg_echo("image:uploadfailed") . '
      '; - foreach($not_uploaded as $im_name){ - $error .= ' [' . $im_name . '] '; - } - $error .= ' ' . elgg_echo("image:notimage"); - register_error($error); - } //end of upload check - if (count($uploaded_images)>0) { - // successful upload so check if this is a new album and throw river event if so - $album = get_entity($container_guid); - if ($album->new_album == 1) { - if (function_exists('add_to_river')) - add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); - $album->new_album = 0; + if (count($not_uploaded) > 0) { + if (count($uploaded_images) > 0) + $error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images)) . '
      '; + else + $error = elgg_echo("tidypics:completeuploadfailure") . '
      '; + + $num_failures = count($not_uploaded); + for ($i = 0; $i < $num_failures; $i++) { + $error .= "{$not_uploaded[$i]}: {$error_msgs[$i]}
      "; } - // plugins can register to be told when a Tidypics album has had images added - trigger_elgg_event('upload', 'tp_album', $album); + register_error($error); - forward($CONFIG->wwwroot . 'mod/tidypics/edit_multi.php?files=' . implode('-', $uploaded_images)); //forward to multi-image edit page + if (count($uploaded_images) == 0) + forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page + else { + // some images did upload so we fall through + } } else { - forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page + system_message(elgg_echo("images:saved")); } + // successful upload so check if this is a new album and throw river event if so + $album = get_entity($container_guid); + if ($album->new_album == 1) { + if (function_exists('add_to_river')) + add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); + $album->new_album = 0; + } + // plugins can register to be told when a Tidypics album has had images added + trigger_elgg_event('upload', 'tp_album', $album); + + + //forward to multi-image edit page + forward($CONFIG->wwwroot . 'mod/tidypics/edit_multi.php?files=' . implode('-', $uploaded_images)); + ?> diff --git a/languages/en.php b/languages/en.php index a0ede635d..0faf96324 100644 --- a/languages/en.php +++ b/languages/en.php @@ -117,7 +117,8 @@ //Error messages 'image:none' => "We could not find any images at the moment.", - 'image:uploadfailed' => "Files not uploaded:", + 'tidypics:partialuploadfailure' => "There was a partial on upload (%s of %s images).", + 'tidypics:completeuploadfailure' => "Upload of images failed.", 'image:deletefailed' => "Your image could not be deleted at this time.", 'image:downloadfailed' => "Sorry; this image is not available at this time.", -- cgit v1.2.3 From 70ad5de3a1d4fffc8b3d97c301194bb0258b4c68 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Mon, 18 May 2009 12:57:59 +0000 Subject: fixed watermarking after code re-org and added most recently viewed option --- actions/upload.php | 11 ++++++----- friendmostviewed.php | 11 +---------- languages/en.php | 1 + lib/resize.php | 4 +++- mostviewedimages.php | 2 +- start.php | 8 ++++++++ yourmostviewed.php | 2 +- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index 7aa87dc2b..1657210ed 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -144,8 +144,8 @@ */ } else { // ImageMagick command line - - if (tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename) != true) { + $thumbs = tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename); + if(!count($thumbs)) { trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING); } @@ -163,8 +163,9 @@ $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); $watermark_text = str_replace("%username%", $viewer->username, $watermark_text); $watermark_text = str_replace("%sitename%", $CONFIG->sitename, $watermark_text); + if( $watermark_text ) { //get this value from the plugin settings - if( $thumblarge ) { + if( $thumbs["thumblarge"] ) { $ext = ".png"; $watermark_filename = strtolower($watermark_text); @@ -190,8 +191,8 @@ } //apply the watermark $commands = array(); - $commands[] = $im_path . 'composite -gravity south -geometry +0+10 "' . $user_stamp_base . $ext . '" "' . $thumblarge . '" "' . $thumblarge . '_watermarked"'; - $commands[] = "mv \"$thumblarge" . "_watermarked\" \"$thumblarge\""; + $commands[] = $im_path . 'composite -gravity south -geometry +0+10 "' . $user_stamp_base . $ext . '" "' . $thumbs["thumblarge"] . '" "' . $thumbs["thumblarge"] . '_watermarked"'; + $commands[] = "mv \"$thumbs[thumblarge]" . "_watermarked\" \"$thumbs[thumblarge]\""; foreach( $commands as $command ) { exec( $command ); } diff --git a/friendmostviewed.php b/friendmostviewed.php index 4f832b228..8f6299c0d 100644 --- a/friendmostviewed.php +++ b/friendmostviewed.php @@ -31,18 +31,9 @@ global $CONFIG; $prefix = $CONFIG->dbprefix; $max = 24; - //grab the top views (metadata 'tp_views') for $max number of entities - //ignores entity subtypes - $sql = "SELECT md.entity_guid, md.owner_guid, md.enabled, ms.string AS views from " . $prefix . "entities ent - INNER JOIN " . $prefix . "metadata md ON md.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON md.value_id = ms.id - INNER JOIN " . $prefix . "metastrings ms2 ON md.name_id = ms2.id AND ms2.string = 'tp_views' - WHERE ent.owner_guid = " . $user->guid . " - ORDER BY (views+0) DESC LIMIT $max"; - $sql = "SELECT ent.guid, count( * ) AS views - FROM `my_elggentities` ent + FROM " . $prefix . "entities ent INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id AND sub.subtype = 'image' INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid diff --git a/languages/en.php b/languages/en.php index 0faf96324..0c7fa3efa 100644 --- a/languages/en.php +++ b/languages/en.php @@ -26,6 +26,7 @@ 'tidypics:enablephotos' => 'Enable Group Photo Albums', 'tidypics:editprops' => 'Edit Image Properties', 'tidypics:mostviewed' => 'Most viewed images', + 'tidypics:recentlyviewed' => 'Recently viewed images', 'tidypics:mostrecent' => 'Most recent images', 'tidypics:yourmostviewed' => 'Your most viewed images', 'tidypics:yourmostrecent' => 'Your most recent images', diff --git a/lib/resize.php b/lib/resize.php index 1c28c49de..f9b7843e5 100644 --- a/lib/resize.php +++ b/lib/resize.php @@ -155,7 +155,9 @@ $file->largethumb = $prefix."largethumb".$filestorename; } - return true; + return array( "thumbnail" => $thumbnail, + "thumbsmall" => $thumbsmall, + "thumblarge" => $thumblarge); } /* diff --git a/mostviewedimages.php b/mostviewedimages.php index 5bbbcf5e7..9d2831bf7 100644 --- a/mostviewedimages.php +++ b/mostviewedimages.php @@ -17,7 +17,7 @@ //$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000); $sql = "SELECT ent.guid, count( * ) AS views - FROM `my_elggentities` ent + FROM " . $prefix . "entities ent INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id AND sub.subtype = 'image' INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid diff --git a/start.php b/start.php index f0c6a22f9..4a50c5092 100644 --- a/start.php +++ b/start.php @@ -147,6 +147,9 @@ add_submenu_item( elgg_echo('tidypics:mostrecent'), $CONFIG->wwwroot . 'pg/photos/mostrecent', 'tidypics-z'); + add_submenu_item( elgg_echo('tidypics:recentlyviewed'), + $CONFIG->wwwroot . 'pg/photos/recentlyviewed', + 'tidypics-z'); } @@ -243,6 +246,11 @@ if (isset($page[1])) set_input('guid',$page[1]); include($CONFIG->pluginspath . "tidypics/friendmostrecent.php"); break; + + case "recentlyviewed": + if (isset($page[1])) set_input('guid',$page[1]); + include($CONFIG->pluginspath . "tidypics/recentlyviewed.php"); + break; } } else diff --git a/yourmostviewed.php b/yourmostviewed.php index 84cc2ca10..18936bd69 100644 --- a/yourmostviewed.php +++ b/yourmostviewed.php @@ -15,7 +15,7 @@ $max = 24; $sql = "SELECT ent.guid, count( * ) AS views - FROM `my_elggentities` ent + FROM " . $prefix . "entities ent INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id AND sub.subtype = 'image' INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid -- cgit v1.2.3 From 63f66e5218ccd1391fb9d6e85cbf20feb5ac8e3d Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Mon, 18 May 2009 13:05:34 +0000 Subject: how about I actually add the recently viewed file --- recentlyviewed.php | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 recentlyviewed.php diff --git a/recentlyviewed.php b/recentlyviewed.php new file mode 100644 index 000000000..4cf3737dd --- /dev/null +++ b/recentlyviewed.php @@ -0,0 +1,45 @@ +dbprefix; + $max_limit = 200; //get extra because you'll have multiple views per image in the result set + $max = 16; //controls how many actually show on screen + + //this works but is wildly inefficient + //$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000); + + $sql = "SELECT distinct ent.guid, ann1.time_created + FROM " . $prefix . "entities ent + INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id + AND sub.subtype = 'image' + INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid + INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id + AND ms.string = 'tp_view' + ORDER BY ann1.id DESC + LIMIT $max_limit"; + + $result = get_data($sql); + + $entities = array(); + foreach($result as $entity) { + if(!$entities[$entity->guid]) { + $entities[$entity->guid] = get_entity($entity->guid); + } + if(count($entities) >= $max) break; + } + + $title = elgg_echo("tidypics:recentlyviewed"); + $area2 = elgg_view_title($title); + $area2 .= elgg_view_entity_list($entities, $max, 0, $max); + $body = elgg_view_layout('two_column_left_sidebar', '', $area2); + page_draw($title, $body); +?> \ No newline at end of file -- cgit v1.2.3 From 1074834100d5191ecb9a6aa02a532fae485f9378 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Mon, 18 May 2009 23:40:23 +0000 Subject: finished the upload error messages --- actions/upload.php | 18 +++++++++--------- languages/en.php | 13 ++++++++++--- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index 1657210ed..c37ce2b94 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -26,7 +26,7 @@ // post limit exceeded if (count($_FILES) == 0) { trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING); - register_error('Too many large images - try to upload fewer or smaller images'); + register_error(elgg_echo('tidypics:exceedpostlimit')); forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); } @@ -38,7 +38,7 @@ } if ($num_images == 0) { // have user try again - register_error('No images were selected. Please try again'); + register_error(elgg_echo('tidypics:noimages')); forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); } @@ -58,10 +58,10 @@ array_push($not_uploaded, $sent_file['name']); if ($sent_file['error'] == 1) { trigger_error('Tidypics warning: image exceed server php upload limit', E_USER_WARNING); - array_push($error_msgs, 'Image was too large in MB'); + array_push($error_msgs, elgg_echo('tidypics:image_mem')); } else { - array_push($error_msgs, 'Unknown upload error'); + array_push($error_msgs, elgg_echo('tidypics:unk_error')); } continue; } @@ -69,14 +69,14 @@ //make sure file is an image if ($mime != 'image/jpeg' && $mime != 'image/gif' && $mime != 'image/png' && $mime != 'image/pjpeg') { array_push($not_uploaded, $sent_file['name']); - array_push($error_msgs, 'Not a known image type'); + array_push($error_msgs, elgg_echo('tidypics:not_image')); continue; } // make sure file does not exceed memory limit if ($sent_file['size'] > $maxfilesize) { array_push($not_uploaded, $sent_file['name']); - array_push($error_msgs, 'Image was too large in MB'); + array_push($error_msgs, elgg_echo('tidypics:image_mem')); continue; } @@ -90,7 +90,7 @@ $mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer if ($mem_required > $mem_avail) { array_push($not_uploaded, $sent_file['name']); - array_push($error_msgs, 'Image was too large in pixels'); + array_push($error_msgs, elgg_echo('tidypics:image_pixels')); trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING); continue; } @@ -125,7 +125,7 @@ if (!$result) { array_push($not_uploaded, $sent_file['name']); - array_push($error_msgs, 'Unknown error saving the image on server'); + array_push($error_msgs, elgg_echo('tidypics:save_error')); continue; } @@ -226,7 +226,7 @@ // some images did upload so we fall through } } else { - system_message(elgg_echo("images:saved")); + system_message(elgg_echo('tidypics:upl_success')); } // successful upload so check if this is a new album and throw river event if so diff --git a/languages/en.php b/languages/en.php index 0c7fa3efa..dbf98eb5d 100644 --- a/languages/en.php +++ b/languages/en.php @@ -102,9 +102,10 @@ // Status messages + 'tidypics:upl_success' => "Your images uploaded successfully.", 'image:saved' => "Your image was successfully saved.", 'images:saved' => "All images were successfully saved.", - 'image:deleted' => "Your image was successfully deleted.", + 'image:deleted' => "Your image was successfully deleted.", 'image:delete:confirm' => "Are you sure you want to delete this image?", 'images:edited' => "Your images were successfully updated.", @@ -118,12 +119,18 @@ //Error messages 'image:none' => "We could not find any images at the moment.", - 'tidypics:partialuploadfailure' => "There was a partial on upload (%s of %s images).", + 'tidypics:partialuploadfailure' => "There were errors uploading some of the images (%s of %s images).", 'tidypics:completeuploadfailure' => "Upload of images failed.", + 'tidypics:exceedpostlimit' => "Too many large images - try to upload fewer or smaller images.", + 'tidypics:noimages' => "No images were selected.", + 'tidypics:image_mem' => "Image is too large - too many bytes", + 'tidypics:image_pixels' => "Image has too many pixels", + 'tidypics:unk_error' => "Unknown upload error", + 'tidypics:save_error' => "Unknown error saving the image on server", + 'tidypics:not_image' => "This is not a recognized image type", 'image:deletefailed' => "Your image could not be deleted at this time.", 'image:downloadfailed' => "Sorry; this image is not available at this time.", - 'image:notimage' => "We only accept jpeg, gif, or png images of the allowed file size.", 'images:notedited' => "Not all images were successfully updated", 'album:none' => "No albums have been created yet.", -- cgit v1.2.3 From 718a5bffa4902f712f9cf9923172a0c1dc641d70 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Mon, 18 May 2009 23:51:31 +0000 Subject: added some defines to make the code easier to understand --- actions/addalbum.php | 2 +- actions/upload.php | 4 ++-- start.php | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/actions/addalbum.php b/actions/addalbum.php index 329ebee48..909f04c9f 100644 --- a/actions/addalbum.php +++ b/actions/addalbum.php @@ -53,7 +53,7 @@ } // we catch the adding images to new albums in the upload action and throw a river new album event - $album->new_album = 1; + $album->new_album = TP_NEW_ALBUM; // Success message diff --git a/actions/upload.php b/actions/upload.php index c37ce2b94..78d4b7889 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -231,10 +231,10 @@ // successful upload so check if this is a new album and throw river event if so $album = get_entity($container_guid); - if ($album->new_album == 1) { + if ($album->new_album == TP_NEW_ALBUM) { if (function_exists('add_to_river')) add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid); - $album->new_album = 0; + $album->new_album = TP_OLD_ALBUM; } // plugins can register to be told when a Tidypics album has had images added trigger_elgg_event('upload', 'tp_album', $album); diff --git a/start.php b/start.php index 4a50c5092..6c22df63b 100644 --- a/start.php +++ b/start.php @@ -4,13 +4,19 @@ * */ + // set some simple defines + define('TP_OLD_ALBUM', 0); + define('TP_NEW_ALBUM', 1); + + // setup tidypics settings object global $CONFIG; if (!isset($CONFIG->tidypics)) $CONFIG->tidypics = new stdClass; include dirname(__FILE__) . "/settings.php"; - + + /** * tidypics plugin initialisation functions. */ -- cgit v1.2.3 From 8f53a8a14634260a9c188b8ca8cefd8c671bf6c5 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 19 May 2009 00:30:56 +0000 Subject: fixed bug with deletion of watermark foreground mask --- actions/upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/upload.php b/actions/upload.php index 78d4b7889..fae8f8eae 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -183,7 +183,7 @@ $commands[] = $im_path . 'composite -compose CopyOpacity "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"'; $commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"'; $commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"'; - $commands[] = 'rm "' . $user_stamp_fgnd . '_mask' . $ext . '"'; + $commands[] = 'rm "' . $user_stamp_base . '_fgnd' . $ext . '"'; foreach( $commands as $command ) { exec( $command ); -- cgit v1.2.3 From c07d96b6307bf29b33ea84177be841779e139f62 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Tue, 19 May 2009 11:47:10 +0000 Subject: improved tag text display --- views/default/js/tagging.php | 4 +++- views/default/tidypics/css.php | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php index 323c2bf57..f7e764194 100644 --- a/views/default/js/tagging.php +++ b/views/default/js/tagging.php @@ -92,7 +92,9 @@ tag_div = $('
      ').css({ left: tag_left + 'px', top: tag_top + 'px', width: tag.width + 'px', height: tag.height + 'px' }); - tag_text_div = $('
      '+tag.text+'
      ').css({ left: tag_left + 'px', top: tag_top + 'px', width: tag.width + 'px', height: 20 + 'px' }); + text_top = parseInt(tag_top) + parseInt(tag.height) + 5; + + tag_text_div = $('
      '+tag.text+'
      ').css({ left: tag_left + 'px', top: text_top + 'px', width: '120px'}); $('body').append(tag_div); $('body').append(tag_text_div); diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 56d4efcad..a130453fb 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -243,13 +243,15 @@ z-index:0; .tidypics_tag_text { display:none; -border:2px solid #ffffff; overflow:hidden; position:absolute; z-index:0; -background: #ffffff; -text-align: center; -color: #4690d6; +text-align:center; +background:#BBDAF7; +border:1px solid #3B5999; +-webkit-border-radius:3px; +-moz-border-radius:3px; +padding:1px; } #tidypics_phototags_list { -- cgit v1.2.3 From 861c1143e231edce5e3b1fc537fe52c51e39bbc6 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 20 May 2009 01:00:39 +0000 Subject: added function for determining path to main image directory --- lib/tidypics.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/tidypics.php b/lib/tidypics.php index 0a9db4f5d..1254f3ff6 100644 --- a/lib/tidypics.php +++ b/lib/tidypics.php @@ -4,5 +4,17 @@ * */ - + /** + * Get image directory path + * + * Each album gets a subdirectory based on its container id + * + * @return string path to image directory + */ + function tp_get_img_dir() + { + $file = new ElggFile(); + return $file->getFilenameOnFilestore() . 'image/'; + } + ?> \ No newline at end of file -- cgit v1.2.3 From b328fd43ed7315fb4189f2408f6a1c10f8a9f3e7 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Wed, 20 May 2009 03:19:54 +0000 Subject: moved watermarking into lib dir --- actions/upload.php | 50 +++---------------------------------------------- lib/watermark.php | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 47 deletions(-) create mode 100644 lib/watermark.php diff --git a/actions/upload.php b/actions/upload.php index fae8f8eae..d9129aef7 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -7,6 +7,7 @@ global $CONFIG; include dirname(dirname(__FILE__)) . "/lib/resize.php"; + include dirname(dirname(__FILE__)) . "/lib/watermark.php"; // Get common variables $access_id = (int) get_input("access_id"); @@ -150,54 +151,9 @@ } $album = get_entity($container_guid); - $user = get_user_entity_as_row($album->owner_guid); - $username = $user->username; - - $im_path = get_plugin_setting('convert_command', 'tidypics'); - if(!$im_path) { - $im_path = "/usr/bin/"; - } - if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; - $viewer = get_loggedin_user(); - $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); - $watermark_text = str_replace("%username%", $viewer->username, $watermark_text); - $watermark_text = str_replace("%sitename%", $CONFIG->sitename, $watermark_text); - - if( $watermark_text ) { //get this value from the plugin settings - if( $thumbs["thumblarge"] ) { - $ext = ".png"; - - $watermark_filename = strtolower($watermark_text); - $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); - $watermark_filename = trim($watermark_filename, '-'); - - $user_stamp_base = strtolower(dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"); - $user_stamp_base = preg_replace("/[^\w-]+/", "-", $user_stamp_base); - $user_stamp_base = trim($user_stamp_base, '-'); - - if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist - $commands = array(); - $commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"'; - $commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; - $commands[] = $im_path . 'composite -compose CopyOpacity "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"'; - $commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"'; - $commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"'; - $commands[] = 'rm "' . $user_stamp_base . '_fgnd' . $ext . '"'; - - foreach( $commands as $command ) { - exec( $command ); - } - } - //apply the watermark - $commands = array(); - $commands[] = $im_path . 'composite -gravity south -geometry +0+10 "' . $user_stamp_base . $ext . '" "' . $thumbs["thumblarge"] . '" "' . $thumbs["thumblarge"] . '_watermarked"'; - $commands[] = "mv \"$thumbs[thumblarge]" . "_watermarked\" \"$thumbs[thumblarge]\""; - foreach( $commands as $command ) { - exec( $command ); - } - } - } + tp_watermark($thumbs); + } // end of image library selector array_push($uploaded_images, $file->guid); diff --git a/lib/watermark.php b/lib/watermark.php new file mode 100644 index 000000000..773aed565 --- /dev/null +++ b/lib/watermark.php @@ -0,0 +1,55 @@ +owner_guid); + $username = $user->username; + + $im_path = get_plugin_setting('convert_command', 'tidypics'); + if(!$im_path) { + $im_path = "/usr/bin/"; + } + if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/"; + + $viewer = get_loggedin_user(); + $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); + $watermark_text = str_replace("%username%", $viewer->username, $watermark_text); + $watermark_text = str_replace("%sitename%", $CONFIG->sitename, $watermark_text); + + if( $watermark_text ) { //get this value from the plugin settings + if( $thumbs["thumblarge"] ) { + $ext = ".png"; + + $watermark_filename = strtolower($watermark_text); + $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); + $watermark_filename = trim($watermark_filename, '-'); + + $user_stamp_base = strtolower(dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"); + $user_stamp_base = preg_replace("/[^\w-]+/", "-", $user_stamp_base); + $user_stamp_base = trim($user_stamp_base, '-'); + + if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist + $commands = array(); + $commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"'; + $commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; + $commands[] = $im_path . 'composite -compose CopyOpacity "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"'; + $commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"'; + $commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"'; + $commands[] = 'rm "' . $user_stamp_fgnd . '_mask' . $ext . '"'; + + foreach( $commands as $command ) { + exec( $command ); + } + } + //apply the watermark + $commands = array(); + $commands[] = $im_path . 'composite -gravity south -geometry +0+10 "' . $user_stamp_base . $ext . '" "' . $thumbs["thumblarge"] . '" "' . $thumbs["thumblarge"] . '_watermarked"'; + $commands[] = "mv \"$thumbs[thumblarge]" . "_watermarked\" \"$thumbs[thumblarge]\""; + foreach( $commands as $command ) { + exec( $command ); + } + } + } +} +?> \ No newline at end of file -- cgit v1.2.3 From 63b91d8aee8e40497d865591d16ee1716e0c9c15 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Wed, 20 May 2009 03:56:56 +0000 Subject: put watermark masks in proper place --- actions/upload.php | 4 ++-- lib/watermark.php | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/actions/upload.php b/actions/upload.php index d9129aef7..dd50d2381 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -6,8 +6,8 @@ */ global $CONFIG; - include dirname(dirname(__FILE__)) . "/lib/resize.php"; - include dirname(dirname(__FILE__)) . "/lib/watermark.php"; + include_once dirname(dirname(__FILE__)) . "/lib/resize.php"; + include_once dirname(dirname(__FILE__)) . "/lib/watermark.php"; // Get common variables $access_id = (int) get_input("access_id"); diff --git a/lib/watermark.php b/lib/watermark.php index 773aed565..813e298a7 100644 --- a/lib/watermark.php +++ b/lib/watermark.php @@ -1,6 +1,8 @@ owner_guid); @@ -25,9 +27,8 @@ function tp_watermark($thumbs) { $watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename); $watermark_filename = trim($watermark_filename, '-'); - $user_stamp_base = strtolower(dirname(__FILE__) . "/" . $viewer->name . "_" . $watermark_filename . "_stamp"); - $user_stamp_base = preg_replace("/[^\w-]+/", "-", $user_stamp_base); - $user_stamp_base = trim($user_stamp_base, '-'); + $user_stamp_base = tp_get_img_dir(); + $user_stamp_base .= strtolower($viewer->name . "_" . $watermark_filename . "_stamp"); if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist $commands = array(); -- cgit v1.2.3 From 12a27fa3b501cf08091cd063dd3208a17e0f624a Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Wed, 20 May 2009 05:01:21 +0000 Subject: added exif support --- actions/upload.php | 5 ++++- lib/exif.php | 35 +++++++++++++++++++++++++++++++++++ lib/watermark.php | 1 - views/default/object/image.php | 9 ++++++++- 4 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 lib/exif.php diff --git a/actions/upload.php b/actions/upload.php index dd50d2381..6e21fd7b0 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -8,6 +8,7 @@ global $CONFIG; include_once dirname(dirname(__FILE__)) . "/lib/resize.php"; include_once dirname(dirname(__FILE__)) . "/lib/watermark.php"; + include_once dirname(dirname(__FILE__)) . "/lib/exif.php"; // Get common variables $access_id = (int) get_input("access_id"); @@ -155,7 +156,9 @@ tp_watermark($thumbs); } // end of image library selector - + + //get and store the exif data + td_get_exif($file); array_push($uploaded_images, $file->guid); unset($file); // may not be needed but there seems to be a memory leak diff --git a/lib/exif.php b/lib/exif.php new file mode 100644 index 000000000..1b6c2cbd2 --- /dev/null +++ b/lib/exif.php @@ -0,0 +1,35 @@ +getFilename(); + $exif = exif_read_data($my_file); + create_metadata($file->getGUID(), "tp_exif", serialize($exif), "string", $file->getObjectOwnerGUID(), 2); +} + +function tp_exif_formatted($file_guid) { + $metadata_exif = get_metadata_byname($file_guid, "tp_exif"); + if($metadata_exif) { + $exif = unserialize($metadata_exif["value"]); + + //got the code snippet below from http://www.zenphoto.org/support/topic.php?id=17 + //convert the raw values to understandible values + $Fnumber = explode("/", $exif['FNumber']); + $Fnumber = $Fnumber[0] / $Fnumber[1]; + $Focal = explode("/", $exif['FocalLength']); + $Focal = $Focal[0] / $Focal[1]; + + //prepare the text for return + $exif_text = "Model: ".$exif['Model']."
      "; + $exif_text .= "Shutter: ".$exif['ExposureTime']."
      "; + $exif_text .= "Aperture: f/".$Fnumber."
      "; + $exif_text .= "ISO Speed: ".$exif['ISOSpeedRatings']."
      "; + $exif_text .= "Focal Length: ".round($Focal)."mm
      "; + $exif_text .= "Captured: ". $exif['DateTime']; + + return "$exif_text"; + } else { + return false; + } +} +?> \ No newline at end of file diff --git a/lib/watermark.php b/lib/watermark.php index 813e298a7..64385ae4a 100644 --- a/lib/watermark.php +++ b/lib/watermark.php @@ -2,7 +2,6 @@ function tp_watermark($thumbs) { include_once dirname(__FILE__) . "/tidypics.php"; - global $CONFIG; $user = get_user_entity_as_row($album->owner_guid); diff --git a/views/default/object/image.php b/views/default/object/image.php index f64942b61..546cd711e 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -5,6 +5,8 @@ */ global $CONFIG; + include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/lib/exif.php"; + $file = $vars['entity']; $file_guid = $file->getGUID(); $tags = $file->tags; @@ -180,7 +182,12 @@ if ($photo_tags) { 'file_guid' => $file_guid, ) ); ?> - +
      + +
      $tags));?>
      -- cgit v1.2.3 From a8376b4033d8ff8880198cf37f4c0ba9d94d0316 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 20 May 2009 12:03:54 +0000 Subject: only owners and friends of owner can tag photos --- views/default/object/image.php | 8 ++++++-- views/default/tidypics/image_menu.php | 8 +++++++- views/default/tidypics/tagging.php | 3 ++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/views/default/object/image.php b/views/default/object/image.php index 546cd711e..b65dc858e 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -172,14 +172,18 @@ if ($photo_tags) {
        '; - echo elgg_view('tidypics/image_menu', array('file_guid' => $file_guid,) ); + echo elgg_view('tidypics/image_menu', array('file_guid' => $file_guid, + 'viewer' => $viewer, + 'owner' => $owner,) ); echo '
      '; // tagging code echo elgg_view('tidypics/tagging', array( 'photo_tags' => $photo_tags, 'links' => $photo_tag_links, 'photo_tags_json' => $photo_tags_json, - 'file_guid' => $file_guid, ) ); + 'file_guid' => $file_guid, + 'viewer' => $viewer, + 'owner' => $owner, ) ); ?>
      diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php index 269fcce8f..dcec9b35a 100644 --- a/views/default/tidypics/image_menu.php +++ b/views/default/tidypics/image_menu.php @@ -11,9 +11,15 @@ **************************************************************************/ $file_guid = $vars['file_guid']; + $viewer = $vars['viewer']; + $owner = $vars['owner']; + + // only owner and friends of owner can tag + if ($viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid)) { ?>
      8. -
      9. diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php index a97285016..8ba58be4f 100644 --- a/views/default/tidypics/tagging.php +++ b/views/default/tidypics/tagging.php @@ -3,6 +3,8 @@ $links = $vars['links']; $photo_tags_json = $vars['photo_tags_json']; $file_guid = $vars['file_guid']; + $viewer = $vars['viewer']; + $owner = $vars['owner']; if ($photo_tags) { ?> @@ -26,7 +28,6 @@
      getGUID(), false, 'user', '', 0); -- cgit v1.2.3 From 0d12092d4c5ca62247fe8495dbb78adfc134691e Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Wed, 20 May 2009 13:36:51 +0000 Subject: fixed most viewed for yourself and friends --- friendmostviewed.php | 5 ++--- yourmostviewed.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/friendmostviewed.php b/friendmostviewed.php index 8f6299c0d..5c4ec91f4 100644 --- a/friendmostviewed.php +++ b/friendmostviewed.php @@ -27,7 +27,6 @@ list($pagename, $friendname) = split("/", $page); } $user = get_user_by_username($friendname); - global $CONFIG; $prefix = $CONFIG->dbprefix; $max = 24; @@ -39,7 +38,7 @@ INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id AND ms.string = 'tp_view' - WHERE ann1.owner_guid = " . $user->guid . " + WHERE ent.owner_guid = " . $user->guid . " GROUP BY ent.guid ORDER BY views DESC LIMIT $max"; @@ -48,7 +47,7 @@ $entities = array(); foreach($result as $entity) { - $entities[] = get_entity($entity->entity_guid); + $entities[] = get_entity($entity->guid); } $title = sprintf(elgg_echo("tidypics:friendmostviewed"), $friendname); diff --git a/yourmostviewed.php b/yourmostviewed.php index 18936bd69..ffcdb50ad 100644 --- a/yourmostviewed.php +++ b/yourmostviewed.php @@ -21,7 +21,7 @@ INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id AND ms.string = 'tp_view' - WHERE ann1.owner_guid = " . $viewer->guid . " + WHERE ent.owner_guid = " . $viewer->guid . " GROUP BY ent.guid ORDER BY views DESC LIMIT $max"; -- cgit v1.2.3 From b5180462ce397d1a6c0c38097f3b2ac4daf04761 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Wed, 20 May 2009 14:22:06 +0000 Subject: get exif data directly from file if non was recorded during upload --- lib/exif.php | 57 ++++++++++++++++++++++++++++++++++-------- views/default/object/image.php | 10 ++++---- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/lib/exif.php b/lib/exif.php index 1b6c2cbd2..1bebb5fdc 100644 --- a/lib/exif.php +++ b/lib/exif.php @@ -1,14 +1,20 @@ getFilename(); - $exif = exif_read_data($my_file); +function td_get_exif($file_guid) { + $file = new ElggFile($file_guid); + $filename = $file->getFilenameOnFilestore(); + $exif = exif_read_data($filename); create_metadata($file->getGUID(), "tp_exif", serialize($exif), "string", $file->getObjectOwnerGUID(), 2); } function tp_exif_formatted($file_guid) { $metadata_exif = get_metadata_byname($file_guid, "tp_exif"); + if(!$metadata_exif) { //try to load it from the file if its not in the database + td_get_exif($file_guid); + $metadata_exif = get_metadata_byname($file_guid, "tp_exif"); + } + if($metadata_exif) { $exif = unserialize($metadata_exif["value"]); @@ -16,18 +22,47 @@ function tp_exif_formatted($file_guid) { //convert the raw values to understandible values $Fnumber = explode("/", $exif['FNumber']); $Fnumber = $Fnumber[0] / $Fnumber[1]; + if(!$Fnumber) { + $Fnumber = "N/A"; + } else { + $Fnumber = "f/$Fnumber"; + } + $Focal = explode("/", $exif['FocalLength']); $Focal = $Focal[0] / $Focal[1]; + if(!$Focal || round($Focal) == "0") $Focal = 0; + if(round($Focal) == 0) { + $Focal = "N/A"; + } else { + $Focal = round($Focal) . "mm"; + } + + $model = $exif['Model']; + if(!$model) $model = "N/A"; + + $exposure = $exif['ExposureTime']; + if(!$exposure) $exposure = "N/A"; + + $iso = $exif['ISOSpeedRatings']; + if(!$iso) $iso = "N/A"; + + $captured = $exif['DateTime']; + if(!$captured) $captured = "N/A"; //prepare the text for return - $exif_text = "Model: ".$exif['Model']."
      "; - $exif_text .= "Shutter: ".$exif['ExposureTime']."
      "; - $exif_text .= "Aperture: f/".$Fnumber."
      "; - $exif_text .= "ISO Speed: ".$exif['ISOSpeedRatings']."
      "; - $exif_text .= "Focal Length: ".round($Focal)."mm
      "; - $exif_text .= "Captured: ". $exif['DateTime']; - - return "$exif_text"; + + $exif_text = "Model: ".$model."
      "; + $exif_text .= "Shutter: ".$exposure."
      "; + $exif_text .= "Aperture: ".$Fnumber."
      "; + $exif_text .= "ISO Speed: ".$iso."
      "; + if(round($Focal) == 0) { + $exif_text .= "Focal Length: N/A
      "; + } else { + $exif_text .= "Focal Length: " . round($Focal) . "mm
      "; + } + $exif_text .= "Captured: ". $captured; + + return $exif_text; } else { return false; } diff --git a/views/default/object/image.php b/views/default/object/image.php index b65dc858e..d9204377f 100644 --- a/views/default/object/image.php +++ b/views/default/object/image.php @@ -187,11 +187,11 @@ if ($photo_tags) { ?>
      - -
      + +
      $tags));?>
      -- cgit v1.2.3 From 239610b7ca432c90f9082e6359b29cefa8eed9f2 Mon Sep 17 00:00:00 2001 From: Greg Froese Date: Wed, 20 May 2009 19:22:07 +0000 Subject: added highest rated view for group albums --- highestrated.php | 65 ++++++++++++++++++++++++++++++++++++++++++ languages/en.php | 1 + start.php | 6 +++- views/default/object/album.php | 6 +++- 4 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 highestrated.php diff --git a/highestrated.php b/highestrated.php new file mode 100644 index 000000000..e9f0296e2 --- /dev/null +++ b/highestrated.php @@ -0,0 +1,65 @@ +username); + } + }*/ + +// if (is_null(page_owner_entity()->name) || page_owner_entity()->name == '') { +// $groupname = get_input('username'); +// } else { +// $groupname = page_owner_entity()->name; +// }; +// + //there has to be a better way to do this + if(!$groupname) { + $page = get_input("page"); + list($pagename, $groupname) = split("/", $page); + } + + list($group_holder, $album_id) = split(":", $groupname); +// echo "
      page: $page\ngroup: $groupname\nalbum: $album_id"; die;
+	
+	$user = get_user_by_username($friendname);
+	global $CONFIG;
+	$prefix = $CONFIG->dbprefix;
+	$max = 24;
+
+	$sql = "SELECT ent.guid, count(1) as mycount, avg(ms2.string) as average
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image' AND  ent.container_guid = $album_id
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'generic_rate'
+			INNER JOIN " . $prefix . "metastrings ms2 ON ms2.id = ann1.value_id
+			INNER JOIN " . $prefix . "users_entity u ON ann1.owner_guid = u.guid			
+			GROUP BY ent.guid HAVING mycount > 1
+			ORDER BY average DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	$album = get_entity($album_id);
+	$title = $album["title"] . ": " . elgg_echo("tidypics:highestrated");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+
+?>
\ No newline at end of file
diff --git a/languages/en.php b/languages/en.php
index dbf98eb5d..094b5aa4c 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -32,6 +32,7 @@
 			'tidypics:yourmostrecent' => 'Your most recent images',
 			'tidypics:friendmostviewed' => "%s's most viewed images",
 			'tidypics:friendmostrecent' => "%s's most recent images",
+			'tidypics:highestrated' => "Highest Rated Images",
 	
 		//settings
 			'tidypics:image_lib' => "Image Library",
diff --git a/start.php b/start.php
index 6c22df63b..1881b1d31 100644
--- a/start.php
+++ b/start.php
@@ -257,6 +257,11 @@
 					if (isset($page[1])) set_input('guid',$page[1]);
 					include($CONFIG->pluginspath . "tidypics/recentlyviewed.php");
 				break;
+				
+				case "highestrated":
+					if (isset($page[1])) set_input('guid',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/highestrated.php");
+				break;
 			}
 		}
 		else
@@ -343,6 +348,5 @@
 	register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
 	register_action("tidypics/download", true, $CONFIG->pluginspath . "tidypics/actions/download.php");
 	register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
-	register_action("tidypics/rate", true, $CONFIG->pluginspath . "tidypics/actions/rate.php");
 
 ?>
\ No newline at end of file
diff --git a/views/default/object/album.php b/views/default/object/album.php
index bee379666..acceaac91 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -57,7 +57,11 @@
 		}
 		
 	} else {							
-		// individual album view	
+		// individual album view
+		$page = get_input("page");
+		list($album_placeholder, $album_id, $album_title) = split("/", $page);
+		add_submenu_item(	elgg_echo("tidypics:highestrated"),
+							$CONFIG->wwwroot . "pg/photos/highestrated/group:" . $album_id);
 ?>
 
      
 	
      
-- 
cgit v1.2.3


From c607a2424cec501051b27ce5c1606df5b602231f Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 22 May 2009 01:26:47 +0000
Subject: Began coding admin settings page

---
 admin.php                              | 22 ++++++++++++++++++
 languages/en.php                       |  1 +
 start.php                              | 12 ++++++++++
 views/default/admin/tidypics.php       | 13 +++++++++++
 views/default/tidypics/forms/admin.php | 42 ++++++++++++++++++++++++++++++++++
 5 files changed, 90 insertions(+)
 create mode 100644 admin.php
 create mode 100644 views/default/admin/tidypics.php
 create mode 100644 views/default/tidypics/forms/admin.php

diff --git a/admin.php b/admin.php
new file mode 100644
index 000000000..f44250d71
--- /dev/null
+++ b/admin.php
@@ -0,0 +1,22 @@
+
\ No newline at end of file
diff --git a/languages/en.php b/languages/en.php
index 094b5aa4c..9edbc6be5 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -19,6 +19,7 @@
 			'album:group' => "Group albums",
 			'item:object:image' => "Photos",
 			'item:object:album' => "Albums",
+			'tidypics:adminsettings' => 'Tidypics Settings',
 			'tidypics:settings:download_link' => "Show download link:",
 			'tidypics:settings:maxfilesize' => "Maximum file size in megabytes (MB):",
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
diff --git a/start.php b/start.php
index 1881b1d31..ea5c67e2d 100644
--- a/start.php
+++ b/start.php
@@ -161,6 +161,17 @@
 		
 	}
 
+	/**
+	 * Sets up tidypics admin menu. Triggered on pagesetup.
+	 */
+	function tidypics_adminmenu()
+	{
+		global $CONFIG;
+		if (get_context() == 'admin' && isadminloggedin()) {
+			add_submenu_item(elgg_echo('tidypics:adminsettings'), $CONFIG->url . "mod/tidypics/admin.php");
+		}
+	}
+
 	/**
 	 * tidypics page handler
 	 *
@@ -338,6 +349,7 @@
 	// Make sure tidypics_init is called on initialisation
 	register_elgg_event_handler('init','system','tidypics_init');
 	register_elgg_event_handler('pagesetup','system','tidypics_submenus');
+	register_elgg_event_handler('pagesetup','system','tidypics_adminmenu');
 	
 	// Register actions
 	register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
diff --git a/views/default/admin/tidypics.php b/views/default/admin/tidypics.php
new file mode 100644
index 000000000..561f3965a
--- /dev/null
+++ b/views/default/admin/tidypics.php
@@ -0,0 +1,13 @@
+';
+	
+	echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
+	
+	echo elgg_view("tidypics/forms/admin");
+		
+	echo "
      ";
+?>
\ No newline at end of file
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
new file mode 100644
index 000000000..32e08b561
--- /dev/null
+++ b/views/default/tidypics/forms/admin.php
@@ -0,0 +1,42 @@
+image_lib;
+	if (!$image_lib) $image_lib = 'GD';
+
+	$form_body = 'Not functional!!!!!!!  
      ' . elgg_echo('tidypics:image_lib');
+	
+	$form_body .= elgg_view('input/pulldown', array(
+					'internalname' => 'params[image_lib]',
+					'options_values' => array(
+						'GD' => 'GD',
+						'ImageMagick' => 'ImageMagick',
+						'ImageMagick Cmdline' => 'ImageMagick Cmdline',
+					),
+					'value' => $image_lib
+	));
+	
+	$form_body .= '
      ';
+	
+	
+	$form_body .= "
      " . elgg_view("input/checkboxes", array('options' => array('Enable Tagging' => true), 'internalname' => 'tagging', 'value' => ($vars['config']->tagging ? true : false) )) . "
      ";
+	
+	$form_body .= "
      " . elgg_view("input/checkboxes", array('options' => array('Enable Download Link' => true), 'internalname' => 'download', 'value' => ($vars['config']->download ? true : false) )) . "
      ";
+	
+
+	$form_body .= "
      " . elgg_echo('watermark') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'watermark', 'value' => $watermark)) . "
      ";
+
+
+	$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
+	
+	echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
\ No newline at end of file
-- 
cgit v1.2.3


From 029ae9fcba086a1cce25e496c9de2593df212bdb Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 22 May 2009 12:14:27 +0000
Subject: loading plugin settings on admin settings page

---
 views/default/tidypics/forms/admin.php | 36 ++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 32e08b561..8006cc69f 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -5,16 +5,19 @@
 
 	// to do
 	// 1. set action and code it
-	// 2. figure out how to load all values since they won't be available in $vars[] by default
+	// 2. add language strings
+	// 3. clean up and organize
 	
 	
 	$action = $vars['url'];// . "action/";
 	
-	$image_lib = $vars['entity']->image_lib;
+	$plugin = find_plugin_settings('tidypics');
+	
+	$image_lib = $plugin->image_lib;
 	if (!$image_lib) $image_lib = 'GD';
 
-	$form_body = 'Not functional!!!!!!!  
      ' . elgg_echo('tidypics:image_lib');
-	
+	// Image Library
+	$form_body = 'Not functional!!!!!!!  
      ' . elgg_echo('tidypics:settings:image_lib');
 	$form_body .= elgg_view('input/pulldown', array(
 					'internalname' => 'params[image_lib]',
 					'options_values' => array(
@@ -24,17 +27,24 @@
 					),
 					'value' => $image_lib
 	));
-	
 	$form_body .= '
      ';
-	
-	
-	$form_body .= "
      " . elgg_view("input/checkboxes", array('options' => array('Enable Tagging' => true), 'internalname' => 'tagging', 'value' => ($vars['config']->tagging ? true : false) )) . "
      ";
-	
-	$form_body .= "
      " . elgg_view("input/checkboxes", array('options' => array('Enable Download Link' => true), 'internalname' => 'download', 'value' => ($vars['config']->download ? true : false) )) . "
      ";
-	
 
-	$form_body .= "
      " . elgg_echo('watermark') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'watermark', 'value' => $watermark)) . "
      ";
+	// Tagging
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => true), 'internalname' => 'tagging', 'value' => ($plugin->tagging ? true : false) )) . "
      ";
+
+	// Download Link
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download') => true), 'internalname' => 'download_link', 'value' => ($plugin->download_link ? true : false) )) . "
      ";
+
+	// Watermark Text
+	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'watermark_text', 'value' => $plugin->$watermark_text)) . "
      ";
+
+	// Max Image Size
+	$form_body .= "
      " . elgg_echo('tidypics:settings:img_size') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'maxfilesize', 'value' => $plugin->$maxfilesize)) . "
      ";
+
+	// Thumbnail sizes
+
 
 
 	$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-- 
cgit v1.2.3


From 620be743083e3c7c53d71c7686175c8ad341c7cb Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Fri, 22 May 2009 15:43:19 +0000
Subject: added river activity for uploaded images

---
 actions/upload.php                          | 22 +++++++++++++++++++---
 languages/en.php                            |  3 ++-
 views/default/river/object/image/create.php | 26 ++++++++++++++++++++++++++
 views/default/settings/tidypics/edit.php    | 18 ++++++++++++++++++
 4 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index 6e21fd7b0..6a941fa66 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -47,6 +47,9 @@
 	$uploaded_images = array();
 	$not_uploaded = array();
 	$error_msgs = array();
+	
+	$river_view = get_plugin_setting('river_view', 'tidypics');
+
 	foreach($_FILES as $key => $sent_file) {
 		
 		// skip empty entries 
@@ -155,18 +158,24 @@
 			
 			tp_watermark($thumbs);
 			
+			//keep one file handy so we can add a notice to the river
+			if(!$file_for_river) {
+				$file_for_river = $file;
+			}
+
 		} // end of image library selector
 
 		//get and store the exif data
 		td_get_exif($file);	
 		array_push($uploaded_images, $file->guid);
 
+		if($river_view == "all") {
+			add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
+		}
 		unset($file);  // may not be needed but there seems to be a memory leak
-		
 
 	} //end of for loop
-	
-	
+				
 	if (count($not_uploaded) > 0) {
 		if (count($uploaded_images) > 0)
 			$error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images))  . '
      ';
@@ -195,6 +204,13 @@
 			add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
 		$album->new_album = TP_OLD_ALBUM;
 	}
+	
+	if(count($uploaded_images) && $river_view == "1") {
+		if (function_exists('add_to_river')) {
+			add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
+		}
+	}
+			
 	// plugins can register to be told when a Tidypics album has had images added
 	trigger_elgg_event('upload', 'tp_album', $album);
 	
diff --git a/languages/en.php b/languages/en.php
index 9edbc6be5..3d8216bb8 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -24,6 +24,7 @@
 			'tidypics:settings:maxfilesize' => "Maximum file size in megabytes (MB):",
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
+			'tidypics:settings:river_view' => "Show entries in river for each batch of uploaded images",
 			'tidypics:enablephotos' => 'Enable Group Photo Albums',
 			'tidypics:editprops' => 'Edit Image Properties',
 			'tidypics:mostviewed' => 'Most viewed images',
@@ -89,7 +90,7 @@
 		//  river
 		
 			//images
-			'image:river:created' => "%s uploaded",
+			'image:river:created' => "%s added %s to album %s",
 			'image:river:item' => "an image",
 			'image:river:annotate' => "a comment on the image",	
 		
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 3f5bbb5e8..bf6d2acbb 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,5 +1,30 @@
 subject_guid);
+	$image = get_entity($vars['item']->object_guid);
+	if($image->title) {
+		$title = $image->title;
+	} else {
+		$title = "untitled";
+	}
+
+	$url = "getURL()}\">{$performed_by->name}";
+	$album = get_entity($image->container_guid);
+
+	$album_link = "" . $album->title . "";
+	$image_link = "getURL() . "\">" . $title . "";
+	
+	$string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link);
+		
+	$string .= "
      ";
+	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> ';
+	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> ';
+	$string .= "
      ";
+	
+	echo $string;
+	
+} else {
 	$statement = $vars['statement'];
 	$performed_by = $statement->getSubject();
 	$object = $statement->getObject();
@@ -9,5 +34,6 @@
 	$string .= "getURL() . "\">" . elgg_echo("image:river:item") . "";
 
 	echo $string;
+}
 	
 ?>
\ No newline at end of file
diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php
index ecfee33bd..59ed912d1 100644
--- a/views/default/settings/tidypics/edit.php
+++ b/views/default/settings/tidypics/edit.php
@@ -64,6 +64,24 @@
 			'value' => $download_link));
 	?>
 
      
+
      
+	river_view;
+		if (!$river_view) $river_view = 'all';
+	?>
+	
+	 'params[river_view]',
+			'options_values' => array(
+				'all' => 'all',
+				'1' => '1',
+				'none' => 'none'
+			),
+			'value' => $river_view));
+	?>
+
      
 
 watermark_text;
-- 
cgit v1.2.3


From fcbfde4da4a2928e960dc4851a6d44d4353a14c7 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 27 May 2009 01:15:50 +0000
Subject: added action framework for new settings page

---
 actions/settings.php                   | 23 +++++++++++++++++++++++
 start.php                              |  1 +
 views/default/tidypics/forms/admin.php |  6 +++---
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 actions/settings.php

diff --git a/actions/settings.php b/actions/settings.php
new file mode 100644
index 000000000..2c043426f
--- /dev/null
+++ b/actions/settings.php
@@ -0,0 +1,23 @@
+ $v) {
+		
+		error_log("$k : $v");
+		
+	}
+	
+	system_message(elgg_echo('tidypics:settings:save:ok'));
+	
+	forward($_SERVER['HTTP_REFERER']);
+?>
diff --git a/start.php b/start.php
index ea5c67e2d..3515ee667 100644
--- a/start.php
+++ b/start.php
@@ -352,6 +352,7 @@
 	register_elgg_event_handler('pagesetup','system','tidypics_adminmenu');
 	
 	// Register actions
+	register_action("tidypics/settings", false, $CONFIG->pluginspath . "tidypics/actions/settings.php");
 	register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
 	register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
 	register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 8006cc69f..7e1c2bf53 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -9,7 +9,7 @@
 	// 3. clean up and organize
 	
 	
-	$action = $vars['url'];// . "action/";
+	$action = $vars['url'] . 'action/tidypics/settings';
 	
 	$plugin = find_plugin_settings('tidypics');
 	
@@ -37,11 +37,11 @@
 
 	// Watermark Text
 	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'watermark_text', 'value' => $plugin->$watermark_text)) . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->$watermark_text)) . "
      ";
 
 	// Max Image Size
 	$form_body .= "
      " . elgg_echo('tidypics:settings:img_size') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'maxfilesize', 'value' => $plugin->$maxfilesize)) . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $plugin->$maxfilesize)) . "
      ";
 
 	// Thumbnail sizes
 
-- 
cgit v1.2.3


From ac7b07f54be91fd2ce1e2ff8c2ddbc23c71e2345 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 2 Jun 2009 11:47:37 +0000
Subject: added next section of admin settings - finishing the action is next

---
 actions/settings.php                   |  5 ++++
 languages/en.php                       |  5 +++-
 views/default/tidypics/forms/admin.php | 43 +++++++++++++++++++++++++++-------
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/actions/settings.php b/actions/settings.php
index 2c043426f..427ca2520 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -17,6 +17,11 @@
 		
 	}
 	
+	if (get_input('download_link') == true)
+		error_log('download link is on');
+	if (get_input('tagging') == true)
+		error_log('tagging is on');
+	
 	system_message(elgg_echo('tidypics:settings:save:ok'));
 	
 	forward($_SERVER['HTTP_REFERER']);
diff --git a/languages/en.php b/languages/en.php
index 3d8216bb8..ffa13b3a2 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -20,7 +20,10 @@
 			'item:object:image' => "Photos",
 			'item:object:album' => "Albums",
 			'tidypics:adminsettings' => 'Tidypics Settings',
-			'tidypics:settings:download_link' => "Show download link:",
+			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
+			'tidypics:settings:image_lib' => "Image Library: ",
+			'tidypics:settings:download_link' => "Show download link",
+			'tidypics:settings:tagging' => "Enable photo tagging",
 			'tidypics:settings:maxfilesize' => "Maximum file size in megabytes (MB):",
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 7e1c2bf53..69089c877 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -12,11 +12,11 @@
 	$action = $vars['url'] . 'action/tidypics/settings';
 	
 	$plugin = find_plugin_settings('tidypics');
-	
-	$image_lib = $plugin->image_lib;
-	if (!$image_lib) $image_lib = 'GD';
+
 
 	// Image Library
+	$image_lib = $plugin->image_lib;
+	if (!$image_lib) $image_lib = 'GD';
 	$form_body = 'Not functional!!!!!!!  
      ' . elgg_echo('tidypics:settings:image_lib');
 	$form_body .= elgg_view('input/pulldown', array(
 					'internalname' => 'params[image_lib]',
@@ -29,19 +29,46 @@
 	));
 	$form_body .= '
      ';
 
+	// Image Magick Path
+	$im_path = $plugin->im_path;
+	if(!$im_path) $im_path = "/usr/bin/";
+	$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
+
 	// Tagging
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => true), 'internalname' => 'tagging', 'value' => ($plugin->tagging ? true : false) )) . "
      ";
+	$tagging = $tagging;
+	if(!$tagging) $tagging = "enabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => true), 'internalname' => 'tagging', 'value' => ($tagging=='enabled' ? true : false) )) . "
      ";
 
 	// Download Link
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download') => true), 'internalname' => 'download_link', 'value' => ($plugin->download_link ? true : false) )) . "
      ";
+	$download_link = $download_link;
+	if(!$download_link) $download_link = "enabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => true), 'internalname' => 'download_link', 'value' => ($download_link=='enabled' ? true : false) )) . "
      ";
 
 	// Watermark Text
 	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->$watermark_text)) . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
 
 	// Max Image Size
-	$form_body .= "
      " . elgg_echo('tidypics:settings:img_size') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $plugin->$maxfilesize)) . "
      ";
+	$maxfilesize = $plugin->maxfilesize;
+	if (!$maxfilesize) $maxfilesize = (int)5; // 5 MB
+	$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
+
+	// River options
+	$river_view = $plugin->river_view;
+	if (!$river_view) $river_view = '1';
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:river_view');
+	$form_body .= elgg_view('input/pulldown', array(
+					'internalname' => 'params[river_view]',
+					'options_values' => array(
+						'all' => 'all',
+						'1' => '1',
+						'none' => 'none',
+					),
+					'value' => $river_view
+	));
+	$form_body .= '
      ';
 
 	// Thumbnail sizes
 
-- 
cgit v1.2.3


From 99a5db94c8e91913e42331bd73d37cb93f3cc2d8 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 3 Jun 2009 01:47:16 +0000
Subject: almost done with new settings page - need to add link to server
 analysis and remove default plugin edit view

---
 actions/settings.php                   | 27 ++++++++++++++++++---------
 languages/en.php                       | 20 ++++++++++----------
 views/default/tidypics/forms/admin.php | 10 +++++-----
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/actions/settings.php b/actions/settings.php
index 427ca2520..c0f53c71d 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -8,19 +8,28 @@
 
 	gatekeeper();
 	action_gatekeeper();
-	
-	$params = get_input('params');
 
+
+	// Params array (text boxes and drop downs)
+	$params = get_input('params');
+	$result = false;
 	foreach ($params as $k => $v) {
-		
-		error_log("$k : $v");
-		
+		if (!set_plugin_setting($k, $v, 'tidypics')) {
+			register_error(sprintf(elgg_echo('plugins:settings:save:fail'), 'tidypics'));
+			forward($_SERVER['HTTP_REFERER']);
+		}
 	}
+
+	// check boxes
+	if (is_array(get_input('download_link'))) // this can be done due to way Elgg uses checkboxes
+		set_plugin_setting('download_link', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('download_link', 'disabled', 'tidypics');
 	
-	if (get_input('download_link') == true)
-		error_log('download link is on');
-	if (get_input('tagging') == true)
-		error_log('tagging is on');
+	if (is_array(get_input('tagging')))
+		set_plugin_setting('tagging', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('tagging', 'disabled', 'tidypics');
 	
 	system_message(elgg_echo('tidypics:settings:save:ok'));
 	
diff --git a/languages/en.php b/languages/en.php
index ffa13b3a2..8ee72b815 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -19,15 +19,6 @@
 			'album:group' => "Group albums",
 			'item:object:image' => "Photos",
 			'item:object:album' => "Albums",
-			'tidypics:adminsettings' => 'Tidypics Settings',
-			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
-			'tidypics:settings:image_lib' => "Image Library: ",
-			'tidypics:settings:download_link' => "Show download link",
-			'tidypics:settings:tagging' => "Enable photo tagging",
-			'tidypics:settings:maxfilesize' => "Maximum file size in megabytes (MB):",
-			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
-			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
-			'tidypics:settings:river_view' => "Show entries in river for each batch of uploaded images",
 			'tidypics:enablephotos' => 'Enable Group Photo Albums',
 			'tidypics:editprops' => 'Edit Image Properties',
 			'tidypics:mostviewed' => 'Most viewed images',
@@ -40,7 +31,15 @@
 			'tidypics:highestrated' => "Highest Rated Images",
 	
 		//settings
-			'tidypics:image_lib' => "Image Library",
+			'tidypics:adminsettings' => 'Tidypics Settings',
+			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
+			'tidypics:settings:image_lib' => "Image Library: ",
+			'tidypics:settings:download_link' => "Show download link",
+			'tidypics:settings:tagging' => "Enable photo tagging",
+			'tidypics:settings:maxfilesize' => "Maximum file size in megabytes (MB):",
+			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
+			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
+			'tidypics:settings:river_view' => "Show entries in river for each batch of uploaded images",
 
 		//actions
 		
@@ -121,6 +120,7 @@
 			'album:delete:confirm' => "Are you sure you want to delete this album?",
 			'album:created' => "Your new album has been created.",
 			'tidypics:status:processing' => "Please wait while we process your picture....",
+			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
 				
 		//Error messages
 				 
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 69089c877..de7062bba 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -17,7 +17,7 @@
 	// Image Library
 	$image_lib = $plugin->image_lib;
 	if (!$image_lib) $image_lib = 'GD';
-	$form_body = 'Not functional!!!!!!!  
      ' . elgg_echo('tidypics:settings:image_lib');
+	$form_body = '
      ' . elgg_echo('tidypics:settings:image_lib');
 	$form_body .= elgg_view('input/pulldown', array(
 					'internalname' => 'params[image_lib]',
 					'options_values' => array(
@@ -36,14 +36,14 @@
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
 
 	// Tagging
-	$tagging = $tagging;
+	$tagging = $plugin->tagging;
 	if(!$tagging) $tagging = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => true), 'internalname' => 'tagging', 'value' => ($tagging=='enabled' ? true : false) )) . "
      ";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
 
 	// Download Link
-	$download_link = $download_link;
+	$download_link = $plugin->download_link;
 	if(!$download_link) $download_link = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => true), 'internalname' => 'download_link', 'value' => ($download_link=='enabled' ? true : false) )) . "
      ";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
 
 	// Watermark Text
 	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
-- 
cgit v1.2.3


From a60e2065b9b943e91a38751694fabae1a3873b3a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 3 Jun 2009 12:08:45 +0000
Subject: completed new admin settings - no longer uses default Elgg plugin
 settings in Tools Administration

---
 languages/en.php                         |  4 +-
 views/default/admin/tidypics.php         |  7 +++
 views/default/object/image.php           | 16 +++---
 views/default/settings/tidypics/edit.php | 85 +-------------------------------
 views/default/tidypics/image_menu.php    |  8 +--
 5 files changed, 25 insertions(+), 95 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 8ee72b815..6354f9ad1 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -36,10 +36,10 @@
 			'tidypics:settings:image_lib' => "Image Library: ",
 			'tidypics:settings:download_link' => "Show download link",
 			'tidypics:settings:tagging' => "Enable photo tagging",
-			'tidypics:settings:maxfilesize' => "Maximum file size in megabytes (MB):",
+			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
-			'tidypics:settings:river_view' => "Show entries in river for each batch of uploaded images",
+			'tidypics:settings:river_view' => "How many entries in river for each batch of uploaded images",
 
 		//actions
 		
diff --git a/views/default/admin/tidypics.php b/views/default/admin/tidypics.php
index 561f3965a..cecf5409f 100644
--- a/views/default/admin/tidypics.php
+++ b/views/default/admin/tidypics.php
@@ -7,6 +7,13 @@
 	
 	echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
 	
+	global $CONFIG;  
+	$system_url = $CONFIG->wwwroot . 'mod/tidypics/system.php';
+?>
+
      
+Run Server Analysis
+
      
+";
diff --git a/views/default/object/image.php b/views/default/object/image.php
index d9204377f..5787bb39f 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -178,13 +178,15 @@ if ($photo_tags) {
 			echo '
      '; 
 			
 			// tagging code
-			echo elgg_view('tidypics/tagging', array(	'photo_tags' => $photo_tags, 
-														'links' => $photo_tag_links,
-														'photo_tags_json' => $photo_tags_json,
-														'file_guid' => $file_guid,
-														'viewer' => $viewer,
-														'owner' => $owner, ) );
-				
+			if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
+				echo elgg_view('tidypics/tagging', array(	'photo_tags' => $photo_tags, 
+															'links' => $photo_tag_links,
+															'photo_tags_json' => $photo_tags_json,
+															'file_guid' => $file_guid,
+															'viewer' => $viewer,
+															'owner' => $owner, ) );
+			}
+			
 ?>
 			
      
 				wwwroot . 'mod/tidypics/system.php';
+	$settings_url = $CONFIG->wwwroot . 'mod/tidypics/admin.php';
 ?>
 
 
      
 Run Server Analysis
 
      
-
-image_lib;
-	if (!$image_lib) $image_lib = 'GD';
-?>
-
      
-	
-	
-	 'params[image_lib]',
-			'options_values' => array(
-				'GD' => 'GD',
-				'ImageMagick' => 'ImageMagick',
-			),
-			'value' => $image_lib
-		));
-	?>
-	
      
-	im_path;
-		if(!$im_path) $im_path = "/usr/bin/";
-	?>
-	
-	 'params[im_path]', 'value' => $im_path)); ?>
-
      
-
-maxfilesize;
-	if (!$maxfilesize) $maxfilesize = (int) 5; //set the default maximum file size to 5MB
-		
-?>
-
      
-	
-	
-	 'params[maxfilesize]', 'value' => $maxfilesize)); ?>
-
      
-image_lib;
-	if (!$image_lib) $image_lib = 'GD';
-?>
-
      
-	download_link;
-		if (!$download_link) $download_link = 'yes';
-	?>
-	
-	 'params[download_link]',
-			'options_values' => array(
-				'yes' => 'yes',
-				'no' => 'no',
-			),
-			'value' => $download_link));
-	?>
-
      
-
      
-	river_view;
-		if (!$river_view) $river_view = 'all';
-	?>
-	
-	 'params[river_view]',
-			'options_values' => array(
-				'all' => 'all',
-				'1' => '1',
-				'none' => 'none'
-			),
-			'value' => $river_view));
-	?>
-
      
-
-watermark_text;
-	if(!$watermark_text) $watermark_text = "";
-?>
 
      
-	
-	 'params[watermark_text]', 'value' => $watermark_text)); ?>
+Change Tidypics Settings
 
      
\ No newline at end of file
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index dcec9b35a..9257d780a 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -14,13 +14,15 @@
 	$viewer = $vars['viewer'];
 	$owner = $vars['owner'];
 	
-	// only owner and friends of owner can tag
-	if ($viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid)) {
+	if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
+		// only owner and friends of owner can tag
+		if ($viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid)) {
 ?>
 
      10. 
 
 
      11. 
 
Date: Thu, 4 Jun 2009 11:34:17 +0000
Subject: oops - forgot to set IM cmd line option back until image mgick php
 code is added

---
 views/default/tidypics/forms/admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index de7062bba..19bde2fe6 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -14,7 +14,7 @@
 	$plugin = find_plugin_settings('tidypics');
 
 
-	// Image Library
+	// Image Library - need to update values!
 	$image_lib = $plugin->image_lib;
 	if (!$image_lib) $image_lib = 'GD';
 	$form_body = '
      ' . elgg_echo('tidypics:settings:image_lib');
@@ -22,8 +22,8 @@
 					'internalname' => 'params[image_lib]',
 					'options_values' => array(
 						'GD' => 'GD',
-						'ImageMagick' => 'ImageMagick',
-						'ImageMagick Cmdline' => 'ImageMagick Cmdline',
+						'ImageMagick' => 'ImageMagick2',
+						'ImageMagick Cmdline' => 'ImageMagick',
 					),
 					'value' => $image_lib
 	));
-- 
cgit v1.2.3


From ee733ee32b08e062ab868a3b26c3cbe73852a28e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 4 Jun 2009 11:38:54 +0000
Subject: 1. only supporting Elgg 1.5 and greater now - river code 2. fixed a
 bug with river code and adding single images to activity

---
 actions/upload.php                            | 16 ++++++++--------
 lib/watermark.php                             |  4 +++-
 views/default/river/object/album/annotate.php | 13 -------------
 views/default/river/object/album/create.php   | 13 +------------
 views/default/river/object/image/annotate.php | 13 -------------
 views/default/river/object/image/create.php   | 13 -------------
 6 files changed, 12 insertions(+), 60 deletions(-)
 delete mode 100644 views/default/river/object/album/annotate.php
 delete mode 100644 views/default/river/object/image/annotate.php

diff --git a/actions/upload.php b/actions/upload.php
index 6a941fa66..11290a1d8 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -6,9 +6,9 @@
 	 */
 
 	global $CONFIG;
-	include_once dirname(dirname(__FILE__)) . "/lib/resize.php";
-	include_once dirname(dirname(__FILE__)) . "/lib/watermark.php";
-	include_once dirname(dirname(__FILE__)) . "/lib/exif.php";
+	include dirname(dirname(__FILE__)) . "/lib/resize.php";
+	include dirname(dirname(__FILE__)) . "/lib/watermark.php";
+	include dirname(dirname(__FILE__)) . "/lib/exif.php";
 
 	// Get common variables
 	$access_id = (int) get_input("access_id");
@@ -158,13 +158,13 @@
 			
 			tp_watermark($thumbs);
 			
-			//keep one file handy so we can add a notice to the river
-			if(!$file_for_river) {
-				$file_for_river = $file;
-			}
-
 		} // end of image library selector
 
+		//keep one file handy so we can add a notice to the river if single image option selected
+		if(!$file_for_river) {
+			$file_for_river = $file;
+		}
+
 		//get and store the exif data
 		td_get_exif($file);	
 		array_push($uploaded_images, $file->guid);
diff --git a/lib/watermark.php b/lib/watermark.php
index 64385ae4a..4aa719aea 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -1,7 +1,9 @@
 owner_guid);
diff --git a/views/default/river/object/album/annotate.php b/views/default/river/object/album/annotate.php
deleted file mode 100644
index 691b0c7ec..000000000
--- a/views/default/river/object/album/annotate.php
+++ /dev/null
@@ -1,13 +0,0 @@
-getSubject();
-	$object = $statement->getObject();
-	
-	$url = "getURL()}\">{$performed_by->name}";
-	$string = sprintf(elgg_echo("album:river:annotate"),$url) . " ";
-	$string .= "getURL() . "\">" . elgg_echo("album:river:item") . "";
-
-	echo $string; 
-	
-?>
\ No newline at end of file
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 300062b5a..40f847c78 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -1,6 +1,5 @@
 subject_guid);
 	$album = get_entity($vars['item']->object_guid);
 	
@@ -11,17 +10,7 @@ if (function_exists('add_to_river')) { // Elgg 1.5
 	if ($album->cover) {
 		$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
 	}
-	
-} else {  // Elgg 1.2
-	$statement = $vars['statement'];
-	$performed_by = $statement->getSubject();
-	$object = $statement->getObject();
-        
-	$url = "getURL()}\">{$performed_by->name}";
-	$string = sprintf(elgg_echo("album:river:created"),$url) . " ";
-	$string .= "getURL() . "\">" . $object->title . "";
-}
 
 echo $string;
-	
+
 ?>
diff --git a/views/default/river/object/image/annotate.php b/views/default/river/object/image/annotate.php
deleted file mode 100644
index b0b1b8719..000000000
--- a/views/default/river/object/image/annotate.php
+++ /dev/null
@@ -1,13 +0,0 @@
-getSubject();
-	$object = $statement->getObject();
-	
-	$url = "getURL()}\">{$performed_by->name}";
-	$string = sprintf(elgg_echo("image:river:annotate"),$url) . " ";
-	$string .= "getURL() . "\">" . elgg_echo("image:river:item") . "";
-
-	echo $string; 
-	
-?>
\ No newline at end of file
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index bf6d2acbb..09320080b 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,6 +1,5 @@
 subject_guid);
 	$image = get_entity($vars['item']->object_guid);
 	if($image->title) {
@@ -23,17 +22,5 @@ if (function_exists('add_to_river')) { // Elgg 1.5
 	$string .= "
      ";
 	
 	echo $string;
-	
-} else {
-	$statement = $vars['statement'];
-	$performed_by = $statement->getSubject();
-	$object = $statement->getObject();
-	
-	$url = "getURL()}\">{$performed_by->name}";
-	$string = sprintf(elgg_echo("image:river:created"),$url) . " ";
-	$string .= "getURL() . "\">" . elgg_echo("image:river:item") . "";
 
-	echo $string;
-}
-	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From 8e8e50d510608d94e266e3c951349a45046dfc67 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 5 Jun 2009 11:26:42 +0000
Subject: added image sizes to settings and removed deprecated settings object

---
 actions/settings.php                   | 13 ++++++++++++
 languages/en.php                       |  4 ++++
 lib/resize.php                         | 38 +++++++++++++++++++++++-----------
 settings.php                           | 26 -----------------------
 start.php                              |  7 -------
 tidypics_settings/manifest.xml         | 10 ---------
 tidypics_settings/readme.txt           | 27 ------------------------
 tidypics_settings/start.php            | 35 -------------------------------
 views/default/tidypics/forms/admin.php | 19 ++++++++++++++++-
 9 files changed, 61 insertions(+), 118 deletions(-)
 delete mode 100644 settings.php
 delete mode 100644 tidypics_settings/manifest.xml
 delete mode 100644 tidypics_settings/readme.txt
 delete mode 100644 tidypics_settings/start.php

diff --git a/actions/settings.php b/actions/settings.php
index c0f53c71d..29a77577f 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -30,6 +30,19 @@
 		set_plugin_setting('tagging', 'enabled', 'tidypics');
 	else
 		set_plugin_setting('tagging', 'disabled', 'tidypics');
+
+
+	// image sizes
+	$image_sizes = array();
+	$image_sizes['large_image_width'] = get_input('large_thumb_width');
+	$image_sizes['large_image_height'] = get_input('large_thumb_height');
+	$image_sizes['small_image_width'] = get_input('small_thumb_width');
+	$image_sizes['small_image_height'] = get_input('small_thumb_height');
+	$image_sizes['thumb_image_width'] = get_input('thumb_width');
+	$image_sizes['thumb_image_height'] = get_input('thumb_height');
+	set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics');
+
+
 	
 	system_message(elgg_echo('tidypics:settings:save:ok'));
 	
diff --git a/languages/en.php b/languages/en.php
index 6354f9ad1..432da458d 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -40,6 +40,9 @@
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
 			'tidypics:settings:river_view' => "How many entries in river for each batch of uploaded images",
+			'tidypics:settings:largesize' => "Primary image size",
+			'tidypics:settings:smallsize' => "Album view image size",
+			'tidypics:settings:thumbsize' => "Thumbnail image size",
 
 		//actions
 		
@@ -136,6 +139,7 @@
 			'tidypics:not_image' => "This is not a recognized image type",
 			'image:deletefailed' => "Your image could not be deleted at this time.",
 			'image:downloadfailed' => "Sorry; this image is not available at this time.",
+			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
 			
 			'images:notedited' => "Not all images were successfully updated",
 		 
diff --git a/lib/resize.php b/lib/resize.php
index f9b7843e5..186900f7d 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -19,10 +19,17 @@
 		
 		$mime = $file->getMimeType();
 		
+		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
+		if (!$image_sizes) {
+			register_error(elgg_echo('tidypics:nosettings'));
+			return false;
+		}
+		$image_sizes = unserialize($image_sizes);
+		
 		// Generate thumbnails
 		$thumbnail = get_resized_image_from_existing_file(	$file->getFilenameOnFilestore(),
-															$CONFIG->tidypics->image_thumb_width,
-															$CONFIG->tidypics->image_thumb_height, 
+															$image_sizes['thumb_image_width'],
+															$image_sizes['thumb_image_height'], 
 															true); 
 
 		if ($thumbnail) {
@@ -41,8 +48,8 @@
 		unset($thumbnail);
 		
 		$thumbsmall = get_resized_image_from_existing_file(	$file->getFilenameOnFilestore(),
-															$CONFIG->tidypics->image_small_width,
-															$CONFIG->tidypics->image_small_height, 
+															$image_sizes['small_image_width'],
+															$image_sizes['small_image_height'], 
 															true); 
 
 		
@@ -62,8 +69,8 @@
 		unset($thumbsmall);
 
 		$thumblarge = get_resized_image_from_existing_file(	$file->getFilenameOnFilestore(),
-															$CONFIG->tidypics->image_large_width,
-															$CONFIG->tidypics->image_large_height, 
+															$image_sizes['large_image_width'],
+															$image_sizes['large_image_height'], 
 															false); 
 		
 		if ($thumblarge) {
@@ -116,22 +123,29 @@
 		
 		$mime = $file->getMimeType();
 		
+		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
+		if (!$image_sizes) {
+			register_error(elgg_echo('tidypics:nosettings'));
+			return array();
+		}
+		$image_sizes = unserialize($image_sizes);
+		
 		$thumblarge = tp_imagick_resize($file->getFilenameOnFilestore(), 
 								"largethumb", 
-								$CONFIG->tidypics->image_large_width, 
-								$CONFIG->tidypics->image_large_height, 
+								$image_sizes['large_image_width'], 
+								$image_sizes['large_image_height'], 
 								false); 
 									
 		$thumbsmall = tp_imagick_resize($file->getFilenameOnFilestore(), 
 								"smallthumb", 
-								$CONFIG->tidypics->image_small_width, 
-								$CONFIG->tidypics->image_small_height, 
+								$image_sizes['small_image_width'], 
+								$image_sizes['small_image_height'], 
 								true); 
 
 		$thumbnail = tp_imagick_resize($file->getFilenameOnFilestore(), 
 								"thumb", 
-								$CONFIG->tidypics->image_thumb_width, 
-								$CONFIG->tidypics->image_thumb_height, 
+								$image_sizes['thumb_image_width'], 
+								$image_sizes['thumb_image_height'], 
 								true);
 		
 		if ($thumbnail) {
diff --git a/settings.php b/settings.php
deleted file mode 100644
index a18660da0..000000000
--- a/settings.php
+++ /dev/null
@@ -1,26 +0,0 @@
-tidypics->image_large_width = 600;
-	$CONFIG->tidypics->image_large_height = 600;
-
-	$CONFIG->tidypics->image_small_width = 153;
-	$CONFIG->tidypics->image_small_height = 153;
-
-	$CONFIG->tidypics->image_thumb_width = 60;
-	$CONFIG->tidypics->image_thumb_height = 60;
-
-?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 3515ee667..374b99b99 100644
--- a/start.php
+++ b/start.php
@@ -8,13 +8,6 @@
 	define('TP_OLD_ALBUM', 0);
 	define('TP_NEW_ALBUM', 1);
 
-	 
-	// setup tidypics settings object
-	global $CONFIG;
-	if (!isset($CONFIG->tidypics))
-		$CONFIG->tidypics = new stdClass;
-	include dirname(__FILE__) . "/settings.php";
-
 	
 	
 	/**
diff --git a/tidypics_settings/manifest.xml b/tidypics_settings/manifest.xml
deleted file mode 100644
index 3ee22d192..000000000
--- a/tidypics_settings/manifest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-        
-        
-        
-        
-        
-        
-        
-
diff --git a/tidypics_settings/readme.txt b/tidypics_settings/readme.txt
deleted file mode 100644
index 2f6ff9cca..000000000
--- a/tidypics_settings/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-What is this?
-=============================
-tidypics_settings is a plugin
-
-
-What does it do?
-=============================
-It allows you to override settings in tidypics like the size of images or whether images
-can be downloaded or not. By changing those settings in this plugin and NOT in the 
-tidypics plugin, you can upgrade to new versions without worrying about losing your
-custom settings. 
-
-
-How do I install it?
-=============================
-1. Copy the tidypics_settings directory to your Elgg mod directory. You should now have 
-a directory path like this: /mod/tidypics_settings
-
-2. Under that directory, you should have 2 files: this readme and a start.php file. Edit
-this start.php file to change any settings that you want to change (uncomment the setting
-and then change its value).
-
-3. Confirm that this plugin appears below tidypics on the plugin list in Tools Administration.
-It does not have to be directly below. Just as long as it is loaded afterwards.
-
-4. Enable the plugin under Tools Administration in your Elgg install. If you get a misconfigured
-plugin error message, you've done something dumb. 
diff --git a/tidypics_settings/start.php b/tidypics_settings/start.php
deleted file mode 100644
index 6332050a8..000000000
--- a/tidypics_settings/start.php
+++ /dev/null
@@ -1,35 +0,0 @@
-tidypics)) {
-		error_log('tidypics_settings: error - not loaded after tidypics plugin!!!');
-	}
-
-
-/////////////////////////////////////////////////////////////////////
-// Image sizes - Tidypics makes 3 views of an image:
-// Large - displayed when viewing the image alone
-// Small - displayed on an album page
-// Thumb - used for the activity log
-// There is also the original image that is available for download
-//	$CONFIG->tidypics->image_large_width = 600;
-//	$CONFIG->tidypics->image_large_height = 600;
-
-//	$CONFIG->tidypics->image_small_width = 153;
-//	$CONFIG->tidypics->image_small_height = 153;
-
-//	$CONFIG->tidypics->image_thumb_width = 60;
-//	$CONFIG->tidypics->image_thumb_height = 60;
-
-
-
-
-
-?>
\ No newline at end of file
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 19bde2fe6..c5e7c68d0 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -71,7 +71,24 @@
 	$form_body .= '
      ';
 
 	// Thumbnail sizes
-
+	$image_sizes = $plugin->image_sizes;
+	if(!$image_sizes) {
+		$image_sizes = array(); // set default values 
+		$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
+		$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
+		$image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60;
+	} else {
+		$image_sizes = unserialize($image_sizes);
+	}
+	$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
+	$form_body .= 'width:    ';
+	$form_body .= 'height: 
      ';
+	$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
+	$form_body .= 'width:    ';
+	$form_body .= 'height: 
      ';
+	$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
+	$form_body .= 'width:    ';
+	$form_body .= 'height: 
      ';
 
 
 	$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-- 
cgit v1.2.3


From 21165f5f200b122389ef3feb9a23e647a64fa46b Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Fri, 5 Jun 2009 19:47:32 +0000
Subject: sanitize watermark base filename to support spaces in username

---
 lib/watermark.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/watermark.php b/lib/watermark.php
index 4aa719aea..ddc41a36b 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -30,6 +30,7 @@ function tp_watermark($thumbs) {
 			
 			$user_stamp_base = tp_get_img_dir();
 			$user_stamp_base .= strtolower($viewer->name . "_" . $watermark_filename . "_stamp");
+			$user_stamp_base .= preg_replace("/[^\w-]+/", "-", $user_stamp_base);
 			
 			if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
 				$commands = array();
-- 
cgit v1.2.3


From 529d3775aba062679fcfcfe848e41a31328e86e8 Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Fri, 5 Jun 2009 20:57:31 +0000
Subject: added a bunch of new pages based on comments and views, none of these
 are in the default menus, must hit the mostvieweddashboard manually, these
 are more admin type pages

---
 languages/en.php                 |  8 +++++++
 mostcommentedimages.php          | 43 ++++++++++++++++++++++++++++++++++
 mostcommentedimagesthismonth.php | 50 ++++++++++++++++++++++++++++++++++++++++
 mostcommentedimagestoday.php     | 50 ++++++++++++++++++++++++++++++++++++++++
 mostvieweddashboard.php          | 44 +++++++++++++++++++++++++++++++++++
 mostviewedimageslastmonth.php    | 50 ++++++++++++++++++++++++++++++++++++++++
 mostviewedimagesthismonth.php    | 50 ++++++++++++++++++++++++++++++++++++++++
 mostviewedimagesthisyear.php     | 50 ++++++++++++++++++++++++++++++++++++++++
 mostviewedimagestoday.php        | 50 ++++++++++++++++++++++++++++++++++++++++
 start.php                        | 18 ++++++++++++++-
 10 files changed, 412 insertions(+), 1 deletion(-)
 create mode 100644 mostcommentedimages.php
 create mode 100644 mostcommentedimagesthismonth.php
 create mode 100644 mostcommentedimagestoday.php
 create mode 100644 mostvieweddashboard.php
 create mode 100644 mostviewedimageslastmonth.php
 create mode 100644 mostviewedimagesthismonth.php
 create mode 100644 mostviewedimagesthisyear.php
 create mode 100644 mostviewedimagestoday.php

diff --git a/languages/en.php b/languages/en.php
index 432da458d..6b2281110 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -21,7 +21,15 @@
 			'item:object:album' => "Albums",
 			'tidypics:enablephotos' => 'Enable Group Photo Albums',
 			'tidypics:editprops' => 'Edit Image Properties',
+			'tidypics:mostcommented' => 'Most commented images',
+			'tidypics:mostcommentedthismonth' => 'Most commented this month',
+			'tidypics:mostcommentedtoday' => 'Most commented today',
 			'tidypics:mostviewed' => 'Most viewed images',
+			'tidypics:mostvieweddashboard' => 'Most viewed dashboard',
+			'tidypics:mostviewedthisyear' => 'Most viewed this year',
+			'tidypics:mostviewedthismonth' => 'Most viewed this month',
+			'tidypics:mostviewedlastmonth' => 'Most viewed last month',
+			'tidypics:mostviewedtoday' => 'Most viewed today',
 			'tidypics:recentlyviewed' => 'Recently viewed images',
 			'tidypics:mostrecent' => 'Most recent images',
 			'tidypics:yourmostviewed' => 'Your most viewed images',
diff --git a/mostcommentedimages.php b/mostcommentedimages.php
new file mode 100644
index 000000000..b3a36a9ac
--- /dev/null
+++ b/mostcommentedimages.php
@@ -0,0 +1,43 @@
+dbprefix;
+	$max = 24;
+	
+	//this works but is wildly inefficient
+	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+	
+	$sql = "SELECT ent.guid, count( * ) AS views
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'generic_comment'
+			GROUP BY ent.guid
+			ORDER BY views DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	tidypics_mostviewed_submenus();
+	$title = elgg_echo("tidypics:mostcommented");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mostcommentedimagesthismonth.php b/mostcommentedimagesthismonth.php
new file mode 100644
index 000000000..c47cee2da
--- /dev/null
+++ b/mostcommentedimagesthismonth.php
@@ -0,0 +1,50 @@
+dbprefix;
+	$max = 24;
+	
+	
+	//find timestamps for first and last days of this month
+	$time_info = new stdClass();
+	$time_info->start = mktime(0,0,0, date("m"), 1, date("Y"));
+	$time_info->end = mktime();
+	
+	//this works but is wildly inefficient
+	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+	
+	$sql = "SELECT ent.guid, count( * ) AS views
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'generic_comment'
+			WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end
+			GROUP BY ent.guid
+			ORDER BY views DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	tidypics_mostviewed_submenus();
+	$title = elgg_echo("tidypics:mostcommentedthismonth");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mostcommentedimagestoday.php b/mostcommentedimagestoday.php
new file mode 100644
index 000000000..ce0ad8aeb
--- /dev/null
+++ b/mostcommentedimagestoday.php
@@ -0,0 +1,50 @@
+dbprefix;
+	$max = 24;
+	
+	
+	//find timestamps for today
+	$time_info = new stdClass();
+	$time_info->start = mktime(0,0,0, date("m"), 1, date("Y"));
+	$time_info->end = mktime();
+	
+	//this works but is wildly inefficient
+	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+	
+	$sql = "SELECT ent.guid, count( * ) AS views
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'generic_comment'
+			WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end
+			GROUP BY ent.guid
+			ORDER BY views DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	tidypics_mostviewed_submenus();
+	$title = elgg_echo("tidypics:mostcommentedtoday");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mostvieweddashboard.php b/mostvieweddashboard.php
new file mode 100644
index 000000000..eef5a15ac
--- /dev/null
+++ b/mostvieweddashboard.php
@@ -0,0 +1,44 @@
+dbprefix;
+	$max = 24;
+	
+	//this works but is wildly inefficient
+	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+	
+	$sql = "SELECT ent.guid, count( * ) AS views
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'tp_view'
+			GROUP BY ent.guid
+			ORDER BY views DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	tidypics_mostviewed_submenus();
+	
+	$title = elgg_echo("tidypics:mostvieweddashboard");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mostviewedimageslastmonth.php b/mostviewedimageslastmonth.php
new file mode 100644
index 000000000..157738d8a
--- /dev/null
+++ b/mostviewedimageslastmonth.php
@@ -0,0 +1,50 @@
+dbprefix;
+	$max = 24;
+	
+	
+	//find timestamps for first and last days of last month
+	$time_info = new stdClass();
+	$time_info->start = strtotime("-1 months", mktime(0,0,0, date("m"), 1, date("Y")));
+	$time_info->end = mktime(0,0,0,date("m"), 0, date("Y"));
+	
+	//this works but is wildly inefficient
+	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+	
+	$sql = "SELECT ent.guid, count( * ) AS views
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'tp_view'
+			WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end
+			GROUP BY ent.guid
+			ORDER BY views DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	tidypics_mostviewed_submenus();
+	$title = elgg_echo("tidypics:mostviewedlastmonth");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mostviewedimagesthismonth.php b/mostviewedimagesthismonth.php
new file mode 100644
index 000000000..5bc9c7151
--- /dev/null
+++ b/mostviewedimagesthismonth.php
@@ -0,0 +1,50 @@
+dbprefix;
+	$max = 24;
+	
+	
+	//find timestamps for first and last days of this month
+	$time_info = new stdClass();
+	$time_info->start = mktime(0,0,0, date("m"), 1, date("Y"));
+	$time_info->end = mktime();
+	
+	//this works but is wildly inefficient
+	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+	
+	$sql = "SELECT ent.guid, count( * ) AS views
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'tp_view'
+			WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end
+			GROUP BY ent.guid
+			ORDER BY views DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	tidypics_mostviewed_submenus();
+	$title = elgg_echo("tidypics:mostviewedthismonth");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mostviewedimagesthisyear.php b/mostviewedimagesthisyear.php
new file mode 100644
index 000000000..d0f246634
--- /dev/null
+++ b/mostviewedimagesthisyear.php
@@ -0,0 +1,50 @@
+dbprefix;
+	$max = 24;
+	
+	
+	//find timestamps for first day of the year and current date
+	$time_info = new stdClass();
+	$time_info->start = mktime(0,0,0, 1, 1, date("Y"));
+	$time_info->end = mktime();
+	
+	//this works but is wildly inefficient
+	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+	
+	$sql = "SELECT ent.guid, count( * ) AS views
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'tp_view'
+			WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end
+			GROUP BY ent.guid
+			ORDER BY views DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	tidypics_mostviewed_submenus();
+	$title = elgg_echo("tidypics:mostviewedthisyear");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/mostviewedimagestoday.php b/mostviewedimagestoday.php
new file mode 100644
index 000000000..9f7c10113
--- /dev/null
+++ b/mostviewedimagestoday.php
@@ -0,0 +1,50 @@
+dbprefix;
+	$max = 24;
+	
+	
+	//find timestamps for today
+	$time_info = new stdClass();
+	$time_info->start = mktime(0,0,0, date("m"), 1, date("Y"));
+	$time_info->end = mktime();
+	
+	//this works but is wildly inefficient
+	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+	
+	$sql = "SELECT ent.guid, count( * ) AS views
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'tp_view'
+			WHERE ann1.time_created BETWEEN $time_info->start AND $time_info->end
+			GROUP BY ent.guid
+			ORDER BY views DESC
+			LIMIT $max";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		$entities[] = get_entity($entity->guid);
+	}
+	
+	tidypics_mostviewed_submenus();
+	$title = elgg_echo("tidypics:mostviewedtoday");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 374b99b99..b812bfb8c 100644
--- a/start.php
+++ b/start.php
@@ -153,7 +153,23 @@
 		}
 		
 	}
-
+	
+	/**
+	 * Sets up submenus for tidypics most viewed pages
+	 */
+	function tidypics_mostviewed_submenus() {
+		
+		global $CONFIG;
+		
+		add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostviewed.php");
+		add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/mostviewedimagesthisyear.php");
+		add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/mostviewedimagesthismonth.php");
+		add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/mostviewedimageslastmonth.php");
+		add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/mostviewedimageslastmonth.php");
+		add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/mostcommentedimages.php");
+		add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/mostcommentedimagesthismonth.php");
+		add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/mostcommentedimagestoday.php");
+	}
 	/**
 	 * Sets up tidypics admin menu. Triggered on pagesetup.
 	 */
-- 
cgit v1.2.3


From f74bc83e4e4788efb7abdfc909abdef62e6d4394 Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Fri, 5 Jun 2009 21:15:51 +0000
Subject: fixed typo

---
 start.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.php b/start.php
index b812bfb8c..6dc283ba0 100644
--- a/start.php
+++ b/start.php
@@ -165,7 +165,7 @@
 		add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/mostviewedimagesthisyear.php");
 		add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/mostviewedimagesthismonth.php");
 		add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/mostviewedimageslastmonth.php");
-		add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/mostviewedimageslastmonth.php");
+		add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/mostviewedimagestoday.php");
 		add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/mostcommentedimages.php");
 		add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/mostcommentedimagesthismonth.php");
 		add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/mostcommentedimagestoday.php");
-- 
cgit v1.2.3


From 37e5df33a788fb4eaacc15076efd01776f297f21 Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Fri, 5 Jun 2009 21:16:26 +0000
Subject: fixed typo again

---
 start.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.php b/start.php
index 6dc283ba0..3a78700c6 100644
--- a/start.php
+++ b/start.php
@@ -161,7 +161,7 @@
 		
 		global $CONFIG;
 		
-		add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostviewed.php");
+		add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostvieweddashboard.php");
 		add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/mostviewedimagesthisyear.php");
 		add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/mostviewedimagesthismonth.php");
 		add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/mostviewedimageslastmonth.php");
-- 
cgit v1.2.3


From b1ec29e1f220e64a6b2ac73d95b847b0b9033a9d Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Sat, 6 Jun 2009 13:23:32 +0000
Subject: fixed daily timestamp generation

---
 mostcommentedimagestoday.php | 2 +-
 mostviewedimagestoday.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mostcommentedimagestoday.php b/mostcommentedimagestoday.php
index ce0ad8aeb..066feb45e 100644
--- a/mostcommentedimagestoday.php
+++ b/mostcommentedimagestoday.php
@@ -16,7 +16,7 @@
 	
 	//find timestamps for today
 	$time_info = new stdClass();
-	$time_info->start = mktime(0,0,0, date("m"), 1, date("Y"));
+	$time_info->start = mktime(0,0,0, date("m"), date("d"), date("Y"));
 	$time_info->end = mktime();
 	
 	//this works but is wildly inefficient
diff --git a/mostviewedimagestoday.php b/mostviewedimagestoday.php
index 9f7c10113..04f051317 100644
--- a/mostviewedimagestoday.php
+++ b/mostviewedimagestoday.php
@@ -14,9 +14,9 @@
 	$max = 24;
 	
 	
-	//find timestamps for today
+	//find timestamps for today 
 	$time_info = new stdClass();
-	$time_info->start = mktime(0,0,0, date("m"), 1, date("Y"));
+	$time_info->start = mktime(0,0,0, date("m"), date("d"), date("Y"));
 	$time_info->end = mktime();
 	
 	//this works but is wildly inefficient
-- 
cgit v1.2.3


From 8ef053df0c982c2e2ffddc04a89b578ec36ec969 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Jun 2009 20:14:42 +0000
Subject: added admin setting for exif

---
 actions/settings.php                   | 5 +++++
 languages/en.php                       | 1 +
 views/default/object/image.php         | 3 +++
 views/default/tidypics/forms/admin.php | 5 +++++
 4 files changed, 14 insertions(+)

diff --git a/actions/settings.php b/actions/settings.php
index 29a77577f..79839ceef 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -31,6 +31,11 @@
 	else
 		set_plugin_setting('tagging', 'disabled', 'tidypics');
 
+	if (is_array(get_input('exif')))
+		set_plugin_setting('exif', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('exif', 'disabled', 'tidypics');
+
 
 	// image sizes
 	$image_sizes = array();
diff --git a/languages/en.php b/languages/en.php
index 6b2281110..863fe554e 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -44,6 +44,7 @@
 			'tidypics:settings:image_lib' => "Image Library: ",
 			'tidypics:settings:download_link' => "Show download link",
 			'tidypics:settings:tagging' => "Enable photo tagging",
+			'tidypics:settings:exif' => "Show EXIF data",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 5787bb39f..21ee3ff1d 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -187,6 +187,8 @@ if ($photo_tags) {
 															'owner' => $owner, ) );
 			}
 			
+			
+			if (get_plugin_setting('exif', 'tidypics') != "disabled") {
 ?>
 			
      
 				
 			
      
+
 		
      
 
 			
       $tags));?>
      
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index c5e7c68d0..d4c9e1b5b 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -45,6 +45,11 @@
 	if(!$download_link) $download_link = "enabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
 
+	// Show EXIF
+	$exif = $plugin->exif;
+	if(!$exif) $exif = "disabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
+
 	// Watermark Text
 	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
-- 
cgit v1.2.3


From 81cb128025f2b5527ac83498a97847aca8309267 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Jun 2009 22:25:14 +0000
Subject: added PHP ImageMagick resizing - needs more testing and determining
 how much memory it needs

---
 actions/upload.php                     |  11 +-
 lib/resize.php                         | 301 ++++++++++++++++++++++++++++++---
 views/default/tidypics/forms/admin.php |   4 +-
 3 files changed, 288 insertions(+), 28 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index 11290a1d8..8f84ea929 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -99,16 +99,15 @@
 				trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
 				continue;
 			}
-		} else if ($image_lib === 'ImageMagick') {  // this will be for PHP ImageMagick
-/*
+		} else if ($image_lib === 'ImageMagickPHP') {  
 			$mem_required = 5 * $imginfo[0] * $imginfo[1];
 			$mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer
 			if ($mem_required > $mem_avail) {
 				array_push($not_uploaded, $sent_file['name']);
+				array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
 				trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
 				continue;
 			}
-*/
 		}
 
 		//this will save to users folder in /image/ and organize by photo album
@@ -141,12 +140,12 @@
 				trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);
 			}
 			
-		} else if ($image_lib === 'ToDo:ImageMagick') {  // ImageMagick PHP 
-/*
+		} else if ($image_lib === 'ImageMagickPHP') {  // ImageMagick PHP 
+
 			if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
 				trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);
 			}
-*/
+
 		} else { // ImageMagick command line
 
 			$thumbs = tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename);
diff --git a/lib/resize.php b/lib/resize.php
index 186900f7d..19af7b451 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -27,10 +27,10 @@
 		$image_sizes = unserialize($image_sizes);
 		
 		// Generate thumbnails
-		$thumbnail = get_resized_image_from_existing_file(	$file->getFilenameOnFilestore(),
-															$image_sizes['thumb_image_width'],
-															$image_sizes['thumb_image_height'], 
-															true); 
+		$thumbnail = tp_gd_resize(	$file->getFilenameOnFilestore(),
+									$image_sizes['thumb_image_width'],
+									$image_sizes['thumb_image_height'], 
+									true); 
 
 		if ($thumbnail) {
 			$thumb = new ElggFile();
@@ -47,10 +47,10 @@
 		}
 		unset($thumbnail);
 		
-		$thumbsmall = get_resized_image_from_existing_file(	$file->getFilenameOnFilestore(),
-															$image_sizes['small_image_width'],
-															$image_sizes['small_image_height'], 
-															true); 
+		$thumbsmall = tp_gd_resize(	$file->getFilenameOnFilestore(),
+									$image_sizes['small_image_width'],
+									$image_sizes['small_image_height'], 
+									true); 
 
 		
 		if ($thumbsmall) {
@@ -68,10 +68,10 @@
 		}
 		unset($thumbsmall);
 
-		$thumblarge = get_resized_image_from_existing_file(	$file->getFilenameOnFilestore(),
-															$image_sizes['large_image_width'],
-															$image_sizes['large_image_height'], 
-															false); 
+		$thumblarge = tp_gd_resize(	$file->getFilenameOnFilestore(),
+									$image_sizes['large_image_width'],
+									$image_sizes['large_image_height'], 
+									false); 
 		
 		if ($thumblarge) {
 			$thumb = new ElggFile();
@@ -91,6 +91,108 @@
 		return true;
 	}
 
+	/**
+	 * Gets the jpeg contents of the resized version of an already uploaded image - original from Elgg filestore.php 
+	 * (Returns false if the uploaded file was not an image)
+	 *
+	 * @param string $input_name The name of the file input field on the submission form
+	 * @param int $maxwidth The maximum width of the resized image
+	 * @param int $maxheight The maximum height of the resized image
+	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+	 * @return false|mixed The contents of the resized image, or false on failure
+	 */
+	function tp_gd_resize($input_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+		
+		// Get the size information from the image
+		if ($imgsizearray = getimagesize($input_name)) {
+		
+			// Get width and height
+			$width = $imgsizearray[0];
+			$height = $imgsizearray[1];
+			$newwidth = $width;
+			$newheight = $height;
+			
+			// Square the image dimensions if we're wanting a square image
+			if ($square) {
+				if ($width < $height) {
+					$height = $width;
+				} else {
+					$width = $height;
+				}
+				
+				$newwidth = $width;
+				$newheight = $height;
+				
+			}
+			
+			if ($width > $maxwidth) {
+				$newheight = floor($height * ($maxwidth / $width));
+				$newwidth = $maxwidth;
+			}
+			if ($newheight > $maxheight) {
+				$newwidth = floor($newwidth * ($maxheight / $newheight));
+				$newheight = $maxheight; 
+			}
+			
+			$accepted_formats = array(
+											'image/jpeg' => 'jpeg',
+											'image/png' => 'png',
+											'image/gif' => 'gif'
+									);
+			
+			// If it's a file we can manipulate ...
+			if (array_key_exists($imgsizearray['mime'],$accepted_formats)) {
+
+				$function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']];
+				$newimage = imagecreatetruecolor($newwidth,$newheight);
+				
+				if (is_callable($function) && $oldimage = $function($input_name)) {
+ 				
+					// Crop the image if we need a square
+					if ($square) {
+						if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+							$widthoffset = floor(($imgsizearray[0] - $width) / 2);
+							$heightoffset = floor(($imgsizearray[1] - $height) / 2);
+						} else {
+							$widthoffset = $x1;
+							$heightoffset = $y1;
+							$width = ($x2 - $x1);
+							$height = $width;
+						}
+					} else {
+						if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+							$widthoffset = 0;
+							$heightoffset = 0;
+						} else {
+							$widthoffset = $x1;
+							$heightoffset = $y1;
+							$width = ($x2 - $x1);
+							$height = ($y2 - $y1);
+						}
+					}
+					
+					if ($square) {
+						$newheight = $maxheight;
+						$newwidth = $maxwidth;
+					}
+					
+					imagecopyresampled($newimage, $oldimage, 0,0,$widthoffset,$heightoffset,$newwidth,$newheight,$width,$height);
+					
+					ob_start();
+					imagejpeg($newimage, null, 90);
+					$jpeg = ob_get_clean();
+					return $jpeg;
+					
+				}
+				
+			}
+			
+		}
+			
+		return false;
+	}
+
+
 	/**
 	 * Create thumbnails using PHP ImageMagick Library
 	 *
@@ -101,13 +203,172 @@
 	 */
 	function tp_create_imagick_thumbnails($file, $prefix, $filestorename)
 	{
-		global $CONFIG;
+		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
+		if (!$image_sizes) {
+			register_error(elgg_echo('tidypics:nosettings'));
+			return false;
+		}
+		$image_sizes = unserialize($image_sizes);
+
+		$thumb = new ElggFile();
+
+
+		// tiny thumbnail
+		$thumb->setFilename($prefix."thumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
+										$thumbname,
+										$image_sizes['thumb_image_width'],
+										$image_sizes['thumb_image_height'], 
+										true);
+		if (!$rtn_code)
+			return false;
+		$file->thumbnail = $prefix."thumb".$filestorename;
+
+
+		// album thumbnail
+		$thumb->setFilename($prefix."smallthumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
+										$thumbname,
+										$image_sizes['small_image_width'],
+										$image_sizes['small_image_height'], 
+										true); 
+		if (!$rtn_code)
+			return false;
+		$file->smallthumb = $prefix."smallthumb".$filestorename;
+
+
+		// main image
+		$thumb->setFilename($prefix."largethumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
+										$thumbname,
+										$image_sizes['large_image_width'],
+										$image_sizes['large_image_height'], 
+										true); 
+		if (!$rtn_code)
+			return false;
+		$file->largethumb = $prefix."largethumb".$filestorename;
+
+		unset($thumb);
+
+		return true;
+	}
+
+	
+	/**
+	 * Resize using PHP ImageMagick Library
+	 *
+	 * Gets the jpeg contents of the resized version of an already uploaded image
+	 * (Returns false if the uploaded file was not an image)
+	 *
+	 * @param string $input_name The name of the file input field on the submission form
+	 * @param string $output_name The name of the file to be written
+	 * @param int $maxwidth The maximum width of the resized image
+	 * @param int $maxheight The maximum height of the resized image
+	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+	 * @return false|mixed The contents of the resized image, or false on failure
+	 */
+	function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 		
-		$mime = $file->getMimeType();
+		// Get the size information from the image
+		$imgsizearray = getimagesize($input_name);
+		if (!$imgsizearray)
+			return false;
 		
-		return false; // not implemented yet
-	}
+		$accepted_formats = array(
+										'image/jpeg' => 'jpeg',
+										'image/png' => 'png',
+										'image/gif' => 'gif'
+								);
+		
+		// test if it's a file we can manipulate ...
+		if (!array_key_exists($imgsizearray['mime'],$accepted_formats))
+			return false;
 
+		// Get width and height
+		$width = $imgsizearray[0];
+		$height = $imgsizearray[1];
+		$newwidth = $width;
+		$newheight = $height;
+		
+		// initial guess at final dimensions for new image (doesn't check for squareness yet
+		if ($newwidth > $maxwidth) {
+			$newheight = floor($newheight * ($maxwidth / $newwidth));
+			$newwidth = $maxwidth;
+		}
+		if ($newheight > $maxheight) {
+			$newwidth = floor($newwidth * ($maxheight / $newheight));
+			$newheight = $maxheight; 
+		}
+		
+		// Handle squareness for both original and new image
+		if ($square) {
+			if ($width < $height) {
+				$height = $width;
+			} else {
+				$width = $height;
+			}
+			
+			// if input arguments = square, no need to use above calculations (which can have round-off errors)
+			if ($maxheight == $maxwidth) {
+				$newwidth = $maxwidth;
+				$newheight = $maxheight;
+			} else {
+				if ($newwidth < $newheight) {
+					$newheight = $newwidth;
+				} else {
+					$newwidth = $newheight;
+				}
+			}
+		}
+		
+		
+		// Crop the original image - this needs to be checked over
+		if ($square) {
+			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+				$xoffset = floor(($imgsizearray[0] - $width) / 2);
+				$yoffset = floor(($imgsizearray[1] - $height) / 2);
+			} else { // assume we're being passed good croping coordinates
+				$xoffset = $x1;
+				$yoffset = $y1;
+				$width = ($x2 - $x1);
+				$height = $width;
+			}
+		} else {
+			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+				$xoffset = 0;
+				$yoffset = 0;
+			} else {
+				$xoffset = $x1;
+				$yoffset = $y1;
+				$width = ($x2 - $x1);
+				$height = ($y2 - $y1);
+			}
+		}
+
+
+		try {
+			$img = new Imagick($input_name);
+		} catch (ImagickException $e) {
+			return false;
+		}
+		
+		$img->cropImage($width, $height, $xoffset, $yoffset);
+		
+		// use the default IM filter (windowing filter), I think 1 means default blurring or number of lobes
+		$img->resizeImage($newwidth, $newheight, imagick::FILTER_LANCZOS, 1);
+		
+		if ($img->writeImage($output_name) != true) {
+			$img->destroy();
+			return false;
+		}
+		
+		$img->destroy();
+		
+		return true;
+	}
 
 	/**
 	 * Create thumbnails using ImageMagick executables
@@ -130,19 +391,19 @@
 		}
 		$image_sizes = unserialize($image_sizes);
 		
-		$thumblarge = tp_imagick_resize($file->getFilenameOnFilestore(), 
+		$thumblarge = tp_imagick_cmdline_resize($file->getFilenameOnFilestore(), 
 								"largethumb", 
 								$image_sizes['large_image_width'], 
 								$image_sizes['large_image_height'], 
 								false); 
 									
-		$thumbsmall = tp_imagick_resize($file->getFilenameOnFilestore(), 
+		$thumbsmall = tp_imagick_cmdline_resize($file->getFilenameOnFilestore(), 
 								"smallthumb", 
 								$image_sizes['small_image_width'], 
 								$image_sizes['small_image_height'], 
 								true); 
 
-		$thumbnail = tp_imagick_resize($file->getFilenameOnFilestore(), 
+		$thumbnail = tp_imagick_cmdline_resize($file->getFilenameOnFilestore(), 
 								"thumb", 
 								$image_sizes['thumb_image_width'], 
 								$image_sizes['thumb_image_height'], 
@@ -185,7 +446,7 @@
 	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
 	 * @return false|mixed The contents of the resized image, or false on failure
 	 */
-	function tp_imagick_resize($input_name, $prefix, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+	function tp_imagick_cmdline_resize($input_name, $prefix, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 
 		$params = array(
 			"input_name"=>$input_name,
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index d4c9e1b5b..af84def00 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -22,8 +22,8 @@
 					'internalname' => 'params[image_lib]',
 					'options_values' => array(
 						'GD' => 'GD',
-						'ImageMagick' => 'ImageMagick2',
-						'ImageMagick Cmdline' => 'ImageMagick',
+						'ImageMagickPHP' => 'ImageMagick',
+						'ImageMagick' => 'ImageMagick Cmdline',
 					),
 					'value' => $image_lib
 	));
-- 
cgit v1.2.3


From 4f5380ec889e89958dbab6cb45a2436743ae8c33 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Jun 2009 23:57:56 +0000
Subject: can now turn off group permissions override - menus are still
 available though

---
 actions/settings.php                   | 5 +++++
 languages/en.php                       | 1 +
 start.php                              | 3 ++-
 views/default/tidypics/forms/admin.php | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/actions/settings.php b/actions/settings.php
index 79839ceef..23fade8d9 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -36,6 +36,11 @@
 	else
 		set_plugin_setting('exif', 'disabled', 'tidypics');
 
+	if (is_array(get_input('grp_perm_override')))
+		set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('grp_perm_override', 'disabled', 'tidypics');
+
 
 	// image sizes
 	$image_sizes = array();
diff --git a/languages/en.php b/languages/en.php
index 863fe554e..1b760e7a7 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -45,6 +45,7 @@
 			'tidypics:settings:download_link' => "Show download link",
 			'tidypics:settings:tagging' => "Enable photo tagging",
 			'tidypics:settings:exif' => "Show EXIF data",
+			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
diff --git a/start.php b/start.php
index 3a78700c6..2d4d40782 100644
--- a/start.php
+++ b/start.php
@@ -49,7 +49,8 @@
 		if (function_exists('add_group_tool_option'))
 			add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true);
 		
-		register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');
+		if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled")
+			register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');
 		
 		// Register for notifications 
 		if (is_callable('register_notification_object')) {
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index af84def00..64e1ed3d1 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -96,6 +96,11 @@
 	$form_body .= 'height: 
      ';
 
 
+	// Group permission override
+	$grp_perm_override = $plugin->grp_perm_override;
+	if(!$grp_perm_override) $grp_perm_override = "enabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
+
 	$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
 	
 	echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
\ No newline at end of file
-- 
cgit v1.2.3


From 39f644c75a545249a2cdaa490b5beb58795529a3 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 7 Jun 2009 00:09:09 +0000
Subject: fixed bug in IM php resize code

---
 lib/resize.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/resize.php b/lib/resize.php
index 19af7b451..e3facf614 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -246,7 +246,7 @@
 										$thumbname,
 										$image_sizes['large_image_width'],
 										$image_sizes['large_image_height'], 
-										true); 
+										false); 
 		if (!$rtn_code)
 			return false;
 		$file->largethumb = $prefix."largethumb".$filestorename;
@@ -311,8 +311,8 @@
 				$width = $height;
 			}
 			
-			// if input arguments = square, no need to use above calculations (which can have round-off errors)
 			if ($maxheight == $maxwidth) {
+				// if input arguments = square, no need to use above calculations (which can have round-off errors)
 				$newwidth = $maxwidth;
 				$newheight = $maxheight;
 			} else {
-- 
cgit v1.2.3


From 23b24f6adb289b6a7c1fe475c4068f2f99130ce7 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 7 Jun 2009 00:20:23 +0000
Subject: fixed minor issue with uploading png from IE7

---
 actions/upload.php | 13 +++++++++++--
 lib/resize.php     |  9 ---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index 8f84ea929..da8af6e69 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -49,6 +49,15 @@
 	$error_msgs = array();
 	
 	$river_view = get_plugin_setting('river_view', 'tidypics');
+	
+	$accepted_formats = array(
+								'image/jpeg',
+								'image/png',
+								'image/gif',
+								'image/pjpeg',
+								'image/x-png',
+								);
+
 
 	foreach($_FILES as $key => $sent_file) {
 		
@@ -58,7 +67,7 @@
 		
 		$name = $sent_file['name'];
 		$mime = $sent_file['type'];
-		
+
 		if ($sent_file['error']) {
 			array_push($not_uploaded, $sent_file['name']);
 			if ($sent_file['error'] == 1) {
@@ -72,7 +81,7 @@
 		}
 		
 		//make sure file is an image
-		if ($mime != 'image/jpeg' && $mime != 'image/gif' && $mime != 'image/png' && $mime != 'image/pjpeg') {
+		if (!in_array($mime, $accepted_formats)) {
 			array_push($not_uploaded, $sent_file['name']);
 			array_push($error_msgs, elgg_echo('tidypics:not_image'));
 			continue;
diff --git a/lib/resize.php b/lib/resize.php
index e3facf614..974f32e9e 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -277,15 +277,6 @@
 		if (!$imgsizearray)
 			return false;
 		
-		$accepted_formats = array(
-										'image/jpeg' => 'jpeg',
-										'image/png' => 'png',
-										'image/gif' => 'gif'
-								);
-		
-		// test if it's a file we can manipulate ...
-		if (!array_key_exists($imgsizearray['mime'],$accepted_formats))
-			return false;
 
 		// Get width and height
 		$width = $imgsizearray[0];
-- 
cgit v1.2.3


From b2ef95042c8335e75657b29f6dabbec4d0266426 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 7 Jun 2009 01:28:16 +0000
Subject: improved exif code - catching pngs, gifs, etc The display code should
 be moved to a view to keep it separate from the controller code

---
 actions/upload.php |  2 +-
 lib/exif.php       | 27 +++++++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index da8af6e69..717c3274f 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -174,7 +174,7 @@
 		}
 
 		//get and store the exif data
-		td_get_exif($file);	
+		td_get_exif($file);
 		array_push($uploaded_images, $file->guid);
 
 		if($river_view == "all") {
diff --git a/lib/exif.php b/lib/exif.php
index 1bebb5fdc..5382fbc9f 100644
--- a/lib/exif.php
+++ b/lib/exif.php
@@ -1,27 +1,39 @@
 mimetype;
+	if ($mime != 'image/jpeg' && $mime != 'image/pjpeg')
+		return;
+
 	$filename = $file->getFilenameOnFilestore();
 	$exif = exif_read_data($filename);
-	create_metadata($file->getGUID(), "tp_exif", serialize($exif), "string", $file->getObjectOwnerGUID(), 2);
+	create_metadata($file->getGUID(), "tp_exif", serialize($exif), "string", $file->getObjectOwnerGUID(), ACCESS_PUBLIC);
 }
 
 function tp_exif_formatted($file_guid) {
+
 	$metadata_exif = get_metadata_byname($file_guid, "tp_exif");
 	if(!$metadata_exif) { //try to load it from the file if its not in the database
-		td_get_exif($file_guid);
+		$file = new ElggFile($file_guid);
+		td_get_exif($file);
+		unset($file);
 		$metadata_exif = get_metadata_byname($file_guid, "tp_exif");
 	}
 	
 	if($metadata_exif) {
+
 		$exif = unserialize($metadata_exif["value"]);
 		
 		//got the code snippet below from http://www.zenphoto.org/support/topic.php?id=17
 		//convert the raw values to understandible values
 		$Fnumber = explode("/", $exif['FNumber']);
-		$Fnumber = $Fnumber[0] / $Fnumber[1];
+		
+		if ($Fnumber[1] != 0)
+			$Fnumber = $Fnumber[0] / $Fnumber[1];
+		else
+			$Fnumber = 0;
+		
 		if(!$Fnumber) {
 			$Fnumber = "N/A";
 		} else {
@@ -29,7 +41,10 @@ function tp_exif_formatted($file_guid) {
 		}
 		
 		$Focal = explode("/", $exif['FocalLength']);
-		$Focal = $Focal[0] / $Focal[1];
+		if ($Focal[1] != 0)
+			$Focal = $Focal[0] / $Focal[1];
+		else
+			$Focal = 0;
 		if(!$Focal || round($Focal) == "0") $Focal = 0;
 		if(round($Focal) == 0) {
 			$Focal = "N/A";
-- 
cgit v1.2.3


From 71158a9840832aefde1c725b4adc56133dc30dfe Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 7 Jun 2009 01:57:07 +0000
Subject: moved highest rated images in the submenu

---
 languages/en.php               | 2 +-
 views/default/object/album.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 1b760e7a7..8adcd7577 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -36,7 +36,7 @@
 			'tidypics:yourmostrecent' => 'Your most recent images',
 			'tidypics:friendmostviewed' => "%s's most viewed images",
 			'tidypics:friendmostrecent' => "%s's most recent images",
-			'tidypics:highestrated' => "Highest Rated Images",
+			'tidypics:highestrated' => "Highest rated images",
 	
 		//settings
 			'tidypics:adminsettings' => 'Tidypics Settings',
diff --git a/views/default/object/album.php b/views/default/object/album.php
index acceaac91..81266e0fd 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -61,7 +61,8 @@
 		$page = get_input("page");
 		list($album_placeholder, $album_id, $album_title) = split("/", $page);
 		add_submenu_item(	elgg_echo("tidypics:highestrated"),
-							$CONFIG->wwwroot . "pg/photos/highestrated/group:" . $album_id);
+							$CONFIG->wwwroot . "pg/photos/highestrated/group:" . $album_id,
+							'photos');
 ?>
 
      
 	
      
-- 
cgit v1.2.3


From 28de8d490b284551867be1153747c29a8d59b13c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 7 Jun 2009 02:11:56 +0000
Subject: fixed minor display issue for album view when no tags

---
 views/default/object/album.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 81266e0fd..9a34e3d5f 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -90,7 +90,9 @@
 ?>
 	
      
 	
      
-		
       $tags));?>
      	
+
+			
       $tags));?>
      
+
 		 name; ?>  
      
 		 
      		
 	
      
-- 
cgit v1.2.3


From 4c9f7458a2c6be523dc98cdb9e94af3242a16b9c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 7 Jun 2009 21:27:47 +0000
Subject: added option for turning off ratings

---
 actions/settings.php                   | 9 +++++++--
 languages/en.php                       | 1 +
 views/default/object/image.php         | 9 ++++++---
 views/default/tidypics/forms/admin.php | 5 +++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/actions/settings.php b/actions/settings.php
index 23fade8d9..903802dd8 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -25,13 +25,18 @@
 		set_plugin_setting('download_link', 'enabled', 'tidypics');
 	else
 		set_plugin_setting('download_link', 'disabled', 'tidypics');
-	
+
 	if (is_array(get_input('tagging')))
 		set_plugin_setting('tagging', 'enabled', 'tidypics');
 	else
 		set_plugin_setting('tagging', 'disabled', 'tidypics');
 
-	if (is_array(get_input('exif')))
+	if (is_array(get_input('photo_ratings')))
+		set_plugin_setting('photo_ratings', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('photo_ratings', 'disabled', 'tidypics');
+
+		if (is_array(get_input('exif')))
 		set_plugin_setting('exif', 'enabled', 'tidypics');
 	else
 		set_plugin_setting('exif', 'disabled', 'tidypics');
diff --git a/languages/en.php b/languages/en.php
index 8adcd7577..b85ca205b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -44,6 +44,7 @@
 			'tidypics:settings:image_lib' => "Image Library: ",
 			'tidypics:settings:download_link' => "Show download link",
 			'tidypics:settings:tagging' => "Enable photo tagging",
+			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or comptabile)",
 			'tidypics:settings:exif' => "Show EXIF data",
 			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 21ee3ff1d..ebac9c775 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -200,12 +200,15 @@ if ($photo_tags) {
 		
      
 
 			
       $tags));?>
      
-
-
      
+
+			
      
 	 $vars['entity'])); ?>
 
      
  name; ?>  
 		
      
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 64e1ed3d1..c5d71409c 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -45,6 +45,11 @@
 	if(!$download_link) $download_link = "enabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
 
+	// Download Link
+	$photo_ratings = $plugin->photo_ratings;
+	if(!$photo_ratings) $photo_ratings = "disabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
+
 	// Show EXIF
 	$exif = $plugin->exif;
 	if(!$exif) $exif = "disabled";
-- 
cgit v1.2.3


From b3e029b15269068cfef4104c6df8988db2418edd Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 7 Jun 2009 22:18:22 +0000
Subject: minor tweak to language file

---
 languages/en.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages/en.php b/languages/en.php
index b85ca205b..18259fc52 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -48,7 +48,7 @@
 			'tidypics:settings:exif' => "Show EXIF data",
 			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
-			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick must be selected for the image library",
+			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick Cmdline must be selected for the image library",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
 			'tidypics:settings:river_view' => "How many entries in river for each batch of uploaded images",
 			'tidypics:settings:largesize' => "Primary image size",
-- 
cgit v1.2.3


From 2ebb9a2bd7f96c6d7f58ee1e24b9853401942de3 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 7 Jun 2009 23:16:36 +0000
Subject: upgraded to newest imgareaselect

---
 vendors/jquery.imgareaselect-0.7.js | 614 ----------------------------------
 vendors/jquery.imgareaselect-0.8.js | 639 ++++++++++++++++++++++++++++++++++++
 views/default/js/tagging.php        |   6 +-
 3 files changed, 643 insertions(+), 616 deletions(-)
 delete mode 100644 vendors/jquery.imgareaselect-0.7.js
 create mode 100644 vendors/jquery.imgareaselect-0.8.js

diff --git a/vendors/jquery.imgareaselect-0.7.js b/vendors/jquery.imgareaselect-0.7.js
deleted file mode 100644
index 781e73949..000000000
--- a/vendors/jquery.imgareaselect-0.7.js
+++ /dev/null
@@ -1,614 +0,0 @@
-/*
- * imgAreaSelect jQuery plugin
- * version 0.7
- *
- * Copyright (c) 2008-2009 Michal Wojciechowski (odyniec.net)
- *
- * Dual licensed under the MIT (MIT-LICENSE.txt) 
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://odyniec.net/projects/imgareaselect/
- *
- */
-
-jQuery.imgAreaSelect = { onKeyPress: null };
-
-jQuery.imgAreaSelect.init = function (img, options) {
-    var $img = jQuery(img), $area = jQuery('
      '),
-        $border1 = jQuery('
      '), $border2 = jQuery('
      '),
-        $areaOver = jQuery('
      '), $areaOver2,
-        $outLeft = jQuery('
      '), $outTop = jQuery('
      '),
-        $outRight = jQuery('
      '), $outBottom = jQuery('
      '),
-        $handles, handleWidth, handles = [ ],
-        left, top, imgOfs, imgWidth, imgHeight, parent, parOfs, parScroll,
-        zIndex = 0, position = 'absolute', $p, startX, startY, moveX, moveY,
-        resizeMargin = 10, resize = [ ], V = 0, H = 1,
-        keyDown, d, aspectRatio, x1, x2, y1, y2, x, y, adjusted,
-        selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 };
-
-    var $a = $area.add($border1).add($border2).add($areaOver);
-    var $o = $outLeft.add($outTop).add($outRight).add($outBottom);
-
-    function viewX(x)
-    {
-        return x + imgOfs.left + parScroll.left - parOfs.left;
-    }
-
-    function viewY(y)
-    {
-        return y + imgOfs.top + parScroll.top - parOfs.top;
-    }
-
-    function selX(x)
-    {
-        return x - imgOfs.left - parScroll.left + parOfs.left;
-    }
-
-    function selY(y)
-    {
-        return y - imgOfs.top - parScroll.top + parOfs.top;
-    }
-
-    function evX(event)
-    {
-        return event.pageX + parScroll.left - parOfs.left;
-    }
-
-    function evY(event)
-    {
-        return event.pageY + parScroll.top - parOfs.top;
-    }
-
-    function getZIndex()
-    {
-        $p = $img;
-
-        while ($p.length && !$p.is('body')) {
-            if (!isNaN($p.css('z-index')) && $p.css('z-index') > zIndex)
-                zIndex = $p.css('z-index');
-            if ($p.css('position') == 'fixed')
-                position = 'fixed';
-
-            $p = $p.parent();
-        }
-    }
-
-    function adjust()
-    {
-        imgOfs = $img.offset();
-        imgOfs.left = parseInt(imgOfs.left) + parseInt($img.css("border-left-width")) + parseInt($img.css("padding-left"));
-        imgOfs.top = parseInt(imgOfs.top) + parseInt($img.css("border-top-width")) + parseInt($img.css("padding-top"));
-        imgWidth = $img.width();
-        imgHeight = $img.height(); 
-
-        if (jQuery(parent).is('body'))
-            parOfs = parScroll = { left: 0, top: 0 };
-        else {
-            parOfs = jQuery(parent).offset();
-            parScroll = { left: parent.scrollLeft, top: parent.scrollTop };
-        }
-
-        left = viewX(0);
-        top = viewY(0);
-    }
-
-    function update(resetKeyPress)
-    {
-        $a.css({
-            left: viewX(selection.x1) + 'px',
-            top: viewY(selection.y1) + 'px',
-            width: Math.max(selection.width - options.borderWidth * 2, 0) + 'px',
-            height: Math.max(selection.height - options.borderWidth * 2, 0) + 'px'
-        });
-        $areaOver.css({ width: selection.width + 'px', height: selection.height + 'px' });
-        $outLeft.css({ left: left + 'px', top: top + 'px',
-            width: selection.x1 + 'px', height: imgHeight + 'px' });
-        $outTop.css({ left: left + selection.x1 + 'px', top: top + 'px',
-            width: selection.width + 'px', height: selection.y1 + 'px' });
-        $outRight.css({ left: left + selection.x2 + 'px', top: top + 'px',
-            width: imgWidth - selection.x2 + 'px', height: imgHeight + 'px' });
-        $outBottom.css({ left: left + selection.x1 + 'px', top: top + selection.y2 + 'px',
-            width: selection.width + 'px', height: imgHeight - selection.y2 + 'px' });
-
-        if ($handles) {
-            handles[0].css({ left: viewX(selection.x1) + 'px',
-                top: viewY(selection.y1) + 'px' });
-            handles[1].css({ left: viewX(selection.x2 - handleWidth) + 'px',
-                top: viewY(selection.y1) + 'px' });
-            handles[2].css({ left: viewX(selection.x1) + 'px',
-                top: viewY(selection.y2 - handleWidth) + 'px' });
-            handles[3].css({ left: viewX(selection.x2 - handleWidth) + 'px',
-                top: viewY(selection.y2 - handleWidth) + 'px' });
-
-            if (handles.length == 8) {
-                handles[4].css({ left: viewX(selection.x1 + (selection.width -
-                    handleWidth) / 2) + 'px', top: viewY(selection.y1) + 'px' });
-                handles[5].css({ left: viewX(selection.x1) + 'px', top: 
-                    viewY(selection.y1 + (selection.height - handleWidth) / 2) + 'px' });
-                handles[6].css({ left: viewX(selection.x1 + (selection.width - handleWidth)
-                    / 2) + 'px', top: viewY(selection.y2 - handleWidth) + 'px' });
-                handles[7].css({ left: viewX(selection.x2 - handleWidth) + 'px', top:
-                    viewY(selection.y1 + (selection.height - handleWidth) / 2) + 'px' });
-            }
-
-            for (var i = 0; i < handles.length; i++) {
-                if (selX(parseInt(handles[i].css('left'))) < 0)
-                    handles[i].css('left', viewX(0) + 'px');
-                if (selX(parseInt(handles[i].css('left'))) > imgWidth - handleWidth)
-                    handles[i].css('left', viewX(imgWidth - handleWidth) + 'px');
-                if (selY(parseInt(handles[i].css('top'))) < 0)
-                    handles[i].css('top', viewY(0) + 'px');
-                if (selY(parseInt(handles[i].css('top'))) > imgHeight - handleWidth)
-                    handles[i].css('top', viewY(imgHeight - handleWidth) + 'px');
-            }
-        }
-
-        if (resetKeyPress !== false) {
-            if (jQuery.imgAreaSelect.keyPress != docKeyPress)
-                jQuery(document).unbind(jQuery.imgAreaSelect.keyPress,
-                    jQuery.imgAreaSelect.onKeyPress);
-
-            if (options.keys)
-                jQuery(document).bind(jQuery.imgAreaSelect.keyPress,
-                    jQuery.imgAreaSelect.onKeyPress = docKeyPress);
-        }
-    }
-
-    function areaMouseMove(event)
-    {
-        if (!adjusted) {
-            adjust();
-            adjusted = true;
-
-            $a.one('mouseout', function () { adjusted = false; });
-        }
-
-        x = selX(evX(event)) - selection.x1;
-        y = selY(evY(event)) - selection.y1;
-
-        resize = [ ];
-
-        if (options.resizable) {
-            if (y <= resizeMargin)
-                resize[V] = 'n';
-            else if (y >= selection.height - resizeMargin)
-                resize[V] = 's';
-            if (x <= resizeMargin)
-                resize[H] = 'w';
-            else if (x >= selection.width - resizeMargin)
-                resize[H] = 'e';
-        }
-
-        $areaOver.css('cursor', resize.length ? resize.join('') + '-resize' :
-            options.movable ? 'move' : '');
-        if ($areaOver2)
-            $areaOver2.toggle();
-    }
-
-    function areaMouseDown(event)
-    {
-        if (event.which != 1) return false;
-
-        adjust();
-
-        if (options.resizable && resize.length > 0) {
-            jQuery('body').css('cursor', resize.join('') + '-resize');
-
-            x1 = viewX(selection[resize[H] == 'w' ? 'x2' : 'x1']);
-            y1 = viewY(selection[resize[V] == 'n' ? 'y2' : 'y1']);
-
-            jQuery(document).mousemove(selectingMouseMove);
-            $areaOver.unbind('mousemove', areaMouseMove);
-
-            jQuery(document).one('mouseup', function () {
-                resize = [ ];
-
-                jQuery('body').css('cursor', '');
-
-                if (options.autoHide || selection.width == 0 || selection.height == 0)
-                    $a.add($o).add($handles).hide();
-
-                options.onSelectEnd(img, selection);
-
-                jQuery(document).unbind('mousemove', selectingMouseMove);
-                $areaOver.mousemove(areaMouseMove);
-            });
-        }
-        else if (options.movable) {
-            moveX = selection.x1 + left;
-            moveY = selection.y1 + top;
-            startX = evX(event);
-            startY = evY(event);
-
-            $areaOver.unbind('mousemove', areaMouseMove);
-
-            jQuery(document).mousemove(movingMouseMove)
-                .one('mouseup', function () {
-                    options.onSelectEnd(img, selection);
-
-                    jQuery(document).unbind('mousemove', movingMouseMove);
-                    $areaOver.mousemove(areaMouseMove);
-                });
-        }
-        else
-            $img.mousedown(event);
-
-        return false;
-    }
-
-    function aspectRatioXY()
-    {
-        x2 = Math.max(left, Math.min(left + imgWidth,
-            x1 + Math.abs(y2 - y1) * aspectRatio * (x2 >= x1 ? 1 : -1)));
-        y2 = Math.round(Math.max(top, Math.min(top + imgHeight,
-            y1 + Math.abs(x2 - x1) / aspectRatio * (y2 >= y1 ? 1 : -1))));
-        x2 = Math.round(x2);
-    }
-
-    function aspectRatioYX()
-    {
-        y2 = Math.max(top, Math.min(top + imgHeight,
-            y1 + Math.abs(x2 - x1) / aspectRatio * (y2 >= y1 ? 1 : -1)));
-        x2 = Math.round(Math.max(left, Math.min(left + imgWidth,
-            x1 + Math.abs(y2 - y1) * aspectRatio * (x2 >= x1 ? 1 : -1))));
-        y2 = Math.round(y2);
-    }
-
-    function doResize(newX2, newY2)
-    {
-        x2 = newX2;
-        y2 = newY2;
-
-        if (options.minWidth && Math.abs(x2 - x1) < options.minWidth) {
-            x2 = x1 - options.minWidth * (x2 < x1 ? 1 : -1);
-
-            if (x2 < left)
-                x1 = left + options.minWidth;
-            else if (x2 > left + imgWidth)
-                x1 = left + imgWidth - options.minWidth;
-        }
-
-        if (options.minHeight && Math.abs(y2 - y1) < options.minHeight) {
-            y2 = y1 - options.minHeight * (y2 < y1 ? 1 : -1);
-
-            if (y2 < top)
-                y1 = top + options.minHeight;
-            else if (y2 > top + imgHeight)
-                y1 = top + imgHeight - options.minHeight;
-        }
-
-        x2 = Math.max(left, Math.min(x2, left + imgWidth));
-        y2 = Math.max(top, Math.min(y2, top + imgHeight));
-
-        if (aspectRatio)
-            if (Math.abs(x2 - x1) / aspectRatio > Math.abs(y2 - y1))
-                aspectRatioYX();
-            else
-                aspectRatioXY();
-
-        if (options.maxWidth && Math.abs(x2 - x1) > options.maxWidth) {
-            x2 = x1 - options.maxWidth * (x2 < x1 ? 1 : -1);
-            if (aspectRatio) aspectRatioYX();
-        }
-
-        if (options.maxHeight && Math.abs(y2 - y1) > options.maxHeight) {
-            y2 = y1 - options.maxHeight * (y2 < y1 ? 1 : -1);
-            if (aspectRatio) aspectRatioXY();
-        }
-
-        selection = { x1: selX(Math.min(x1, x2)), x2: selX(Math.max(x1, x2)),
-            y1: selY(Math.min(y1, y2)), y2: selY(Math.max(y1, y2)),
-            width: Math.abs(x2 - x1), height: Math.abs(y2 - y1) };
-
-        update();
-
-        options.onSelectChange(img, selection);
-    }
-
-    function selectingMouseMove(event)
-    {
-        x2 = !resize.length || resize[H] || aspectRatio ? evX(event) : viewX(selection.x2);
-        y2 = !resize.length || resize[V] || aspectRatio ? evY(event) : viewY(selection.y2);
-
-        doResize(x2, y2);
-
-        return false;        
-    }
-
-    function doMove(newX1, newY1)
-    {
-        x2 = (x1 = newX1) + selection.width;
-        y2 = (y1 = newY1) + selection.height;
-
-        selection.x1 = selX(x1);
-        selection.y1 = selY(y1);
-        selection.x2 = selX(x2);
-        selection.y2 = selY(y2);
-
-        update();
-
-        options.onSelectChange(img, selection);
-    }
-
-    function movingMouseMove(event)
-    {
-        var newX1 = Math.max(left, Math.min(moveX + evX(event) - startX,
-            left + imgWidth - selection.width));
-        var newY1 = Math.max(top, Math.min(moveY + evY(event) - startY,
-            top + imgHeight - selection.height));
-
-        doMove(newX1, newY1);
-
-        event.preventDefault();     
-        return false;
-    }
-
-    function startSelection(event)
-    {
-        adjust();
-
-        selection = { x1: selX(x1), y1: selY(y1) };       
-        doResize(x1, y1);
-
-        resize = [ ];
-
-        $a.add($o).add($handles).show();
-
-        jQuery(document).unbind('mouseup', cancelSelection)
-            .mousemove(selectingMouseMove);
-        $areaOver.unbind('mousemove', areaMouseMove);
-
-        options.onSelectStart(img, selection);
-
-        jQuery(document).one('mouseup', function () {
-            if (options.autoHide || (selection.width * selection.height == 0))
-                $a.add($o).add($handles).hide();
-
-            options.onSelectEnd(img, selection);
-
-            jQuery(document).unbind('mousemove', selectingMouseMove);
-            $areaOver.mousemove(areaMouseMove);
-        });
-    }
-
-    function cancelSelection()
-    {
-        jQuery(document).unbind('mousemove', startSelection);
-        $a.add($o).add($handles).hide();
-
-        selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 };
-
-        options.onSelectChange(img, selection);
-        options.onSelectEnd(img, selection);
-    }
-
-    function imgMouseDown(event)
-    {
-        if (event.which != 1) return false;
-
-        startX = x1 = evX(event);
-        startY = y1 = evY(event);
-
-        jQuery(document).one('mousemove', startSelection)
-            .one('mouseup', cancelSelection);
-
-        return false;
-    }
-
-    function windowResize()
-    {
-        adjust();
-        update(false);
-        x1 = viewX(selection.x1);
-        y1 = viewY(selection.y1);
-        x2 = viewX(selection.x2);
-        y2 = viewY(selection.y2);
-    }
-
-    var docKeyPress = function(event) {
-        var k = options.keys, d = 10, t,
-            key = event.keyCode || event.which;
-
-        if (!isNaN(k.arrows)) d = k.arrows;
-        if (!isNaN(k.shift) && event.shiftKey) d = k.shift;
-        if (!isNaN(k.ctrl) && event.ctrlKey) d = k.ctrl;
-        if (!isNaN(k.alt) && (event.altKey || event.originalEvent.altKey)) d = k.alt;
-
-        if (k.arrows == 'resize' || (k.shift == 'resize' && event.shiftKey) ||
-            (k.ctrl == 'resize' && event.ctrlKey) ||
-            (k.alt == 'resize' && (event.altKey || event.originalEvent.altKey)))
-        {
-            switch (key) {
-            case 37:
-                d = -d;
-            case 39:
-                t = Math.max(x1, x2);
-                x1 = Math.min(x1, x2);
-                x2 = Math.max(t + d, x1);
-                if (aspectRatio) aspectRatioYX();
-                break;
-            case 38:
-                d = -d;
-            case 40:
-                t = Math.max(y1, y2);
-                y1 = Math.min(y1, y2);
-                y2 = Math.max(t + d, y1);
-                if (aspectRatio) aspectRatioXY();
-                break;
-            default:
-                return;
-            }
-
-            doResize(x2, y2);
-        }
-        else {
-            x1 = Math.min(x1, x2);
-            y1 = Math.min(y1, y2);
-
-            switch (key) {
-            case 37:
-                doMove(Math.max(x1 - d, left), y1);
-                break;
-            case 38:
-                doMove(x1, Math.max(y1 - d, top));
-                break;
-            case 39:
-                doMove(x1 + Math.min(d, imgWidth - selX(x2)), y1);
-                break;
-            case 40:
-                doMove(x1, y1 + Math.min(d, imgHeight - selY(y2)));
-                break;
-            default:
-                return;
-            }
-        }
-
-        return false;
-    };
-
-    this.setOptions = function(newOptions)
-    {
-        options = jQuery.extend(options, newOptions);
-
-        if (newOptions.x1 != null) {
-            selection = { x1: newOptions.x1, y1: newOptions.y1,
-                x2: newOptions.x2, y2: newOptions.y2 };
-            newOptions.show = true;
-        }
-
-        if (newOptions.keys)
-            options.keys = jQuery.extend({ shift: 1, ctrl: 'resize' },
-                newOptions.keys === true ? { } : newOptions.keys);
-
-        parent = jQuery(options.parent).get(0);
-
-        adjust();
-
-        getZIndex();
-
-        x1 = viewX(selection.x1);
-        y1 = viewY(selection.y1);
-        x2 = viewX(selection.x2);
-        y2 = viewY(selection.y2);
-        selection.width = x2 - x1;
-        selection.height = y2 - y1;
-
-        if ($handles) {
-            $handles.remove();
-            $handles = null;
-            handles = [ ];
-        }
-
-        if (options.handles) {
-            for (var i = 0; i < (options.handles == 'corners' ? 4 : 8); i++)
-                $handles = $handles ? $handles.add(handles[i] = jQuery('
      ')) :
-                    handles[i] = jQuery('
      ');
-
-            handleWidth = 4 + options.borderWidth;
-
-            $handles.css({ position: position, borderWidth: options.borderWidth,
-                borderStyle: 'solid', borderColor: options.borderColor1, 
-                backgroundColor: options.borderColor2, display: $area.css('display'),
-                width: handleWidth + 'px', height: handleWidth + 'px',
-                fontSize: '0px', zIndex: zIndex > 0 ? zIndex + 1 : '1' });
-            $handles.addClass(options.classPrefix + '-handle');
-
-            handleWidth += options.borderWidth * 2;
-        }
-
-        $o.addClass(options.classPrefix + '-outer');
-        $area.addClass(options.classPrefix + '-selection');
-        $border1.addClass(options.classPrefix + '-border1');
-        $border2.addClass(options.classPrefix + '-border2');
-
-        $a.css({ borderWidth: options.borderWidth + 'px' });
-        $area.css({ backgroundColor: options.selectionColor, opacity: options.selectionOpacity });       
-        $border1.css({ borderStyle: 'solid', borderColor: options.borderColor1 });
-        $border2.css({ borderStyle: 'dashed', borderColor: options.borderColor2 });
-        $o.css({ opacity: options.outerOpacity, backgroundColor: options.outerColor });
-
-        jQuery(options.parent).append($o.add($a).add($handles));
-
-        update();
-
-        if (newOptions.hide)
-            $a.add($o).add($handles).hide();
-        else if (newOptions.show)
-            $a.add($o).add($handles).show();
-
-        aspectRatio = options.aspectRatio && (d = options.aspectRatio.split(/:/)) ?
-            d[0] / d[1] : null;
-
-        if (aspectRatio)
-            if (options.minWidth)
-                options.minHeight = parseInt(options.minWidth / aspectRatio);
-            else if (options.minHeight)
-                options.minWidth = parseInt(options.minHeight * aspectRatio);
-
-        if (options.disable || options.enable === false) {
-            $areaOver.unbind('mousemove', areaMouseMove).unbind('mousedown', areaMouseDown);
-            $img.add($o).unbind('mousedown', imgMouseDown);
-            jQuery(window).unbind('resize', windowResize);
-        }
-        else if (options.enable || options.disable === false) {
-            if (options.resizable || options.movable)
-                $areaOver.mousemove(areaMouseMove).mousedown(areaMouseDown);
-
-            if (!options.persistent)
-                $img.add($o).mousedown(imgMouseDown);
-            jQuery(window).resize(windowResize);
-        }
-
-        options.enable = options.disable = undefined;
-    };
-
-    if (jQuery.browser.msie)   
-        $img.attr('unselectable', 'on');
-
-    jQuery.imgAreaSelect.keyPress = jQuery.browser.msie ||
-        jQuery.browser.safari ? 'keydown' : 'keypress';
-
-    if (jQuery.browser.opera)
-        $areaOver.append($areaOver2 = jQuery('
      '));
-
-    getZIndex();
-
-    $a.add($o).css({ display: 'none', position: position,
-        overflow: 'hidden', zIndex: zIndex > 0 ? zIndex : '0' });
-    $areaOver.css({ zIndex: zIndex > 0 ? zIndex + 2 : '2' });
-    $area.css({ borderStyle: 'solid' });
-
-    this.setOptions(options = jQuery.extend({
-        borderColor1: '#000',
-        borderColor2: '#fff',
-        borderWidth: 1,
-        classPrefix: 'imgareaselect',
-        movable: true,
-        resizable: true,
-        selectionColor: '#fff',
-        selectionOpacity: 0.2,
-        outerColor: '#000',
-        outerOpacity: 0.2,
-        parent: 'body',
-        onSelectStart: function () {},
-        onSelectChange: function () {},
-        onSelectEnd: function () {}
-    }, options));
-};
-
-jQuery.fn.imgAreaSelect = function (options) {
-    options = options || {};
-
-    this.each(function () {
-        if (jQuery(this).data('imgAreaSelect'))
-            jQuery(this).data('imgAreaSelect').setOptions(options);
-        else {
-            if (options.enable === undefined && options.disable === undefined)
-                options.enable = true;
-
-            jQuery(this).data('imgAreaSelect', new jQuery.imgAreaSelect.init(this, options));
-        }
-    });
-
-    return this;
-};
diff --git a/vendors/jquery.imgareaselect-0.8.js b/vendors/jquery.imgareaselect-0.8.js
new file mode 100644
index 000000000..123bbf77c
--- /dev/null
+++ b/vendors/jquery.imgareaselect-0.8.js
@@ -0,0 +1,639 @@
+/*
+ * imgAreaSelect jQuery plugin
+ * version 0.8
+ *
+ * Copyright (c) 2008-2009 Michal Wojciechowski (odyniec.net)
+ *
+ * Dual licensed under the MIT (MIT-LICENSE.txt) 
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://odyniec.net/projects/imgareaselect/
+ *
+ */
+
+(function($) {
+
+$.imgAreaSelect = { onKeyPress: null };
+
+$.imgAreaSelect.init = function (img, options) {
+    var $img = $(img), imgLoaded, $box = $('
      '), $area = $('
      '),
+        $border1 = $('
      '), $border2 = $('
      '), $areaOpera,
+        $outLeft = $('
      '), $outTop = $('
      '),
+        $outRight = $('
      '), $outBottom = $('
      '),
+        $handles = $([]), handleWidth, handles = [ ], left, top, M = Math,
+        imgOfs, imgWidth, imgHeight, $parent, parOfs,
+        zIndex = 0, position = 'absolute', $p, startX, startY,
+        scaleX = 1, scaleY = 1, resizeMargin = 10, resize = [ ], V = 0, H = 1,
+        d, aspectRatio, x1, x2, y1, y2, x, y, adjusted, shown, i,
+        selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 };
+
+    var $o = $outLeft.add($outTop).add($outRight).add($outBottom);
+
+    function viewX(x)
+    {
+        return x + imgOfs.left - parOfs.left;
+    }
+
+    function viewY(y)
+    {
+        return y + imgOfs.top - parOfs.top;
+    }
+
+    function selX(x)
+    {
+        return x - imgOfs.left + parOfs.left;
+    }
+
+    function selY(y)
+    {
+        return y - imgOfs.top + parOfs.top;
+    }
+
+    function evX(event)
+    {
+        return event.pageX - parOfs.left;
+    }
+
+    function evY(event)
+    {
+        return event.pageY - parOfs.top;
+    }
+
+    function trueSelection()
+    {
+        return { x1: M.round(selection.x1 * scaleX),
+            y1: M.round(selection.y1 * scaleY),
+            x2: M.round(selection.x2 * scaleX),
+            y2: M.round(selection.y2 * scaleY),
+            width: M.round(selection.x2 * scaleX) - M.round(selection.x1 * scaleX),
+            height: M.round(selection.y2 * scaleY) - M.round(selection.y1 * scaleY) };
+    }
+
+    function getZIndex()
+    {
+        $p = $img;
+
+        while ($p.length && !$p.is('body')) {
+            if (!isNaN($p.css('z-index')) && $p.css('z-index') > zIndex)
+                zIndex = $p.css('z-index');
+            if ($p.css('position') == 'fixed')
+                position = 'fixed';
+
+            $p = $p.parent();
+        }
+
+        if (!isNaN(options.zIndex))
+            zIndex = options.zIndex;
+    }
+
+    function adjust()
+    {
+        imgOfs = { left: M.round($img.offset().left), top: M.round($img.offset().top) };
+        // next two lines are Tidypics change to handle image having padding and border
+        imgOfs.left = parseInt(imgOfs.left) + parseInt($img.css("border-left-width")) + parseInt($img.css("padding-left"));
+        imgOfs.top = parseInt(imgOfs.top) + parseInt($img.css("border-top-width")) + parseInt($img.css("padding-top"));
+        
+        imgWidth = $img.width();
+        imgHeight = $img.height();
+
+        if ($().jquery == '1.3.2' && $.browser.safari && position == 'fixed') {
+            imgOfs.top += M.max(document.documentElement.scrollTop, $('body').scrollTop()); 
+            imgOfs.left += M.max(document.documentElement.scrollLeft, $('body').scrollLeft());
+        }
+
+        parOfs = $.inArray($parent.css('position'), ['absolute', 'relative']) != -1 ? 
+            { left: M.round($parent.offset().left) - $parent.scrollLeft(),
+                top: M.round($parent.offset().top) - $parent.scrollTop() } :
+            position == 'fixed' ?
+                { left: $(document).scrollLeft(), top: $(document).scrollTop() } :
+                { left: 0, top: 0 };
+
+        left = viewX(0);
+        top = viewY(0);
+    }
+
+    function update(resetKeyPress)
+    {
+        if (!shown) return;
+
+        $box.css({
+            left: viewX(selection.x1) + 'px', top: viewY(selection.y1) + 'px',
+            width: selection.width + 'px', height: selection.height + 'px'
+        });
+        $area.add($border1).add($border2).css({
+            left: '0px', top: '0px',
+            width: M.max(selection.width - options.borderWidth * 2, 0) + 'px',
+            height: M.max(selection.height - options.borderWidth * 2, 0) + 'px'
+        });
+        $border1.css({ borderStyle: 'solid', borderColor: options.borderColor1 });
+        $border2.css({ borderStyle: 'dashed', borderColor: options.borderColor2 });
+        $border1.add($border2).css({ opacity: options.borderOpacity });
+        $outLeft.css({ left: left + 'px', top: top + 'px',
+            width: selection.x1 + 'px', height: imgHeight + 'px' });
+        $outTop.css({ left: left + selection.x1 + 'px', top: top + 'px',
+            width: selection.width + 'px', height: selection.y1 + 'px' });
+        $outRight.css({ left: left + selection.x2 + 'px', top: top + 'px',
+            width: imgWidth - selection.x2 + 'px', height: imgHeight + 'px' });
+        $outBottom.css({ left: left + selection.x1 + 'px', top: top + selection.y2 + 'px',
+            width: selection.width + 'px', height: imgHeight - selection.y2 + 'px' });
+
+        if (handles.length) {
+            handles[1].css({ left: selection.width - handleWidth + 'px' });
+            handles[2].css({ left: selection.width - handleWidth + 'px',
+                top: selection.height - handleWidth + 'px' });
+            handles[3].css({ top: selection.height - handleWidth + 'px' });
+
+            if (handles.length == 8) {
+                handles[4].css({ left: (selection.width - handleWidth) / 2 + 'px' });
+                handles[5].css({ left: selection.width - handleWidth + 'px',
+                    top: (selection.height - handleWidth) / 2 + 'px' });
+                handles[6].css({ left: (selection.width - handleWidth) / 2 + 'px',
+                    top: selection.height - handleWidth + 'px' });
+                handles[7].css({ top: (selection.height - handleWidth) / 2 + 'px' });
+            }
+        }
+
+        if (resetKeyPress !== false) {
+            if ($.imgAreaSelect.keyPress != docKeyPress)
+                $(document).unbind($.imgAreaSelect.keyPress,
+                    $.imgAreaSelect.onKeyPress);
+
+            if (options.keys)
+                $(document).bind($.imgAreaSelect.keyPress,
+                    $.imgAreaSelect.onKeyPress = docKeyPress);
+        }
+
+        if ($.browser.msie && options.borderWidth == 1 && options.borderOpacity < 1) {
+            $border1.add($border2).css('margin', '0');
+            setTimeout(function () { $border1.add($border2).css('margin', 'auto'); }, 0);
+        }
+    }
+
+    function areaMouseMove(event)
+    {
+        if (!adjusted) {
+            adjust();
+            adjusted = true;
+
+            $box.one('mouseout', function () { adjusted = false; });
+        }
+
+        x = selX(evX(event)) - selection.x1;
+        y = selY(evY(event)) - selection.y1;
+
+        resize = [ ];
+
+        if (options.resizable) {
+            if (y <= resizeMargin)
+                resize[V] = 'n';
+            else if (y >= selection.height - resizeMargin)
+                resize[V] = 's';
+            if (x <= resizeMargin)
+                resize[H] = 'w';
+            else if (x >= selection.width - resizeMargin)
+                resize[H] = 'e';
+        }
+
+        $box.css('cursor', resize.length ? resize.join('') + '-resize' :
+            options.movable ? 'move' : '');
+        if ($areaOpera)
+            $areaOpera.toggle();
+    }
+
+    function docMouseUp(event)
+    {
+        resize = [ ];
+
+        $('body').css('cursor', '');
+
+        if (options.autoHide || selection.width * selection.height == 0)
+            $box.add($o).hide();
+
+        options.onSelectEnd(img, trueSelection());
+
+        $(document).unbind('mousemove', selectingMouseMove);
+        $box.mousemove(areaMouseMove);
+    }
+
+    function areaMouseDown(event)
+    {
+        if (event.which != 1) return false;
+
+        adjust();
+
+        if (options.resizable && resize.length > 0) {
+            $('body').css('cursor', resize.join('') + '-resize');
+
+            x1 = viewX(selection[resize[H] == 'w' ? 'x2' : 'x1']);
+            y1 = viewY(selection[resize[V] == 'n' ? 'y2' : 'y1']);
+
+            $(document).mousemove(selectingMouseMove)
+                .one('mouseup', docMouseUp);
+            $box.unbind('mousemove', areaMouseMove);
+        }
+        else if (options.movable) {
+            startX = left + selection.x1 - evX(event);
+            startY = top + selection.y1 - evY(event);
+
+            $box.unbind('mousemove', areaMouseMove);
+
+            $(document).mousemove(movingMouseMove)
+                .one('mouseup', function () {
+                    options.onSelectEnd(img, trueSelection());
+
+                    $(document).unbind('mousemove', movingMouseMove);
+                    $box.mousemove(areaMouseMove);
+                });
+        }
+        else
+            $img.mousedown(event);
+
+        return false;
+    }
+
+    function aspectRatioXY()
+    {
+        x2 = M.max(left, M.min(left + imgWidth,
+            x1 + M.abs(y2 - y1) * aspectRatio * (x2 < x1 ? -1 : 1)));
+        y2 = M.round(M.max(top, M.min(top + imgHeight,
+            y1 + M.abs(x2 - x1) / aspectRatio * (y2 < y1 ? -1 : 1))));
+        x2 = M.round(x2);
+    }
+
+    function aspectRatioYX()
+    {
+        y2 = M.max(top, M.min(top + imgHeight,
+            y1 + M.abs(x2 - x1) / aspectRatio * (y2 < y1 ? -1 : 1)));
+        x2 = M.round(M.max(left, M.min(left + imgWidth,
+            x1 + M.abs(y2 - y1) * aspectRatio * (x2 < x1 ? -1 : 1))));
+        y2 = M.round(y2);
+    }
+
+    function doResize()
+    {
+        if (options.minWidth && M.abs(x2 - x1) < options.minWidth) {
+            x2 = x1 - options.minWidth * (x2 < x1 ? 1 : -1);
+
+            if (x2 < left)
+                x1 = left + options.minWidth;
+            else if (x2 > left + imgWidth)
+                x1 = left + imgWidth - options.minWidth;
+        }
+
+        if (options.minHeight && M.abs(y2 - y1) < options.minHeight) {
+            y2 = y1 - options.minHeight * (y2 < y1 ? 1 : -1);
+
+            if (y2 < top)
+                y1 = top + options.minHeight;
+            else if (y2 > top + imgHeight)
+                y1 = top + imgHeight - options.minHeight;
+        }
+
+        x2 = M.max(left, M.min(x2, left + imgWidth));
+        y2 = M.max(top, M.min(y2, top + imgHeight));
+
+        if (aspectRatio)
+            if (M.abs(x2 - x1) / aspectRatio > M.abs(y2 - y1))
+                aspectRatioYX();
+            else
+                aspectRatioXY();
+
+        if (options.maxWidth && M.abs(x2 - x1) > options.maxWidth) {
+            x2 = x1 - options.maxWidth * (x2 < x1 ? 1 : -1);
+            if (aspectRatio) aspectRatioYX();
+        }
+
+        if (options.maxHeight && M.abs(y2 - y1) > options.maxHeight) {
+            y2 = y1 - options.maxHeight * (y2 < y1 ? 1 : -1);
+            if (aspectRatio) aspectRatioXY();
+        }
+
+        selection = { x1: selX(M.min(x1, x2)), x2: selX(M.max(x1, x2)),
+            y1: selY(M.min(y1, y2)), y2: selY(M.max(y1, y2)),
+            width: M.abs(x2 - x1), height: M.abs(y2 - y1) };
+
+        update();
+
+        options.onSelectChange(img, trueSelection());
+    }
+
+    function selectingMouseMove(event)
+    {
+        x2 = !resize.length || resize[H] || aspectRatio ? evX(event) : viewX(selection.x2);
+        y2 = !resize.length || resize[V] || aspectRatio ? evY(event) : viewY(selection.y2);
+
+        doResize();
+
+        return false;        
+    }
+
+    function doMove(newX1, newY1)
+    {
+        x2 = (x1 = newX1) + selection.width;
+        y2 = (y1 = newY1) + selection.height;
+
+        selection = $.extend(selection, { x1: selX(x1), y1: selY(y1),
+            x2: selX(x2), y2: selY(y2) });
+
+        update();
+
+        options.onSelectChange(img, trueSelection());
+    }
+
+    function movingMouseMove(event)
+    {
+        x1 = M.max(left, M.min(startX + evX(event), left + imgWidth - selection.width));
+        y1 = M.max(top, M.min(startY + evY(event), top + imgHeight - selection.height));
+
+        doMove(x1, y1);
+
+        event.preventDefault();     
+        return false;
+    }
+
+    function startSelection(event)
+    {
+        adjust();
+
+        x2 = x1;
+        y2 = y1;       
+        doResize();
+
+        resize = [ ];
+
+        $box.add($o.is(':visible') ? null : $o).show();
+        shown = true;
+
+        $(document).unbind('mouseup', cancelSelection)
+            .mousemove(selectingMouseMove).one('mouseup', docMouseUp);
+        $box.unbind('mousemove', areaMouseMove);
+
+        options.onSelectStart(img, trueSelection());
+    }
+
+    function cancelSelection()
+    {
+        $(document).unbind('mousemove', startSelection);
+        $box.add($o).hide();
+
+        selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 };
+
+        options.onSelectChange(img, selection);
+        options.onSelectEnd(img, selection);
+    }
+
+    function imgMouseDown(event)
+    {
+        if (event.which != 1) return false;
+
+        adjust();
+        startX = x1 = evX(event);
+        startY = y1 = evY(event);
+
+        $(document).one('mousemove', startSelection)
+            .one('mouseup', cancelSelection);
+
+        return false;
+    }
+
+    function parentScroll()
+    {
+        adjust();
+        update(false);
+        x1 = viewX(selection.x1); y1 = viewY(selection.y1);
+        x2 = viewX(selection.x2); y2 = viewY(selection.y2);
+    }
+
+    function imgLoad()
+    {
+        imgLoaded = true;
+
+        if (options.show) {
+            shown = true;
+            adjust();
+            update();
+            $box.add($o).show();
+        }
+
+        $box.add($o).css({ visibility: '' });
+    }
+
+    var docKeyPress = function(event) {
+        var k = options.keys, d, t, key = event.keyCode || event.which;
+
+        d = !isNaN(k.alt) && (event.altKey || event.originalEvent.altKey) ? k.alt :
+            !isNaN(k.ctrl) && event.ctrlKey ? k.ctrl :
+            !isNaN(k.shift) && event.shiftKey ? k.shift :
+            !isNaN(k.arrows) ? k.arrows : 10;
+
+        if (k.arrows == 'resize' || (k.shift == 'resize' && event.shiftKey) ||
+            (k.ctrl == 'resize' && event.ctrlKey) ||
+            (k.alt == 'resize' && (event.altKey || event.originalEvent.altKey)))
+        {
+            switch (key) {
+            case 37:
+                d = -d;
+            case 39:
+                t = M.max(x1, x2);
+                x1 = M.min(x1, x2);
+                x2 = M.max(t + d, x1);
+                if (aspectRatio) aspectRatioYX();
+                break;
+            case 38:
+                d = -d;
+            case 40:
+                t = M.max(y1, y2);
+                y1 = M.min(y1, y2);
+                y2 = M.max(t + d, y1);
+                if (aspectRatio) aspectRatioXY();
+                break;
+            default:
+                return;
+            }
+
+            doResize();
+        }
+        else {
+            x1 = M.min(x1, x2);
+            y1 = M.min(y1, y2);
+
+            switch (key) {
+            case 37:
+                doMove(M.max(x1 - d, left), y1);
+                break;
+            case 38:
+                doMove(x1, M.max(y1 - d, top));
+                break;
+            case 39:
+                doMove(x1 + M.min(d, imgWidth - selX(x2)), y1);
+                break;
+            case 40:
+                doMove(x1, y1 + M.min(d, imgHeight - selY(y2)));
+                break;
+            default:
+                return;
+            }
+        }
+
+        return false;
+    };
+
+    this.setOptions = function(newOptions)
+    {
+        if (newOptions.parent)
+            ($parent = $(newOptions.parent)).append($box.add($o));
+
+        adjust();
+        getZIndex();
+
+        if (newOptions.x1 != null) {
+            selection = { x1: newOptions.x1, y1: newOptions.y1,
+                x2: newOptions.x2, y2: newOptions.y2 };
+            newOptions.show = !newOptions.hide;
+
+            x1 = viewX(selection.x1); y1 = viewY(selection.y1);
+            x2 = viewX(selection.x2); y2 = viewY(selection.y2);
+            selection.width = x2 - x1;
+            selection.height = y2 - y1;
+        }
+
+        if (newOptions.handles != null) {
+            $handles.remove();
+            $handles = $(handles = [ ]);
+
+            i = newOptions.handles ? newOptions.handles == 'corners' ? 4 : 8 : 0;
+
+            while (i--)
+                $handles = $handles.add(handles[i] = $('
      '));
+
+            handleWidth = 4 + options.borderWidth;
+
+            $handles.css({ position: 'absolute', borderWidth: options.borderWidth + 'px',
+                borderStyle: 'solid', borderColor: options.borderColor1, 
+                opacity: options.borderOpacity, backgroundColor: options.borderColor2,
+                width: handleWidth + 'px', height: handleWidth + 'px',
+                fontSize: '0px', zIndex: zIndex > 0 ? zIndex + 1 : '1' })
+                .addClass(options.classPrefix + '-handle');
+
+            handleWidth += options.borderWidth * 2;
+        }
+
+        update();
+
+        options = $.extend(options, newOptions);
+
+        if (options.imageWidth || options.imageHeight) {
+            scaleX = (parseInt(options.imageWidth) || imgWidth) / imgWidth;
+            scaleY = (parseInt(options.imageHeight) || imgHeight) / imgHeight;
+        }
+
+        if (newOptions.keys)
+            options.keys = $.extend({ shift: 1, ctrl: 'resize' },
+                newOptions.keys === true ? { } : newOptions.keys);
+
+        $o.addClass(options.classPrefix + '-outer');
+        $area.addClass(options.classPrefix + '-selection');
+        $border1.addClass(options.classPrefix + '-border1');
+        $border2.addClass(options.classPrefix + '-border2');
+
+        $box.add($area).add($border1).add($border2).css({ borderWidth: options.borderWidth + 'px' });
+        $area.css({ backgroundColor: options.selectionColor, opacity: options.selectionOpacity });       
+        $border1.css({ borderStyle: 'solid', borderColor: options.borderColor1 });
+        $border2.css({ borderStyle: 'dashed', borderColor: options.borderColor2 });
+        $border1.add($border2).css({ opacity: options.borderOpacity });
+        $o.css({ opacity: options.outerOpacity, backgroundColor: options.outerColor });
+
+        $box.append($area.add($border1).add($border2).add($handles).add($areaOpera));
+
+        if (newOptions.hide)
+            $box.add($o).hide();
+        else if (newOptions.show && imgLoaded) {
+            shown = true;
+            update();
+            $box.add($o).show();
+        }
+
+        aspectRatio = options.aspectRatio && (d = options.aspectRatio.split(/:/)) ?
+            d[0] / d[1] : null;
+
+        if (aspectRatio)
+            if (options.minWidth)
+                options.minHeight = parseInt(options.minWidth / aspectRatio);
+            else if (options.minHeight)
+                options.minWidth = parseInt(options.minHeight * aspectRatio);
+
+        if (options.disable || options.enable === false) {
+            $box.unbind('mousemove', areaMouseMove).unbind('mousedown', areaMouseDown);
+            $img.add($o).unbind('mousedown', imgMouseDown);
+            $(window).unbind('resize', parentScroll);
+            $img.add($img.parents()).unbind('scroll', parentScroll);
+        }
+        else if (options.enable || options.disable === false) {
+            if (options.resizable || options.movable)
+                $box.mousemove(areaMouseMove).mousedown(areaMouseDown);
+
+            if (!options.persistent)
+                $img.add($o).mousedown(imgMouseDown);
+            $(window).resize(parentScroll);
+            $img.add($img.parents()).scroll(parentScroll);
+        }
+
+        options.enable = options.disable = undefined;
+    };
+
+    if ($.browser.msie)
+        $img.attr('unselectable', 'on');
+
+    $.imgAreaSelect.keyPress = $.browser.msie ||
+        $.browser.safari ? 'keydown' : 'keypress';
+
+    if ($.browser.opera)
+        ($areaOpera = $('
      '))
+            .css({ zIndex: zIndex > 0 ? zIndex + 2 : '2' });
+
+    this.setOptions(options = $.extend({
+        borderColor1: '#000',
+        borderColor2: '#fff',
+        borderWidth: 1,
+        borderOpacity: .5,
+        classPrefix: 'imgareaselect',
+        movable: true,
+        resizable: true,
+        selectionColor: '#fff',
+        selectionOpacity: 0,
+        outerColor: '#000',
+        outerOpacity: .4,
+        parent: 'body',
+        onSelectStart: function () {},
+        onSelectChange: function () {},
+        onSelectEnd: function () {}
+    }, options));
+
+    $box.add($o).css({ visibility: 'hidden', position: position,
+        overflow: 'hidden', zIndex: zIndex > 0 ? zIndex : '0' });
+    $area.css({ borderStyle: 'solid' });
+    $box.css({ position: position, zIndex: zIndex > 0 ? zIndex + 2 : '2' });
+    $area.add($border1).add($border2).css({ position: 'absolute' });
+
+    img.complete || img.readyState == 'complete' || !$img.is('img') ?
+        imgLoad() : $img.one('load', imgLoad);
+};
+
+$.fn.imgAreaSelect = function (options) {
+    options = options || {};
+
+    this.each(function () {
+        if ($(this).data('imgAreaSelect'))
+            $(this).data('imgAreaSelect').setOptions(options);
+        else {
+            if (options.enable === undefined && options.disable === undefined)
+                options.enable = true;
+
+            $(this).data('imgAreaSelect', new $.imgAreaSelect.init(this, options));
+        }
+    });
+
+    return this;
+};
+
+})(jQuery);
diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php
index f7e764194..d47d88a37 100644
--- a/views/default/js/tagging.php
+++ b/views/default/js/tagging.php
@@ -1,7 +1,7 @@
 
-
+
 
  
 
+
 
  
 
 
      
-
+
 	
      
 		
      
 		
      
@@ -67,6 +69,13 @@ function showhide(layer_ref) {
 			?>
 			" onclick="showhide('tidypics_loader');" />
 		
      
-
-
+ "{$vars['url']}action/tidypics/upload", 
+										'body' => $form_body, 
+										'internalid' => 'tidypicsUpload',
+										'enctype' => 'multipart/form-data',
+										'method' => 'post',));
+?>
 
      
\ No newline at end of file
-- 
cgit v1.2.3


From 8f5aa6a87b15ecee226f46539b1400710c9c9047 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 13 Jun 2009 23:53:17 +0000
Subject: added disk quota for users and groups

---
 actions/delete.php                     | 13 ++++++++++++-
 actions/upload.php                     | 25 +++++++++++++++++++++++--
 languages/en.php                       |  3 ++-
 views/default/tidypics/forms/admin.php |  6 ++++++
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/actions/delete.php b/actions/delete.php
index f6b677c55..3deb69c5b 100644
--- a/actions/delete.php
+++ b/actions/delete.php
@@ -30,13 +30,17 @@
 		register_error(elgg_echo("file:deletefailed"));
 		forward($forward_url);
 	}
-	
+
+	$owner_guid = 0; // group or user
 	if ($subtype == 'image') { //deleting an image
+		$album = get_entity($entity->container_guid);
+		$owner_guid = $album->container_guid;
 		$forward_url = $container->getURL(); //forward back to album after deleting pictures
 		$images = array($entity);
 		// plugins can register to be told when a Tidypics image has been deleted
 		trigger_elgg_event('upload', 'tp_album', $entity);
 	} else { //deleting an album
+		$owner_guid = $entity->container_guid;
 		$forward_url = 'pg/photos/owned/' . $container->username;
 		//get all the images from this album as long as less than 999 images
 		$images = get_entities("object", "image", $guid, '', 999); 
@@ -44,6 +48,10 @@
 		trigger_elgg_event('upload', 'tp_album', $entity);
 	}
 
+	// make sure we decrease the repo size for the size quota
+	$image_repo_size_md = get_metadata_byname($owner_guid, "image_repo_size");
+	$image_repo_size = (int)$image_repo_size_md->value;
+
 	//loop through all images and delete them
 	foreach($images as $im) {
 		$thumbnail = $im->thumbnail;
@@ -72,6 +80,8 @@
 			$delfile = new ElggFile($im->getGUID());
 			$delfile->owner_guid = $im->getOwner();
 			//$delfile->setFilename($im->originalfilename);
+			$image_repo_size -= $delfile->size();
+			
 			if (!$delfile->delete()) {
 				if ($subtype=='image') register_error(elgg_echo("file:deletefailed")); //unable to delete object
 			} else {
@@ -104,6 +114,7 @@
 		}
 	} //end of delete album
 
+	create_metadata($owner_guid, "image_repo_size", $image_repo_size, 'integer', $owner_guid);
 
 	forward($forward_url);
 
diff --git a/actions/upload.php b/actions/upload.php
index 5dacd5fec..e7c78c178 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -16,11 +16,18 @@
 	if (!$container_guid)
 		$container_guid == $_SESSION['user']->getGUID();
 
+	$album = get_entity($container_guid);
+
 	$maxfilesize = get_plugin_setting('maxfilesize','tidypics'); 
 	if (!$maxfilesize)
 		$maxfilesize = 5; // default to 5 MB if not set 
 	$maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs
 
+	$quota = get_plugin_setting('quota','tidypics');
+	$quota = 1024 * 1024 * $quota;
+	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
+	$image_repo_size = (int)$image_repo_size_md->value;
+
 	$image_lib = get_plugin_setting('image_lib', 'tidypics');
 	if (!$image_lib)
 		$image_lib = 'GD';
@@ -87,6 +94,15 @@
 			continue;
 		}
 
+		// check quota
+		if ($quota) {
+			if ($image_repo_size + $sent_file['size'] > $quota) {
+				array_push($not_uploaded, $sent_file['name']);
+				array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
+				continue;
+			}
+		}
+		
 		// make sure file does not exceed memory limit
 		if ($sent_file['size'] > $maxfilesize) {
 			array_push($not_uploaded, $sent_file['name']);
@@ -178,6 +194,9 @@
 		td_get_exif($file);
 		array_push($uploaded_images, $file->guid);
 
+		// update user/group size for checking quota
+		$image_repo_size += $sent_file['size'];
+
 		if($river_view == "all") {
 			add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
 		}
@@ -207,7 +226,6 @@
 	}
 
 	// successful upload so check if this is a new album and throw river event if so
-	$album = get_entity($container_guid);
 	if ($album->new_album == TP_NEW_ALBUM) {
 		if (function_exists('add_to_river'))
 			add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
@@ -219,7 +237,10 @@
 			add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
 		}
 	}
-			
+	
+	// update image repo size
+	create_metadata($album->container_guid, "image_repo_size", $image_repo_size, 'integer', $album->container_guid);
+	
 	// plugins can register to be told when a Tidypics album has had images added
 	trigger_elgg_event('upload', 'tp_album', $album);
 	
diff --git a/languages/en.php b/languages/en.php
index bbeb9a634..c5f4dd99f 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -50,6 +50,7 @@
 			'tidypics:settings:exif' => "Show EXIF data",
 			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
+			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick Cmdline must be selected for the image library",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
 			'tidypics:settings:river_view' => "How many entries in river for each batch of uploaded images",
@@ -153,7 +154,7 @@
 			'image:deletefailed' => "Your image could not be deleted at this time.",
 			'image:downloadfailed' => "Sorry; this image is not available at this time.",
 			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
-			
+			'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator",
 			'images:notedited' => "Not all images were successfully updated",
 		 
 			'album:none' => "No albums have been created yet.",
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index c5d71409c..d2d676290 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -65,6 +65,12 @@
 	$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
 
+	// Quota Size
+	$quota = $plugin->quota;
+	if (!$quota) $quota = 0;
+	$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
+
 	// River options
 	$river_view = $plugin->river_view;
 	if (!$river_view) $river_view = '1';
-- 
cgit v1.2.3


From 2932918effa51f9689cabe38b758e44435d08e96 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 14 Jun 2009 20:37:08 +0000
Subject: close to final version of river entries - commented out cover from
 image view and added option for album to show multiple photos

---
 actions/upload.php                          |  6 +++---
 languages/en.php                            |  3 ++-
 views/default/river/object/album/create.php | 22 ++++++++++++++++++++--
 views/default/river/object/image/create.php |  3 +++
 views/default/tidypics/forms/admin.php      | 26 ++++++++++++++++++++------
 5 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index e7c78c178..2e33d67db 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -55,7 +55,7 @@
 	$not_uploaded = array();
 	$error_msgs = array();
 	
-	$river_view = get_plugin_setting('river_view', 'tidypics');
+	$img_river_view = get_plugin_setting('img_river_view', 'tidypics');
 	
 	$accepted_formats = array(
 								'image/jpeg',
@@ -197,7 +197,7 @@
 		// update user/group size for checking quota
 		$image_repo_size += $sent_file['size'];
 
-		if($river_view == "all") {
+		if($img_river_view == "all") {
 			add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
 		}
 		unset($file);  // may not be needed but there seems to be a memory leak
@@ -232,7 +232,7 @@
 		$album->new_album = TP_OLD_ALBUM;
 	}
 	
-	if(count($uploaded_images) && $river_view == "1") {
+	if(count($uploaded_images) && $img_river_view == "1") {
 		if (function_exists('add_to_river')) {
 			add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
 		}
diff --git a/languages/en.php b/languages/en.php
index c5f4dd99f..6aff28061 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -53,7 +53,8 @@
 			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick Cmdline must be selected for the image library",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
-			'tidypics:settings:river_view' => "How many entries in river for each batch of uploaded images",
+			'tidypics:settings:img_river_view' => "How many entries in river for each batch of uploaded images",
+			'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",
 			'tidypics:settings:largesize' => "Primary image size",
 			'tidypics:settings:smallsize' => "Album view image size",
 			'tidypics:settings:thumbsize' => "Thumbnail image size",
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 40f847c78..5f8b07965 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -6,9 +6,27 @@
 	$url = "getURL()}\">{$performed_by->name}";
 	$string = sprintf(elgg_echo("album:river:created"),$url) . " ";
 	$string .= "getURL() . "\">" . $album->title . "";
+
+	$album_river_view = get_plugin_setting('album_river_view', 'tidypics');
 	
-	if ($album->cover) {
-		$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
+	if ($album_river_view == "cover") {
+		if ($album->cover) {
+			$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
+		}
+	} else {
+
+		$string .= "
      ";
+		
+		// display the simple image views. Uses: via 'object/image.php'
+		$images = get_entities("object", "image", $file_guid, 'time_created desc', 7);
+
+		if (count($images)) {
+			foreach($images as $image){
+				$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> ';
+			}
+		}
+
+		$string .= "
      ";
 	}
 
 echo $string;
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 09320080b..8f7a856ea 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -17,7 +17,10 @@
 	$string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link);
 		
 	$string .= "
      ";
+
+/*	// this adds the album cover to the river display 
 	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> ';
+*/
 	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> ';
 	$string .= "
      ";
 	
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index d2d676290..a67d320d5 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -71,18 +71,32 @@
 	$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
 
-	// River options
-	$river_view = $plugin->river_view;
-	if (!$river_view) $river_view = '1';
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:river_view');
+	// River Image options
+	$img_river_view = $plugin->img_river_view;
+	if (!$img_river_view) $img_river_view = '1';
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view');
 	$form_body .= elgg_view('input/pulldown', array(
-					'internalname' => 'params[river_view]',
+					'internalname' => 'params[img_river_view]',
 					'options_values' => array(
 						'all' => 'all',
 						'1' => '1',
 						'none' => 'none',
 					),
-					'value' => $river_view
+					'value' => $img_river_view
+	));
+	$form_body .= '
      ';
+
+	// River Album options
+	$album_river_view = $plugin->album_river_view;
+	if (!$album_river_view) $album_river_view = '1';
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view');
+	$form_body .= elgg_view('input/pulldown', array(
+					'internalname' => 'params[album_river_view]',
+					'options_values' => array(
+						'cover' => 'cover',
+						'set' => 'set',
+					),
+					'value' => $album_river_view
 	));
 	$form_body .= '
      ';
 
-- 
cgit v1.2.3


From 1681015db9a4c9d91337f634b6f2c20a63a549f1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 14 Jun 2009 22:08:31 +0000
Subject: finished river mods for next release

---
 graphics/icons/river_icon_image.gif | Bin 284 -> 945 bytes
 languages/en.php                    |   4 ++--
 views/default/tidypics/css.php      |   5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/graphics/icons/river_icon_image.gif b/graphics/icons/river_icon_image.gif
index 6f8bfd6af..cf391898e 100644
Binary files a/graphics/icons/river_icon_image.gif and b/graphics/icons/river_icon_image.gif differ
diff --git a/languages/en.php b/languages/en.php
index 6aff28061..f1f3ed543 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -110,9 +110,9 @@
 		//  river
 		
 			//images
-			'image:river:created' => "%s added %s to album %s",
+			'image:river:created' => "%s added the image %s to album %s",
 			'image:river:item' => "an image",
-			'image:river:annotate' => "a comment on the image",	
+			'image:river:annotate' => "a comment on the image",
 		
 			//albums
 			'album:river:created' => "%s created a new photo album: ",
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 4d17ba214..bc0073734 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -178,12 +178,9 @@ padding:0 0 5px;
 
 /* ---------  tidypics river items ------------   */
 
-.river_image_create {
+.river_object_image_create {
 	background: url(mod/tidypics/graphics/icons/river_icon_image.gif) no-repeat left -1px;
 }
-.river_album_create {
-	background: url(mod/tidypics/graphics/icons/river_icon_album.gif) no-repeat left -1px;
-}
 .river_object_album_create {
 	background: url(mod/tidypics/graphics/icons/river_icon_album.gif) no-repeat left -1px;
 }
-- 
cgit v1.2.3


From de4945a1bb1b627a530048c7dece50805d06f1ee Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 14 Jun 2009 22:29:02 +0000
Subject: highest ratings submenu controlled by plugin settings

---
 views/default/object/album.php         | 9 ++++++---
 views/default/tidypics/forms/admin.php | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 9a34e3d5f..1e8ff9dc9 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -60,9 +60,12 @@
 		// individual album view
 		$page = get_input("page");
 		list($album_placeholder, $album_id, $album_title) = split("/", $page);
-		add_submenu_item(	elgg_echo("tidypics:highestrated"),
-							$CONFIG->wwwroot . "pg/photos/highestrated/group:" . $album_id,
-							'photos');
+		
+		$photo_ratings = get_plugin_setting('photo_ratings', 'tidypics');
+		if ($photo_ratings == "enabled")
+			add_submenu_item(	elgg_echo("tidypics:highestrated"),
+								$CONFIG->wwwroot . "pg/photos/highestrated/group:" . $album_id,
+								'photos');
 ?>
 
      
 	
      
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index a67d320d5..564b89987 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -45,7 +45,7 @@
 	if(!$download_link) $download_link = "enabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
 
-	// Download Link
+	// Ratings
 	$photo_ratings = $plugin->photo_ratings;
 	if(!$photo_ratings) $photo_ratings = "disabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
-- 
cgit v1.2.3


From b4b85ecc55a6787726627150a2ee93fd960ff2c6 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 16 Jun 2009 01:39:32 +0000
Subject: added delete phototags capability

---
 actions/deletetag.php                 | 51 +++++++++++++++++++++++++++++++++++
 languages/en.php                      |  6 +++++
 start.php                             |  1 +
 views/default/js/tagging.php          | 29 +++++++++++++++++++-
 views/default/object/image.php        |  6 ++++-
 views/default/tidypics/css.php        | 12 +++++++++
 views/default/tidypics/image_menu.php | 11 +++++++-
 views/default/tidypics/tagging.php    | 16 +++++++++++
 8 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 actions/deletetag.php

diff --git a/actions/deletetag.php b/actions/deletetag.php
new file mode 100644
index 000000000..cd76b0a1d
--- /dev/null
+++ b/actions/deletetag.php
@@ -0,0 +1,51 @@
+ $value) {
+		// delete normal tag if it exists
+		if (is_array($image->tags)) {
+			$index = array_search($value[0], $image->tags);
+			if ($index !== false) {
+				$tagarray = $image->tags;
+				unset($tagarray[$index]);
+				$image->clearMetadata('tags');
+				$image->tags = $tagarray;
+			}
+		} else {
+			if ($value[0] === $image->tags) {
+				$image->clearMetadata('tags');
+			}
+		}
+		
+		// delete the photo tag annotation
+		delete_annotation($id);
+	}
+	
+	system_message(elgg_echo("tidypics:deletetag:success"));
+
+	forward($_SERVER['HTTP_REFERER']);
+
+?>
diff --git a/languages/en.php b/languages/en.php
index f1f3ed543..7c452c6e4 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -92,12 +92,18 @@
 			
 		// tagging
 			'tidypics:taginstruct' => 'Select area that you want to tag',
+			'tidypics:deltag_title' => 'Select tags to delete',
 			'tidypics:finish_tagging' => 'Stop tagging',
 			'tidypics:tagthisphoto' => 'Tag this photo',
+			'tidypics:deletetag' => 'Delete a photo tag',
 			'tidypics:actiontag' => 'Tag',
+			'tidypics:actiondelete' => 'Delete',
+			'tidypics:actioncancel' => 'Cancel',
 			'tidypics:inthisphoto' => 'In this photo',
 			'tidypics:phototagging:success' => 'Photo tag was successfully added',
 			'tidypics:phototagging:error' => 'Unexpected error occurred during tagging',
+			'tidypics:deletetag:success' => 'Selected tags were successfully deleted',
+			
 		
 		//widgets
 		
diff --git a/start.php b/start.php
index 2d4d40782..082dc1507 100644
--- a/start.php
+++ b/start.php
@@ -371,5 +371,6 @@
 	register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
 	register_action("tidypics/download", true, $CONFIG->pluginspath . "tidypics/actions/download.php");
 	register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
+	register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
 
 ?>
\ No newline at end of file
diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php
index e27af7fca..a79914196 100644
--- a/views/default/js/tagging.php
+++ b/views/default/js/tagging.php
@@ -139,7 +139,7 @@
 		$('#tag_control').text("Stop Tagging");
 		
 		showTagInstruct();
-		
+		$('#delete_tag_menu').hide();
 
 		$('#tidypics_image').hover(
 			function(){
@@ -252,4 +252,31 @@
 		//Show loading
 		//$("#tag_menu").replaceWith('
      ');
 	}
+
+	function deleteTags()
+	{
+		offsetY = 60;
+		
+		divWidth = $('#delete_tag_menu').width();
+		imgOffset = $('#tidypics_image').offset();
+		imgWidth  = $('#tidypics_image').width();
+		offsetX   = parseInt((imgWidth - divWidth)/2);
+		
+		_top = imgOffset.top + offsetY;
+		_left = imgOffset.left + offsetX;
+
+		$('#delete_tag_menu').show().css({
+			"top": _top + "px",
+			"left": _left + "px"
+		});
+		
+		$('#tidypics_image').hover(
+			function(){
+				$('.tidypics_tag').hide();
+			},
+			function(){
+				$('.tidypics_tag').hide();
+			}
+		);
+	}
 
\ No newline at end of file
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 64109f1a2..1ab2e921a 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -47,6 +47,7 @@ if ($photo_tags) {
 			$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
 		
 		$photo_tag_links[] = array($p->id, $phototag_text); // gave up on associative array for now
+		$photo_tag_texts[$p->id] = $phototag_text;
 	}
 	$photo_tags_json = rtrim($photo_tags_json,',');
 	$photo_tags_json .= ']';
@@ -184,16 +185,19 @@ if ($photo_tags) {
 		
      
 
        ';
 			echo elgg_view('tidypics/image_menu', array('file_guid' => $file_guid, 
 														'viewer' => $viewer,
-														'owner' => $owner,) );
+														'owner' => $owner,
+														'anytags' => $photo_tags != '',) );
 			echo '
      '; 
 			
 			// tagging code
 			if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
 				echo elgg_view('tidypics/tagging', array(	'photo_tags' => $photo_tags, 
 															'links' => $photo_tag_links,
+															'text' => $photo_tag_texts,
 															'photo_tags_json' => $photo_tags_json,
 															'file_guid' => $file_guid,
 															'viewer' => $viewer,
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index bc0073734..7564f1eaf 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -230,6 +230,18 @@ font-size:12px;
 text-align:left;
 }
 
+#delete_tag_menu {
+border:1px solid #3B5999; 
+width:200px; 
+position:absolute;
+z-index:10000; 
+display:none; 
+background:#ffffff; 
+padding:10px; 
+font-size:12px; 
+text-align:left;
+}
+
 .tidypics_tag {
 display:none;
 background:url(mod/tidypics/graphics/spacer.gif); 
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 9257d780a..5940a0138 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -13,15 +13,24 @@
 	$file_guid = $vars['file_guid'];
 	$viewer = $vars['viewer'];
 	$owner = $vars['owner'];
-	
+	$anytags = $vars['anytags'];
+
 	if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
 		// only owner and friends of owner can tag
 		if ($viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid)) {
 ?>
 
      12. 
+guid == $owner->guid) {
+?>
+
      13. 
 
 
      14. 
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 8ba58be4f..fdf40b3a5 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -5,6 +5,7 @@
 	$file_guid = $vars['file_guid'];
 	$viewer = $vars['viewer'];
 	$owner = $vars['owner'];
+	$tag_texts = $vars['text'];
 	
 	if ($photo_tags) { 
 ?>
@@ -53,6 +54,21 @@
 
 ?>
 
      
+
      
 ';
+		$content = "";
+		foreach ($tag_texts as $id => $text) {
+			$name = "tags[{$id}]";
+			$content .= elgg_view("input/checkboxes", array('options' => array($text => $text), 'internalname' => $name, 'value' => '' ));
+		}
+		$content .= "
      ";
+
+		echo elgg_view('input/form', array('internalname' => 'form-deletetag', 'action' => "{$vars['url']}action/tidypics/deletetag", 'body' => $content));
+
+	}
+	echo '
      '; // delete_tag_menu
+	
 	echo elgg_view('js/tagging', array('photo_tags_json' => $photo_tags_json,) );
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From e1b554d703d6a41006009392afcfe66f64f9b769 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 16 Jun 2009 10:53:40 +0000
Subject: changed max file size parsing code in upload form

---
 views/default/tidypics/forms/upload.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index db162e4e9..ec33ca933 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -6,15 +6,9 @@
 	$container_guid = get_input('container_guid');
 	$access_id = get_entity($vars['album'])->access_id;
 
-	if (get_plugin_setting('maxfilesize','tidypics')) {
-		if (((int) get_plugin_setting('maxfilesize','tidypics')) < 1 || ((int) get_plugin_setting('maxfilesize','tidypics')) > 1048576) {
-			$maxfilesize = 10240; //if file size is less than 1KB or greater than 1GB, default to 10MB
-		} else {
-			$maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics');
-		}
-	} else {
-		$maxfilesize = 10240; //if the file size limit is not set, default to 10MB
-	}
+	$maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics');
+	if (!$maxfilesize)
+		$maxfilesize = 5;
 
 ?>
 
+
      
 
      
 
-	
      
-		
      
-		
      
-		
      
-	  
        
+
        
+	
        
+	
        
+	
        
+		Uploading images
        
+		
        ...
        
+	
        
+	
          
 ' . elgg_view("input/file",array('internalname' => "upload_$x")) . "\n";
-		}	  
+		for ($x = 0; $x < 10; $x++) {
+			echo '
        1. ' . elgg_view("input/file",array('internalname' => "upload_$x")) . '
          2. ';
+		} 
 ?>
-		
        
-	
        		
-		
-		
        
-			';
-				if ($access_id)
-					echo '';
-			?>
-			" onclick="showhide('tidypics_loader');" />
-		
        
+	
      
+
      
+
      
+';
+		if ($access_id)
+			echo '';
+?>
+	" onclick="displayProgress();" />
+
      
  'multipart/form-data',
 										'method' => 'post',));
 ?>
-
      
\ No newline at end of file
+
      
+
\ No newline at end of file
-- 
cgit v1.2.3


From 0afd1a3ce8392863a89932b7525d58be8c7f5135 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 17 Jun 2009 00:07:17 +0000
Subject: switched to Administration from Settings

---
 admin.php        | 4 ++--
 languages/en.php | 4 ++--
 start.php        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin.php b/admin.php
index f44250d71..23a3c22f3 100644
--- a/admin.php
+++ b/admin.php
@@ -13,10 +13,10 @@
 	set_context('admin');
 	set_page_owner($_SESSION['guid']);
 
-	$body = elgg_view_title(elgg_echo('tidypics:adminsettings'));
+	$body = elgg_view_title(elgg_echo('tidypics:administration'));
 	
 	$body .= elgg_view("admin/tidypics");
 	
-	page_draw(elgg_echo('tidypics:adminsettings'),elgg_view_layout("two_column_left_sidebar", '', $body));
+	page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));
 
 ?>
\ No newline at end of file
diff --git a/languages/en.php b/languages/en.php
index 7c452c6e4..9bcd623f6 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -39,9 +39,9 @@
 			'tidypics:highestrated' => "Highest rated images",
 			'tidypics:viewsbyowner' => "Views: %s by %s users (not including you)",
 			'tidypics:viewsbyothers' => "Views: %s (%s by you)",
-	
+			'tidypics:administration' => 'Tidypics Administration',
+			
 		//settings
-			'tidypics:adminsettings' => 'Tidypics Settings',
 			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
 			'tidypics:settings:image_lib' => "Image Library: ",
 			'tidypics:settings:download_link' => "Show download link",
diff --git a/start.php b/start.php
index 082dc1507..650c9ed2e 100644
--- a/start.php
+++ b/start.php
@@ -178,7 +178,7 @@
 	{
 		global $CONFIG;
 		if (get_context() == 'admin' && isadminloggedin()) {
-			add_submenu_item(elgg_echo('tidypics:adminsettings'), $CONFIG->url . "mod/tidypics/admin.php");
+			add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "mod/tidypics/admin.php");
 		}
 	}
 
-- 
cgit v1.2.3


From 4928e46d6b93ccd1256117e08283341bdc224791 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 17 Jun 2009 00:53:35 +0000
Subject: tabbed interface for admin now

---
 admin.php                           |  4 +++-
 languages/en.php                    |  4 +++-
 views/default/admin/tidypics.php    | 40 ++++++++++++++++++++++++++-----------
 views/default/tidypics/settings.php | 13 ++++++++++++
 views/default/tidypics/stats.php    |  3 +++
 5 files changed, 50 insertions(+), 14 deletions(-)
 create mode 100644 views/default/tidypics/settings.php
 create mode 100644 views/default/tidypics/stats.php

diff --git a/admin.php b/admin.php
index 23a3c22f3..e881c5ecd 100644
--- a/admin.php
+++ b/admin.php
@@ -12,10 +12,12 @@
 	admin_gatekeeper();
 	set_context('admin');
 	set_page_owner($_SESSION['guid']);
+	
+	$tab = isset($_GET['tab']) ? $_GET['tab'] : 'settings';
 
 	$body = elgg_view_title(elgg_echo('tidypics:administration'));
 	
-	$body .= elgg_view("admin/tidypics");
+	$body .= elgg_view("admin/tidypics", array('tab' => $tab));
 	
 	page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));
 
diff --git a/languages/en.php b/languages/en.php
index 9bcd623f6..f71a1fb89 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -40,13 +40,15 @@
 			'tidypics:viewsbyowner' => "Views: %s by %s users (not including you)",
 			'tidypics:viewsbyothers' => "Views: %s (%s by you)",
 			'tidypics:administration' => 'Tidypics Administration',
+			'tidypics:stats' => 'Stats',
 			
 		//settings
+			'tidypics:settings' => 'Settings',
 			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
 			'tidypics:settings:image_lib' => "Image Library: ",
 			'tidypics:settings:download_link' => "Show download link",
 			'tidypics:settings:tagging' => "Enable photo tagging",
-			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or comptabile)",
+			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
 			'tidypics:settings:exif' => "Show EXIF data",
 			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
diff --git a/views/default/admin/tidypics.php b/views/default/admin/tidypics.php
index cecf5409f..7bc2c2921 100644
--- a/views/default/admin/tidypics.php
+++ b/views/default/admin/tidypics.php
@@ -2,19 +2,35 @@
 
 	global $CONFIG;
 	
+	$tab = $vars['tab'];
 	
-	echo '
      ';
+	$settingsselect = ''; 
+	$statsselect = '';
+	switch($tab) {
+		case 'settings':
+			$settingsselect = 'class="selected"';
+			break;
+		case 'stats':
+			$statsselect = 'class="selected"';
+			break;
+	}
 	
-	echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
-	
-	global $CONFIG;  
-	$system_url = $CONFIG->wwwroot . 'mod/tidypics/system.php';
 ?>
-
      
-Run Server Analysis
-
      
+
      
+	
      
+		
        
+			
      • '>
        • 
+			
      • >
        • 
+		
      
+	
      
 ";
-?>
\ No newline at end of file
+	switch($tab) {
+		case 'settings':
+			echo elgg_view("tidypics/settings");
+			break;
+		case 'stats':
+			echo elgg_view("tidypics/stats");
+			break;
+	}
+?>
+
      
\ No newline at end of file
diff --git a/views/default/tidypics/settings.php b/views/default/tidypics/settings.php
new file mode 100644
index 000000000..e69d6d306
--- /dev/null
+++ b/views/default/tidypics/settings.php
@@ -0,0 +1,13 @@
+ elgg_echo("tidypics:admin:instructions")));
+	
+	global $CONFIG;  
+	$system_url = $CONFIG->wwwroot . 'mod/tidypics/system.php';
+?>
+
      
+Run Server Analysis
+
      
+
\ No newline at end of file
diff --git a/views/default/tidypics/stats.php b/views/default/tidypics/stats.php
new file mode 100644
index 000000000..8680ab052
--- /dev/null
+++ b/views/default/tidypics/stats.php
@@ -0,0 +1,3 @@
+
\ No newline at end of file
-- 
cgit v1.2.3


From 9eadf21d8a1782f4f77d99826c91d705cade404d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 17 Jun 2009 01:27:43 +0000
Subject: added another setting - now view counter can be turned on and off

---
 actions/settings.php                   |  7 +++-
 languages/en.php                       |  1 +
 start.php                              | 48 ++++++++++++++++----------
 views/default/object/image.php         | 62 +++++++++++++++++++---------------
 views/default/tidypics/forms/admin.php |  5 +++
 5 files changed, 77 insertions(+), 46 deletions(-)

diff --git a/actions/settings.php b/actions/settings.php
index 903802dd8..ae74b8945 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -36,11 +36,16 @@
 	else
 		set_plugin_setting('photo_ratings', 'disabled', 'tidypics');
 
-		if (is_array(get_input('exif')))
+	if (is_array(get_input('exif')))
 		set_plugin_setting('exif', 'enabled', 'tidypics');
 	else
 		set_plugin_setting('exif', 'disabled', 'tidypics');
 
+	if (is_array(get_input('view_count')))
+		set_plugin_setting('view_count', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('view_count', 'disabled', 'tidypics');
+
 	if (is_array(get_input('grp_perm_override')))
 		set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
 	else
diff --git a/languages/en.php b/languages/en.php
index f71a1fb89..fca507407 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -50,6 +50,7 @@
 			'tidypics:settings:tagging' => "Enable photo tagging",
 			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
 			'tidypics:settings:exif' => "Show EXIF data",
+			'tidypics:settings:view_count' => "View counter",
 			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
 			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
diff --git a/start.php b/start.php
index 650c9ed2e..9c59fd8e6 100644
--- a/start.php
+++ b/start.php
@@ -77,9 +77,11 @@
 				}
 			}
 		}
-		// context is only set to photos on individual pages, not on group pages		
+		// context is only set to photos on individual pages, not on group pages
 		else if (get_context() == "photos") {
 			
+			$view_count = get_plugin_setting('view_count', 'tidypics');
+			
 			// owner gets "your albumn", "your friends albums", "your most viewed", "your most recent"
 			if (get_loggedin_userid() == $page_owner->guid && get_loggedin_userid()) {
 				add_submenu_item(	elgg_echo('album:create'), 
@@ -93,10 +95,12 @@
 				add_submenu_item( 	elgg_echo('album:yours:friends'), 
 									$CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, 
 									'tidypics-a');
-									
-				add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
-									$CONFIG->wwwroot . 'pg/photos/yourmostviewed',
-									'tidypics-a');
+				
+				if ($view_count != 'disabled') {
+					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
+										$CONFIG->wwwroot . 'pg/photos/yourmostviewed',
+										'tidypics-a');
+				}
 				
 				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
 									$CONFIG->wwwroot . 'pg/photos/yourmostrecent',
@@ -106,9 +110,12 @@
 				add_submenu_item(	elgg_echo("album:yours"), 
 									$CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, 
 									'tidypics-b' );
-				add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
-									$CONFIG->wwwroot . 'pg/photos/yourmostviewed',
-									'tidypics-b');
+				
+				if ($view_count != 'disabled') {
+					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
+										$CONFIG->wwwroot . 'pg/photos/yourmostviewed',
+										'tidypics-b');
+				}
 				
 				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
 									$CONFIG->wwwroot . 'pg/photos/yourmostrecent',
@@ -121,9 +128,13 @@
 					add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name), 
 										$CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, 
 										'tidypics-a');
-					add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/friendmostviewed/". $page_owner->username, 
-										'tidypics-a');
+					
+					if ($view_count != 'disabled') {
+						add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), 
+											$CONFIG->wwwroot . "pg/photos/friendmostviewed/". $page_owner->username, 
+											'tidypics-a');
+					}
+					
 					add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name), 
 										$CONFIG->wwwroot . "pg/photos/friendmostrecent/". $page_owner->username, 
 										'tidypics-a');
@@ -141,15 +152,18 @@
 			add_submenu_item(	sprintf(elgg_echo('album:all'),$page_owner->name), 
 								$CONFIG->wwwroot . "pg/photos/world/", 
 								'tidypics-z');
-			add_submenu_item(	elgg_echo('tidypics:mostviewed'),
-								$CONFIG->wwwroot . 'pg/photos/mostviewed',
-								'tidypics-z');			
 			add_submenu_item(	elgg_echo('tidypics:mostrecent'),
 								$CONFIG->wwwroot . 'pg/photos/mostrecent',
 								'tidypics-z');
-			add_submenu_item(	elgg_echo('tidypics:recentlyviewed'),
-								$CONFIG->wwwroot . 'pg/photos/recentlyviewed',
-								'tidypics-z');
+			
+			if ($view_count != 'disabled') {
+				add_submenu_item(	elgg_echo('tidypics:mostviewed'),
+									$CONFIG->wwwroot . 'pg/photos/mostviewed',
+									'tidypics-z');
+				add_submenu_item(	elgg_echo('tidypics:recentlyviewed'),
+									$CONFIG->wwwroot . 'pg/photos/recentlyviewed',
+									'tidypics-z');
+			}
 
 		}
 		
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 1ab2e921a..bd81e238e 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -101,33 +101,37 @@ if ($photo_tags) {
 //
 ////////////////////////////////////////////////////////
 
-			// Get view information
+			$view_count = get_plugin_setting('view_count', 'tidypics');
 			
 			$viewer = get_loggedin_user();
-		
-			//who is viewing?
-			if($viewer->guid) {
-				$the_viewer = $viewer->guid;
-			} else {
-				$the_viewer = 0;
-			}
+
+			if ($view_count != 'disabled') {
+				// Get view information
+				
+				//who is viewing?
+				if($viewer->guid) {
+					$the_viewer = $viewer->guid;
+				} else {
+					$the_viewer = 0;
+				}
+				
+				create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, ACCESS_PUBLIC);
+				$views_a = get_annotations($file_guid, "object", "image", "tp_view", "", 0, 9999);
+				$views = count($views_a);
 			
-			create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, 2);
-			$views_a = get_annotations($file_guid, "object", "image", "tp_view", "", 0, 9999);
-			$views = count($views_a);
-		
-			$my_views = 0;
-			$owner_views = 0;
-			$diff_viewers = array();
-//			echo "
      "; var_dump($owner); echo "
      ";
-			foreach($views_a as $view) {
-				if($view->owner_guid == $the_viewer && $the_viewer != 0) $my_views++;
-				if($owner->guid == $view->owner_guid) $owner_views++;
-				//count how many different people have viewed it
-				if($owner->guid != $view->owner_guid) $diff_viewers[$view->owner_guid] = 1;
+				$my_views = 0;
+				$owner_views = 0;
+				$diff_viewers = array();
+	//			echo "
      "; var_dump($owner); echo "
      ";
+				foreach($views_a as $view) {
+					if($view->owner_guid == $the_viewer && $the_viewer != 0) $my_views++;
+					if($owner->guid == $view->owner_guid) $owner_views++;
+					//count how many different people have viewed it
+					if($owner->guid != $view->owner_guid) $diff_viewers[$view->owner_guid] = 1;
+				}
+				//remove the owner's views from the total count (prevents artificially inflated view counts)
+				$views = $views - $owner_views;
 			}
-			//remove the owner's views from the total count (prevents artificially inflated view counts)
-			$views = $views - $owner_views;
 			
 			// Build back and next links
 			$back = '';
@@ -163,11 +167,13 @@ if ($photo_tags) {
 
 		
      
 			 $album,) ); ?> 
      
-			guid == $the_viewer) {
-					echo sprintf(elgg_echo("tidypics:viewsbyowner"), $views, count($diff_viewers));
-				} else {
-					echo sprintf(elgg_echo("tidypics:viewsbyothers"), $views, $my_views);
+			guid == $the_viewer) {
+						echo sprintf(elgg_echo("tidypics:viewsbyowner"), $views, count($diff_viewers));
+					} else {
+						echo sprintf(elgg_echo("tidypics:viewsbyothers"), $views, $my_views);
+					}
 				}
 			?>
 		
      
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 564b89987..6094a776c 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -55,6 +55,11 @@
 	if(!$exif) $exif = "disabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
 
+	// Show EXIF
+	$view_count = $plugin->view_count;
+	if(!$view_count) $view_count = "enabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
+
 	// Watermark Text
 	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
-- 
cgit v1.2.3


From 17854bb2fece61401f9d4c8d5dc31f396e0fbf70 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 17 Jun 2009 01:48:48 +0000
Subject: moved exif to a view

---
 views/default/object/image.php  | 5 +----
 views/default/tidypics/exif.php | 8 ++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 views/default/tidypics/exif.php

diff --git a/views/default/object/image.php b/views/default/object/image.php
index bd81e238e..b7e19d8c0 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -214,10 +214,7 @@ if ($photo_tags) {
 			if (get_plugin_setting('exif', 'tidypics') != "disabled") {
 ?>
 			
      
-				
+				 $file_guid)); ?>
 			
      
 
 		
      
diff --git a/views/default/tidypics/exif.php b/views/default/tidypics/exif.php
new file mode 100644
index 000000000..80d52d781
--- /dev/null
+++ b/views/default/tidypics/exif.php
@@ -0,0 +1,8 @@
+
\ No newline at end of file
-- 
cgit v1.2.3


From 6061b39ac74181e00b58bdede9095502e9e6bec9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 18 Jun 2009 00:57:27 +0000
Subject: forgot to delete relationship created when tagging with users

---
 actions/deletetag.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/actions/deletetag.php b/actions/deletetag.php
index cd76b0a1d..748d00380 100644
--- a/actions/deletetag.php
+++ b/actions/deletetag.php
@@ -7,7 +7,6 @@
 	gatekeeper();
 	action_gatekeeper();
 
-	//$user_id = get_input('user_id');
 	$image_guid = get_input('image_guid');
 	$tags = get_input('tags');
 	
@@ -40,6 +39,13 @@
 			}
 		}
 		
+		// delete relationship if this tag is a user
+		$annotation = get_annotation($id);
+		$photo_tag = unserialize($annotation->value);
+		if ($photo_tag->type == 'user') {
+			remove_entity_relationship($photo_tag->value, 'phototag', $image_guid);
+		}
+		
 		// delete the photo tag annotation
 		delete_annotation($id);
 	}
-- 
cgit v1.2.3


From 5b8a7460d026d91f5c2411673f3b02be2b0e724d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 18 Jun 2009 01:27:35 +0000
Subject: cleaned up the tagging code

---
 views/default/object/image.php     |  9 +++++----
 views/default/tidypics/tagging.php | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index b7e19d8c0..d86f3ca46 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -20,7 +20,6 @@
 
 /////////////////////////////////////////////////////
 // get photo tags from database
-$photo_tag_links = array();
 $photo_tags_json = "\"\"";
 $photo_tags = get_annotations($file_guid,'object','image','phototag');
 
@@ -31,12 +30,15 @@ if ($photo_tags) {
 		
 
 		$phototag_text = $photo_tag->value;
+		$phototag_link = $vars['url'] . "word";
 		if ($photo_tag->type === 'user') {
 			$user = get_entity($photo_tag->value);
 			if ($user)
 				$phototag_text = $user->name;
 			else
 				$phototag_text = "unknown user";
+			
+			$phototag_link = $vars['url'] . "user";
 		}
 
 		// hack to handle format of Pedro Prez's tags - ugh
@@ -46,8 +48,8 @@ if ($photo_tags) {
 		} else
 			$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
 		
-		$photo_tag_links[] = array($p->id, $phototag_text); // gave up on associative array for now
-		$photo_tag_texts[$p->id] = $phototag_text;
+		// prepare variable arrays for tagging view
+		$photo_tag_links[$p->id] = array($phototag_text, $phototag_link);
 	}
 	$photo_tags_json = rtrim($photo_tags_json,',');
 	$photo_tags_json .= ']';
@@ -203,7 +205,6 @@ if ($photo_tags) {
 			if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
 				echo elgg_view('tidypics/tagging', array(	'photo_tags' => $photo_tags, 
 															'links' => $photo_tag_links,
-															'text' => $photo_tag_texts,
 															'photo_tags_json' => $photo_tags_json,
 															'file_guid' => $file_guid,
 															'viewer' => $viewer,
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index fdf40b3a5..fcb0b8d4e 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -5,7 +5,7 @@
 	$file_guid = $vars['file_guid'];
 	$viewer = $vars['viewer'];
 	$owner = $vars['owner'];
-	$tag_texts = $vars['text'];
+
 	
 	if ($photo_tags) { 
 ?>
@@ -13,8 +13,8 @@
 	
      
 	
@@ -59,9 +59,9 @@
 	if ($photo_tags) {
 		echo elgg_echo('tidypics:deltag_title') . '
      ';
 		$content = "";
-		foreach ($tag_texts as $id => $text) {
+		foreach ($links as $id => $text) {
 			$name = "tags[{$id}]";
-			$content .= elgg_view("input/checkboxes", array('options' => array($text => $text), 'internalname' => $name, 'value' => '' ));
+			$content .= elgg_view("input/checkboxes", array('options' => array($text[0] => $text[0]), 'internalname' => $name, 'value' => '' ));
 		}
 		$content .= "
      ";
 
-- 
cgit v1.2.3


From effbb14022495081f80acdc1d68ced09c1dd67c0 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 18 Jun 2009 01:54:52 +0000
Subject: added the framework to get a list of photos tagged with a user

---
 search.php                     | 24 ++++++++++++++++++++++++
 start.php                      |  5 +++++
 views/default/object/image.php |  4 ++--
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 search.php

diff --git a/search.php b/search.php
new file mode 100644
index 000000000..2899d2c3f
--- /dev/null
+++ b/search.php
@@ -0,0 +1,24 @@
+name;
+		
+	$title = $user->name;
+	
+	
+	$body = elgg_view_title($title); 
+	$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image'); 
+	$body = elgg_view_layout('two_column_left_sidebar','',$body);
+
+	page_draw($title,$body);
+
+?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 9c59fd8e6..6318a3da1 100644
--- a/start.php
+++ b/start.php
@@ -253,6 +253,11 @@
 					include($CONFIG->pluginspath . "tidypics/world.php");
 				break;
 				
+				case "search": //view an image individually
+					if (isset($page[1])) set_input('guid',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/search.php");
+				break;
+
 				case "rate": //rate image
 					if (isset($page[1])) set_input('guid',$page[1]);
 					include($CONFIG->pluginspath . "tidypics/actions/rate.php");
diff --git a/views/default/object/image.php b/views/default/object/image.php
index d86f3ca46..d7b791a78 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -30,7 +30,7 @@ if ($photo_tags) {
 		
 
 		$phototag_text = $photo_tag->value;
-		$phototag_link = $vars['url'] . "word";
+		$phototag_link = $vars['url'] . 'search/?tag=' . $phototag_text . '&subtype=image&object=object';
 		if ($photo_tag->type === 'user') {
 			$user = get_entity($photo_tag->value);
 			if ($user)
@@ -38,7 +38,7 @@ if ($photo_tags) {
 			else
 				$phototag_text = "unknown user";
 			
-			$phototag_link = $vars['url'] . "user";
+			$phototag_link = $vars['url'] . "pg/photos/search/" . $photo_tag->value;
 		}
 
 		// hack to handle format of Pedro Prez's tags - ugh
-- 
cgit v1.2.3


From e9ca89769c050bc88a32151012b773ca9c8246f0 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 19 Jun 2009 11:06:45 +0000
Subject: finished phototag search page

---
 languages/en.php |  1 +
 search.php       | 27 +++++++++++++++++++++++----
 start.php        |  2 +-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index fca507407..4802308ff 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -103,6 +103,7 @@
 			'tidypics:actiondelete' => 'Delete',
 			'tidypics:actioncancel' => 'Cancel',
 			'tidypics:inthisphoto' => 'In this photo',
+			'tidypics:usertag' => "Photos tagged with user %s",
 			'tidypics:phototagging:success' => 'Photo tag was successfully added',
 			'tidypics:phototagging:error' => 'Unexpected error occurred during tagging',
 			'tidypics:deletetag:success' => 'Selected tags were successfully deleted',
diff --git a/search.php b/search.php
index 2899d2c3f..b7b67295d 100644
--- a/search.php
+++ b/search.php
@@ -2,22 +2,41 @@
 
 	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 	
-	// Set context
 	set_context('search');
 	
 	// Get user guid
 	$guid = get_input('guid');
 	
 	$user = get_entity($guid);
-//	if ($user)
-//		$user->name;
+
+	if ($user)
+		$title = sprintf(elgg_echo('tidypics:usertag'), $user->name);
+	else
+		$title = "User does not exist";
 		
-	$title = $user->name;
 	
 	
+	// create main column
 	$body = elgg_view_title($title); 
 	$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image'); 
+
+	// Set up submenus
+	if (isloggedin()) {
+		add_submenu_item(	elgg_echo("album:yours"), 
+							$CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, 
+							'tidypics-b' );
+	}
+	add_submenu_item(	elgg_echo('album:all'), 
+						$CONFIG->wwwroot . "pg/photos/world/", 
+						'tidypics-z');
+	add_submenu_item(	elgg_echo('tidypics:mostrecent'),
+						$CONFIG->wwwroot . 'pg/photos/mostrecent',
+						'tidypics-z');
+
+	
+	
 	$body = elgg_view_layout('two_column_left_sidebar','',$body);
+	
 
 	page_draw($title,$body);
 
diff --git a/start.php b/start.php
index 6318a3da1..dec7e36ed 100644
--- a/start.php
+++ b/start.php
@@ -149,7 +149,7 @@
 									'tidypics');
 			}
 			
-			add_submenu_item(	sprintf(elgg_echo('album:all'),$page_owner->name), 
+			add_submenu_item(	elgg_echo('album:all'), 
 								$CONFIG->wwwroot . "pg/photos/world/", 
 								'tidypics-z');
 			add_submenu_item(	elgg_echo('tidypics:mostrecent'),
-- 
cgit v1.2.3


From e244c318e85b2fa1db141b7405964ff4108de63f Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 19 Jun 2009 11:27:07 +0000
Subject: finalized next and back controls in image view

---
 views/default/object/image.php | 9 ++++++---
 views/default/tidypics/css.php | 5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index d7b791a78..65319c1be 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -157,10 +157,10 @@ if ($photo_tags) {
 			}
 
 			if ($current != 0)
-				$back = '<<' . elgg_echo('image:back') . '';
+				$back = '<<' . elgg_echo('image:back') . '';
 
 			if (sizeof($_SESSION['image_sort']) > $current + 1)
-				$next = '' . elgg_echo('image:next') . '>>';
+				$next = '' . elgg_echo('image:next') . '>>';
 
 
 ?>
@@ -184,7 +184,10 @@ if ($photo_tags) {
 			
 		
      
 		
      
-			
+			
        
+				
        • 
+				
        • 
+			
      
 		
      
 		
      
 			'; ?>
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 7564f1eaf..88f70bf7b 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -78,6 +78,11 @@ text-align:center;
 text-align:center;
 }
 
+#tidypics_image_nav ul li {
+display:inline;
+margin-right:10px;
+}
+
 #tidypics_image_full {
 text-align:center;
 margin:10px;
-- 
cgit v1.2.3


From 8579b6e9d72efdf26c47870ed7962a3f12374fd5 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 19 Jun 2009 11:32:46 +0000
Subject: started working on css for release

---
 docs/css_guide.txt             | 77 ++++++++++++++++++++++++++++++++++++++++++
 views/default/tidypics/css.php | 21 ------------
 2 files changed, 77 insertions(+), 21 deletions(-)
 create mode 100644 docs/css_guide.txt

diff --git a/docs/css_guide.txt b/docs/css_guide.txt
new file mode 100644
index 000000000..6153739f4
--- /dev/null
+++ b/docs/css_guide.txt
@@ -0,0 +1,77 @@
+#tidypics_wrapper 
+
+#tidypics_breadcrumbs 
+
+#tidypics_desc 
+
+#tidypics_info 
+
+#tidypics_controls 
+
+.tidypics_album_images 
+
+#tidypics_image_nav 
+
+#tidypics_image_full 
+
+#tidypics_image_wrapper 
+
+#tidypics_image 
+
+.tidypics_album_cover 
+
+.tidypics_album_widget_single_item 
+
+.tidypics_album_gallery_item 
+
+
+/* ------ tidypics widget view ------  */
+
+#tidypics_album_widget_container 
+
+.tidypics_album_widget_timestamp 
+
+/* ---------  image upload/edit forms  ------------   */
+
+#tidpics_image_upload_list li 
+
+.tidypics_edit_image_container 
+
+.tidypics_edit_images 
+
+.tidypics_image_info 
+
+
+/* ---- tidypics group css ----- */
+
+#group_albums_widget 
+
+
+/* ---------  tidypics river items ------------   */
+
+.river_object_image_create 
+
+.river_object_album_create 
+
+.river_object_image_comment 
+
+.river_object_album_comment 
+
+/* ----------- tagging ---------------- */
+#tagging_instructions 
+
+#tag_instruct_text 
+
+#tag_instruct_button_div 
+
+#tag_instruct_button 
+
+#tag_menu 
+
+#delete_tag_menu 
+
+.tidypics_tag 
+
+.tidypics_tag_text 
+
+#tidypics_phototags_list 
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 88f70bf7b..5f4fa3417 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -42,28 +42,7 @@ padding:2px 10px 2px 22px;
 margin:2px 0px; 
 display:inline;
 }
-/*
-.tidypics_download a {
-font:12px/100% Arial, Helvetica, sans-serif;
-font-weight:bold;
-color:white;
-background:#4690d6;
-border:none;
--webkit-border-radius: 5px; 
--moz-border-radius: 5px;
-width:auto;
-height:25px;
-padding:3px 6px 3px 6px;
-margin:10px 0 10px 0;
-cursor:pointer;
-}
 
-.tidypics_download a:hover {
-background:#0054a7;
-color:white;
-text-decoration:none;
-}
-*/
 .tidypics_album_images {
 float:left;
 width:153px; 
-- 
cgit v1.2.3


From 4bb424720267de34d2c96023e60f1118dc7e1629 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 19 Jun 2009 11:39:15 +0000
Subject: move div on exif to view from image.php - need to change css id

---
 views/default/object/image.php  | 2 --
 views/default/tidypics/exif.php | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 65319c1be..5bca81a49 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -217,9 +217,7 @@ if ($photo_tags) {
 			
 			if (get_plugin_setting('exif', 'tidypics') != "disabled") {
 ?>
-			
      
 				 $file_guid)); ?>
-			
      
 
 		
      
 
diff --git a/views/default/tidypics/exif.php b/views/default/tidypics/exif.php
index 80d52d781..d6b455309 100644
--- a/views/default/tidypics/exif.php
+++ b/views/default/tidypics/exif.php
@@ -3,6 +3,10 @@
 	$guid = $vars['guid'];
 	
 	$exif = tp_exif_formatted($guid);
-	if($exif) echo $exif;
+	if ($exif) {
+		echo '
      ';
+		echo $exif;
+		echo '
      ';
+	}
 	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From f99dc54a39dd6754057fcaa11d19028316e60598 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 19 Jun 2009 11:48:48 +0000
Subject: creating document that describes each element in css

---
 docs/css_guide.txt | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/docs/css_guide.txt b/docs/css_guide.txt
index 6153739f4..235410963 100644
--- a/docs/css_guide.txt
+++ b/docs/css_guide.txt
@@ -1,24 +1,34 @@
-#tidypics_wrapper 
+Views:
+-----------------
+all albums view
+album view
+image view
+upload view
 
-#tidypics_breadcrumbs 
 
-#tidypics_desc 
+CSS elements:
+-------------------------
+#tidypics_wrapper - wrapper on image view 
 
-#tidypics_info 
+#tidypics_breadcrumbs - breadcrumbs on image and album views
 
-#tidypics_controls 
+#tidypics_desc - description/caption in image and album views 
 
-.tidypics_album_images 
+#tidypics_info - holds metadata about image/album like tags
 
-#tidypics_image_nav 
+#tidypics_controls - image view controls (download, start tagging, etc.)
 
-#tidypics_image_full 
+.tidypics_album_images - border around images - needs work
 
-#tidypics_image_wrapper 
+#tidypics_image_nav - back and next nav controls in image view
 
-#tidypics_image 
+#tidypics_image_full - not used
 
-.tidypics_album_cover 
+#tidypics_image_wrapper - margins for image in image view
+
+#tidypics_image - frame
+
+.tidypics_album_cover - all albums view and river images 
 
 .tidypics_album_widget_single_item 
 
@@ -33,7 +43,7 @@
 
 /* ---------  image upload/edit forms  ------------   */
 
-#tidpics_image_upload_list li 
+#tidpics_image_upload_list 
 
 .tidypics_edit_image_container 
 
-- 
cgit v1.2.3


From 6984f98aed17217bcfbaf166414183ccd063e0ed Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 13:53:48 +0000
Subject: catching empty tags now

---
 actions/addtag.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/actions/addtag.php b/actions/addtag.php
index dc4274728..fb299dee6 100644
--- a/actions/addtag.php
+++ b/actions/addtag.php
@@ -25,6 +25,13 @@
 		forward($_SERVER['HTTP_REFERER']);
 	}
 
+	// test for empty tag
+	if ($user_id == 0 && empty($word)) {
+		register_error(elgg_echo("tidypics:phototagging:error"));
+		forward($_SERVER['HTTP_REFERER']);
+	}
+
+
 	$new_word_tag = false;
 	if ($user_id != 0) {
 		$relationships_type = 'user';
@@ -55,8 +62,6 @@
 		$image->tags = $tagarray;
 	}
 
-	// test for empty tag
-
 	// create string for javascript tag object
 	$tag->coords = $coordinates_str;
 	$tag->type   = $relationships_type;
-- 
cgit v1.2.3


From 6dd9dabbcc2fe9ddf3c31913e7799fba8b105e3a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 14:23:04 +0000
Subject: added cancel button to delete tag menu and cleaned up submit buttons

---
 views/default/js/tagging.php       | 17 +++++++++++++++++
 views/default/tidypics/tagging.php |  8 +++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php
index a79914196..193ce1458 100644
--- a/views/default/js/tagging.php
+++ b/views/default/js/tagging.php
@@ -257,6 +257,8 @@
 	{
 		offsetY = 60;
 		
+		stopTagging();
+		
 		divWidth = $('#delete_tag_menu').width();
 		imgOffset = $('#tidypics_image').offset();
 		imgWidth  = $('#tidypics_image').width();
@@ -279,4 +281,19 @@
 			}
 		);
 	}
+	
+	function hideDeleteMenu()
+	{
+		$('#delete_tag_menu').hide();
+		
+		// restart tag hovering
+		$('#tidypics_image').hover(
+			function(){
+				$('.tidypics_tag').show();
+			},
+			function(){
+				$('.tidypics_tag').hide();
+			}
+		);
+	}
 
\ No newline at end of file
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index fcb0b8d4e..2cdc2f957 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -48,8 +48,8 @@
 	}
 	$content .= "";
 
-	$content .= "
      ";
-
+	$content .= "";
+	
 	echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content));
 
 ?>
@@ -63,7 +63,9 @@
 			$name = "tags[{$id}]";
 			$content .= elgg_view("input/checkboxes", array('options' => array($text[0] => $text[0]), 'internalname' => $name, 'value' => '' ));
 		}
-		$content .= "
      ";
+
+		$content .= "";
+		$content .= ""; 
 
 		echo elgg_view('input/form', array('internalname' => 'form-deletetag', 'action' => "{$vars['url']}action/tidypics/deletetag", 'body' => $content));
 
-- 
cgit v1.2.3


From 11b231e85f8f0d3a384c01bbbbbb097e03c10ee4 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 14:28:30 +0000
Subject: removed graphics not being used anymore

---
 graphics/arrow_next.gif     | Bin 304 -> 0 bytes
 graphics/arrow_previous.gif | Bin 306 -> 0 bytes
 graphics/bl.gif             | Bin 215 -> 0 bytes
 graphics/br.gif             | Bin 217 -> 0 bytes
 graphics/btnClose.gif       | Bin 361 -> 0 bytes
 graphics/btnContract.gif    | Bin 188 -> 0 bytes
 graphics/btnExpand.gif      | Bin 192 -> 0 bytes
 graphics/btnNext.gif        | Bin 308 -> 0 bytes
 graphics/btnPrevious.gif    | Bin 317 -> 0 bytes
 graphics/icons/general.png  | Bin 7177 -> 0 bytes
 graphics/tl.gif             | Bin 214 -> 0 bytes
 graphics/tr.gif             | Bin 217 -> 0 bytes
 graphics/ttl.gif            | Bin 288 -> 0 bytes
 graphics/ttp.gif            | Bin 192 -> 0 bytes
 graphics/ttr.gif            | Bin 288 -> 0 bytes
 15 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 graphics/arrow_next.gif
 delete mode 100644 graphics/arrow_previous.gif
 delete mode 100644 graphics/bl.gif
 delete mode 100644 graphics/br.gif
 delete mode 100644 graphics/btnClose.gif
 delete mode 100644 graphics/btnContract.gif
 delete mode 100644 graphics/btnExpand.gif
 delete mode 100644 graphics/btnNext.gif
 delete mode 100644 graphics/btnPrevious.gif
 delete mode 100644 graphics/icons/general.png
 delete mode 100644 graphics/tl.gif
 delete mode 100644 graphics/tr.gif
 delete mode 100644 graphics/ttl.gif
 delete mode 100644 graphics/ttp.gif
 delete mode 100644 graphics/ttr.gif

diff --git a/graphics/arrow_next.gif b/graphics/arrow_next.gif
deleted file mode 100644
index 6b3d8f829..000000000
Binary files a/graphics/arrow_next.gif and /dev/null differ
diff --git a/graphics/arrow_previous.gif b/graphics/arrow_previous.gif
deleted file mode 100644
index e7ded54eb..000000000
Binary files a/graphics/arrow_previous.gif and /dev/null differ
diff --git a/graphics/bl.gif b/graphics/bl.gif
deleted file mode 100644
index 735fcb582..000000000
Binary files a/graphics/bl.gif and /dev/null differ
diff --git a/graphics/br.gif b/graphics/br.gif
deleted file mode 100644
index 90cdccdcb..000000000
Binary files a/graphics/br.gif and /dev/null differ
diff --git a/graphics/btnClose.gif b/graphics/btnClose.gif
deleted file mode 100644
index b8ab4638d..000000000
Binary files a/graphics/btnClose.gif and /dev/null differ
diff --git a/graphics/btnContract.gif b/graphics/btnContract.gif
deleted file mode 100644
index 9be301039..000000000
Binary files a/graphics/btnContract.gif and /dev/null differ
diff --git a/graphics/btnExpand.gif b/graphics/btnExpand.gif
deleted file mode 100644
index 72a8471b3..000000000
Binary files a/graphics/btnExpand.gif and /dev/null differ
diff --git a/graphics/btnNext.gif b/graphics/btnNext.gif
deleted file mode 100644
index 467f23246..000000000
Binary files a/graphics/btnNext.gif and /dev/null differ
diff --git a/graphics/btnPrevious.gif b/graphics/btnPrevious.gif
deleted file mode 100644
index 298c1e99c..000000000
Binary files a/graphics/btnPrevious.gif and /dev/null differ
diff --git a/graphics/icons/general.png b/graphics/icons/general.png
deleted file mode 100644
index 267ae010c..000000000
Binary files a/graphics/icons/general.png and /dev/null differ
diff --git a/graphics/tl.gif b/graphics/tl.gif
deleted file mode 100644
index ff93dadcc..000000000
Binary files a/graphics/tl.gif and /dev/null differ
diff --git a/graphics/tr.gif b/graphics/tr.gif
deleted file mode 100644
index 8dc197272..000000000
Binary files a/graphics/tr.gif and /dev/null differ
diff --git a/graphics/ttl.gif b/graphics/ttl.gif
deleted file mode 100644
index 8e44c0374..000000000
Binary files a/graphics/ttl.gif and /dev/null differ
diff --git a/graphics/ttp.gif b/graphics/ttp.gif
deleted file mode 100644
index 36f7211c4..000000000
Binary files a/graphics/ttp.gif and /dev/null differ
diff --git a/graphics/ttr.gif b/graphics/ttr.gif
deleted file mode 100644
index 66d06941e..000000000
Binary files a/graphics/ttr.gif and /dev/null differ
-- 
cgit v1.2.3


From c118d77f0625fa70fe3cdadb23bcbeea96a0768c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 15:09:01 +0000
Subject: using built-in elgg checkbox view rather than custom

---
 actions/edit.php                       |  4 +++-
 views/default/input/cover_checkbox.php | 39 ----------------------------------
 views/default/tidypics/forms/edit.php  | 23 ++++++++++++--------
 3 files changed, 17 insertions(+), 49 deletions(-)
 delete mode 100644 views/default/input/cover_checkbox.php

diff --git a/actions/edit.php b/actions/edit.php
index 359e83fb0..f5c66a1d8 100644
--- a/actions/edit.php
+++ b/actions/edit.php
@@ -15,6 +15,8 @@
 	$access  = get_input('access_id');
 	$tags    = get_input('tidypicstags');
 	$subtype = get_input('subtype');
+	$cover   = get_input('cover');
+	if (is_array($cover)) $cover = $cover[0];
 	
 	$container_guid = get_input('container_guid');
 
@@ -59,7 +61,7 @@
 	}
 
 	//if cover meta is sent from image save as metadata
-	if ($subtype == 'image' && get_input('cover') == elgg_echo('album:cover:yes')) {
+	if ($subtype == 'image' && $cover == elgg_echo('album:cover')) {
 		$album = get_entity($container_guid); 
 		$album->cover = $entity->guid;
 	}
diff --git a/views/default/input/cover_checkbox.php b/views/default/input/cover_checkbox.php
deleted file mode 100644
index 04132661d..000000000
--- a/views/default/input/cover_checkbox.php
+++ /dev/null
@@ -1,39 +0,0 @@
- $option) {
-
-	    if ($option != $vars['value']) {
-	        $selected = "";
-	    } else {
-			$selected = "checked = \"checked\"";
-	    }
-
-        $labelint = (int) $label;
-        if ("{$label}" == "{$labelint}") {
-        	$label = $option;
-        }
-        
-        $disabled = "";
-        if ($vars['disabled']) $disabled = ' disabled="yes" '; 
-        echo "
      ";
-    }
-
-?> 
\ No newline at end of file
diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index 533852413..a504cde60 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -72,21 +72,26 @@
 
 guid;
 			$container_guid = $vars['entity']->container_guid;
-			$cover_guid = get_entity($container_guid)->cover;
-			if($cover_guid == $vars['entity']->guid)
-				$cover = 'yes';
+			
+			// should this image be the cover for the album - only ask for non-cover photos
+			// determine if it is already the cover
+			$img_guid = $vars['entity']->guid;
+			$album = get_entity($container_guid);
+			$cover_guid = $album->cover;
+			
+			if ($cover_guid != $img_guid) { 
 			
 ?>
 		
      
-			
-			 "cover", "value" => $cover, 'options' => array(elgg_echo('album:cover:yes'))));  ?>
+ "cover", 
+													'options' => array(elgg_echo("album:cover")),
+													));
+?>
 		
      
 
-- 
cgit v1.2.3


From bf9291c23b5fe587e2226bf73c317bf76ea686a6 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 16:05:56 +0000
Subject: now using built-in radio input view

---
 actions/edit_multi.php                      | 12 +++----
 views/default/input/multi_radio.php         | 36 -------------------
 views/default/tidypics/forms/edit_multi.php | 55 +++++++++++++++++------------
 3 files changed, 39 insertions(+), 64 deletions(-)
 delete mode 100644 views/default/input/multi_radio.php

diff --git a/actions/edit_multi.php b/actions/edit_multi.php
index a857e92d7..7c03244a5 100644
--- a/actions/edit_multi.php
+++ b/actions/edit_multi.php
@@ -7,19 +7,19 @@
 	// Make sure we're logged in (send us to the front page if not)
 	if (!isloggedin()) forward();
 
-	// Get input data	
-	$cover = get_input('cover');
+	// Get input data
 	$title_array = get_input('title');
 	$caption_array = get_input('caption');
 	$tags_array = get_input('tags');
 	$image_guid_array = get_input('image_guid');
 	$container_guid = get_input('container_guid');
 	$album_entity = get_entity($container_guid);
+	$cover = get_input('cover');
 	$not_updated = array();
 
-	foreach($image_guid_array as $key => $im) {	
+	foreach($image_guid_array as $key => $im) {
 		$image = get_entity($im);
-				
+		
 		if ($image->canEdit()) {
 			
 			// Convert string of tags into a preformatted array
@@ -27,7 +27,7 @@
 
 			//set description appropriately
 			$image->title = $title_array[$key];
-														
+			
 			//set description appropriately
 			$image->description = $caption_array[$key];
 
@@ -43,7 +43,7 @@
 			}
 				
 			//if cover meta is sent from image save as metadata
-			if ($cover == $im) {	
+			if ($cover == $im) {
 				$album_entity->cover = $im;
 			}
 		}
diff --git a/views/default/input/multi_radio.php b/views/default/input/multi_radio.php
deleted file mode 100644
index 3e3bb1649..000000000
--- a/views/default/input/multi_radio.php
+++ /dev/null
@@ -1,36 +0,0 @@
- $option) {
-
-	    if ($vars['set'] != $vars['value']) {
-	        $selected = "";
-	    } else {
-			$selected = "checked = \"checked\"";
-	    }
-
-        $labelint = (int) $label;
-        if ("{$label}" == "{$labelint}") {
-        	$label = $option;
-        }
-        
-        $disabled = "";
-        if ($vars['disabled']) $disabled = ' disabled="yes" '; 
-        echo "
      ";
-    }
-
-?> 
\ No newline at end of file
diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php
index 24755e9cf..01ffb3128 100644
--- a/views/default/tidypics/forms/edit_multi.php
+++ b/views/default/tidypics/forms/edit_multi.php
@@ -8,38 +8,49 @@
 cover) $no_cover = true;
+	if (!$album_entity->cover) $no_cover = true;
 	
-	foreach($file_array as $key => $file_guid){
+	foreach ($file_array as $key => $file_guid){
 		$entity = get_entity($file_guid);
 		$guid = $entity->guid;
 		$body = $entity->description;
 		$tags = $entity->tags;
 		$container_guid = $entity->container_guid;
-		if($no_cover && !$cover) $cover = $guid;
-						
-  echo '
      ';		
-	echo '' . $title . '';
-	echo '
      ';
-	echo '
      ';
-	echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n";
-	echo '
      ';
-	  echo '
      ";
-	  echo elgg_view("input/text",array("internalname" => "caption[$key]", "value" => $body,)) . "\n";
-	  echo "
      ";
-	  echo '
      \n";
-	  echo elgg_view("input/tags", array( "internalname" => "tags[$key]","value" => $tags)) . "\n";
-	  echo '
      ';
-	  echo '' . "\n";
-	  echo '';
-	  echo elgg_view("input/multi_radio", array( "internalname" => "cover", "value" => $guid, 'options' => array(elgg_echo('album:cover:yes')), 'set' => $cover));
-	echo '
      ';
-  echo '
      ';
 		
+		// first one is default cover if there isn't one already
+		if ($no_cover) {
+			$val = $guid;
+			$no_cover = false;
+		}
+		
+		echo '
      ';
+		echo '' . $title . '';
+		echo '
      ';
+		echo '
      ';
+		echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n";
+		echo '
      ';
+		echo '
      ";
+		echo elgg_view("input/text",array("internalname" => "caption[$key]", "value" => $body,)) . "\n";
+		echo "
      ";
+		echo '
      \n";
+		echo elgg_view("input/tags", array( "internalname" => "tags[$key]","value" => $tags)) . "\n";
+		echo '
      ';
+		echo '' . "\n";
+		
+		echo elgg_view("input/radio", array("internalname" => "cover",
+											"value" => $val,
+											'options' => array(	elgg_echo('album:cover') => $guid,
+																),
+													));
+		echo '
      ';
+		echo '
      ';
 	}
+	
 ?>
- 		
+
 
      
 
 
      
\ No newline at end of file
-- 
cgit v1.2.3

-- 
cgit v1.2.3


From 72278f3d3ce9b3dff0b4f5e95ad400d14a79eb71 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 16:33:54 +0000
Subject: cleaned up the thumbnail code

---
 thumbnail.php | 66 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/thumbnail.php b/thumbnail.php
index fe8ca8bab..113262960 100644
--- a/thumbnail.php
+++ b/thumbnail.php
@@ -5,46 +5,50 @@
 	 * 
 	 */
 
-	// Get engine
 	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-		
+	
 	// Get file GUID
-	$file_guid = (int) get_input('file_guid',0);
-		
+	$file_guid = (int) get_input('file_guid');
+	
 	// Get file thumbnail size
-	$size = get_input('size','small');
+	$size = get_input('size');
+	// only 3 possibilities
 	if ($size != 'small' && $size != 'thumb') {
 		$size = 'large';
 	}
-		
+	error_log('size is ' . $size);
+	
 	// Get file entity
-	if ($file = get_entity($file_guid)) {
-		if ($file->getSubtype() == "image") {
-			// Get file thumbnail
-			if ($size === "thumb") {
-				$thumbfile = $file->thumbnail;
-			} else if ($size === "small") {
-				$thumbfile = $file->smallthumb;
-			} else {
-				$thumbfile = $file->largethumb;
-			}
-						
-			// Grab the file
-			if ($thumbfile && !empty($thumbfile)) {
-				$readfile = new ElggFile();
-				$readfile->owner_guid = $file->owner_guid;
-				$readfile->setFilename($thumbfile);
-				//$mime = $file->getMimeType();
-				$contents = $readfile->grabFile();
-			}
-		} //end subtype comparison
-	} //end get_entity
+	$file = get_entity($file_guid);
+	if (!$file)
+		forward('mod/tidypics/graphics/img_error.jpg');
+	
+	if ($file->getSubtype() != "image")
+		forward('mod/tidypics/graphics/img_error.jpg');
+	
+	// Get filename
+	if ($size == "thumb") {
+		$thumbfile = $file->thumbnail;
+	} else if ($size == "small") {
+		$thumbfile = $file->smallthumb;
+	} else {
+		$thumbfile = $file->largethumb;
+	}
+	error_log('filename is ' . $thumbfile);
+	
+	if (!$thumbfile)
+		forward('mod/tidypics/graphics/img_error.jpg');
+	
+	// create Elgg File object
+	$readfile = new ElggFile();
+	$readfile->owner_guid = $file->owner_guid;
+	$readfile->setFilename($thumbfile);
+	$contents = $readfile->grabFile();
 
-	// Open error image if file was not found
-	if (!isset($contents) || is_null($contents) || $file->getSubtype()!='image') {
-		//$vars['url'].'mod/tidypics/graphics/img_error.jpg
+	// send error image if file could not be read
+	if (!$contents) {
 		forward('mod/tidypics/graphics/img_error.jpg');
-	} //end of default error image
+	}
 
 	// Return the thumbnail and exit
 	header("Content-type: image");
-- 
cgit v1.2.3


From 0b9bcb1acb3435b2800bd038d2687f29eea9b2c7 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 17:13:01 +0000
Subject: fixed bug where gifs were messed up in resizing

---
 lib/resize.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/resize.php b/lib/resize.php
index 974f32e9e..ebbf587d7 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -350,6 +350,7 @@
 		
 		// use the default IM filter (windowing filter), I think 1 means default blurring or number of lobes
 		$img->resizeImage($newwidth, $newheight, imagick::FILTER_LANCZOS, 1);
+		$img->setImagePage($newwidth, $newheight, 0, 0);
 		
 		if ($img->writeImage($output_name) != true) {
 			$img->destroy();
-- 
cgit v1.2.3


From 90c11f05015ed4e1a88e859437097cdb8542552a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 18:58:35 +0000
Subject: added server configuration to docs

---
 docs/configure_server.txt | 51 +++++++++++++++++++++++++++++++++++++++++++++++
 system.php                | 18 +++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 docs/configure_server.txt

diff --git a/docs/configure_server.txt b/docs/configure_server.txt
new file mode 100644
index 000000000..057c4ee82
--- /dev/null
+++ b/docs/configure_server.txt
@@ -0,0 +1,51 @@
+Server Configuration
+-----------------------------------
+
+Run your server analysis located in the Tidypics Administration section and 
+then read through this document.
+
+If you are experiencing errors, please check your server error log. Tidypics 
+writes warnings for most upload related problems. You will see something 
+along these lines: "Tidypics warning: user exceeded post limit on image upload"
+
+
+
+GD: Elgg requires GD for image resizing. Tidypics uses GD by default for 
+resizing. There are two versions GD and GD2. It generally does not matter 
+which one you are using and it isn't always apparent which one you are
+running anyways.
+
+ImageMagick: A significantly better image library than GD. It uses less 
+memory during resizing. Use this if it is available.
+
+Memory Available to PHP: The amount of RAM available to a single PHP 
+process. This can have an effect on how large an image you can resize
+(especially if you are running Tidypics with GD). The best place to
+change it is .htaccess.
+
+Memory Used to Load This Page: This gives you a baseline of how much
+memory is being used to load the Elgg framework and plugins. 
+
+Max File Upload Size: The largest file that can be uploaded. You can
+adjust this in .htaccess.
+
+Max Post Size: The largest amount of data that can be submitted. For
+Tidypics, this affects how many large images can be uploaded in a 
+single upload. If this is exceeded, nothing is uploaded and the 
+user gets an error message. It can be adjusted in .htaccess.
+
+Max Input Time: This is the amount of time PHP will wait for an 
+upload to finish. Your users may experience failures if they are
+uploading large images on a poor connection or if your server 
+does not have a lot of bandwidth.
+
+Max Execution Time: The longest time a PHP script can run on your
+server. If a user uploads many large images, the resize code may take
+a long time to complete and will be stopped by PHP. If you are seeing
+problems with this, you probably have a slow server.
+
+GD imagejpeg: jpeg resizing with GD
+
+GD imagegif: gif resizing with GD
+
+GD imagepng: png resizing with GD
\ No newline at end of file
diff --git a/system.php b/system.php
index 82a705932..ef781b92a 100644
--- a/system.php
+++ b/system.php
@@ -89,7 +89,25 @@
 			 s
 			Max time a script will run
 		
+		
+			GD imagejpeg
+			
+			
+		
+		
+			GD imagepng
+			
+			
+		
+		
+			GD imagegif
+			
+			
+		
 	
+	
 
      
 
Date: Sat, 20 Jun 2009 19:02:06 +0000
Subject: improved the GD resizing code - writing files rather than returning
 jpegs

---
 lib/resize.php | 278 ++++++++++++++++++++++++++++-----------------------------
 system.php     |   4 +-
 2 files changed, 140 insertions(+), 142 deletions(-)

diff --git a/lib/resize.php b/lib/resize.php
index ebbf587d7..9db81f318 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -16,180 +16,176 @@
 	function tp_create_gd_thumbnails($file, $prefix, $filestorename)
 	{
 		global $CONFIG;
-		
-		$mime = $file->getMimeType();
-		
+
 		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
 		if (!$image_sizes) {
 			register_error(elgg_echo('tidypics:nosettings'));
 			return false;
 		}
 		$image_sizes = unserialize($image_sizes);
-		
-		// Generate thumbnails
-		$thumbnail = tp_gd_resize(	$file->getFilenameOnFilestore(),
+
+		$thumb = new ElggFile();
+
+		// tiny thumbail
+		$thumb->setFilename($prefix."thumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+									$thumbname,
 									$image_sizes['thumb_image_width'],
 									$image_sizes['thumb_image_height'], 
-									true); 
+									true);
+		if (!$rtn_code)
+			return false;
+		$file->thumbnail = $prefix."thumb".$filestorename;
 
-		if ($thumbnail) {
-			$thumb = new ElggFile();
-			$thumb->setMimeType($mime);
-			$thumb->setFilename($prefix."thumb".$filestorename);
-			$thumb->open("write");
-			if ($thumb->write($thumbnail)) {
-				$file->thumbnail = $prefix."thumb".$filestorename;
-			} else {
-				$thumb->delete();
-			}
-			$thumb->close();
-			unset($thumb);
-		}
-		unset($thumbnail);
-		
-		$thumbsmall = tp_gd_resize(	$file->getFilenameOnFilestore(),
+
+		// album thumbnail
+		$thumb->setFilename($prefix."smallthumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+									$thumbname,
 									$image_sizes['small_image_width'],
 									$image_sizes['small_image_height'], 
 									true); 
+		if (!$rtn_code)
+			return false;
+		$file->smallthumb = $prefix."smallthumb".$filestorename;
 
-		
-		if ($thumbsmall) {
-			$thumb = new ElggFile();
-			$thumb->setMimeType($mime);
-			$thumb->setFilename($prefix."smallthumb".$filestorename);
-			$thumb->open("write");
-			if ($thumb->write($thumbsmall)) {
-				$file->smallthumb = $prefix."smallthumb".$filestorename;
-			} else {
-				$thumb->delete();
-			}
-			$thumb->close();
-			unset($thumb);
-		}
-		unset($thumbsmall);
 
-		$thumblarge = tp_gd_resize(	$file->getFilenameOnFilestore(),
+		// main image
+		$thumb->setFilename($prefix."largethumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+									$thumbname,
 									$image_sizes['large_image_width'],
 									$image_sizes['large_image_height'], 
 									false); 
-		
-		if ($thumblarge) {
-			$thumb = new ElggFile();
-			$thumb->setMimeType($mime);
-			$thumb->setFilename($prefix."largethumb".$filestorename);
-			$thumb->open("write");
-			if ($thumb->write($thumblarge)) {
-				$file->largethumb = $prefix."largethumb".$filestorename;
-			} else {
-				$thumb->delete();
-			}
-			$thumb->close();
-			unset($thumb);
-		}
-		unset($thumblarge);
+		if (!$rtn_code)
+			return false;
+		$file->largethumb = $prefix."largethumb".$filestorename;
+
+		unset($thumb);
 
 		return true;
 	}
 
 	/**
-	 * Gets the jpeg contents of the resized version of an already uploaded image - original from Elgg filestore.php 
-	 * (Returns false if the uploaded file was not an image)
+	 * Writes resized version of an already uploaded image - original from Elgg filestore.php 
+	 * Saves it in the same format as uploaded
 	 *
-	 * @param string $input_name The name of the file input field on the submission form
+	 * @param string $input_name The name of the file on the disk
+	 * @param string $output_name The name of the file to be written
 	 * @param int $maxwidth The maximum width of the resized image
 	 * @param int $maxheight The maximum height of the resized image
 	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
-	 * @return false|mixed The contents of the resized image, or false on failure
+	 * @return bool true on success or false on failure
 	 */
-	function tp_gd_resize($input_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+	function tp_gd_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 		
 		// Get the size information from the image
-		if ($imgsizearray = getimagesize($input_name)) {
+		$imgsizearray = getimagesize($input_name);
+		if (!imgsizearray)
+			return false;
 		
-			// Get width and height
-			$width = $imgsizearray[0];
-			$height = $imgsizearray[1];
-			$newwidth = $width;
-			$newheight = $height;
-			
-			// Square the image dimensions if we're wanting a square image
-			if ($square) {
-				if ($width < $height) {
-					$height = $width;
-				} else {
-					$width = $height;
-				}
-				
-				$newwidth = $width;
-				$newheight = $height;
-				
-			}
-			
-			if ($width > $maxwidth) {
-				$newheight = floor($height * ($maxwidth / $width));
-				$newwidth = $maxwidth;
-			}
-			if ($newheight > $maxheight) {
-				$newwidth = floor($newwidth * ($maxheight / $newheight));
-				$newheight = $maxheight; 
+		// Get width and height
+		$width = $imgsizearray[0];
+		$height = $imgsizearray[1];
+		$newwidth = $width;
+		$newheight = $height;
+		
+		// Square the image dimensions if we're wanting a square image
+		if ($square) {
+			if ($width < $height) {
+				$height = $width;
+			} else {
+				$width = $height;
 			}
 			
-			$accepted_formats = array(
-											'image/jpeg' => 'jpeg',
-											'image/png' => 'png',
-											'image/gif' => 'gif'
-									);
+			$newwidth = $width;
+			$newheight = $height;
 			
-			// If it's a file we can manipulate ...
-			if (array_key_exists($imgsizearray['mime'],$accepted_formats)) {
+		}
+		
+		if ($width > $maxwidth) {
+			$newheight = floor($height * ($maxwidth / $width));
+			$newwidth = $maxwidth;
+		}
+		if ($newheight > $maxheight) {
+			$newwidth = floor($newwidth * ($maxheight / $newheight));
+			$newheight = $maxheight; 
+		}
+		
+		$accepted_formats = array(
+										'image/jpeg' => 'jpeg',
+										'image/pjpeg' => 'jpeg',
+										'image/png' => 'png',
+										'image/x-png' => 'png',
+										'image/gif' => 'gif'
+								);
 
-				$function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']];
-				$newimage = imagecreatetruecolor($newwidth,$newheight);
-				
-				if (is_callable($function) && $oldimage = $function($input_name)) {
- 				
-					// Crop the image if we need a square
-					if ($square) {
-						if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-							$widthoffset = floor(($imgsizearray[0] - $width) / 2);
-							$heightoffset = floor(($imgsizearray[1] - $height) / 2);
-						} else {
-							$widthoffset = $x1;
-							$heightoffset = $y1;
-							$width = ($x2 - $x1);
-							$height = $width;
-						}
-					} else {
-						if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-							$widthoffset = 0;
-							$heightoffset = 0;
-						} else {
-							$widthoffset = $x1;
-							$heightoffset = $y1;
-							$width = ($x2 - $x1);
-							$height = ($y2 - $y1);
-						}
-					}
-					
-					if ($square) {
-						$newheight = $maxheight;
-						$newwidth = $maxwidth;
-					}
-					
-					imagecopyresampled($newimage, $oldimage, 0,0,$widthoffset,$heightoffset,$newwidth,$newheight,$width,$height);
-					
-					ob_start();
-					imagejpeg($newimage, null, 90);
-					$jpeg = ob_get_clean();
-					return $jpeg;
-					
-				}
-				
+		// make sure the function is available
+		$function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']];
+		if (!is_callable($function))
+			return false;
+		
+		
+		// load old image
+		$oldimage = $function($input_name);
+		if (!$oldimage)
+			return false;
+		
+		// allocate the new image
+		$newimage = imagecreatetruecolor($newwidth, $newheight);
+		if (!$newimage)
+			return false;
+		
+		// Crop the image if we need a square
+		if ($square) {
+			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+				$widthoffset = floor(($imgsizearray[0] - $width) / 2);
+				$heightoffset = floor(($imgsizearray[1] - $height) / 2);
+			} else {
+				$widthoffset = $x1;
+				$heightoffset = $y1;
+				$width = ($x2 - $x1);
+				$height = $width;
+			}
+		} else {
+			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+				$widthoffset = 0;
+				$heightoffset = 0;
+			} else {
+				$widthoffset = $x1;
+				$heightoffset = $y1;
+				$width = ($x2 - $x1);
+				$height = ($y2 - $y1);
 			}
-			
 		}
-			
-		return false;
+		
+		if ($square) {
+			$newheight = $maxheight;
+			$newwidth = $maxwidth;
+		}
+		
+		$rtn_code = imagecopyresampled($newimage, $oldimage, 0,0,$widthoffset,$heightoffset,$newwidth,$newheight,$width,$height);
+		if (!rtn_code)
+			return $rtn_code;
+		
+		switch ($imgsizearray['mime']) {
+			case 'image/jpeg':
+			case 'image/pjpeg':
+				$rtn_code = imagejpeg($newimage, $output_name, 85); 
+				break;
+			case 'image/png':
+			case 'image/x-png':
+				$rtn_code = imagepng($newimage, $output_name);
+				break;
+			case 'image/gif':
+				$rtn_code = imagegif($newimage, $output_name);
+				break;
+		}
+		
+		return $rtn_code;
 	}
 
 
@@ -260,15 +256,15 @@
 	/**
 	 * Resize using PHP ImageMagick Library
 	 *
-	 * Gets the jpeg contents of the resized version of an already uploaded image
-	 * (Returns false if the uploaded file was not an image)
+	 * Writes resized version of an already uploaded image
+	 * 
 	 *
 	 * @param string $input_name The name of the file input field on the submission form
 	 * @param string $output_name The name of the file to be written
 	 * @param int $maxwidth The maximum width of the resized image
 	 * @param int $maxheight The maximum height of the resized image
 	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
-	 * @return false|mixed The contents of the resized image, or false on failure
+	 * @return bool true on success
 	 */
 	function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 		
diff --git a/system.php b/system.php
index ef781b92a..833722db8 100644
--- a/system.php
+++ b/system.php
@@ -8,7 +8,9 @@
  *
  ********************************************************************/   
 
-	require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+	global $CONFIG;
 
 	admin_gatekeeper();
 
-- 
cgit v1.2.3


From 139964bcc7bc8c0fc4fd708d9df265e067049391 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 19:22:35 +0000
Subject: finished improving thumbnail code and replaced the old image error
 image

---
 graphics/empty_album.png          | Bin 0 -> 1389 bytes
 graphics/image_error_large.png    | Bin 0 -> 2208 bytes
 graphics/image_error_small.png    | Bin 0 -> 2351 bytes
 graphics/image_error_thumb.png    | Bin 0 -> 759 bytes
 graphics/img_error.jpg            | Bin 5864 -> 0 bytes
 thumbnail.php                     |  26 +++++++++++++++++++-------
 views/default/object/album.php    |   6 +++---
 views/default/tidypics/albums.php |   4 ++--
 8 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 graphics/empty_album.png
 create mode 100644 graphics/image_error_large.png
 create mode 100644 graphics/image_error_small.png
 create mode 100644 graphics/image_error_thumb.png
 delete mode 100644 graphics/img_error.jpg

diff --git a/graphics/empty_album.png b/graphics/empty_album.png
new file mode 100644
index 000000000..0c041d0a2
Binary files /dev/null and b/graphics/empty_album.png differ
diff --git a/graphics/image_error_large.png b/graphics/image_error_large.png
new file mode 100644
index 000000000..4316f459d
Binary files /dev/null and b/graphics/image_error_large.png differ
diff --git a/graphics/image_error_small.png b/graphics/image_error_small.png
new file mode 100644
index 000000000..2f814fd81
Binary files /dev/null and b/graphics/image_error_small.png differ
diff --git a/graphics/image_error_thumb.png b/graphics/image_error_thumb.png
new file mode 100644
index 000000000..0eeb797dc
Binary files /dev/null and b/graphics/image_error_thumb.png differ
diff --git a/graphics/img_error.jpg b/graphics/img_error.jpg
deleted file mode 100644
index e3aad2aed..000000000
Binary files a/graphics/img_error.jpg and /dev/null differ
diff --git a/thumbnail.php b/thumbnail.php
index 113262960..688d400af 100644
--- a/thumbnail.php
+++ b/thumbnail.php
@@ -16,15 +16,27 @@
 	if ($size != 'small' && $size != 'thumb') {
 		$size = 'large';
 	}
-	error_log('size is ' . $size);
+	
+	$error_image = '';
+	switch ($size) {
+		case 'thumb':
+			$error_image = "image_error_thumb.png";
+			break;
+		case 'small':
+			$error_image = "image_error_small.png";
+			break;
+		case 'large':
+			$error_image = "image_error_large.png";
+			break;
+	}
 	
 	// Get file entity
 	$file = get_entity($file_guid);
 	if (!$file)
-		forward('mod/tidypics/graphics/img_error.jpg');
+		forward('mod/tidypics/graphics/' . $error_image);
 	
 	if ($file->getSubtype() != "image")
-		forward('mod/tidypics/graphics/img_error.jpg');
+		forward('mod/tidypics/graphics/' . $error_image);
 	
 	// Get filename
 	if ($size == "thumb") {
@@ -34,10 +46,9 @@
 	} else {
 		$thumbfile = $file->largethumb;
 	}
-	error_log('filename is ' . $thumbfile);
 	
 	if (!$thumbfile)
-		forward('mod/tidypics/graphics/img_error.jpg');
+		forward('mod/tidypics/graphics/' . $error_image);
 	
 	// create Elgg File object
 	$readfile = new ElggFile();
@@ -47,11 +58,12 @@
 
 	// send error image if file could not be read
 	if (!$contents) {
-		forward('mod/tidypics/graphics/img_error.jpg');
+		forward('mod/tidypics/graphics/' . $error_image);
 	}
 
 	// Return the thumbnail and exit
-	header("Content-type: image");
+	$mime = $file->mimetype;
+	header("Content-type: $mime");
 	echo $contents;
 	exit;
 ?>
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 1e8ff9dc9..eb26123e2 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -5,7 +5,7 @@
 
 	global $CONFIG;
 	
-	$file = $vars['entity'];	
+	$file = $vars['entity'];
 	$file_guid = $file->getGUID();
 	$tags = $file->tags;
 	$title = $file->title;
@@ -14,7 +14,7 @@
 	$friendlytime = friendly_time($vars['entity']->time_created);
 	$mime = $file->mimetype;
 
-	if (get_context() == "search") { 	
+	if (get_context() == "search") {
 
 		if (get_input('search_viewtype') == "gallery") {
 			//default gallery view for album listing @ /photos/owned/
@@ -23,7 +23,7 @@
 			if($file->cover)
 				$album_cover = 'thumbnail';
 			else
-				$album_cover = 'new album';
+				$album_cover = 'new album';
 
 	?>
 			
      			
diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php
index ba75760c6..9c75bf024 100644
--- a/views/default/tidypics/albums.php
+++ b/views/default/tidypics/albums.php
@@ -14,9 +14,9 @@
 		foreach($owner_albums as $album) {
 
 			if($album->cover)
-				$album_cover = '' . $album->title . '';
+				$album_cover = '' . $album->title . '';
 			else
-				$album_cover = '' . $album->title . '';
+				$album_cover = '' . $album->title . '';
 ?>
 		
      
 			
      title;?>
      
-- 
cgit v1.2.3


From ff9fc926e60a06777e589d1fad9af1f59c8a2376 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 19:28:20 +0000
Subject: minor tweak to index - show 12 albums

---
 index.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 6ac4ca7a5..b308a026d 100644
--- a/index.php
+++ b/index.php
@@ -39,10 +39,9 @@
 	set_context('search');
 	set_input('search_viewtype', 'gallery');
 	if ($owner instanceof ElggGroup)
-		$area2 .= list_entities("object", "album", $owner->guid, 10);
-		//$area2 .= list_entities_groups("album", 0, $owner->guid, 10);
+		$area2 .= list_entities("object", "album", $owner->guid, 12);
 	else
-		$area2 .= list_entities("object", "album", $owner->guid, 10);
+		$area2 .= list_entities("object", "album", $owner->guid, 12);
 	
 	set_context('photos');
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-- 
cgit v1.2.3


From 3f750d86ed5b4acd80c9ed656eac9610c76201f9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 19:56:10 +0000
Subject: added some documentation to object/album view

---
 views/default/object/album.php | 75 +++++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 27 deletions(-)

diff --git a/views/default/object/album.php b/views/default/object/album.php
index eb26123e2..34174e571 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -17,31 +17,45 @@
 	if (get_context() == "search") {
 
 		if (get_input('search_viewtype') == "gallery") {
-			//default gallery view for album listing @ /photos/owned/
-			
+		
+/******************************************************************************
+ *
+ *  Gallery view of an album object
+ * 
+ *  This is called when looking at page of albums (index.php).
+ *
+ *
+ *****************************************************************************/
+
 			//get album cover if one was set 
-			if($file->cover)
-				$album_cover = 'thumbnail';
+			if ($file->cover)
+				$album_cover = 'thumbnail';
 			else
 				$album_cover = 'new album';
 
-	?>
-			
      			
-				
      
-				
      
-				name;?> 
      			
-				getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
-				?>
-				      
-			
      
-			
-		
+
      
+	
      
+	
      
+	name;?> 
      
+getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
+?>
+	      
+
      
+'.$title.'
      ';
 			$info .= "
      username}\">{$owner->name} {$friendlytime}";
@@ -53,11 +67,18 @@
 			$icon = "getURL()}\">" . elgg_view("tidypics/icon", array('album' => true, 'size' => 'small')) . "";
 			
 			echo elgg_view_listing($icon, $info);
-		
 		}
-		
-	} else {							
-		// individual album view
+	} else {
+
+/******************************************************************************
+ *
+ *  Individual view of an album object
+ * 
+ *  This is called when getting a listing of the photos in an album
+ *
+ *
+ *****************************************************************************/
+
 		$page = get_input("page");
 		list($album_placeholder, $album_id, $album_title) = split("/", $page);
 		
@@ -85,7 +106,7 @@
 				array_push($_SESSION['image_sort'], $image->guid);
 			}
 		
-			echo list_entities("object","image", $file_guid, 24, false);	
+			echo list_entities("object","image", $file_guid, 24, false);
 		} else {
 			echo elgg_echo('image:none');
 		}
@@ -97,12 +118,12 @@
 			
       $tags));?>
      
 
 		 name; ?>  
      
-		 
      		
+		 
      
 	
      
 
 ';
-- 
cgit v1.2.3


From 774b7c79bfcdb5d3139ec16152e6955a86093699 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 20:32:17 +0000
Subject: still cleaning up album view - this fixes a count bug with an empty
 album

---
 languages/en.php               |  1 -
 views/default/object/album.php | 80 +++++++++++++++++++++++-------------------
 views/default/object/image.php |  2 +-
 views/default/tidypics/css.php |  2 +-
 4 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 4802308ff..135344d6d 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -152,7 +152,6 @@
 				
 		//Error messages
 				 
-			'image:none' => "We could not find any images at the moment.",
 			'tidypics:partialuploadfailure' => "There were errors uploading some of the images (%s of %s images).",
 			'tidypics:completeuploadfailure' => "Upload of images failed.",
 			'tidypics:exceedpostlimit' => "Too many large images - try to upload fewer or smaller images.",
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 34174e571..3a5f5a975 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -5,19 +5,19 @@
 
 	global $CONFIG;
 	
-	$file = $vars['entity'];
-	$file_guid = $file->getGUID();
-	$tags = $file->tags;
-	$title = $file->title;
-	$desc = $file->description;
-	$owner = $vars['entity']->getOwnerEntity();
-	$friendlytime = friendly_time($vars['entity']->time_created);
-	$mime = $file->mimetype;
+	$album = $vars['entity'];
+	$album_guid = $album->getGUID();
+	$owner = $album->getOwnerEntity();
+	$tags = $album->tags;
+	$title = $album->title;
+	$desc = $album->description;
+	$friendlytime = friendly_time($album->time_created);
+	$mime = $album->mimetype;
 
 	if (get_context() == "search") {
 
 		if (get_input('search_viewtype') == "gallery") {
-		
+
 /******************************************************************************
  *
  *  Gallery view of an album object
@@ -28,21 +28,21 @@
  *****************************************************************************/
 
 			//get album cover if one was set 
-			if ($file->cover)
-				$album_cover = 'thumbnail';
+			if ($album->cover)
+				$album_cover = 'thumbnail';
 			else
-				$album_cover = 'new album';
+				$album_cover = 'new album';
 
 ?>
 
      
-	
      
-	
      
+	
      
+	
      
 	name;?> 
      
 getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
+				echo "getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
 ?>
 	      
 
      
@@ -57,14 +57,14 @@
  *
  *****************************************************************************/
 
-			$info = '
      '.$title.'
      ';
+			$info = '
      ' . $title . '
      ';
 			$info .= "
      username}\">{$owner->name} {$friendlytime}";
-			$numcomments = elgg_count_comments($file);
+			$numcomments = elgg_count_comments($album);
 			if ($numcomments)
-				$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
+				$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
 			$info .= "
      ";
 			
-			$icon = "getURL()}\">" . elgg_view("tidypics/icon", array('album' => true, 'size' => 'small')) . "";
+			$icon = "getURL()}\">" . elgg_view("tidypics/icon", array('album' => true, 'size' => 'small')) . "";
 			
 			echo elgg_view_listing($icon, $info);
 		}
@@ -93,32 +93,40 @@
 		
 	
      
 '.autop($desc).'
      ';
-	
-		// display the simple image views. Uses: via 'object/image.php'
-		$count = get_entities("object","image", $file_guid, '', 999);
-
+		echo '
      ' . autop($desc) . '
      ';
+		
+		$images = get_entities("object", "image", $album_guid, '', 999);
+		
 		//build array for back | next links 
 		$_SESSION['image_sort'] = array();
-	
-		if(count($count) > 0) {
-			foreach($count as $image){
+		
+		if (is_array($images)) {
+			foreach ($images as $image) {
 				array_push($_SESSION['image_sort'], $image->guid);
 			}
-		
-			echo list_entities("object","image", $file_guid, 24, false);
+			
+			// display the simple image views. Uses 'object/image' view
+			echo list_entities("object", "image", $album_guid, 24, false);
+			
+			$num_images = count($images);
 		} else {
-			echo elgg_echo('image:none');
+			echo '
      ' . elgg_echo('image:none') . '
      ';
+			$num_images = 0;
 		}
 	
 ?>
 	
      
-	
      
-
-			
       $tags));?>
      
-
+	
      
+
+		
       $tags));?>
      
+
 		 name; ?>  
      
-		 
      
+		 
      
 	
      
 
 
 				 $file_guid)); ?>
 
-		
      
+		
      
 
 			
       $tags));?>
      
 
Date: Sat, 20 Jun 2009 20:52:39 +0000
Subject: cleaned up icon code - don't need tidypics/icon view anymore - may
 reinstate it at a later time

---
 actions/icon.php                | 36 ------------------------------------
 start.php                       |  1 -
 views/default/object/album.php  |  6 +++++-
 views/default/object/image.php  |  2 +-
 views/default/tidypics/icon.php | 37 -------------------------------------
 5 files changed, 6 insertions(+), 76 deletions(-)
 delete mode 100644 actions/icon.php
 delete mode 100644 views/default/tidypics/icon.php

diff --git a/actions/icon.php b/actions/icon.php
deleted file mode 100644
index bfc18198a..000000000
--- a/actions/icon.php
+++ /dev/null
@@ -1,36 +0,0 @@
-thumbnail;
-		$mime = $file->mimetype;
-		
-		header("Content-type: $mime");
-		if (strpos($mime, "image/")!==false)
-			header("Content-Disposition: inline; filename=\"$filename\"");
-		else
-			header("Content-Disposition: attachment; filename=\"$filename\"");
-
-			
-		$readfile = new ElggFile();
-		$readfile->owner_guid = $file->owner_guid;
-		$readfile->setFilename($filename);
-			
-		$contents = $readfile->grabFile();
-		
-		if (empty($contents))
-			echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/icons/general.jpg" );
-		else
-			echo $contents;
-		
-		exit;
-	} else {
-		register_error(elgg_echo("file:downloadfailed"));
-	}
-?>
\ No newline at end of file
diff --git a/start.php b/start.php
index dec7e36ed..cfd20db62 100644
--- a/start.php
+++ b/start.php
@@ -386,7 +386,6 @@
 	register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
 	register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
 	register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
-	register_action("tidypics/icon", true, $CONFIG->pluginspath. "tidypics/actions/icon.php");
 	register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
 	register_action("tidypics/download", true, $CONFIG->pluginspath . "tidypics/actions/download.php");
 	register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 3a5f5a975..ca28d1672 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -64,7 +64,11 @@
 				$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
 			$info .= "
      ";
 			
-			$icon = "getURL()}\">" . elgg_view("tidypics/icon", array('album' => true, 'size' => 'small')) . "";
+			//get album cover if one was set 
+			if ($album->cover)
+				$icon = "getURL()}\">" . 'thumbnail';
+			else
+				$icon = "getURL()}\">" . 'new album';
 			
 			echo elgg_view_listing($icon, $info);
 		}
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 03ba12a02..d09b721f1 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -78,7 +78,7 @@ if ($photo_tags) {
 			if ($numcomments)
 				$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
 			$info .= "
      ";
-			$icon = "getURL()}\">" . elgg_view("tidypics/icon", array("mimetype" => $mime, 'thumbnail' => $file->thumbnail, 'file_guid' => $file_guid, 'size' => 'small')) . "";
+			$icon = "getURL()}\">" . '' . $title . '';
 
 			echo elgg_view_listing($icon, $info);
 		}
diff --git a/views/default/tidypics/icon.php b/views/default/tidypics/icon.php
deleted file mode 100644
index c960bc00b..000000000
--- a/views/default/tidypics/icon.php
+++ /dev/null
@@ -1,37 +0,0 @@
-wwwroot}mod/tidypics/graphics/icons/album.gif\" border=\"0\" />";
-}
-else{
-	
-	$mime = $vars['mimetype'];
-	if (isset($vars['thumbnail'])) {
-		$thumbnail = $vars['thumbnail'];
-	} else {
-		$thumbnail = false;
-	}
-	
-	$size = $vars['size'];
-	if ($size != 'large') {
-		$size = 'small';
-	}
-
-	if ($thumbnail && strpos($mime, "image/")!==false)
-		echo "";
-	else 
-	{
-		if ($size == 'large')
-			echo "wwwroot}mod/tidypics/graphics/icons/general_lrg.gif\" border=\"0\" />";
-		else
-			echo "wwwroot}mod/tidypics/graphics/icons/general.gif\" border=\"0\" />";
-	}
-}
-?>
\ No newline at end of file
-- 
cgit v1.2.3


From 93ee973d635385d39fcad58ad934748cd80a8a6e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 20:59:07 +0000
Subject: tweaked previous and next controls

---
 languages/en.php               | 2 +-
 views/default/object/image.php | 4 ++--
 views/default/tidypics/css.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 135344d6d..9d39c64c6 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -90,7 +90,7 @@
 			'album:by' => "Album created by",
 			'album:created:on' => "Created",
 			'image:none' => "No images have been added yet.",
-			'image:back' => "Back",
+			'image:back' => "Previous",
 			'image:next' => "Next",
 			
 		// tagging
diff --git a/views/default/object/image.php b/views/default/object/image.php
index d09b721f1..9e78ece75 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -157,10 +157,10 @@ if ($photo_tags) {
 			}
 
 			if ($current != 0)
-				$back = '<<' . elgg_echo('image:back') . '';
+				$back = '« ' . elgg_echo('image:back') . '';
 
 			if (sizeof($_SESSION['image_sort']) > $current + 1)
-				$next = '' . elgg_echo('image:next') . '>>';
+				$next = '' . elgg_echo('image:next') . ' »';
 
 
 ?>
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 07b02eeb1..ec4757c2c 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -59,7 +59,7 @@ text-align:center;
 
 #tidypics_image_nav ul li {
 display:inline;
-margin-right:10px;
+margin-right:15px;
 }
 
 #tidypics_image_full {
-- 
cgit v1.2.3


From 993825d5ca798fe5a0825f09a4adb10d3aa731e8 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 20 Jun 2009 21:20:35 +0000
Subject: continuing to work on cleaning up css

---
 docs/css_guide.txt                    | 14 +++++++-------
 views/default/js/tagging.php          | 26 +++++++++++++-------------
 views/default/tidypics/css.php        | 12 ++++++------
 views/default/tidypics/image_menu.php |  2 +-
 views/default/tidypics/tagging.php    | 20 ++++++++++----------
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/docs/css_guide.txt b/docs/css_guide.txt
index 235410963..9663cad1a 100644
--- a/docs/css_guide.txt
+++ b/docs/css_guide.txt
@@ -14,7 +14,7 @@ CSS elements:
 
 #tidypics_desc - description/caption in image and album views 
 
-#tidypics_info - holds metadata about image/album like tags
+.tidypics_info - holds metadata about image/album like tags
 
 #tidypics_controls - image view controls (download, start tagging, etc.)
 
@@ -68,17 +68,17 @@ CSS elements:
 .river_object_album_comment 
 
 /* ----------- tagging ---------------- */
-#tagging_instructions 
+#tidypics_tag_instructions 
 
-#tag_instruct_text 
+#tidypics_tag_instruct_text 
 
-#tag_instruct_button_div 
+#tidypics_tag_instruct_button_div 
 
-#tag_instruct_button 
+#tidypics_tag_instruct_button 
 
-#tag_menu 
+#tidypics_tag_menu 
 
-#delete_tag_menu 
+#tidypics_delete_tag_menu 
 
 .tidypics_tag 
 
diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php
index 193ce1458..586291b4c 100644
--- a/views/default/js/tagging.php
+++ b/views/default/js/tagging.php
@@ -12,9 +12,9 @@
 
 	// add to DOM as soon as ready
 	$(document).ready(function () {
-			$('ul#phototagging-menu li').quicksearch({
+			$('ul#tidypics_phototag_list li').quicksearch({
 				position: 'before',
-				attached: 'ul#phototagging-menu',
+				attached: 'ul#tidypics_phototag_list',
 				loaderText: '',
 				inputClass: 'input-filter',
 				labelText: "
      ",
@@ -59,7 +59,7 @@
 
 		addTagEvents();
 		
-		$('.phototag-links').hover(
+		$('.tidypics_phototag_links').hover(
 			function(){
 				code = this.id.substr(7); // cut off taglink to get unique id
 				$('#tag'+code).show();
@@ -136,10 +136,10 @@
 		
 		tagging = 1;
 		
-		$('#tag_control').text("Stop Tagging");
+		$('#tidypics_tag_control').text("Stop Tagging");
 		
 		showTagInstruct();
-		$('#delete_tag_menu').hide();
+		$('#tidypics_delete_tag_menu').hide();
 
 		$('#tidypics_image').hover(
 			function(){
@@ -169,7 +169,7 @@
 		hideTagInstruct();
 		hideTagMenu();
 
-		$('#tag_control').text("Tag this photo");
+		$('#tidypics_tag_control').text("Tag this photo");
 
 		$('img#tidypics_image').imgAreaSelect( {hide: true, disable: true} );
 
@@ -197,7 +197,7 @@
 			_top = imgOffset.top + oCoordenates.y2;
 			_left = imgOffset.left + oCoordenates.x2 + offsetX;
 
-			$('#tag_menu').show().css({
+			$('#tidypics_tag_menu').show().css({
 				"top": _top + "px",
 				"left": _left + "px"
 			});
@@ -209,14 +209,14 @@
 
 	function hideTagMenu()
 	{
-		$('#tag_menu').hide();
+		$('#tidypics_tag_menu').hide();
 	}
 
 	function showTagInstruct()
 	{
 		offsetY = -60;
 		
-		divWidth = $('#tagging_instructions').width();
+		divWidth = $('#tidypics_tag_instructions').width();
 		imgOffset = $('#tidypics_image').offset();
 		imgWidth  = $('#tidypics_image').width();
 		offsetX   = parseInt((imgWidth - divWidth)/2);
@@ -224,7 +224,7 @@
 		_top = imgOffset.top + offsetY;
 		_left = imgOffset.left + offsetX;
 
-		$('#tagging_instructions').show().css({
+		$('#tidypics_tag_instructions').show().css({
 			"top": _top + "px",
 			"left": _left + "px"
 		});
@@ -232,7 +232,7 @@
 
 	function hideTagInstruct()
 	{
-		$('#tagging_instructions').hide();
+		$('#tidypics_tag_instructions').hide();
 	}
 
 	function addTag()
@@ -267,7 +267,7 @@
 		_top = imgOffset.top + offsetY;
 		_left = imgOffset.left + offsetX;
 
-		$('#delete_tag_menu').show().css({
+		$('#tidypics_delete_tag_menu').show().css({
 			"top": _top + "px",
 			"left": _left + "px"
 		});
@@ -284,7 +284,7 @@
 	
 	function hideDeleteMenu()
 	{
-		$('#delete_tag_menu').hide();
+		$('#tidypics_delete_tag_menu').hide();
 		
 		// restart tag hovering
 		$('#tidypics_image').hover(
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index ec4757c2c..032388813 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -176,7 +176,7 @@ padding:0 0 5px;
 }
 
 /* ----------- tagging ---------------- */
-#tagging_instructions {
+#tidypics_tag_instructions {
 background:#BBDAF7; 
 border:1px solid #4690D6;  
 padding:10px;
@@ -188,21 +188,21 @@ position:absolute;
 z-index:10000;
 }
 
-#tag_instruct_text {
+#tidypics_tag_instruct_text {
 padding-top: 3px;
 float: left;
 }
 
-#tag_instruct_button_div {
+#tidypics_tag_instruct_button_div {
 float: left;
 margin-left: 15px;
 }
 
-#tag_instruct_button {
+#tidypics_tag_instruct_button {
 margin:0;
 }
 
-#tag_menu {
+#tidypics_tag_menu {
 border:1px solid #3B5999; 
 width:200px; 
 position:absolute;
@@ -214,7 +214,7 @@ font-size:12px;
 text-align:left;
 }
 
-#delete_tag_menu {
+#tidypics_delete_tag_menu {
 border:1px solid #3B5999; 
 width:200px; 
 position:absolute;
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 5940a0138..b4597a99f 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -19,7 +19,7 @@
 		// only owner and friends of owner can tag
 		if ($viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid)) {
 ?>
-
      15. 
+
      16. 
 
 $link) {
-			echo "
    16. {$link[0]}
      17. ";
+			echo "
    17. {$link[0]}
      18. ";
 		}
 ?>
 	
@@ -22,11 +22,11 @@
 
-
      
-	
      
-	
      
+
      
+	
      
+	
      
 
      
-
      
+
      
 ";
 		$content .= "";
 	
-		$content .= "
        ";
+		$content .= "
          ";
 		$content .= "
        •  {$viewer->name} (" . elgg_echo('me') . ")
          • ";
 	
 		if ($friends) {
@@ -50,11 +50,11 @@
 
 	$content .= "";
 	
-	echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'form-phototagging', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content));
+	echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'body' => $content));
 
 ?>
 
      
-
      
+
      
 ';
@@ -67,10 +67,10 @@
 		$content .= "";
 		$content .= ""; 
 
-		echo elgg_view('input/form', array('internalname' => 'form-deletetag', 'action' => "{$vars['url']}action/tidypics/deletetag", 'body' => $content));
+		echo elgg_view('input/form', array('internalname' => 'phototag_deletetag_form', 'action' => "{$vars['url']}action/tidypics/deletetag", 'body' => $content));
 
 	}
-	echo '
      '; // delete_tag_menu
+	echo '
      '; // tidypics_delete_tag_menu
 	
 	echo elgg_view('js/tagging', array('photo_tags_json' => $photo_tags_json,) );
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From 9b44d58f4836a1e7c02a01ac249b25a9e0d75cb1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 01:44:03 +0000
Subject: few more css tweaks

---
 views/default/tidypics/css.php | 69 +++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 45 deletions(-)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 032388813..707c9599c 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -9,7 +9,7 @@
 }
 
 #tidypics_breadcrumbs {
-margin:5px 0 25px 0;
+margin:5px 0 15px 0;
 font-size:80%;
 }
 
@@ -18,8 +18,24 @@ padding:0 20px;
 font-style:italic;
 }
 
-.tidypics_info {
-padding:20px;
+#tidypics_image_nav {
+text-align:center;
+}
+
+#tidypics_image_wrapper {
+margin:10px 0 10px 0;
+text-align:center;
+}
+
+#tidypics_image {
+background:#EEEEEE none repeat scroll 0 0;
+border:2px solid #999999;
+padding:5px;
+}
+
+#tidypics_image_nav ul li {
+display:inline;
+margin-right:15px;
 }
 
 #tidypics_controls {
@@ -43,6 +59,10 @@ margin:2px 0px;
 display:inline;
 }
 
+.tidypics_info {
+padding:20px;
+}
+
 .tidypics_album_images {
 float:left;
 width:153px; 
@@ -53,47 +73,6 @@ border:1px solid #dedede;
 text-align:center;
 }
 
-#tidypics_image_nav {
-text-align:center;
-}
-
-#tidypics_image_nav ul li {
-display:inline;
-margin-right:15px;
-}
-
-#tidypics_image_full {
-text-align:center;
-margin:10px;
-}
-
-#tidypics_image_wrapper {
-margin:10px 0 10px 0;
-text-align:center;
-}
-
-/*
-#tidypics_image_frame {
-padding:5px;
-border:1px solid #dedede;
-float: left;
-margin: 0 auto;
-}
-*/
-
-
-#tidypics_image_full img {
-padding:5px;
-border:1px solid #dedede;
-margin:7px 0;
-}
-
-#tidypics_image {
-background:#EEEEEE none repeat scroll 0 0;
-border:2px solid #999999;
-padding:5px;
-}
-
 .tidypics_album_cover {
 padding:2px;
 border:1px solid #dedede;
@@ -249,7 +228,7 @@ padding:1px;
 }
 
 #tidypics_phototags_list {
-padding:20px;
+padding:0 20px 0 20px;
 }
 
 #tidypics_phototags_list ul {
-- 
cgit v1.2.3


From cbacd1dc4c9debebf79a44c4a70747cb7baec207 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 12:07:38 +0000
Subject: final tweaks of gd upload code

---
 actions/upload.php | 4 ++--
 lib/resize.php     | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index a297128c4..1b8776075 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -116,8 +116,8 @@
 		$mem_avail = rtrim($mem_avail, 'M');
 		$mem_avail = $mem_avail * 1024 * 1024;
 		if ($image_lib == 'GD') {
-			$mem_required = 5 * $imginfo[0] * $imginfo[1];
-			$mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer
+			$mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);
+			$mem_avail = $mem_avail - memory_get_peak_usage() - 2097152; // 2 MB buffer
 			if ($mem_required > $mem_avail) {
 				array_push($not_uploaded, $sent_file['name']);
 				array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
diff --git a/lib/resize.php b/lib/resize.php
index 9db81f318..7c06b28c5 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -185,6 +185,9 @@
 				break;
 		}
 		
+		imagedestroy($newimage);
+		imagedestroy($oldimage);
+		
 		return $rtn_code;
 	}
 
-- 
cgit v1.2.3


From a4e59a78db73753aac791b0dec520dba30baf0dc Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 12:16:54 +0000
Subject: tweaked css of popups

---
 views/default/tidypics/css.php          | 30 ++++++++++++------------------
 views/default/tidypics/forms/upload.php |  4 ++--
 views/default/tidypics/tagging.php      |  4 ++--
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 707c9599c..198bf4643 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -87,6 +87,18 @@ margin-bottom:8px;
 text-align:center;
 }
 
+.tidypics_popup {
+border:1px solid #3B5999; 
+width:200px; 
+position:absolute;
+z-index:10000; 
+display:none; 
+background:#ffffff; 
+padding:10px; 
+font-size:12px; 
+text-align:left;
+}
+
 /* ------ tidypics widget view ------  */
 
 #tidypics_album_widget_container {
@@ -182,27 +194,9 @@ margin:0;
 }
 
 #tidypics_tag_menu {
-border:1px solid #3B5999; 
-width:200px; 
-position:absolute;
-z-index:10000; 
-display:none; 
-background:#ffffff; 
-padding:10px; 
-font-size:12px; 
-text-align:left;
 }
 
 #tidypics_delete_tag_menu {
-border:1px solid #3B5999; 
-width:200px; 
-position:absolute;
-z-index:10000; 
-display:none; 
-background:#ffffff; 
-padding:10px; 
-font-size:12px; 
-text-align:left;
 }
 
 .tidypics_tag {
diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index 1d83cf311..a8f3c8386 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -19,7 +19,7 @@
 
      
 	
      
 	
      
-	
      
+	
      
 		Uploading images
      
 		
      ...
      
 	
      
@@ -64,7 +64,7 @@
 		_top = imgOffset.top + offsetY;
 		_left = imgOffset.left + offsetX;
 
-		$('#delete_tag_menu').show().css({
+		$('.tidypics_popup').show().css({
 			"top": _top + "px",
 			"left": _left + "px"
 		});
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 400e6f1ba..9bd585ea1 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -26,7 +26,7 @@
 	
      
 	
      
 
      
-
      
+
      
 
 
      
-
      
+
      
 ';
-- 
cgit v1.2.3


From 1cab81b9b45adc28342078cea97e715e399b0f05 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 12:22:23 +0000
Subject: fixed bug in river view of album

---
 views/default/river/object/album/create.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 5f8b07965..e4e2ce4bb 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -17,8 +17,7 @@
 
 		$string .= "
      ";
 		
-		// display the simple image views. Uses: via 'object/image.php'
-		$images = get_entities("object", "image", $file_guid, 'time_created desc', 7);
+		$images = get_entities("object", "image", $album->guid, 'time_created desc', 7);
 
 		if (count($images)) {
 			foreach($images as $image){
-- 
cgit v1.2.3


From bda141ad119b7d382a8689182edd80aa603c2442 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 12:41:09 +0000
Subject: improved exif code

---
 lib/exif.php                    | 104 ++++++++++++++++++----------------------
 views/default/tidypics/css.php  |   5 ++
 views/default/tidypics/exif.php |   6 ++-
 3 files changed, 56 insertions(+), 59 deletions(-)

diff --git a/lib/exif.php b/lib/exif.php
index 5382fbc9f..9d5ae6343 100644
--- a/lib/exif.php
+++ b/lib/exif.php
@@ -14,72 +14,62 @@ function td_get_exif($file) {
 function tp_exif_formatted($file_guid) {
 
 	$metadata_exif = get_metadata_byname($file_guid, "tp_exif");
-	if(!$metadata_exif) { //try to load it from the file if its not in the database
+	if (!$metadata_exif) { //try to load it from the file if its not in the database
 		$file = new ElggFile($file_guid);
 		td_get_exif($file);
 		unset($file);
 		$metadata_exif = get_metadata_byname($file_guid, "tp_exif");
 	}
 	
-	if($metadata_exif) {
+	if (!$metadata_exif) {
+		return false;
+	}
+
+	$exif = unserialize($metadata_exif["value"]);
+	
+	$model = $exif['Model'];
+	if(!$model) $model = "N/A";
+	$exif_data['Model'] = $model;
 
-		$exif = unserialize($metadata_exif["value"]);
-		
-		//got the code snippet below from http://www.zenphoto.org/support/topic.php?id=17
-		//convert the raw values to understandible values
-		$Fnumber = explode("/", $exif['FNumber']);
-		
-		if ($Fnumber[1] != 0)
-			$Fnumber = $Fnumber[0] / $Fnumber[1];
-		else
-			$Fnumber = 0;
-		
-		if(!$Fnumber) {
-			$Fnumber = "N/A";
-		} else {
-			$Fnumber = "f/$Fnumber";
-		}
-		
-		$Focal = explode("/", $exif['FocalLength']);
-		if ($Focal[1] != 0)
-			$Focal = $Focal[0] / $Focal[1];
-		else
-			$Focal = 0;
-		if(!$Focal || round($Focal) == "0") $Focal = 0;
-		if(round($Focal) == 0) {
-			$Focal = "N/A";
-		} else {
-			$Focal = round($Focal) . "mm";
-		}
+	$exposure = $exif['ExposureTime'];
+	if (!$exposure) $exposure = "N/A";
+	$exif_data['Shutter'] = $exposure;
 
-		$model = $exif['Model'];
-		if(!$model) $model = "N/A";
-		
-		$exposure = $exif['ExposureTime'];
-		if(!$exposure) $exposure = "N/A";
-		
-		$iso = $exif['ISOSpeedRatings'];
-		if(!$iso) $iso = "N/A";
-		
-		$captured = $exif['DateTime'];
-		if(!$captured) $captured = "N/A";
-		
-		//prepare the text for return
-		
-		$exif_text = "Model: ".$model."
      ";
-		$exif_text .= "Shutter: ".$exposure."
      ";
-		$exif_text .= "Aperture: ".$Fnumber."
      ";
-		$exif_text .= "ISO Speed: ".$iso."
      ";
-		if(round($Focal) == 0) {
-			$exif_text .= "Focal Length: N/A
      ";
-		} else {
-			$exif_text .= "Focal Length: " . round($Focal) . "mm
      ";
-		}
-		$exif_text .= "Captured: ". $captured;
-		
-		return $exif_text;
+	//got the code snippet below from http://www.zenphoto.org/support/topic.php?id=17
+	//convert the raw values to understandible values
+	$Fnumber = explode("/", $exif['FNumber']);
+	if ($Fnumber[1] != 0)
+		$Fnumber = $Fnumber[0] / $Fnumber[1];
+	else
+		$Fnumber = 0;
+	if (!$Fnumber) {
+		$Fnumber = "N/A";
 	} else {
-		return false;
+		$Fnumber = "f/$Fnumber";
 	}
+	$exif_data['Aperture'] = $Fnumber;
+
+	$iso = $exif['ISOSpeedRatings'];
+	if (!$iso) $iso = "N/A";
+	$exif_data['ISO Speed'] = $iso;
+
+	$Focal = explode("/", $exif['FocalLength']);
+	if ($Focal[1] != 0)
+		$Focal = $Focal[0] / $Focal[1];
+	else
+		$Focal = 0;
+	if (!$Focal || round($Focal) == "0") $Focal = 0;
+	if (round($Focal) == 0) {
+		$Focal = "N/A";
+	} else {
+		$Focal = round($Focal) . "mm";
+	}
+	$exif_data['Focal Length'] = $Focal;
+
+	$captured = $exif['DateTime'];
+	if (!$captured) $captured = "N/A";
+	$exif_data['Captured'] = $captured;
+
+	return $exif_data;
 }
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 198bf4643..3ade75ff4 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -63,6 +63,11 @@ display:inline;
 padding:20px;
 }
 
+#tidypics_exif {
+padding-left:20px;
+font-size:80%;
+}
+
 .tidypics_album_images {
 float:left;
 width:153px; 
diff --git a/views/default/tidypics/exif.php b/views/default/tidypics/exif.php
index d6b455309..525665754 100644
--- a/views/default/tidypics/exif.php
+++ b/views/default/tidypics/exif.php
@@ -4,8 +4,10 @@
 	
 	$exif = tp_exif_formatted($guid);
 	if ($exif) {
-		echo '
      ';
-		echo $exif;
+		echo '
      ';
+		foreach ($exif as $name => $value) {
+			echo $name . ': ' . $value . '
      ';
+		}
 		echo '
      ';
 	}
 	
-- 
cgit v1.2.3


From fef76848f2e6f52d5f4941b9b519aadf996070cf Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 13:26:48 +0000
Subject: added quota message

---
 languages/en.php                        |  6 ++----
 views/default/tidypics/forms/upload.php | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 9d39c64c6..e0201dc46 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -80,8 +80,7 @@
 			'album:desc' => "Description",
 			'album:tags' => "Tags",
 			'album:cover' => "Make image album cover?",
-			'album:cover:yes' => "Yes",
-			'image:access:note' => "(view access is inherited from the album)",
+			'tidypics:quota' => "Quota usage:",
 			
 		//views 
 		
@@ -144,10 +143,9 @@
 			'images:edited' => "Your images were successfully updated.",
 			'album:edited' => "Your album was successfully updated.",
 			'album:saved' => "Your album was successfully saved.",
-			'album:deleted' => "Your album was successfully deleted.",	
+			'album:deleted' => "Your album was successfully deleted.",
 			'album:delete:confirm' => "Are you sure you want to delete this album?",
 			'album:created' => "Your new album has been created.",
-			'tidypics:status:processing' => "Please wait while we process your picture....",
 			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
 				
 		//Error messages
diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index a8f3c8386..c4313bf40 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -4,11 +4,21 @@
 	//this is for image uploads only. Image edits are handled by edit.php form
 	
 	$container_guid = get_input('container_guid');
-	$access_id = get_entity($vars['album'])->access_id;
+	$album = get_entity($vars['album']);
+	$access_id = $album->access_id;
 
 	$maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics');
 	if (!$maxfilesize)
 		$maxfilesize = 5;
+		
+	$quota = get_plugin_setting('quota','tidypics');
+	if ($quota) {
+		$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
+		$image_repo_size = (int)$image_repo_size_md->value;
+		$image_repo_size = round($image_repo_size / 1024 / 1024);
+		if ($image_repo_size > $quota)
+			$image_repo_size = $quota;
+	}
 
 ?>
 
      
@@ -19,6 +29,13 @@
 
      
 	
      
 	
      
+
+	
      
+
 	
      
 		Uploading images
      
 		
      ...
      
-- 
cgit v1.2.3


From f162f786a0b152e37eed2b0e4ec89b51958ac023 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 13:53:40 +0000
Subject: improved group code including river view

---
 actions/upload.php                             | 17 +++++++++--------
 languages/en.php                               |  3 ++-
 views/default/river/object/album/create.php    |  9 +++++++++
 views/default/tidypics/css.php                 |  2 +-
 views/default/tidypics/groupprofile_albums.php |  8 +++++++-
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index 1b8776075..65005671a 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -190,7 +190,14 @@
 		// update user/group size for checking quota
 		$image_repo_size += $sent_file['size'];
 
-		if($img_river_view == "all") {
+		// successful upload so check if this is a new album and throw river event if so
+		if ($album->new_album == TP_NEW_ALBUM) {
+			if (function_exists('add_to_river'))
+				add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
+			$album->new_album = TP_OLD_ALBUM;
+		}
+	
+		if ($img_river_view == "all") {
 			add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
 		}
 		unset($file);  // may not be needed but there seems to be a memory leak
@@ -218,14 +225,8 @@
 			system_message(elgg_echo('tidypics:upl_success'));
 	}
 
-	// successful upload so check if this is a new album and throw river event if so
-	if ($album->new_album == TP_NEW_ALBUM) {
-		if (function_exists('add_to_river'))
-			add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
-		$album->new_album = TP_OLD_ALBUM;
-	}
 	
-	if(count($uploaded_images) && $img_river_view == "1") {
+	if (count($uploaded_images) && $img_river_view == "1") {
 		if (function_exists('add_to_river')) {
 			add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
 		}
diff --git a/languages/en.php b/languages/en.php
index e0201dc46..fb7fa7182 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -124,7 +124,8 @@
 			'image:river:annotate' => "a comment on the image",
 		
 			//albums
-			'album:river:created' => "%s created a new photo album: ",
+			'album:river:created' => "%s created a new photo album",
+			'album:river:group' => "in the group",
 			'album:river:item' => "an album",
 			'album:river:annotate' => "a comment on the photo album",
 			
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index e4e2ce4bb..9c2486fa2 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -3,9 +3,18 @@
 	$performed_by = get_entity($vars['item']->subject_guid);
 	$album = get_entity($vars['item']->object_guid);
 	
+	$group_album = ($album->owner_guid != $album->container_guid);
+	if ($group_album) {
+		$group = get_entity($album->container_guid);
+		$group_name = $group->name;
+		$group_link = $group->getURL();
+	}
+	
 	$url = "getURL()}\">{$performed_by->name}";
 	$string = sprintf(elgg_echo("album:river:created"),$url) . " ";
 	$string .= "getURL() . "\">" . $album->title . "";
+	if ($group_album)
+		$string .= ' ' . elgg_echo('album:river:group') . ' ' . "{$group_name}";
 
 	$album_river_view = get_plugin_setting('album_river_view', 'tidypics');
 	
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 3ade75ff4..440edb5ab 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -147,7 +147,7 @@ font-size:1em;
 
 /* ---- tidypics group css ----- */
 
-#group_albums_widget {
+#tidypics_group_profile {
 -webkit-border-radius: 8px; 
 -moz-border-radius: 8px;
 background:white none repeat scroll 0 0;
diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php
index 060c540d4..7f28705c7 100644
--- a/views/default/tidypics/groupprofile_albums.php
+++ b/views/default/tidypics/groupprofile_albums.php
@@ -1,7 +1,13 @@
 photos_enable != 'no') {
-	echo '
      ';
+	echo '
      ';
 	echo '
      ' . elgg_echo('album:group') . '
      ';
 	echo elgg_view('tidypics/albums', array('num_albums' => 5));
 	echo '
      ';
-- 
cgit v1.2.3


From 779ff6e97e53a016b9384427d65d98daf6480e24 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 13:58:10 +0000
Subject: fixed bug introduced with cleaning up album view

---
 views/default/object/album.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/object/album.php b/views/default/object/album.php
index ca28d1672..9e3e05356 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -135,7 +135,7 @@
 
 ';
-- 
cgit v1.2.3


From 8a76d53f35eabe1b33f012e91fd745c1e0653203 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 21:47:47 +0000
Subject: added convenience function for front page

---
 lib/exif.php                                |  1 -
 lib/tidypics.php                            | 35 +++++++++++++++++++++++
 lib/watermark.php                           |  2 --
 start.php                                   |  2 ++
 views/default/object/image.php              | 43 +++++++++++++++++------------
 views/default/river/object/album/create.php |  4 +--
 views/default/river/object/image/create.php |  4 +--
 views/default/tidypics/forms/edit_multi.php |  2 +-
 8 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/lib/exif.php b/lib/exif.php
index 9d5ae6343..2bc25c996 100644
--- a/lib/exif.php
+++ b/lib/exif.php
@@ -1,5 +1,4 @@
 mimetype;
diff --git a/lib/tidypics.php b/lib/tidypics.php
index 1254f3ff6..d81b3ab2f 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -4,6 +4,41 @@
 	 * 
 	 */
 
+	/**
+	 * Get images for display on front page
+	 *
+	 * @param int number of images
+	 * @param int (optional) guid of owner
+	 * @return string of html for display
+	 *
+	 * To use with the custom index plugin, use something like this:
+	
+	if (is_plugin_enabled('tidypics')) {
+?>
+	
+		
      
+			
      
+			
      
+			
+			
      
+		
      
+
+
+	 * Good luck
+	 */
+	function tp_get_latest_photos($num_images, $owner_guid = 0)
+	{
+		$prev_context = set_context('front');
+		$image_html = list_entities('object', 'image', $owner_guid, $num_images, false, false, false);  
+		set_context($prev_context);
+		return $image_html;
+	}
+	
+	
 	/**
 	 * Get image directory path
 	 *
diff --git a/lib/watermark.php b/lib/watermark.php
index ddc41a36b..330ae7b29 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -1,7 +1,5 @@
 
 			
      
-				thumbnail
+				thumbnail
 			
      
 			
+		<?php echo $title; ?>
+
 	
      
-		thumbnail
+		thumbnail
 	
      
 cover) {
-			$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
+			$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
 		}
 	} else {
 
@@ -30,7 +30,7 @@
 
 		if (count($images)) {
 			foreach($images as $image){
-				$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> ';
+				$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
 			}
 		}
 
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 8f7a856ea..5229e109a 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -19,9 +19,9 @@
 	$string .= "
      ";
 
 /*	// this adds the album cover to the river display 
-	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> ';
+	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
 */
-	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> ';
+	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
 	$string .= "
      ";
 	
 	echo $string;
diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php
index 01ffb3128..f6c29e4a5 100644
--- a/views/default/tidypics/forms/edit_multi.php
+++ b/views/default/tidypics/forms/edit_multi.php
@@ -27,7 +27,7 @@
 		}
 		
 		echo '
      ';
-		echo '' . $title . '';
+		echo '' . $title . '';
 		echo '
      ';
 		echo '
      ';
 		echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n";
-- 
cgit v1.2.3


From 6ce057f5162e18cd5190717145a13e7c29fe9da7 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 22:42:39 +0000
Subject: added in skeleton for image and album classes

---
 languages/en.php                    |  6 +++++-
 lib/album.php                       | 23 ++++++++++++++++++++++
 lib/image.php                       | 23 ++++++++++++++++++++++
 start.php                           |  7 ++++++-
 thumbnail.php                       |  2 +-
 upgrade.php                         | 38 +++++++++++++++++++++++++++++++++++++
 views/default/tidypics/settings.php | 12 ++++++++++++
 7 files changed, 108 insertions(+), 3 deletions(-)
 create mode 100644 lib/album.php
 create mode 100644 lib/image.php
 create mode 100644 upgrade.php

diff --git a/languages/en.php b/languages/en.php
index fb7fa7182..355f9660b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -148,6 +148,8 @@
 			'album:delete:confirm' => "Are you sure you want to delete this album?",
 			'album:created' => "Your new album has been created.",
 			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
+			
+			'tidypics:upgrade:success' => 'Upgrade of Tidypics a success',
 				
 		//Error messages
 				 
@@ -169,7 +171,9 @@
 			'album:none' => "No albums have been created yet.",
 			'album:uploadfailed' => "Sorry; we could not save your album.",
 			'album:deletefailed' => "Your album could not be deleted at this time.",
-			'album:blank' => "Please give this album a title and description."
+			'album:blank' => "Please give this album a title and description.",
+			
+			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed",
 	);
 					
 	add_translation("en",$english);
diff --git a/lib/album.php b/lib/album.php
new file mode 100644
index 000000000..7e03ed6eb
--- /dev/null
+++ b/lib/album.php
@@ -0,0 +1,23 @@
+attributes['subtype'] = "album";
+		}
+		
+		public function __construct($guid = null) 
+		{
+			parent::__construct($guid);
+		}
+	}
+	
+?>
\ No newline at end of file
diff --git a/lib/image.php b/lib/image.php
new file mode 100644
index 000000000..3a23a1932
--- /dev/null
+++ b/lib/image.php
@@ -0,0 +1,23 @@
+attributes['subtype'] = "image";
+		}
+		
+		public function __construct($guid = null) 
+		{
+			parent::__construct($guid);
+		}
+	}
+	
+?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 24423dafd..e2a87a8e8 100644
--- a/start.php
+++ b/start.php
@@ -10,7 +10,8 @@
 
 	// include core libraries
 	include dirname(__FILE__) . "/lib/tidypics.php";
-	
+	include dirname(__FILE__) . "/lib/image.php";
+	include dirname(__FILE__) . "/lib/album.php";
 	
 	/**
 	 * tidypics plugin initialisation functions.
@@ -44,6 +45,10 @@
 		register_entity_url_handler('tidypics_image_url', 'object', 'image');
 		register_entity_url_handler('tidypics_album_url', 'object', 'album');
 
+		// add the class files for image and album
+		add_subtype("object", "image", "TidypicsImage");
+		add_subtype("object", "album", "TidypicsAlbum");
+
 		// Register entity type
 		register_entity_type('object','image');
 		register_entity_type('object','album');
diff --git a/thumbnail.php b/thumbnail.php
index 688d400af..eaca0849f 100644
--- a/thumbnail.php
+++ b/thumbnail.php
@@ -62,7 +62,7 @@
 	}
 
 	// Return the thumbnail and exit
-	$mime = $file->mimetype;
+	$mime = $file->getMimeType();
 	header("Content-type: $mime");
 	echo $contents;
 	exit;
diff --git a/upgrade.php b/upgrade.php
new file mode 100644
index 000000000..7fc3187d6
--- /dev/null
+++ b/upgrade.php
@@ -0,0 +1,38 @@
+dbprefix . 'entity_subtypes';
+		$result = update_data("UPDATE {$table} set class='TidypicsImage' where id={$id}");
+		if (!result) {
+			register_error(elgg_echo('tidypics:upgrade:failed'));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+	}
+
+	// add album class
+	$id = get_subtype_id("object", "album"); 
+	if ($id != 0) {
+		$table = $CONFIG->dbprefix . 'entity_subtypes';
+		$result = update_data("UPDATE {$table} set class='TidypicsAlbum' where id={$id}");
+		if (!result) {
+			register_error(elgg_echo('tidypics:upgrade:failed'));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+	}
+
+	system_message(elgg_echo('tidypics:upgrade:success'));
+	
+	forward($_SERVER['HTTP_REFERER']);
+?>
\ No newline at end of file
diff --git a/views/default/tidypics/settings.php b/views/default/tidypics/settings.php
index e69d6d306..c8d12d861 100644
--- a/views/default/tidypics/settings.php
+++ b/views/default/tidypics/settings.php
@@ -4,8 +4,20 @@
 	
 	global $CONFIG;  
 	$system_url = $CONFIG->wwwroot . 'mod/tidypics/system.php';
+	$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/upgrade.php';
+	
+	$upgrade = false;
+	if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album'))
+		$upgrade = true;
 ?>
 
      
+
+Upgrade
      
+
 Run Server Analysis
 
      
 
Date: Sun, 21 Jun 2009 22:50:00 +0000
Subject: started getting ready for beta release

---
 contributions.txt | 22 ++++++++++++++--------
 manifest.xml      |  6 +++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index 06f7918df..f7aee9ba5 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,13 +1,19 @@
-Project Lead:
-Gabriel Monge-Franco (gabrielinux)
-http://gabriel.mongefranco.com
-
-Original Author:
-Jade Dominguez
-http://www.tastyseed.com/
+See individual change logs for contributors to those builds
 
 
-See individual change logs for contributors to those builds
+------------------------------------------------------------------------
+Version 1.6.0 Change List
+Release Date: 06/24/2009
+Contributors:
+  * Cash Costello
+  * Greg
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.0 CHANGES
+------------------------------------------------------------------------
+ * Photo tagging
+------------------------------------------------------------------------
+END VERSION 1.6.0 CHANGES
+------------------------------------------------------------------------
 
 
 ------------------------------------------------------------------------
diff --git a/manifest.xml b/manifest.xml
index 67858103d..b29aeea6f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,10 +1,10 @@
 
 
-        
-        
+        
+        
         
         
-        
+        
         
         
 
-- 
cgit v1.2.3


From d723ef3f6e5ba2567cb494943ba6aaeaac6c7e22 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 21 Jun 2009 23:03:23 +0000
Subject: better job catching no settings

---
 actions/upload.php | 33 +++++++++++++++++----------------
 lib/resize.php     |  1 +
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index 65005671a..f062edc80 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -30,7 +30,7 @@
 
 	$image_lib = get_plugin_setting('image_lib', 'tidypics');
 	if (!$image_lib)
-		$image_lib = 'GD';
+		$image_lib = "GD";
 
 	// post limit exceeded
 	if (count($_FILES) == 0) {
@@ -153,29 +153,30 @@
 		}
 		
 
-		if ($image_lib == 'GD') {
-
-			if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);
-			}
+		if ($image_lib == 'ImageMagick') { // ImageMagick command line
 			
-		} else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP 
-
-			if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);
-			}
-
-		} else { // ImageMagick command line
-
 			$thumbs = tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename);
 			if(!count($thumbs)) {
-				trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);
+				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
 			}
-
+			
 			$album = get_entity($container_guid);
 			
 			tp_watermark($thumbs);
 			
+			
+		} else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP 
+			
+			if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
+			}
+		
+		} else { 
+			
+			if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
+			}
+			
 		} // end of image library selector
 
 		//keep one file handy so we can add a notice to the river if single image option selected
diff --git a/lib/resize.php b/lib/resize.php
index 7c06b28c5..8561e1f4a 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -20,6 +20,7 @@
 		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
 		if (!$image_sizes) {
 			register_error(elgg_echo('tidypics:nosettings'));
+			forward($_SERVER['HTTP_REFERER']);
 			return false;
 		}
 		$image_sizes = unserialize($image_sizes);
-- 
cgit v1.2.3


From 3caf7a0417b44d295b8b794226bd443ccabd6955 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 24 Jun 2009 11:22:34 +0000
Subject: tweak in preparation for better RSS feeds

---
 viewalbum.php                  | 8 +++-----
 views/default/object/album.php | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/viewalbum.php b/viewalbum.php
index 4bdd1a2c7..602963816 100644
--- a/viewalbum.php
+++ b/viewalbum.php
@@ -45,11 +45,9 @@
 							true);
 	}
 
-	// set title and body
-	$title = $album->title;
-	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity($album, true);
+	// create body
+	$area2 = elgg_view_entity($album, true);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 
-	page_draw($title, $body);
+	page_draw($album->title, $body);
 ?>
\ No newline at end of file
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 9e3e05356..988ad0f7c 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -91,6 +91,8 @@
 			add_submenu_item(	elgg_echo("tidypics:highestrated"),
 								$CONFIG->wwwroot . "pg/photos/highestrated/group:" . $album_id,
 								'photos');
+								
+		echo elgg_view_title($title);
 ?>
 
      
 	
      
-- 
cgit v1.2.3


From 8a555c332c4c1172375aa589aded36537b1f967e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 24 Jun 2009 11:57:27 +0000
Subject: added album object for rss view

---
 views/rss/object/album.php | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 views/rss/object/album.php

diff --git a/views/rss/object/album.php b/views/rss/object/album.php
new file mode 100644
index 000000000..9f7b7b123
--- /dev/null
+++ b/views/rss/object/album.php
@@ -0,0 +1,38 @@
+title;
+	if (empty($title)) {
+		$subtitle = strip_tags($vars['entity']->description);
+		$title = substr($subtitle,0,32);
+		if (strlen($subtitle) > 32)
+			$title .= " ...";
+	}
+
+	$owner_guid = $album->getOwner();
+	$images = get_entities("object", "image", 0, "", 10, 0, false, 0, $album->container_guid);
+	
+	//error_log(count($images));
+?>
+
+	
+		getURL()); ?>
+		time_created) ?>
+		getURL()); ?>
+		<![CDATA[<?php echo $title; ?>]]>
+		description)); ?>]]>
+getOwnerEntity();
+			if ($owner)
+			{
+?>
+		name; ?>
+
+	
+	
-- 
cgit v1.2.3


From ea636d9fbc60dbd54cd4f8ca271fd845361a2726 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 26 Jun 2009 11:41:28 +0000
Subject: download image doesn't display now

---
 actions/download.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/actions/download.php b/actions/download.php
index fd23a21a7..3b39c831d 100644
--- a/actions/download.php
+++ b/actions/download.php
@@ -8,27 +8,22 @@
 
 	$file_guid = (int) get_input("file_guid");
 	$file = get_entity($file_guid);
-		
-	if ($file)
-	{	
+	
+	if ($file) {
 		$filename = $file->originalfilename;
 		$mime = $file->mimetype;
 		
 		header("Content-type: $mime");
-		if (strpos($mime, "image/")!==false)
-			header("Content-Disposition: inline; filename=\"$filename\"");
-		else
-			header("Content-Disposition: attachment; filename=\"$filename\"");
+		header("Content-Disposition: attachment; filename=\"$filename\"");
 
-			
+		
 		$readfile = new ElggFile($file_guid);
 		$readfile->owner_guid = $file->owner_guid;
-		//$readfile->setFilename($filename);
-			
+		
 		$contents = $readfile->grabFile();
 		
 		if (empty($contents))
-			echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/icons/general.jpg" );
+			echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );
 		else
 			echo $contents;
 		
-- 
cgit v1.2.3


From ec24309e01d00fd913071747839aece6f7a8d866 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 28 Jun 2009 13:22:18 +0000
Subject: new rss view of albums - includes yahoo media xmlns

---
 start.php                                 |  4 +++
 views/rss/extensions/tidypics/channel.php |  1 +
 views/rss/extensions/tidypics/xmlns.php   |  1 +
 views/rss/object/album.php                | 42 ++++++++++++++++++-------------
 4 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 views/rss/extensions/tidypics/channel.php
 create mode 100644 views/rss/extensions/tidypics/xmlns.php

diff --git a/start.php b/start.php
index e2a87a8e8..e4aee58bd 100644
--- a/start.php
+++ b/start.php
@@ -35,6 +35,10 @@
 		//group view  ** psuedo widget view for group pages**
 		extend_view('groups/right_column','tidypics/groupprofile_albums');
 		
+		// rss extensions
+		extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
+		extend_view('extensions/channel', 'extensions/tidypics/channel');
+		
 		// Register a page handler, so we can have nice URLs
 		register_page_handler('photos','tidypics_page_handler');
 			
diff --git a/views/rss/extensions/tidypics/channel.php b/views/rss/extensions/tidypics/channel.php
new file mode 100644
index 000000000..8b620d15d
--- /dev/null
+++ b/views/rss/extensions/tidypics/channel.php
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/views/rss/extensions/tidypics/xmlns.php b/views/rss/extensions/tidypics/xmlns.php
new file mode 100644
index 000000000..cb9646dcb
--- /dev/null
+++ b/views/rss/extensions/tidypics/xmlns.php
@@ -0,0 +1 @@
+ xmlns:media="http://search.yahoo.com/mrss/" 
\ No newline at end of file
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 9f7b7b123..fbe1ab058 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -12,27 +12,33 @@
 		if (strlen($subtitle) > 32)
 			$title .= " ...";
 	}
+	
+	$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
 
+	
 	$owner_guid = $album->getOwner();
-	$images = get_entities("object", "image", 0, "", 10, 0, false, 0, $album->container_guid);
+	$images = get_entities("object", "image", 0, "", 10, 0, false, 0, $album->guid);
 	
-	//error_log(count($images));
+	echo "\n";
+	
+	foreach ($images as $image) {
+		$caption = $image->description;
+		if (!$caption)
+			$caption = "No caption";
 ?>
-
 	
-		getURL()); ?>
-		time_created) ?>
-		getURL()); ?>
-		<![CDATA[<?php echo $title; ?>]]>
-		description)); ?>]]>
-getOwnerEntity();
-			if ($owner)
-			{
-?>
-		name; ?>
-
-	
+		<?php echo $image->title; ?>
+		getURL(); ?>
+		
+		time_created); ?>
+		getURL(); ?>
+		
+			title; ?>
+			
+			
+		
 	
+	
+
\ No newline at end of file
-- 
cgit v1.2.3


From cb8f1902d1fed270507c045d7b1575fb265a57f2 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 28 Jun 2009 13:32:41 +0000
Subject: added media type to media content tag

---
 views/rss/object/album.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index fbe1ab058..70552e833 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -32,7 +32,7 @@
 		
 		time_created); ?>
 		getURL(); ?>
-		
+		
 			title; ?>
 			
 			
-- 
cgit v1.2.3


From ac0de7ada7ddefc77f6b25965ab71a736b27bca1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 28 Jun 2009 13:49:04 +0000
Subject: added album cover as image for channel

---
 views/rss/object/album.php | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 70552e833..7afb19d34 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -5,21 +5,32 @@
 
 	$album = $vars['entity'];
 	
-	$title = $album->title;
-	if (empty($title)) {
-		$subtitle = strip_tags($vars['entity']->description);
-		$title = substr($subtitle,0,32);
-		if (strlen($subtitle) > 32)
-			$title .= " ...";
-	}
-	
 	$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
 
+	// insert cover image if it exists image
+	if ($album->cover) {
+		// Set title
+		$vars['title'] = $album->title;
+		if (empty($vars['title'])) {
+			$title = $vars['config']->sitename;
+		} else if (empty($vars['config']->sitename)) {
+			$title = $vars['title'];
+		} else {
+			$title = $vars['config']->sitename . ": " . $vars['title'];
+		}
+		$album_cover_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb';
+?>		
+			
+			<![CDATA[<?php echo $title; ?>]]>
+			getURL() . '?view=rss'; ?>
+			
+		
+getOwner();
 	$images = get_entities("object", "image", 0, "", 10, 0, false, 0, $album->guid);
 	
-	echo "\n";
 	
 	foreach ($images as $image) {
 		$caption = $image->description;
-- 
cgit v1.2.3


From a98b6fc059974283cdbc7ee2a5d2b90dce30bb0d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 28 Jun 2009 14:06:09 +0000
Subject: finished up album rss - added embedded photos in the item description

---
 views/rss/object/album.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 7afb19d34..e429ee94d 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -33,19 +33,21 @@
 	
 	
 	foreach ($images as $image) {
-		$caption = $image->description;
-		if (!$caption)
-			$caption = "No caption";
+		$descr = '
      ' . get_entity($image->owner_guid)->name;
+		$descr .= ' ' . elgg_echo('tidypics:posted') . '
      ';
+		$descr .= "
      guid}&size=small\" />
      ";
+		$descr .= "
      {$image->description}
      ";
+		
 ?>
 	
 		<?php echo $image->title; ?>
 		getURL(); ?>
-		
+		
 		time_created); ?>
 		getURL(); ?>
 		
 			title; ?>
-			
+			description); ?>
 			
 		
 	
-- 
cgit v1.2.3


From 5f7b66163ae40ebb8829dca4bb1c273b5a52b0e1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 28 Jun 2009 14:06:40 +0000
Subject: forgot the language file change for previous

---
 languages/en.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/languages/en.php b/languages/en.php
index 355f9660b..360de8b87 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -108,6 +108,9 @@
 			'tidypics:deletetag:success' => 'Selected tags were successfully deleted',
 			
 		
+		//rss
+			'tidypics:posted' => 'posted a photo:',
+		
 		//widgets
 		
 			'album:widget' => "Photo Albums",
-- 
cgit v1.2.3


From 1224dc309fd8451d56e8959e1e6a3cc59ba8803e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 28 Jun 2009 14:16:33 +0000
Subject: ignore index for rss - this is the view of all of an owner's albums

---
 views/rss/object/album.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index e429ee94d..ecd4c51ab 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -3,6 +3,10 @@
 	 * Tidypics Album RSS View
 	 */
 
+	// for now catch the albums view and ignore it
+	if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
+	} else {
+		
 	$album = $vars['entity'];
 	
 	$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
@@ -54,4 +58,6 @@
 	
 
\ No newline at end of file
-- 
cgit v1.2.3


From db92957e150c3cd86dfee9f51056c0c5101e575e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 30 Jun 2009 01:03:43 +0000
Subject: changed ratings and exif to default off

---
 views/default/object/image.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index c99bb1ed9..e38576abf 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -224,7 +224,7 @@ if ($photo_tags) {
 			}
 			
 			
-			if (get_plugin_setting('exif', 'tidypics') != "disabled") {
+			if (get_plugin_setting('exif', 'tidypics') == "enabled") {
 ?>
 				 $file_guid)); ?>
 
@@ -232,7 +232,7 @@ if ($photo_tags) {
 
 			
       $tags));?>
      
 
 			
      
 	 $vars['entity'])); ?>
-- 
cgit v1.2.3


From d1e02e6aa2f75a311c46a465bc044211edb36ed9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 1 Jul 2009 00:29:30 +0000
Subject: fix to support inline if the view is specified - could be used by rss
 feeds or slideshows

---
 actions/download.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/actions/download.php b/actions/download.php
index 3b39c831d..2736e5438 100644
--- a/actions/download.php
+++ b/actions/download.php
@@ -9,12 +9,17 @@
 	$file_guid = (int) get_input("file_guid");
 	$file = get_entity($file_guid);
 	
+	$view = get_input("view");
+	
 	if ($file) {
 		$filename = $file->originalfilename;
 		$mime = $file->mimetype;
 		
 		header("Content-type: $mime");
-		header("Content-Disposition: attachment; filename=\"$filename\"");
+		if ($view == "inline")
+			header("Content-Disposition: inline; filename=\"$filename\"");
+		else
+			header("Content-Disposition: attachment; filename=\"$filename\"");
 
 		
 		$readfile = new ElggFile($file_guid);
-- 
cgit v1.2.3


From fd36c38f04f775f34734f88ece2d23466d7715bb Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 1 Jul 2009 01:00:52 +0000
Subject: If everything works out, this should be Tidypics 1.6.0 Beta 1 - note
 I pulled back support for ImageMagick command line and watermarks. It would
 lead to too many support questions from the general public and I already
 expect to be inundated.

---
 contributions.txt                      | 16 +++++++++++++---
 manifest.xml                           |  2 +-
 views/default/object/image.php         |  4 +++-
 views/default/tidypics/forms/admin.php | 12 ++++++------
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index f7aee9ba5..f88e09832 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -2,15 +2,25 @@ See individual change logs for contributors to those builds
 
 
 ------------------------------------------------------------------------
-Version 1.6.0 Change List
-Release Date: 06/24/2009
+Version 1.6.0 Beta 1 Change List
+Release Date: 06/30/2009
 Contributors:
   * Cash Costello
-  * Greg
+  * Greg Froese
+  * tagging based on code by Predo Prez
 ------------------------------------------------------------------------
 BEGIN VERSION 1.6.0 CHANGES
 ------------------------------------------------------------------------
  * Photo tagging
+ * View counter
+ * EXIF view
+ * ImageMagick support
+ * Extensive admin settings
+ * Improved CSS
+ * Image ratings
+ * Upload quotas
+ * Better album RSS feed
+ * better almost everything
 ------------------------------------------------------------------------
 END VERSION 1.6.0 CHANGES
 ------------------------------------------------------------------------
diff --git a/manifest.xml b/manifest.xml
index b29aeea6f..31d66e2f0 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
         
-        
+        
         
         
         
diff --git a/views/default/object/image.php b/views/default/object/image.php
index e38576abf..ba3bb0272 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -126,7 +126,9 @@ if ($photo_tags) {
 					$the_viewer = 0;
 				}
 				
-				create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, ACCESS_PUBLIC);
+				// only non-owner views count
+				if ($owner->guid != $view->owner_guid)
+					create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, ACCESS_PUBLIC);
 				$views_a = get_annotations($file_guid, "object", "image", "tp_view", "", 0, 9999);
 				$views = count($views_a);
 			
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 6094a776c..79f652e4f 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -23,18 +23,18 @@
 					'options_values' => array(
 						'GD' => 'GD',
 						'ImageMagickPHP' => 'ImageMagick',
-						'ImageMagick' => 'ImageMagick Cmdline',
+/*						'ImageMagick' => 'ImageMagick Cmdline', */
 					),
 					'value' => $image_lib
 	));
 	$form_body .= '
      ';
-
+/*
 	// Image Magick Path
 	$im_path = $plugin->im_path;
 	if(!$im_path) $im_path = "/usr/bin/";
 	$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
-
+*/
 	// Tagging
 	$tagging = $plugin->tagging;
 	if(!$tagging) $tagging = "enabled";
@@ -55,15 +55,15 @@
 	if(!$exif) $exif = "disabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
 
-	// Show EXIF
+	// Show View count
 	$view_count = $plugin->view_count;
 	if(!$view_count) $view_count = "enabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
-
+/*
 	// Watermark Text
 	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
-
+*/
 	// Max Image Size
 	$maxfilesize = $plugin->maxfilesize;
 	if (!$maxfilesize) $maxfilesize = (int)5; // 5 MB
-- 
cgit v1.2.3


From 38a8fe2df9c4c9f8f7c2b2abb3273617466a6393 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 1 Jul 2009 01:24:13 +0000
Subject: Well, not quite! This will be beta 1

---
 views/default/tidypics/forms/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 79f652e4f..a80fff91d 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -93,7 +93,7 @@
 
 	// River Album options
 	$album_river_view = $plugin->album_river_view;
-	if (!$album_river_view) $album_river_view = '1';
+	if (!$album_river_view) $album_river_view = 'set';
 	$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view');
 	$form_body .= elgg_view('input/pulldown', array(
 					'internalname' => 'params[album_river_view]',
-- 
cgit v1.2.3


From bc15e7d35963c1ec3ce8c8387eea42238f1eb9aa Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 1 Jul 2009 02:32:05 +0000
Subject: clicking on the image pulls up a large one now

---
 views/default/object/image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index ba3bb0272..24c9dfd7a 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -201,7 +201,7 @@ if ($photo_tags) {
 			
 		
      
 		
      
-			'; ?>
+			\"{$title}\""; ?>
 
 			
      
 		
      
-- 
cgit v1.2.3


From d6d3d6e1b6740b3f9dd437219755ba0fa02fa185 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 1 Jul 2009 11:55:01 +0000
Subject: fixed extra ' in administration view

---
 views/default/admin/tidypics.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/default/admin/tidypics.php b/views/default/admin/tidypics.php
index 7bc2c2921..66bfc29d9 100644
--- a/views/default/admin/tidypics.php
+++ b/views/default/admin/tidypics.php
@@ -19,7 +19,7 @@
 
      
 	
      
 		
        
-			
      • '>
        • 
+			
      • >
        • 
 			
      • >
        • 
 		
      
 	
      
@@ -33,4 +33,4 @@
 			break;
 	}
 ?>
-
      
\ No newline at end of file
+
      
-- 
cgit v1.2.3


From 16c6cb9372e5d7697c4d566d3ad3689c7f44807b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 1 Jul 2009 11:57:31 +0000
Subject: doctype requires onclick rather than onClick

---
 views/default/tidypics/tagging.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 9bd585ea1..eb5f7e208 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -38,11 +38,11 @@
 		$content .= "";
 	
 		$content .= "
        ";
-		$content .= "
      •  {$viewer->name} (" . elgg_echo('me') . ")
        • ";
+		$content .= "
      •  {$viewer->name} (" . elgg_echo('me') . ")
        • ";
 	
 		if ($friends) {
 			foreach($friends as $friend) {
-				$content .= "
      • {$friend->name}
        • ";
+				$content .= "
      • {$friend->name}
        • ";
 			}
 		}
 	}
-- 
cgit v1.2.3


From 46fdfa767062fa42c6ec3dfc6f985afc5ccee08b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 2 Jul 2009 11:37:05 +0000
Subject: sorting friends list and going beyond 10

---
 views/default/tidypics/tagging.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index eb5f7e208..513845e32 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -30,7 +30,14 @@
 getGUID(), false, 'user', '', 0);
+		$friends = get_entities_from_relationship('friend', $viewer->getGUID(), false, 'user', '', 0, 'time_created desc', 1000);
+		
+		if ($friends) {
+			foreach($friends as $friend) {
+				$friend_array[$friend->name] = $friend->getGUID();
+			}
+		}
+		ksort($friend_array);
 
 		$content = "";
 		$content .= "";
@@ -41,8 +48,8 @@
 		$content .= "
      •  {$viewer->name} (" . elgg_echo('me') . ")
        • ";
 	
 		if ($friends) {
-			foreach($friends as $friend) {
-				$content .= "
      • {$friend->name}
        • ";
+			foreach($friend_array as $friend_name => $friend_guid) {
+				$content .= "
      • {$friend_name}
        • ";
 			}
 		}
 	}
-- 
cgit v1.2.3


From 4ef110ba8214ab16277a03ab4439df4ec3b03ab9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 2 Jul 2009 11:37:28 +0000
Subject: using display name for notifications

---
 start.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.php b/start.php
index e4aee58bd..0851a3e5c 100644
--- a/start.php
+++ b/start.php
@@ -358,7 +358,7 @@
 			$title = $entity->title;
 			if ($method == 'email') {
 				$owner = $entity->getOwnerEntity();
-				return sprintf(elgg_echo('album:river:created'), $owner->username) . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+				return sprintf(elgg_echo('album:river:created'), $owner->name) . ' ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
 			}
 		}
 		return null;
-- 
cgit v1.2.3


From 0f7a79ee3ff8b6ade335bfb4ce9d4f8b62c2c3c0 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 3 Jul 2009 01:43:30 +0000
Subject: languages updated for slideshow (Tidypics 1.7)

---
 languages/de.php | 49 ++++++++++++++++++++++++----------------------
 languages/en.php | 59 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/languages/de.php b/languages/de.php
index 582590c7f..f1723131c 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -9,16 +9,19 @@
 */
 
 	$german = array(
-			
+
 		// Menu items and titles
-			 
+
 			'image' => "Bild",
 			'images' => "Bilder",
 			'caption' => "Untertitel",
 			'photos' => "Photos",
 			'images:upload' => "Bilder hochladen",
+			'images:multiupload' => "Flash Multi Upload Tool",
+			'images:multiupload:todo' => "Ein oder mehrere Bilder zum Hochladen wählen!",
 			'album' => "Fotoalbum",
 			'albums' => "Fotoalben",
+			'album:slideshow' => "Diashow ansehen",
 			'album:yours' => "Deine Fotoalben",
 			'album:yours:friends' => "Fotoalben von Freunden",
 			'album:user' => "Fotoalben von %s",
@@ -28,11 +31,11 @@
 			'item:object:image' => "Photos",
 			'item:object:album' => "Alben",
 			'tidypics:settings:maxfilesize' => "Maximale Dateigröße in Kilobytes (KB):",
-            'tidypics:enablephotos' => "Erlaube Gruppen-Galerie", 
+            'tidypics:enablephotos' => "Erlaube Gruppen-Galerie",
             'tidypics:editprops' => "Bildeigenschaften Bearbeiten",
-	
+
 		//actions
-		
+
 			'album:create' => "Neues Album",
 			'album:add' => "Fotoalbum hinzufügen",
 			'album:addpix' => "Fotos hinzufügen",
@@ -42,18 +45,18 @@
 			'image:edit' => "Bild bearbeiten",
 			'image:delete' => "Bild löschen",
 			'image:download' => "Bild herunterladen",
-		
+
 		//forms
-		
+
 			'album:title' => "Titel",
 			'album:desc' => "Beschreibung",
 			'album:tags' => "Stichwörter",
 			'album:cover' => "Albumcover erstellen?",
 			'album:cover:yes' => "Ja",
 			'image:access:note' => "Info: Zugriffsberechtigung wird vom Album übernommen",
-			
-		//views 
-		
+
+		//views
+
 			'image:total' => "Bilder im Album:",
 			'image:by' => "Bild hinzugefügt von",
 			'album:by' => "Album erstellt von:",
@@ -61,22 +64,22 @@
 			'image:none' => "Noch keine Bilder hinzugefügt.",
 			'image:back' => "Zurück",
 			'image:next' => "Weiter",
-		
+
 		//widgets
-		
+
 			'album:widget' => "Fotoalben",
 			'album:more' => "Alle Alben ansehen",
 			'album:widget:description' => "Zeige Deine neuesten Fotoalben",
 			'album:display:number' => "Anzahl der Alben, die angezeigt werden sollen",
 			'album:num_albums' => "Anzahl der anzuzeigenden Alben",
-			
+
 		//  river
-		
+
 			//images
 			'image:river:created' => "%s hat hochgeladen:",
 			'image:river:item' => "ein Bild",
 			'image:river:annotate' => "%s kommentierte",
-		
+
 		    //albums
 			'album:river:created' => "%s erstellte",
 			'album:river:item' => "ein Album",
@@ -85,14 +88,14 @@
         //Benachrichtigungen
             'tidypics:newalbum' => 'Neues Foto-Album',
 
-				
+
 		//  Status messages
-			
+
 			'image:saved' => "Dein Bild wurde gespeichert.",
 			'images:saved' => "Alle Bilder wurden gespeichert.",
 			'image:deleted' => "Dein Bild wurde gelöscht.",
 			'image:delete:confirm' => "Willst du das Bild wirklich löschen?",
-			
+
 			'images:edited' => "Dein Bild wurde aktualisiert.",
 			'album:edited' => "Dein Album wurde aktualisiert.",
 			'album:saved' => "Dein Album wurde gespeichert.",
@@ -100,22 +103,22 @@
 			'album:delete:confirm' => "Willst du das Album wirklich löschen?",
 			'album:created' => "Ihr neues Album ist hergestellt worden.",
 			'tidypics:status:processing' => "Warten Sie bitte, während wir verarbeiten Ihre Abbildung....",
-				
+
 		//Error messages
-				 
+
 			'image:none' => "Kein Bilder gefunden.",
 			'image:uploadfailed' => "Dateien konnten nicht hochgeladen werden:",
 			'image:deletefailed' => "Bild konnte nicht gelöscht werden.",
 			'image:downloadfailed' => "Dieses Bild ist nicht diesmal vorhanden.",
-			
+
 			'image:notimage' => 'Wir akzeptieren nur jpeg, gif, und png Dateien der erlaubten Dateigröße an.',
 			'images:notedited' => 'Nicht alle Bilder konnten hochgeladen werden',
-		 
+
 			'album:none' => "Keine Alben gefunden.",
 			'album:uploadfailed' => "Dein Album konnte nicht gespeichert werden.",
 			'album:deletefailed' => "Dein Album konnte nicht gelöscht werden.",
 			'album:blank' => "Gib diesem Album einen Titel und eine Beschreibung bitte."
 	);
-					
+
 	add_translation("de",$german);
 ?>
diff --git a/languages/en.php b/languages/en.php
index 360de8b87..114fa3eff 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1,16 +1,19 @@
  "Image",
 			'images' => "Images",
 			'caption' => "Caption",
 			'photos' => "Photos",
 			'images:upload' => "Upload Images",
+			'images:multiupload' => "Flash Multi Upload Tool",
+			'images:multiupload:todo' => "Choose one or more files for upload.",
 			'album' => "Photo Album",
 			'albums' => "Photo Albums",
+			'album:slideshow' => "View Slideshow",
 			'album:yours' => "Your photo albums",
 			'album:yours:friends' => "Friends' photo albums",
 			'album:user' => "%s's photo albums",
@@ -41,7 +44,7 @@
 			'tidypics:viewsbyothers' => "Views: %s (%s by you)",
 			'tidypics:administration' => 'Tidypics Administration',
 			'tidypics:stats' => 'Stats',
-			
+
 		//settings
 			'tidypics:settings' => 'Settings',
 			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
@@ -63,7 +66,7 @@
 			'tidypics:settings:thumbsize' => "Thumbnail image size",
 
 		//actions
-		
+
 			'album:create' => "Create new album",
 			'album:add' => "Add Photo Album",
 			'album:addpix' => "Add photos to album",
@@ -73,17 +76,17 @@
 			'image:edit' => "Edit image",
 			'image:delete' => "Delete image",
 			'image:download' => "Download image",
-		
+
 		//forms
-		
+
 			'album:title' => "Title",
 			'album:desc' => "Description",
 			'album:tags' => "Tags",
 			'album:cover' => "Make image album cover?",
 			'tidypics:quota' => "Quota usage:",
-			
-		//views 
-		
+
+		//views
+
 			'image:total' => "Images in album:",
 			'image:by' => "Image added by",
 			'album:by' => "Album created by",
@@ -91,7 +94,7 @@
 			'image:none' => "No images have been added yet.",
 			'image:back' => "Previous",
 			'image:next' => "Next",
-			
+
 		// tagging
 			'tidypics:taginstruct' => 'Select area that you want to tag',
 			'tidypics:deltag_title' => 'Select tags to delete',
@@ -106,44 +109,44 @@
 			'tidypics:phototagging:success' => 'Photo tag was successfully added',
 			'tidypics:phototagging:error' => 'Unexpected error occurred during tagging',
 			'tidypics:deletetag:success' => 'Selected tags were successfully deleted',
-			
-		
+
+
 		//rss
 			'tidypics:posted' => 'posted a photo:',
-		
+
 		//widgets
-		
+
 			'album:widget' => "Photo Albums",
 			'album:more' => "View all albums",
 			'album:widget:description' => "Showcase your latest photo albums",
 			'album:display:number' => "Number of albums to display",
 			'album:num_albums' => "Number of albums to display",
-			
+
 		//  river
-		
+
 			//images
 			'image:river:created' => "%s added the image %s to album %s",
 			'image:river:item' => "an image",
 			'image:river:annotate' => "a comment on the image",
-		
+
 			//albums
 			'album:river:created' => "%s created a new photo album",
 			'album:river:group' => "in the group",
 			'album:river:item' => "an album",
 			'album:river:annotate' => "a comment on the photo album",
-			
+
 		// notifications
 			'tidypics:newalbum' => 'New photo album',
-			
-				
+
+
 		//  Status messages
-			
+
 			'tidypics:upl_success' => "Your images uploaded successfully.",
 			'image:saved' => "Your image was successfully saved.",
 			'images:saved' => "All images were successfully saved.",
 			'image:deleted' => "Your image was successfully deleted.",
 			'image:delete:confirm' => "Are you sure you want to delete this image?",
-			
+
 			'images:edited' => "Your images were successfully updated.",
 			'album:edited' => "Your album was successfully updated.",
 			'album:saved' => "Your album was successfully saved.",
@@ -151,11 +154,11 @@
 			'album:delete:confirm' => "Are you sure you want to delete this album?",
 			'album:created' => "Your new album has been created.",
 			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
-			
+
 			'tidypics:upgrade:success' => 'Upgrade of Tidypics a success',
-				
+
 		//Error messages
-				 
+
 			'tidypics:partialuploadfailure' => "There were errors uploading some of the images (%s of %s images).",
 			'tidypics:completeuploadfailure' => "Upload of images failed.",
 			'tidypics:exceedpostlimit' => "Too many large images - try to upload fewer or smaller images.",
@@ -170,14 +173,14 @@
 			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
 			'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator",
 			'images:notedited' => "Not all images were successfully updated",
-		 
+
 			'album:none' => "No albums have been created yet.",
 			'album:uploadfailed' => "Sorry; we could not save your album.",
 			'album:deletefailed' => "Your album could not be deleted at this time.",
 			'album:blank' => "Please give this album a title and description.",
-			
+
 			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed",
 	);
-					
+
 	add_translation("en",$english);
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From 5e0bfcd150c5275184dd8cdc7fda2f8bd139d84d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 3 Jul 2009 02:13:23 +0000
Subject: forgot to include this in a previous check-in

---
 views/rss/pageshells/pageshell.php | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 views/rss/pageshells/pageshell.php

diff --git a/views/rss/pageshells/pageshell.php b/views/rss/pageshells/pageshell.php
new file mode 100644
index 000000000..2dfc8917f
--- /dev/null
+++ b/views/rss/pageshells/pageshell.php
@@ -0,0 +1,46 @@
+\n";
+
+	
+	
+	// Set title
+		if (empty($vars['title'])) {
+			$title = $vars['config']->sitename;
+		} else if (empty($vars['config']->sitename)) {
+			$title = $vars['title'];
+		} else {
+			$title = $vars['config']->sitename . ": " . $vars['title'];
+		}
+		
+	// Remove RSS from URL
+		$url = str_replace('?view=rss','',full_url());
+		$url = str_replace('&view=rss','',full_url());
+
+?>
+
+ >
+	
+		<![CDATA[<?php echo $title; ?>]]>
+		
+		
+		
+	
+
\ No newline at end of file
-- 
cgit v1.2.3


From d8483c4e91de51caa007fe61a785983a439aedb9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 3 Jul 2009 02:36:23 +0000
Subject: better feed - from Torsten

---
 views/rss/object/album.php | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index ecd4c51ab..c66c0f7e9 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -6,11 +6,14 @@
 	// for now catch the albums view and ignore it
 	if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
 	} else {
-		
+
 	$album = $vars['entity'];
-	
+
 	$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
 
+	// use fullsize image
+	$base_url_fullsize = $vars['url'] . 'action/tidypics/download?file_guid=';
+
 	// insert cover image if it exists image
 	if ($album->cover) {
 		// Set title
@@ -27,37 +30,36 @@
 			
 			<![CDATA[<?php echo $title; ?>]]>
 			getURL() . '?view=rss'; ?>
-			
+
 		
 guid);
-	
-	
+
+
+	$images = get_entities("object", "image", 0, "", 0, 0, false, 0, $album->guid);
+
+
 	foreach ($images as $image) {
 		$descr = '
        ' . get_entity($image->owner_guid)->name;
 		$descr .= ' ' . elgg_echo('tidypics:posted') . '
        ';
 		$descr .= "
        guid}&size=small\" />
        ";
 		$descr .= "
        {$image->description}
        ";
-		
+
 ?>
 	
 		<?php echo $image->title; ?>
-		getURL(); ?>
+		guid . '&size=large'; ?>
 		
 		time_created); ?>
 		getURL(); ?>
-		
-			title; ?>
-			description); ?>
-			
-		
+		
+		title; ?>
+		description); ?>
+		
 	
-	
+
 
\ No newline at end of file
-- 
cgit v1.2.3


From 4bd3c70f0d5073e16ccb90f8b1c4d01a9da909d9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 10 Jul 2009 21:06:20 +0000
Subject: removed short tags

---
 views/default/object/image.php         | 2 +-
 views/default/tidypics/breadcrumbs.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 24c9dfd7a..93c79e174 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -239,7 +239,7 @@ if ($photo_tags) {
 			
        
 	 $vars['entity'])); ?>
 
        
- name; ?>  name);
 ?>
 
-title;
-- 
cgit v1.2.3


From 5126effdfb53a622523dcade777a391680aac58a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 10 Jul 2009 22:42:22 +0000
Subject: better checks on who can tag for group albums

---
 views/default/object/image.php        |  3 ++-
 views/default/tidypics/image_menu.php | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 93c79e174..e5ccd2276 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -212,7 +212,8 @@ if ($photo_tags) {
 			echo elgg_view('tidypics/image_menu', array('file_guid' => $file_guid, 
 														'viewer' => $viewer,
 														'owner' => $owner,
-														'anytags' => $photo_tags != '',) );
+														'anytags' => $photo_tags != '',
+														'album' => $album, ) );
 			echo '
      '; 
 			
 			// tagging code
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index b4597a99f..d6568360c 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -10,14 +10,25 @@
 	 *
 	 **************************************************************************/
 
-	$file_guid = $vars['file_guid'];
+	$image_guid = $vars['file_guid'];
 	$viewer = $vars['viewer'];
 	$owner = $vars['owner'];
 	$anytags = $vars['anytags'];
+	$album = $vars['album'];
 
 	if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
+		
+		$can_tag = false;
+		
+		$container = get_entity($album->container_guid);
+		if ($container instanceof ElggGroup) {
+			$can_tag = $viewer && $container->isMember($viewer);
+		} else {
+			$can_tag = $viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid);
+		}
+		
 		// only owner and friends of owner can tag
-		if ($viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid)) {
+		if ($can_tag) {
 ?>
 
      19. 
 
-
      20. 
+
      21. 
 
\ No newline at end of file
-- 
cgit v1.2.3


From f66d98898539fc212db2231fac4262fb003ffc76 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 10 Jul 2009 22:45:40 +0000
Subject: tweak the css for image frame

---
 views/default/tidypics/css.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 440edb5ab..c2adb899c 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -28,8 +28,7 @@ text-align:center;
 }
 
 #tidypics_image {
-background:#EEEEEE none repeat scroll 0 0;
-border:2px solid #999999;
+border:1px solid #dedede;
 padding:5px;
 }
 
-- 
cgit v1.2.3


From 808fe952da4d1dab727ec44588319d8cc3da3e44 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 10 Jul 2009 23:19:44 +0000
Subject: work around for IE animated gif issue

---
 views/default/tidypics/forms/upload.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index c4313bf40..d3fc7828d 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -38,7 +38,7 @@
 ?>
 	
      
 		Uploading images
      
-		
      ...
      
+		
      ...
      
 	
      
 	
        
 "', 200); 
 	}
 
\ No newline at end of file
-- 
cgit v1.2.3


From ef40f4101aa5653a6697a273806ed4d4537bc91e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 10 Jul 2009 23:49:33 +0000
Subject: mostly fixed recent images listing - issue with css on pagination
 when surrounding floated elements

---
 mostrecentimages.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/mostrecentimages.php b/mostrecentimages.php
index edceb9cd4..9b2c05c60 100644
--- a/mostrecentimages.php
+++ b/mostrecentimages.php
@@ -1,8 +1,7 @@
 text;
-	
+	$area2 .= '
        '; 
 	$area2 .= $images;
+	$area2 .= '
        ';
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
-	if($notice->showMessage == true) system_message($notice->text);
-	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From d19606b96ba0f5ed56e9e736b8fe88210528577c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 11 Jul 2009 00:58:19 +0000
Subject: I will probably regret this - opening up imagemagick command line to
 all

---
 docs/configure_server.txt              |  5 ++++-
 languages/en.php                       |  2 +-
 lib/resize.php                         |  2 +-
 system.php                             | 11 ++++++++++-
 views/default/tidypics/forms/admin.php | 36 +++++++++++++++++++++-------------
 5 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/docs/configure_server.txt b/docs/configure_server.txt
index 057c4ee82..4d77816d6 100644
--- a/docs/configure_server.txt
+++ b/docs/configure_server.txt
@@ -13,11 +13,14 @@ along these lines: "Tidypics warning: user exceeded post limit on image upload"
 GD: Elgg requires GD for image resizing. Tidypics uses GD by default for 
 resizing. There are two versions GD and GD2. It generally does not matter 
 which one you are using and it isn't always apparent which one you are
-running anyways.
+running anyway.
 
 ImageMagick: A significantly better image library than GD. It uses less 
 memory during resizing. Use this if it is available.
 
+exec: Calls to ImageMagick command line utilities like convert require that
+exec() be available. On some servers it will be for security reasons.
+
 Memory Available to PHP: The amount of RAM available to a single PHP 
 process. This can have an effect on how large an image you can resize
 (especially if you are running Tidypics with GD). The best place to
diff --git a/languages/en.php b/languages/en.php
index 114fa3eff..76604f543 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -58,7 +58,7 @@
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
 			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
 			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick Cmdline must be selected for the image library",
-			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands",
+			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands (with trailing slash)",
 			'tidypics:settings:img_river_view' => "How many entries in river for each batch of uploaded images",
 			'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",
 			'tidypics:settings:largesize' => "Primary image size",
diff --git a/lib/resize.php b/lib/resize.php
index 8561e1f4a..a2c522eb8 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -527,7 +527,7 @@
 				}
 				if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/";
 				$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
-				system($command);
+				exec($command);
 				return $output_name;
 
 			}
diff --git a/system.php b/system.php
index 833722db8..24295c715 100644
--- a/system.php
+++ b/system.php
@@ -39,6 +39,10 @@
 	return $size;
 	}
 
+	$disablefunc = explode(',', ini_get('disable_functions'));
+	$exec_avail = "Disabled";
+	if (is_callable('exec') && !in_array('exec',$disablefunc))
+		$exec_avail = "Enabled";
 
 	ob_start();
 
@@ -57,10 +61,15 @@
 			Elgg requires the GD extension to be loaded
 		
 		
-			ImageMagick
+			ImageMagick PHP
 			
 			
 		
+		
+			exec()
+			
+			Required for ImageMagick command line
+		
 		
 			Memory Available to PHP
 			B
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index a80fff91d..0ade3d885 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -12,29 +12,37 @@
 	$action = $vars['url'] . 'action/tidypics/settings';
 	
 	$plugin = find_plugin_settings('tidypics');
+	
+	
+	if (extension_loaded('imagick'))
+		$img_lib_options['ImageMagickPHP'] = 'ImageMagick';
+		
+	$disablefunc = explode(',', ini_get('disable_functions'));
+	if (is_callable('exec') && !in_array('exec',$disablefunc))
+		$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
+
+	$img_lib_options['GD'] = 'GD';
 
 
-	// Image Library - need to update values!
+	// Image Library
 	$image_lib = $plugin->image_lib;
 	if (!$image_lib) $image_lib = 'GD';
 	$form_body = '
        ' . elgg_echo('tidypics:settings:image_lib');
 	$form_body .= elgg_view('input/pulldown', array(
 					'internalname' => 'params[image_lib]',
-					'options_values' => array(
-						'GD' => 'GD',
-						'ImageMagickPHP' => 'ImageMagick',
-/*						'ImageMagick' => 'ImageMagick Cmdline', */
-					),
+					'options_values' => $img_lib_options,
 					'value' => $image_lib
 	));
-	$form_body .= '
        ';
-/*
-	// Image Magick Path
-	$im_path = $plugin->im_path;
-	if(!$im_path) $im_path = "/usr/bin/";
-	$form_body .= "
        " . elgg_echo('tidypics:settings:im_path') . "
        ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
        ";
-*/
+	$form_body .= '
        Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
        ';
+
+	if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+		// Image Magick Path
+		$im_path = $plugin->im_path;
+		if(!$im_path) $im_path = "/usr/bin/";
+		$form_body .= "
        " . elgg_echo('tidypics:settings:im_path') . "
        ";
+		$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
        ";
+	}
+
 	// Tagging
 	$tagging = $plugin->tagging;
 	if(!$tagging) $tagging = "enabled";
-- 
cgit v1.2.3


From 14556cf5870dff8138c76a25aba9c2c0323c56d1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 11 Jul 2009 01:09:59 +0000
Subject: hopefully fixes the problems that some had with server analysis

---
 system.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system.php b/system.php
index 24295c715..549c51de4 100644
--- a/system.php
+++ b/system.php
@@ -21,6 +21,9 @@
 
 	function tp_readable_size($bytes) 
 	{
+		if (strpos($bytes, 'M'))
+			return $bytes . 'B';
+		
 		$size = $bytes / 1024;
 		if ($size < 1024) {
 			$size = number_format($size, 2);
@@ -72,7 +75,7 @@
 		
 		
 			Memory Available to PHP
-			B
+			
 			Change memory_limit to increase
 		
 		
-- 
cgit v1.2.3


From 1924174daf750859a379c7b5d1e34d49a6b412d0 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 11 Jul 2009 01:17:16 +0000
Subject: beta 2 for 1.6

---
 contributions.txt | 5 +++--
 manifest.xml      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index f88e09832..6b3e2e280 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -2,8 +2,9 @@ See individual change logs for contributors to those builds
 
 
 ------------------------------------------------------------------------
-Version 1.6.0 Beta 1 Change List
-Release Date: 06/30/2009
+Version 1.6.0 Change List
+Beta 2 Release Date: 07/10/2009
+Beta 1 Release Date: 06/30/2009
 Contributors:
   * Cash Costello
   * Greg Froese
diff --git a/manifest.xml b/manifest.xml
index 31d66e2f0..ddc167911 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
         
-        
+        
         
         
         
-- 
cgit v1.2.3


From 4316b94d5448c0127fe6bc42ca5dcbacd7b9d563 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 11 Jul 2009 14:36:08 +0000
Subject: contribution from Toto on German translation

---
 languages/de.php | 147 ++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 107 insertions(+), 40 deletions(-)

diff --git a/languages/de.php b/languages/de.php
index f1723131c..3c6d3d101 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -2,41 +2,79 @@
 /**
 * Elgg tidypics plugin german language pack
 *
-* @version 1.21
-* @author  Modified and fixed by Dieter Konrad aka alfalive
-* @contact http://community.elgg.org/pg/profile/alfalive
 *
 */
 
+
 	$german = array(
 
 		// Menu items and titles
 
 			'image' => "Bild",
 			'images' => "Bilder",
-			'caption' => "Untertitel",
-			'photos' => "Photos",
-			'images:upload' => "Bilder hochladen",
+			'caption' => "Beschreibung",
+			'photos' => "Fotos",
+			'images:upload' => "Fotos hochladen",
 			'images:multiupload' => "Flash Multi Upload Tool",
 			'images:multiupload:todo' => "Ein oder mehrere Bilder zum Hochladen wählen!",
 			'album' => "Fotoalbum",
 			'albums' => "Fotoalben",
 			'album:slideshow' => "Diashow ansehen",
 			'album:yours' => "Deine Fotoalben",
-			'album:yours:friends' => "Fotoalben von Freunden",
-			'album:user' => "Fotoalben von %s",
-			'album:friends' => "Fotoalben von Freunden von %s",
+			'album:yours:friends' => "Fotoalben deiner Freunde",
+			'album:user' => "%s's Fotoalben",
+			'album:friends' => "%s's Fotoalben von Freunden",
 			'album:all' => "Alle Fotoalben",
-			'album:group' => "Alben der Gruppe",
-			'item:object:image' => "Photos",
+			'album:group' => "Gruppenalben",
+			'item:object:image' => "Fotos",
 			'item:object:album' => "Alben",
-			'tidypics:settings:maxfilesize' => "Maximale Dateigröße in Kilobytes (KB):",
-            'tidypics:enablephotos' => "Erlaube Gruppen-Galerie",
-            'tidypics:editprops' => "Bildeigenschaften Bearbeiten",
+			'tidypics:enablephotos' => 'Schalte Gruppenalben frei',
+			'tidypics:editprops' => 'Bearbeite Bildereigenschaften',
+			'tidypics:mostcommented' => 'Am häufigsten kommentierte Bilder',
+			'tidypics:mostcommentedthismonth' => 'Am häufigsten kommentierte Bilder des Monats',
+			'tidypics:mostcommentedtoday' => 'Am häufigsten kommentierte Bilder des Tages',
+			'tidypics:mostviewed' => 'Am häufigsten gezeigte Bilder',
+			'tidypics:mostvieweddashboard' => 'Am häufigsten gezeigteS dashboard',
+			'tidypics:mostviewedthisyear' => 'Am häufigsten gezeigte des Jahres',
+			'tidypics:mostviewedthismonth' => 'Am häufigsten gezeigte des Monats',
+			'tidypics:mostviewedlastmonth' => 'Am häufigsten gezeigte des letzten Monats',
+			'tidypics:mostviewedtoday' => 'Am häufigsten gezeigte des Tages',
+			'tidypics:recentlyviewed' => 'Zuletzt angezeigte Bilder',
+			'tidypics:mostrecent' => 'Letzte Bilder',
+			'tidypics:yourmostviewed' => 'Deine am häufigsten gezeigten Bilder',
+			'tidypics:yourmostrecent' => 'Deine letzten Bilder',
+			'tidypics:friendmostviewed' => "%s's m häufigsten gezeigten Bilder",
+			'tidypics:friendmostrecent' => "%s's letzte Bilder",
+			'tidypics:highestrated' => "Am höchsten bewertete Bilder",
+			'tidypics:viewsbyowner' => "Aufrufe: %s von %s Mitglieder (du ausgeschlossen)",
+			'tidypics:viewsbyothers' => "Aufrufe: %s (%s von dir)",
+			'tidypics:administration' => 'Tidypics Administration',
+			'tidypics:stats' => 'Statitik',
+
+		//settings
+			'tidypics:settings' => 'Einstellungen',
+			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
+			'tidypics:settings:image_lib' => "Image Library: ",
+			'tidypics:settings:download_link' => "Show download link",
+			'tidypics:settings:tagging' => "Enable photo tagging",
+			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
+			'tidypics:settings:exif' => "Show EXIF data",
+			'tidypics:settings:view_count' => "View counter",
+			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
+			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
+			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
+			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick Cmdline must be selected for the image library",
+			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands (with trailing slash)",
+			'tidypics:settings:img_river_view' => "How many entries in river for each batch of uploaded images",
+			'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",
+			'tidypics:settings:largesize' => "Primary image size",
+			'tidypics:settings:smallsize' => "Album view image size",
+			'tidypics:settings:thumbsize' => "Thumbnail image size",
+
 
 		//actions
 
-			'album:create' => "Neues Album",
+			'album:create' => "Lege neues Album an",
 			'album:add' => "Fotoalbum hinzufügen",
 			'album:addpix' => "Fotos hinzufügen",
 			'album:edit' => "Album bearbeiten",
@@ -52,8 +90,7 @@
 			'album:desc' => "Beschreibung",
 			'album:tags' => "Stichwörter",
 			'album:cover' => "Albumcover erstellen?",
-			'album:cover:yes' => "Ja",
-			'image:access:note' => "Info: Zugriffsberechtigung wird vom Album übernommen",
+			'tidypics:quota' => "Quota usage:",
 
 		//views
 
@@ -62,8 +99,27 @@
 			'album:by' => "Album erstellt von:",
 			'album:created:on' => "Erstellt",
 			'image:none' => "Noch keine Bilder hinzugefügt.",
-			'image:back' => "Zurück",
-			'image:next' => "Weiter",
+			'image:back' => "Vorheriges",
+			'image:next' => "Nächstes",
+
+		// tagging
+			'tidypics:taginstruct' => 'Wähle den Bereich, den du taggen möchstest, aus',
+			'tidypics:deltag_title' => 'Wähle zu löschende Tags',
+			'tidypics:finish_tagging' => 'Stop tagging',
+			'tidypics:tagthisphoto' => 'Tagge dieses Foto',
+			'tidypics:deletetag' => 'Lösche Foto tag',
+			'tidypics:actiontag' => 'Tag',
+			'tidypics:actiondelete' => 'Löschen',
+			'tidypics:actioncancel' => 'Abbrechen',
+			'tidypics:inthisphoto' => 'in diesem Foto',
+			'tidypics:usertag' => "Foto tagged mit Mitglied %s",
+			'tidypics:phototagging:success' => 'Photo tag was successfully added',
+			'tidypics:phototagging:error' => 'Unerwarteter Fehler aufgetreten beim taggen',
+			'tidypics:deletetag:success' => 'Ausgewählte Tags wurden erfolgreich gelöscht',
+
+
+		//rss
+			'tidypics:posted' => 'posted a photo:',
 
 		//widgets
 
@@ -73,24 +129,25 @@
 			'album:display:number' => "Anzahl der Alben, die angezeigt werden sollen",
 			'album:num_albums' => "Anzahl der anzuzeigenden Alben",
 
-		//  river
+		//river
 
 			//images
-			'image:river:created' => "%s hat hochgeladen:",
+			'image:river:created' => "%s hat ein Bild %s zum Album %s hinzugefügt",
 			'image:river:item' => "ein Bild",
-			'image:river:annotate' => "%s kommentierte",
+			'image:river:annotate' => "einen Kommentar zum Bild",
 
-		    //albums
-			'album:river:created' => "%s erstellte",
+			//albums
+			'album:river:created' => "%s hat ein neues Fotoalbum erstellt",
+			'album:river:group' => "in der Gruppe",
 			'album:river:item' => "ein Album",
-			'album:river:annotate' => "%s kommentierte",
+			'album:river:annotate' => "einen Kommentar zum Fotoalbum",
 
-        //Benachrichtigungen
-            'tidypics:newalbum' => 'Neues Foto-Album',
+		//notifications
+			'tidypics:newalbum' => 'Neues Fotoalbum',
 
 
 		//  Status messages
-
+			'tidypics:upl_success' => "Deine Bilder wurden erfolgreich hochgeladen.",
 			'image:saved' => "Dein Bild wurde gespeichert.",
 			'images:saved' => "Alle Bilder wurden gespeichert.",
 			'image:deleted' => "Dein Bild wurde gelöscht.",
@@ -102,22 +159,32 @@
 			'album:deleted' => "Dein Album wurde gelöscht.",
 			'album:delete:confirm' => "Willst du das Album wirklich löschen?",
 			'album:created' => "Ihr neues Album ist hergestellt worden.",
-			'tidypics:status:processing' => "Warten Sie bitte, während wir verarbeiten Ihre Abbildung....",
+			'tidypics:settings:save:ok' => 'Tidypics plugin Einstellungen erfolgreich gespeichert',
+			'tidypics:upgrade:success' => 'Upgrade von Tidypics erfolgreich',
 
 		//Error messages
 
-			'image:none' => "Kein Bilder gefunden.",
-			'image:uploadfailed' => "Dateien konnten nicht hochgeladen werden:",
-			'image:deletefailed' => "Bild konnte nicht gelöscht werden.",
-			'image:downloadfailed' => "Dieses Bild ist nicht diesmal vorhanden.",
-
-			'image:notimage' => 'Wir akzeptieren nur jpeg, gif, und png Dateien der erlaubten Dateigröße an.',
-			'images:notedited' => 'Nicht alle Bilder konnten hochgeladen werden',
-
-			'album:none' => "Keine Alben gefunden.",
-			'album:uploadfailed' => "Dein Album konnte nicht gespeichert werden.",
+			'tidypics:partialuploadfailure' => "Es sind Fehler beim Hochladen einiger Bilder aufgetreten (%s von %s Bildern).",
+			'tidypics:completeuploadfailure' => "Upload of images failed.",
+			'tidypics:exceedpostlimit' => "Zuviel große Bilder - versuche weinger oder kleinere Bilder hochzuladen.",
+			'tidypics:noimages' => "Keine Bilder ausgewählt.",
+			'tidypics:image_mem' => "Bildgröße zu groß - zuviele Bytes",
+			'tidypics:image_pixels' => "Bild hat zuviele Pixel",
+			'tidypics:unk_error' => "Unbekannte upload Fehler",
+			'tidypics:save_error' => "Unknown error saving the image on server",
+			'tidypics:not_image' => "Bildtyp wurde nicht erkannt",
+			'image:deletefailed' => "Dein Bild konnte nicht gelöscht werden.",
+			'image:downloadfailed' => "Sorry; dieses Bild ist zur Zeit nicht vorhanden.",
+			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
+			'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator",
+			'images:notedited' => "Nicht alle Bilder konnten erfolgreich upgedated werden",
+
+			'album:none' => "Es wurde kein Album .",
+			'album:uploadfailed' => "Sorry; dein Album konnte nicht gespeichert werden.",
 			'album:deletefailed' => "Dein Album konnte nicht gelöscht werden.",
-			'album:blank' => "Gib diesem Album einen Titel und eine Beschreibung bitte."
+			'album:blank' => "Bitte geib diesem Album einen Titel und eine Beschreibung.",
+
+			'tidypics:upgrade:failed' => "Upgrade von Tidypics gescheitert",
 	);
 
 	add_translation("de",$german);
-- 
cgit v1.2.3


From b2bd7496baa3d2261233451627e0331fcb4d3fc3 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 12 Jul 2009 00:09:08 +0000
Subject: wrong variable for image magick path

---
 lib/resize.php    | 2 +-
 lib/watermark.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/resize.php b/lib/resize.php
index a2c522eb8..a346fc272 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -521,7 +521,7 @@
 					$newheight = $maxheight;
 					$newwidth = $maxwidth;
 				}
-				$im_path = get_plugin_setting('convert_command', 'tidypics');
+				$im_path = get_plugin_setting('im_path', 'tidypics');
 				if(!$im_path) {
 					$im_path = "/usr/bin/";
 				}
diff --git a/lib/watermark.php b/lib/watermark.php
index 330ae7b29..095b10eac 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -7,7 +7,7 @@ function tp_watermark($thumbs) {
 	$user = get_user_entity_as_row($album->owner_guid);
 	$username = $user->username;
 
-	$im_path = get_plugin_setting('convert_command', 'tidypics');
+	$im_path = get_plugin_setting('im_path', 'tidypics');
 	if(!$im_path) {
 		$im_path = "/usr/bin/";
 	}
-- 
cgit v1.2.3


From f2d64ceba49e6eef714b5b9432d946e3532efca5 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 12 Jul 2009 00:28:20 +0000
Subject: not leaving behind temp image from watermark and shortened watermark
 image name

---
 lib/watermark.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/watermark.php b/lib/watermark.php
index 095b10eac..25eb52d48 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -28,7 +28,6 @@ function tp_watermark($thumbs) {
 			
 			$user_stamp_base = tp_get_img_dir();
 			$user_stamp_base .= strtolower($viewer->name . "_" . $watermark_filename . "_stamp");
-			$user_stamp_base .= preg_replace("/[^\w-]+/", "-", $user_stamp_base);
 			
 			if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
 				$commands = array();
@@ -37,7 +36,7 @@ function tp_watermark($thumbs) {
 				$commands[] = $im_path . 'composite -compose CopyOpacity  "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"';
 				$commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"';
 				$commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"';
-				$commands[] = 'rm "' . $user_stamp_fgnd . '_mask' . $ext . '"';
+				$commands[] = 'rm "' . $user_stamp_base . '_fgnd' . $ext . '"';
 				
 				foreach( $commands as $command ) {
 					exec( $command );
-- 
cgit v1.2.3


From 533231ec979a907cab73e27013da5f9d69b22121 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 12 Jul 2009 00:57:56 +0000
Subject: moving around the watermarking code for supporting other image libs

---
 actions/upload.php |   9 +---
 lib/resize.php     | 122 +++++++++++++++++++++++++----------------------------
 2 files changed, 59 insertions(+), 72 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index f062edc80..b74f72c7b 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -7,7 +7,6 @@
 
 	global $CONFIG;
 	include dirname(dirname(__FILE__)) . "/lib/resize.php";
-	include dirname(dirname(__FILE__)) . "/lib/watermark.php";
 	include dirname(dirname(__FILE__)) . "/lib/exif.php";
 
 	// Get common variables
@@ -155,16 +154,10 @@
 
 		if ($image_lib == 'ImageMagick') { // ImageMagick command line
 			
-			$thumbs = tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename);
-			if(!count($thumbs)) {
+			if (tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
 				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
 			}
 			
-			$album = get_entity($container_guid);
-			
-			tp_watermark($thumbs);
-			
-			
 		} else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP 
 			
 			if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
diff --git a/lib/resize.php b/lib/resize.php
index a346fc272..a379d8c93 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -3,6 +3,8 @@
 	 * Elgg tidypics library of resizing functions
 	 * 
 	 */
+	 
+	include dirname(__FILE__) . "/watermark.php";
 
 	 
 	/**
@@ -372,59 +374,62 @@
 	 */
 	function tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename)
 	{
-		global $CONFIG;
-		
-		$mime = $file->getMimeType();
-		
 		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
 		if (!$image_sizes) {
 			register_error(elgg_echo('tidypics:nosettings'));
-			return array();
+			return false;
 		}
 		$image_sizes = unserialize($image_sizes);
+
+		$thumb = new ElggFile();
+
+
+		// tiny thumbnail
+		$thumb->setFilename($prefix."thumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_imagick_cmdline_resize(	$file->getFilenameOnFilestore(),
+										$thumbname,
+										$image_sizes['thumb_image_width'],
+										$image_sizes['thumb_image_height'], 
+										true);
+		if (!$rtn_code)
+			return false;
+		$file->thumbnail = $prefix."thumb".$filestorename;
+
+
+		// album thumbnail
+		$thumb->setFilename($prefix."smallthumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_imagick_cmdline_resize(	$file->getFilenameOnFilestore(),
+										$thumbname,
+										$image_sizes['small_image_width'],
+										$image_sizes['small_image_height'], 
+										true); 
+		if (!$rtn_code)
+			return false;
+		$file->smallthumb = $prefix."smallthumb".$filestorename;
+
+
+		// main image
+		$thumb->setFilename($prefix."largethumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_imagick_cmdline_resize(	$file->getFilenameOnFilestore(),
+										$thumbname,
+										$image_sizes['large_image_width'],
+										$image_sizes['large_image_height'], 
+										false); 
+		if (!$rtn_code)
+			return false;
+		$file->largethumb = $prefix."largethumb".$filestorename;
 		
-		$thumblarge = tp_imagick_cmdline_resize($file->getFilenameOnFilestore(), 
-								"largethumb", 
-								$image_sizes['large_image_width'], 
-								$image_sizes['large_image_height'], 
-								false); 
-									
-		$thumbsmall = tp_imagick_cmdline_resize($file->getFilenameOnFilestore(), 
-								"smallthumb", 
-								$image_sizes['small_image_width'], 
-								$image_sizes['small_image_height'], 
-								true); 
-
-		$thumbnail = tp_imagick_cmdline_resize($file->getFilenameOnFilestore(), 
-								"thumb", 
-								$image_sizes['thumb_image_width'], 
-								$image_sizes['thumb_image_height'], 
-								true);
-		
-		if ($thumbnail) {
-			$thumb = new ElggFile();
-			$thumb->setMimeType($mime);
-			$thumb->setFilename($prefix."thumb".$filestorename);
-			$file->thumbnail = $prefix."thumb".$filestorename;
-		}
-		
-		if ($thumbsmall) {
-			$thumb = new ElggFile();
-			$thumb->setMimeType($mime);
-			$thumb->setFilename($prefix."smallthumb".$filestorename);
-			$file->smallthumb = $prefix."smallthumb".$filestorename;
-		}
-		
-		if ($thumblarge) {
-			$thumb = new ElggFile();
-			$thumb->setMimeType($mime);
-			$thumb->setFilename($prefix."largethumb".$filestorename);
-			$file->largethumb = $prefix."largethumb".$filestorename;
-		}
+					
+			//tp_watermark($thumbs);
+			
+
 
-		return array(	"thumbnail" => $thumbnail,
-						"thumbsmall" => $thumbsmall,
-						"thumblarge" => $thumblarge);
+		unset($thumb);
+
+		return true;
 	}
 
 	/*
@@ -432,27 +437,14 @@
 	 * (Returns false if the uploaded file was not an image)
 	 *
 	 * @param string $input_name The name of the file input field on the submission form
-	 * @param string $prefix The text to prefix to the existing filename
+	 * @param string $output_name The name of the file to be written
 	 * @param int $maxwidth The maximum width of the resized image
 	 * @param int $maxheight The maximum height of the resized image
 	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
-	 * @return false|mixed The contents of the resized image, or false on failure
+	 * @return bool
 	 */
-	function tp_imagick_cmdline_resize($input_name, $prefix, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
-
-		$params = array(
-			"input_name"=>$input_name,
-			"output_name"=>$output_name,
-			"maxwidth"=>$maxwidth,
-			"maxheight"=>$maxheight,
-			"square"=>$square,
-			"x1"=>$x1,
-			"y1"=>$y1,
-			"x2"=>$x2,
-			"y2"=>$y2);
+	function tp_imagick_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 		
-		$path = pathinfo($input_name);
-		$output_name = $path["dirname"] . "/$prefix" . $path["filename"] . "." . $path["extension"];
 		
 		// Get the size information from the image
 		if ($imgsizearray = getimagesize($input_name)) {
@@ -487,9 +479,11 @@
 
 			$accepted_formats = array(
 										'image/jpeg' => 'jpeg',
+										'image/pjpeg' => 'jpeg',
 										'image/png' => 'png',
+										'image/x-png' => 'png',
 										'image/gif' => 'gif'
-										);
+								);
 			// If it's a file we can manipulate ...
 			if (array_key_exists($imgsizearray['mime'],$accepted_formats)) {
 
@@ -528,7 +522,7 @@
 				if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/";
 				$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
 				exec($command);
-				return $output_name;
+				return true;
 
 			}
 		}
-- 
cgit v1.2.3


From 6f542ab26ea4bc65ae33a691802d233d8dafa592 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 12 Jul 2009 01:27:26 +0000
Subject: cleaned up the command line watermarking code

---
 lib/resize.php    | 10 +++++--
 lib/watermark.php | 86 ++++++++++++++++++++++++++++++-------------------------
 2 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/lib/resize.php b/lib/resize.php
index a379d8c93..894a68fff 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -66,6 +66,8 @@
 		if (!$rtn_code)
 			return false;
 		$file->largethumb = $prefix."largethumb".$filestorename;
+		
+		tp_gd_watermark($thumbname);
 
 		unset($thumb);
 
@@ -252,6 +254,8 @@
 		if (!$rtn_code)
 			return false;
 		$file->largethumb = $prefix."largethumb".$filestorename;
+		
+		tp_imagick_watermark($thumbname);
 
 		unset($thumb);
 
@@ -422,9 +426,9 @@
 			return false;
 		$file->largethumb = $prefix."largethumb".$filestorename;
 		
-					
-			//tp_watermark($thumbs);
-			
+		
+		tp_imagick_cmdline_watermark($thumbname);
+		
 
 
 		unset($thumb);
diff --git a/lib/watermark.php b/lib/watermark.php
index 25eb52d48..b60bae88e 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -1,55 +1,63 @@
 owner_guid);
-	$username = $user->username;
+	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
+	if (!$watermark_text)
+		return;
+	
 
 	$im_path = get_plugin_setting('im_path', 'tidypics');
-	if(!$im_path) {
+	if (!$im_path) {
 		$im_path = "/usr/bin/";
 	}
-	if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/";
 	
-	$viewer = get_loggedin_user();
-	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
-	$watermark_text = str_replace("%username%", $viewer->username, $watermark_text);
+	// make sure end of path is /
+	if (substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/";
+
+	
+	$owner = get_loggedin_user();
+
+	
+	$watermark_text = str_replace("%username%", $owner->username, $watermark_text);
 	$watermark_text = str_replace("%sitename%", $CONFIG->sitename, $watermark_text);
 
-	if( $watermark_text ) { //get this value from the plugin settings
-		if( $thumbs["thumblarge"] ) {
-			$ext = ".png";
-			
-			$watermark_filename = strtolower($watermark_text);
-			$watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename);
-			$watermark_filename = trim($watermark_filename, '-');
-			
-			$user_stamp_base = tp_get_img_dir();
-			$user_stamp_base .= strtolower($viewer->name . "_" . $watermark_filename . "_stamp");
-			
-			if( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
-				$commands = array();
-				$commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70  text 0,0  \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"';
-				$commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white  text  1,1  \''. $watermark_text . '\' text  0,0  \''. $watermark_text . '\' fill black  text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext;
-				$commands[] = $im_path . 'composite -compose CopyOpacity  "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"';
-				$commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"';
-				$commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"';
-				$commands[] = 'rm "' . $user_stamp_base . '_fgnd' . $ext . '"';
-				
-				foreach( $commands as $command ) {
-					exec( $command );
-				}
-			}
-			//apply the watermark
-			$commands = array();
-			$commands[] = $im_path . 'composite -gravity south -geometry +0+10 "' . $user_stamp_base . $ext . '" "' . $thumbs["thumblarge"] . '" "' . $thumbs["thumblarge"] . '_watermarked"';
-			$commands[] = "mv \"$thumbs[thumblarge]" . "_watermarked\" \"$thumbs[thumblarge]\"";
-			foreach( $commands as $command ) {
-				exec( $command );
-			}
+	$ext = ".png";
+	
+	$watermark_filename = strtolower($watermark_text);
+	$watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename);
+	$watermark_filename = trim($watermark_filename, '-');
+	
+	$user_stamp_base = tp_get_img_dir();
+	$user_stamp_base .= strtolower($owner->username . "_" . $watermark_filename . "_stamp");
+	
+	if ( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
+		$commands = array();
+		$commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70  text 0,0  \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"';
+		$commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white  text  1,1  \''. $watermark_text . '\' text  0,0  \''. $watermark_text . '\' fill black  text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext;
+		$commands[] = $im_path . 'composite -compose CopyOpacity  "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"';
+		$commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"';
+		$commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"';
+		$commands[] = 'rm "' . $user_stamp_base . '_fgnd' . $ext . '"';
+		
+		foreach( $commands as $command ) {
+			exec( $command );
 		}
 	}
+	
+	//apply the watermark
+	$commands = array();
+	$commands[] = $im_path . 'composite -gravity south -geometry +0+10 "' . $user_stamp_base . $ext . '" "' . $filename . '" "' . $filename . '_watermarked"';
+	$commands[] = "mv \"$filename" . "_watermarked\" \"$filename\"";
+	foreach( $commands as $command ) {
+		exec( $command );
+	}
 }
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From 1a7960b6f99cde142c27f84225611fbae3b8617d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 12 Jul 2009 01:38:17 +0000
Subject: reorged the watermark code so easier to add gd and php imagick

---
 lib/watermark.php | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/watermark.php b/lib/watermark.php
index b60bae88e..91e2a38f3 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -1,5 +1,27 @@
 username, $text);
+	$text = str_replace("%sitename%", $CONFIG->sitename, $text);
+	
+	return $text;
+}
+
+function tp_get_watermark_filename($text, $owner) {
+	global $CONFIG;
+
+	$base = strtolower($text);
+	$base = preg_replace("/[^\w-]+/", "-", $base);
+	$base = trim($base, '-');
+	
+	$filename = tp_get_img_dir();
+	$filename .= strtolower($owner->username . "_" . $base . "_stamp");
+	
+	return $filename;
+}
+
 function tp_gd_watermark($filename) {
 }
 
@@ -7,7 +29,6 @@ function tp_imagick_watermark($filename) {
 }
 
 function tp_imagick_cmdline_watermark($filename) {
-	global $CONFIG;
 	
 	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
 	if (!$watermark_text)
@@ -25,18 +46,12 @@ function tp_imagick_cmdline_watermark($filename) {
 	
 	$owner = get_loggedin_user();
 
+	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
 	
-	$watermark_text = str_replace("%username%", $owner->username, $watermark_text);
-	$watermark_text = str_replace("%sitename%", $CONFIG->sitename, $watermark_text);
-
 	$ext = ".png";
 	
-	$watermark_filename = strtolower($watermark_text);
-	$watermark_filename = preg_replace("/[^\w-]+/", "-", $watermark_filename);
-	$watermark_filename = trim($watermark_filename, '-');
+	$user_stamp_base = tp_get_watermark_filename($watermark_text, $owner);
 	
-	$user_stamp_base = tp_get_img_dir();
-	$user_stamp_base .= strtolower($owner->username . "_" . $watermark_filename . "_stamp");
 	
 	if ( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
 		$commands = array();
-- 
cgit v1.2.3


From 6896c4082a9ab3636380e8b1407635274dabab8e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 12 Jul 2009 02:01:24 +0000
Subject: started the imagick watermarking code

---
 lib/watermark.php | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/lib/watermark.php b/lib/watermark.php
index 91e2a38f3..b80e1b9e9 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -26,6 +26,70 @@ function tp_gd_watermark($filename) {
 }
 
 function tp_imagick_watermark($filename) {
+	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
+	if (!$watermark_text)
+		return;
+	
+
+	
+	$owner = get_loggedin_user();
+
+	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
+	
+	$ext = ".png";
+	
+	$user_stamp_base = tp_get_watermark_filename($watermark_text, $owner);
+	
+	
+	if ( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
+/*
+	$commands = array();
+		$commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70  text 0,0  \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"';
+		$commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white  text  1,1  \''. $watermark_text . '\' text  0,0  \''. $watermark_text . '\' fill black  text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext;
+		$commands[] = $im_path . 'composite -compose CopyOpacity  "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"';
+		$commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"';
+		$commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"';
+		$commands[] = 'rm "' . $user_stamp_base . '_fgnd' . $ext . '"';
+		
+		foreach( $commands as $command ) {
+			exec( $command );
+		}
+*/
+	}
+
+	try {
+		$img = new Imagick($filename);
+	} catch (ImagickException $e) {
+		return false;
+	}
+	
+	try {
+		$mask = new Imagick($user_stamp_base . $ext);
+	} catch (ImagickException $e) {
+		return false;
+	}
+	
+	$image_width = $img->getImageWidth();
+	$image_height = $img->getImageHeight();
+	$mask_width = $mask->getImageWidth();
+	$mask_height = $mask->getImageHeight();
+	
+	// matching -gravity south -geometry +0+10
+	$top = $image_height - $mask_height - 10;
+	$left = round(($image_width - $mask_width) / 2);
+	
+	$img->compositeImage($mask, Imagick::COMPOSITE_DEFAULT, $left, $top);
+	
+	$mask->destroy();
+	
+	if ($img->writeImage($filename) != true) {
+		$img->destroy();
+		return false;
+	}
+	
+	$img->destroy();
+	
+	return true;
 }
 
 function tp_imagick_cmdline_watermark($filename) {
-- 
cgit v1.2.3


From 19714b046eb9c385a671d1c8f1e8890d694400b7 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 00:37:28 +0000
Subject: continue to build watermarking code

---
 lib/resize.php    | 10 ++++++++--
 lib/watermark.php | 26 +++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/lib/resize.php b/lib/resize.php
index 894a68fff..803cb8fa7 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -34,6 +34,7 @@
 		$thumbname = $thumb->getFilenameOnFilestore();
 		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
 									$thumbname,
+									false,
 									$image_sizes['thumb_image_width'],
 									$image_sizes['thumb_image_height'], 
 									true);
@@ -47,6 +48,7 @@
 		$thumbname = $thumb->getFilenameOnFilestore();
 		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
 									$thumbname,
+									false,
 									$image_sizes['small_image_width'],
 									$image_sizes['small_image_height'], 
 									true); 
@@ -60,6 +62,7 @@
 		$thumbname = $thumb->getFilenameOnFilestore();
 		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
 									$thumbname,
+									true,
 									$image_sizes['large_image_width'],
 									$image_sizes['large_image_height'], 
 									false); 
@@ -67,7 +70,6 @@
 			return false;
 		$file->largethumb = $prefix."largethumb".$filestorename;
 		
-		tp_gd_watermark($thumbname);
 
 		unset($thumb);
 
@@ -80,12 +82,13 @@
 	 *
 	 * @param string $input_name The name of the file on the disk
 	 * @param string $output_name The name of the file to be written
+	 * @param bool - watermark this image? 
 	 * @param int $maxwidth The maximum width of the resized image
 	 * @param int $maxheight The maximum height of the resized image
 	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
 	 * @return bool true on success or false on failure
 	 */
-	function tp_gd_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+	function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 		
 		// Get the size information from the image
 		$imgsizearray = getimagesize($input_name);
@@ -176,6 +179,9 @@
 		if (!rtn_code)
 			return $rtn_code;
 		
+		if ($watermark)
+			tp_gd_watermark($newimage);
+		
 		switch ($imgsizearray['mime']) {
 			case 'image/jpeg':
 			case 'image/pjpeg':
diff --git a/lib/watermark.php b/lib/watermark.php
index b80e1b9e9..2263bdd8f 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -22,7 +22,31 @@ function tp_get_watermark_filename($text, $owner) {
 	return $filename;
 }
 
-function tp_gd_watermark($filename) {
+function tp_gd_watermark($image) {
+	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
+	if (!$watermark_text)
+		return;
+	
+	
+	$owner = get_loggedin_user();
+
+	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
+	
+	
+	
+	$font = 5;
+	$line_width = strlen($watermark_text) * imagefontwidth($font);
+	$line_height = imagefontheight($font);
+	
+	$image_width = 600;
+	$image_height = 450;
+	
+	// matching -gravity south -geometry +0+10
+	$top = $image_height - $line_height - 10;
+	$left = round(($image_width - $line_width) / 2);
+	
+	$textcolor = imagecolorallocate($image, 0, 0, 255);
+	imagestring($image, $font, $left, $top, $watermark_text, $textcolor);
 }
 
 function tp_imagick_watermark($filename) {
-- 
cgit v1.2.3


From fba9d91ec8f173f0f3cc939eb70b94530c57151c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 00:51:16 +0000
Subject: check for exif module

---
 lib/exif.php | 5 +++++
 system.php   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/lib/exif.php b/lib/exif.php
index 2bc25c996..5343044ea 100644
--- a/lib/exif.php
+++ b/lib/exif.php
@@ -1,6 +1,11 @@
 mimetype;
 	if ($mime != 'image/jpeg' && $mime != 'image/pjpeg')
 		return;
diff --git a/system.php b/system.php
index 549c51de4..85397fc08 100644
--- a/system.php
+++ b/system.php
@@ -118,6 +118,11 @@
 			
 			
 		
+		
+			EXIF
+			
+			
+		
 	
 	
        
 		">Server configuration doc
-- 
cgit v1.2.3


From 2a0b13d8668da50325dac33b21de1a376af28953 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 01:00:19 +0000
Subject: using memory_get_usage due to some people not having php 5.2

---
 actions/upload.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/actions/upload.php b/actions/upload.php
index b74f72c7b..6911978b0 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -116,7 +116,10 @@
 		$mem_avail = $mem_avail * 1024 * 1024;
 		if ($image_lib == 'GD') {
 			$mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);
-			$mem_avail = $mem_avail - memory_get_peak_usage() - 2097152; // 2 MB buffer
+			
+			$mem_used = memory_get_usage();
+				
+			$mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer
 			if ($mem_required > $mem_avail) {
 				array_push($not_uploaded, $sent_file['name']);
 				array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
-- 
cgit v1.2.3


From f19567d4aba06283c99093087a10ba2f5c7369ac Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 01:06:52 +0000
Subject: catch so closed group albums are not available to outsiders

---
 index.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/index.php b/index.php
index b308a026d..17aa70f3b 100644
--- a/index.php
+++ b/index.php
@@ -7,6 +7,9 @@
 
 	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 	
+	// if this page belongs to a closed group, prevent anyone outside group from seeing
+	if (is_callable('group_gatekeeper')) group_gatekeeper();
+	
 	//get the owner of the current page
 	$owner = page_owner_entity();
 	
-- 
cgit v1.2.3


From e013de96d9c734b4b4ce7bc26c928c2b82c4063a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 01:22:40 +0000
Subject: added more catches for accessing closed group content

---
 viewalbum.php | 3 +++
 viewimage.php | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/viewalbum.php b/viewalbum.php
index 602963816..9342db1e6 100644
--- a/viewalbum.php
+++ b/viewalbum.php
@@ -19,6 +19,9 @@
 	else
 		set_page_owner($album->owner_guid);
 
+	// if this page belongs to a closed group, prevent anyone outside group from seeing
+	if (is_callable('group_gatekeeper')) group_gatekeeper();
+
 	$owner = page_owner_entity();
 
 	// setup group menu
diff --git a/viewimage.php b/viewimage.php
index 3a0d42b5d..05efff6df 100644
--- a/viewimage.php
+++ b/viewimage.php
@@ -9,7 +9,7 @@
 	// Load Elgg engine
 	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
-		// get the album entity
+	// get the album entity
 	$photo_guid = (int) get_input('guid');
 	$photo = get_entity($photo_guid);
 
@@ -25,6 +25,10 @@
 			set_page_owner($owner_guid);
 	}
 
+	// if this page belongs to a closed group, prevent anyone outside group from seeing
+	if (is_callable('group_gatekeeper')) group_gatekeeper();
+
+	
 	$page_owner = page_owner_entity();
 	if ($page_owner instanceof ElggGroup) {
 		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
-- 
cgit v1.2.3


From bbd3f9d8566a7050784d1adbbbbe84ab6521ec19 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 01:35:46 +0000
Subject: simple stats

---
 views/default/tidypics/stats.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/views/default/tidypics/stats.php b/views/default/tidypics/stats.php
index 8680ab052..ebaf9a061 100644
--- a/views/default/tidypics/stats.php
+++ b/views/default/tidypics/stats.php
@@ -1,3 +1,14 @@
 dbprefix}entities where subtype={$img_type}";
+	$total = get_data_row($query);
+	$num_images = $total->total;
+	
+	$img_type = get_subtype_id('object', 'album');
+	$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
+	$total = get_data_row($query);
+	$num_albums = $total->total;
+
+	echo  $num_images . " Photos in " . $num_albums . " Albums";
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From dba7f91e3350d3e824877e927feaf05dd8c213f1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 01:44:07 +0000
Subject: from dgonzalez - unfinished spanish translation

---
 languages/es.php | 82 +-------------------------------------------------------
 1 file changed, 1 insertion(+), 81 deletions(-)

diff --git a/languages/es.php b/languages/es.php
index f42fded0b..4078452b0 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -1,81 +1 @@
-  "Imagen" , 
-	 'images'  =>  "Imágenes" , 
-	 'caption'  =>  "Leyenda" , 
-	 'photos'  =>  "Fotos" , 
-	 'images:upload'  =>  "Subir Imágenes" , 
-	 'album'  =>  "Állbum de Fotos" , 
-	 'albums'  =>  "Álbums de Fotos" , 
-	 'album:yours'  =>  "Tus álbums de fotos" , 
-	 'album:yours:friends'  =>  "Álbums de tus amigos" , 
-	 'album:user'  =>  "Állbums de %s" , 
-	 'album:friends'  =>  "Albums de los amigos de %s" , 
-	 'album:all'  =>  "Todos los álbums" , 
-	 'album:group'  =>  "Állbums del grupo" , 
-	 'item:object:image'  =>  "Fotos" , 
-	 'item:object:album'  =>  "Állbums" , 
-	 'tidypics:settings:maxfilesize'  =>  "Tamaño máximo en kilo bytes (KB):" , 
-	 'album:create'  =>  "Nuevo álbum" , 
-	 'album:add'  =>  "Añadir álbum de fotos" , 
-	 'album:addpix'  =>  "Añadir fotos" , 
-	 'album:edit'  =>  "Modificar álbum" , 
-	 'album:delete'  =>  "Eliminar álbum" , 
-	 'image:edit'  =>  "Modificar imagen" , 
-	 'image:delete'  =>  "Eliminar imagen" , 
-	 'image:download'  =>  "Descargar imagen" , 
-	 'album:title'  =>  "Título" , 
-	 'album:desc'  =>  "Descripción" , 
-	 'album:tags'  =>  "Etiquetas" , 
-	 'album:cover'  =>  "¿Hacer portada del álbum?" , 
-	 'album:cover:yes'  =>  "Si" , 
-	 'image:access:note'  =>  "(los permisos de acceso se heredan del álbum)" , 
-	 'image:total'  =>  "Imágenes en el álbum:" , 
-	 'image:by'  =>  "Imagen añadida por" , 
-	 'album:by'  =>  "Album creado por" , 
-	 'album:created:on'  =>  "Creado" , 
-	 'image:none'  =>  "No ha sido psible encontrar ninguna imagen en este momento." , 
-	 'image:back'  =>  "Anterior" , 
-	 'image:next'  =>  "Siguiente" , 
-	 'album:widget'  =>  "Albums de Fotos" , 
-	 'album:more'  =>  "Ver todos los albums" , 
-	 'album:widget:description'  =>  "Muestra tus álbums de fotos más recientes" , 
-	 'album:display:number'  =>  "Número de albums a mostrar" , 
-	 'album:num_albums'  =>  "Número de albums a mostrar" , 
-	 'image:river:created'  =>  "%s subió" , 
-	 'image:river:item'  =>  "una imagen" , 
-	 'image:river:annotate'  =>  "%s comentó en" , 
-	 'album:river:created'  =>  "%s creó" , 
-	 'album:river:item'  =>  "un album" , 
-	 'album:river:annotate'  =>  "%s comentó en" , 
-	 'image:saved'  =>  "Tu imagen ha sido guardada." , 
-	 'images:saved'  =>  "Todas tus imágenes han sido guardadas." , 
-	 'image:deleted'  =>  "Tu imagen ha sido borrada." , 
-	 'image:delete:confirm'  =>  "¿Deseas borrar esta imagen?" , 
-	 'images:edited'  =>  "Tus imágenes han sido actualizadas." , 
-	 'album:edited'  =>  "Tu álbum ha sido actualizado." , 
-	 'album:saved'  =>  "Tu álbum ha sido guardado." , 
-	 'album:deleted'  =>  "Tu álbum ha sido borrado con éxito." , 
-	 'album:delete:confirm'  =>  "¿Deseas borrar este álbum?" , 
-	 'album:created'  =>  "Tu nuevo álbum ha sido creado." , 
-	 'tidypics:status:processing'  =>  "Por favor espera mientras procesamos tu imagen...." , 
-	 'image:uploadfailed'  =>  "Algunos ficheros no se pudieron subir:" , 
-	 'image:deletefailed'  =>  "Tu imagen no ha podido ser borrada en este momento." , 
-	 'image:downloadfailed'  =>  "Esta imagen no se encuentra disponible en este momento." , 
-	 'image:notimage'  =>  "Sólo se aceptan imágenes jpeg, gif, o png del tamaño permitido." , 
-	 'images:notedited'  =>  "No se pudieron actualizar todas las imágenes." , 
-	 'album:none'  =>  "Actualmente no hay ningún álbum de fotos." , 
-	 'album:uploadfailed'  =>  "No se ha podido guardar el álbum." , 
-	 'album:deletefailed'  =>  "En este momento no se ha podido borrar el álbum." , 
-	 'album:blank'  =>  "Por favor entra un título y descripción para tu nuevo álbum." , 
-	 'image:tools'  =>  "Herramientas" , 
-	 'image:inthisphoto'  =>  "En esta foto" , 
-	 'yes'  =>  "Si "
-); 
-
-add_translation('es', $spanish); 
-
-?>
\ No newline at end of file
+ "Imagen",
			'images' => "Imagenes",
			'caption' => "Titulo",		
			'photos' => "Fotos",
			'images:upload' => "Subir Imagenes",
			'album' => "Albums de Fotos",
			'albums' => "Albums de Fotos",
			'album:yours' => "Tus albums de fotos",
			'album:yours:friends' => "Albums de fotos de tus amigos",
			'album:user' => "Albums de fotos de %s",
			'album:friends' => "Albums de fotos de los amigos de %s",
			'album:all' => "Todos los albums de fotos",
			'album:group' => "Albums de grupo",
	
		//actions
		
			'album:create' => "Crear Album",
			'album:add' => "Añadir Album de Fotos",
			'album:addpix' => "Añadir fotos",		
			'album:edit' => "Editar album",			
			'album:delete' => "Borrar album",		
			'image:edit' => "Editar imagen",
			'image:delete' => "Borrar imagen",
		
		//forms
		
			'album:title' => "Titulo",
			'album:desc' => "Descripcion",
			'album:tags' => "Tags",
			'album:cover' => "Hacer de esta foto la caratula del album?",
			'image:access:note' => "(Permisos de vision heredados del album)",
			
		//views 
		
			'image:total' => "Imagenes en album:",
			'image:by' => "Imagen añadida por",
			'album:by' => "Album creado por",
			'image:none' => "Ninguna imagen añadida.",
			'image:back' => "Anterior",
			'image:next' => "Siguente",
		
		//widgets
		
			'album:widget' => "Albums de Fotos",
			'album:more' => "Ver todos los albumns",
			'album:widget:description' => "Mostrar los ultimos albums de fotos",
			'album:display:number' => "Numero de albums a mostrar",
			'album:num_albums' => "Numero de albums a mostrar",
			
		//  river
		
			//images
			'image:river:created' => "%s ha añadido",
			'image:river:item' => "una imagen",
			'image:river:annotate' => "%s hizo un comentario en",	
		
			//albums
			'album:river:created' => "%s ha creado",
			'album:river:item' => "un album",
			'album:river:annotate' => "%s hizo un comentatio en",				
				
		//  Status messages
			
			'images:saved' => "Imagen grabada correctamente.",
			'images:saved' => "Todas las imagentes se grabaron correctamente.",
			'image:deleted' => "Imagen borrada correctamente.",			
			'image:delete:confirm' => "Desea borrar esta imagen?",
			
			'images:edited' => "Imagenes actualizadas correctamente.",
			'album:edited' => "Album actualizado correctamente.",
			'album:saved' => "Album grabado correctamente.",
			'album:deleted' => "Album borrado correctamente.",	
			'album:delete:confirm' => "Desea borrar este album?",
				
		//Error messages
				 
			'image:none' => "No se ha encontrado ninguna imagen.",
			'image:uploadfailed' => "Archivos no subidos:",
			'image:deletefailed' => "La imagen no se ha podido borrar.",
			
			'image:notimage' => 'Solo se aceptan los formatos jpeg, gif, o png.',
			'images:notedited' => 'No se han podido actualizar todas las imagenes',
		 
			'album:none' => "No se ha encontrado ningun album.",
			'album:uploadfailed' => "Disculpe; no se ha podido grabar el album.",
			'album:deletefailed' => "No se ha podido borrar el album.",
	
	);
					
	add_translation("es",$spanish);
?>
\ No newline at end of file
-- 
cgit v1.2.3


From 0d1da079939a3943a410b04443014fb5fc4806f1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 01:49:03 +0000
Subject: beta 3 for 1.6.0

---
 contributions.txt | 2 ++
 manifest.xml      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/contributions.txt b/contributions.txt
index 6b3e2e280..ae931c63a 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -3,12 +3,14 @@ See individual change logs for contributors to those builds
 
 ------------------------------------------------------------------------
 Version 1.6.0 Change List
+Beta 3 Release Date: 07/16/2009
 Beta 2 Release Date: 07/10/2009
 Beta 1 Release Date: 06/30/2009
 Contributors:
   * Cash Costello
   * Greg Froese
   * tagging based on code by Predo Prez
+  * RSS improvements by Torsten Wesolek
 ------------------------------------------------------------------------
 BEGIN VERSION 1.6.0 CHANGES
 ------------------------------------------------------------------------
diff --git a/manifest.xml b/manifest.xml
index ddc167911..ba8d95bb3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
         
-        
+        
         
         
         
-- 
cgit v1.2.3


From b81fd34ca453f252ba025c560fa180cf2a68e8fb Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 11:08:46 +0000
Subject: where did that string parameter come from? - fixed now

---
 lib/exif.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/exif.php b/lib/exif.php
index 5343044ea..81f5dd960 100644
--- a/lib/exif.php
+++ b/lib/exif.php
@@ -12,7 +12,7 @@ function td_get_exif($file) {
 
 	$filename = $file->getFilenameOnFilestore();
 	$exif = exif_read_data($filename);
-	create_metadata($file->getGUID(), "tp_exif", serialize($exif), "string", $file->getObjectOwnerGUID(), ACCESS_PUBLIC);
+	create_metadata($file->getGUID(), "tp_exif", serialize($exif), "text", $file->getObjectOwnerGUID(), ACCESS_PUBLIC);
 }
 
 function tp_exif_formatted($file_guid) {
-- 
cgit v1.2.3


From 767251648493bdf4c6798571f921363859763e4e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 17 Jul 2009 11:10:04 +0000
Subject: another beta

---
 contributions.txt | 1 +
 manifest.xml      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contributions.txt b/contributions.txt
index ae931c63a..255e0059a 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -3,6 +3,7 @@ See individual change logs for contributors to those builds
 
 ------------------------------------------------------------------------
 Version 1.6.0 Change List
+Beta 4 Release Date: 07/17/2009
 Beta 3 Release Date: 07/16/2009
 Beta 2 Release Date: 07/10/2009
 Beta 1 Release Date: 06/30/2009
diff --git a/manifest.xml b/manifest.xml
index ba8d95bb3..8fa5056d7 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
         
-        
+        
         
         
         
-- 
cgit v1.2.3


From f76ddd74a49d5de2c29fcb9fb78efa47e25552c8 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 18 Jul 2009 17:40:04 +0000
Subject: russian language file for Tidypics 1.5

---
 languages/ru.php | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 languages/ru.php

diff --git a/languages/ru.php b/languages/ru.php
new file mode 100644
index 000000000..2722450c3
--- /dev/null
+++ b/languages/ru.php
@@ -0,0 +1,113 @@
+ "Фотография",
+			'images' => "Фотографии",
+			'caption' => "Описание",		
+			'photos' => "Фотки",
+			'images:upload' => "Загрузить Фотки",
+			'album' => "Фотоальбом",
+			'albums' => "Фотоальбомы",
+			'album:yours' => "Ваш Альбом",
+			'album:yours:friends' => "Альбомы Ваших Друзей",
+			'album:user' => "%s - Фотоальбом",
+			'album:friends' => "Альбомы друзей пользователя %s",
+			'album:all' => "Все Альбомы Сайта",
+			'album:group' => "Альбомы Группы",
+			'item:object:image' => "Фотки",
+			'item:object:album' => "Альбомы",
+			'tidypics:settings:maxfilesize' => "Максимальный размер файла (KB):",
+			'tidypics:enablephotos' => 'Включить Альбомы Группы',
+			'tidypics:editprops' => 'Редактировать данные фотогографии',
+	
+		//actions
+		
+			'album:create' => "Создать новый Альбом",
+			'album:add' => "Добавить Альбом",
+			'album:addpix' => "Добавить Фотки в Альбом",
+			'album:edit' => "Редактировать Альбом",
+			'album:delete' => "Стереть Альбом",
+
+			'image:edit' => "Редактировать Фотку",
+			'image:delete' => "Стереть Фотку",
+			'image:download' => "Скачать Фотку",
+		
+		//forms
+		
+			'album:title' => "Заголовок",
+			'album:desc' => "Описание",
+			'album:tags' => "Тэги",
+			'album:cover' => "Сдеалем Обложку Альбома?",
+			'album:cover:yes' => "Да",
+			'image:access:note' => "(ыровень доступа как и у основного Альбома)",
+			
+		//views 
+		
+			'image:total' => "Всего Фоток:",
+			'image:by' => "Фотка добавлена:",
+			'album:by' => "Альбом принадлежит:",
+			'album:created:on' => "Создан:",
+			'image:none' => "Пока Фоток не добавлено",
+			'image:back' => "Назад",
+			'image:next' => "Вперед",
+		
+		//widgets
+		
+			'album:widget' => "Фотоальбомы",
+			'album:more' => "Посмотреть все Альбомы",
+			'album:widget:description' => "Продемонстрировать свой новый Альбом",
+			'album:display:number' => "Число Альбомов для показа",
+			'album:num_albums' => "Число Альбомов для показа",
+			
+		//  river
+		
+			//images
+			'image:river:created' => "%s загрузил",
+			'image:river:item' => "фотку",
+			'image:river:annotate' => "комментариы к Фотке",	
+		
+			//albums
+			'album:river:created' => "%s создал новый Альбом: ",
+			'album:river:item' => "Альбом",
+			'album:river:annotate' => "Комментарий к Альбому",
+			
+		// notifications
+			'tidypics:newalbum' => 'Новый Фото Альбом',
+			
+				
+		//  Status messages
+			
+			'image:saved' => "Ваша фотография загружена успешно.",
+			'images:saved' => "Все Фотки успешно сохранены.",
+			'image:deleted' => "Ваша Фотография стерта.",			
+			'image:delete:confirm' => "Вы уверены, что хотите стереть эту Фотку?",
+			
+			'images:edited' => "Ваши Фотки успешно обновленны.",
+			'album:edited' => "Ваш Альбом обновлен.",
+			'album:saved' => "Ваш Альбом сохранен.",
+			'album:deleted' => "Ваш Альбом стерт.",	
+			'album:delete:confirm' => "Вы уверены, что хотите стереть этот Альбом?",
+			'album:created' => "Ваш новый Альбом готов.",
+			'tidypics:status:processing' => "Подозчдите пока мы загружаем фотку....",
+				
+		//Error messages
+				 
+			'image:none' => "На данный момент никаких фоток не обнаружено.",
+			'image:uploadfailed' => "Файлы не загружены:",
+			'image:deletefailed' => "В данный момент эту Фотку стереть невозможно.",
+			'image:downloadfailed' => "На данный момент эту фотку просмотреть невозможно.",
+			
+			'image:notimage' => "Допускаются только фотки формата jpeg, gif, или png разрешенного размера.",
+			'images:notedited' => "Не все фотографии были обновленны",
+		 
+			'album:none' => "Пока никаких Альбомов не имеется.",
+			'album:uploadfailed' => "Ваш Альбом сохранить не удалось.",
+			'album:deletefailed' => "В данный момент ваш Альбом стереть невозможно.",
+			'album:blank' => "Пожалуйста создайте заголовок и описание вашего Альбома.",
+	);
+					
+	add_translation("ru",$russian);
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 35d712021886b9ffc1c50ed4e195903cbd6b480c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 18 Jul 2009 18:12:47 +0000
Subject: hebrew for Tidypics 1.6 - Susan Tsairi

---
 languages/he.php | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 147 insertions(+)
 create mode 100644 languages/he.php

diff --git a/languages/he.php b/languages/he.php
new file mode 100644
index 000000000..801d8a96f
--- /dev/null
+++ b/languages/he.php
@@ -0,0 +1,147 @@
+  "תמונה" , 
+	 'images'  =>  "תמונות" , 
+	 'caption'  =>  "כיתוב" , 
+	 'photos'  =>  "תמונות" , 
+	 'images:upload'  =>  "העלאת תמונות" , 
+	 'images:multiupload'  =>  "כלי פלאש להעלאת תמונות רבות" , 
+	 'images:multiupload:todo'  =>  "בחרו קובץ אחד או יותר" , 
+	 'album'  =>  "אלבום תמונות" , 
+	 'albums'  =>  "אלבומי תמונות" , 
+	 'album:slideshow'  =>  "צפיה כמצגת" , 
+	 'album:yours'  =>  "אלבומי התמונות שלך" , 
+	 'album:yours:friends'  =>  "אלבומי תמונות של חברים" , 
+	 'album:user'  =>  "אלבומי תמונות של %s" , 
+	 'album:friends'  =>  "אלבומי התמונות של החברים של %s " , 
+	 'album:all'  =>  "כל אלבומי התמונות באתר" , 
+	 'album:group'  =>  "אלבומים קבוצתיים" , 
+	 'item:object:image'  =>  "תמונות" , 
+	 'item:object:album'  =>  "אלבומים" , 
+	 'tidypics:enablephotos'  =>  "אפשר אלבומי תמונות קבוצתיים" , 
+	 'tidypics:editprops'  =>  "ערוך מאפייני תמונה" , 
+	 'tidypics:mostcommented'  =>  "תמונות עם הכי הרבה תגובות" , 
+	 'tidypics:mostcommentedthismonth'  =>  "הכי הרבה תגובות בחודש זה" , 
+	 'tidypics:mostcommentedtoday'  =>  "הכי הרבה תגובות היום" , 
+	 'tidypics:mostviewed'  =>  "תמונות אשר נצפו הכי הרבה" , 
+	 'tidypics:mostvieweddashboard'  =>  "הדף אשר נצפה הכי הרבה" , 
+	 'tidypics:mostviewedthisyear'  =>  "נצפה הכי הרבה השנה" , 
+	 'tidypics:mostviewedthismonth'  =>  "נצפה הכי הרבה החודש" , 
+	 'tidypics:mostviewedlastmonth'  =>  "נצפה הכי הרבה בחודש שעבר" , 
+	 'tidypics:mostviewedtoday'  =>  "נצפה הכי הרבה היום" , 
+	 'tidypics:recentlyviewed'  =>  "תמונות אשר נצפו לאחרונה" , 
+	 'tidypics:mostrecent'  =>  "תמונות חדשות" , 
+	 'tidypics:yourmostviewed'  =>  "תמונות שלך אשר נצפו הכי הרבה" , 
+	 'tidypics:yourmostrecent'  =>  "התמונות הכי חדשות שלך" , 
+	 'tidypics:friendmostviewed'  =>  "תמונות של %s אשר נצפו הכי הרבה" , 
+	 'tidypics:friendmostrecent'  =>  "תמונות החדשות ביותר של %s" , 
+	 'tidypics:highestrated'  =>  "תמונות בעלי הדירוג הגבוה ביותר" , 
+	 'tidypics:viewsbyowner'  =>  "צפיות: %s על ידי %s משתמשים (לא כולל אותך)" , 
+	 'tidypics:viewsbyothers'  =>  "צפיות: %s (%s על ידיך)" , 
+	 'tidypics:administration'  =>  "ניהול Tidypics" , 
+	 'tidypics:stats'  =>  "סטטיסטיקה" , 
+	 'tidypics:settings'  =>  "הגדרות" , 
+	 'tidypics:admin:instructions'  =>  "אלה הגדרות הליבה של Tidypics.  שנה אותן לפי הצורך ולחץ על שמור" , 
+	 'tidypics:settings:image_lib'  =>  "ספריית תמונות:" , 
+	 'tidypics:settings:download_link'  =>  "הצג לינק להורדה" , 
+	 'tidypics:settings:tagging'  =>  "אפשר תיוג תמונות" , 
+	 'tidypics:settings:photo_ratings'  =>  "אפשר דירוג תמונות, דורש תוסף דירוג של Miguel Montes או דומה" , 
+	 'tidypics:settings:exif'  =>  "הצג נתוני EXIF" , 
+	 'tidypics:settings:view_count'  =>  "מונה צפיה" , 
+	 'tidypics:settings:grp_perm_override'  =>  "אפשר לחברי קבוצה גישה מלאה לאלבומים קבוצתיים" , 
+	 'tidypics:settings:maxfilesize'  =>  "גודל תמונה מירבי בMB" , 
+	 'tidypics:settings:quota'  =>  "מכסה בMB למשתמש/קבוצה - 0 שווה ללא מכסה" , 
+	 'tidypics:settings:watermark'  =>  "הזן טקסט אשר יופיע בסימן המים - יש לבחור ב ImageMagick Cmdline עבור ספריית התמונות" , 
+	 'tidypics:settings:im_path'  =>  "הזן את הנטיב לפקודות ImageMagick ללא לוכסן בסוף" , 
+	 'tidypics:settings:img_river_view'  =>  "כמה רשומות במה חדש עבור כל מקבץ תמונות אשר נוסף" , 
+	 'tidypics:settings:album_river_view'  =>  "הצג תמונה אחת או מקבץ תמונות עבור אלבום חדש" , 
+	 'tidypics:settings:largesize'  =>  "גודל תמונה בסיסי" , 
+	 'tidypics:settings:smallsize'  =>  "גודל תמונה בתצוגת אלבום" , 
+	 'tidypics:settings:thumbsize'  =>  "גודל תמונה ממוזערת" , 
+	 'album:create'  =>  "יצירת אלבום חדש" , 
+	 'album:add'  =>  "הוספת אלבום" , 
+	 'album:addpix'  =>  "הוספת תמונות לאלבום" , 
+	 'album:edit'  =>  "עריכת אלבום" , 
+	 'album:delete'  =>  "מחיקת אלבום" , 
+	 'image:edit'  =>  "עריכת תמונה" , 
+	 'image:delete'  =>  "מחיקת תמונה" , 
+	 'image:download'  =>  "הורדת תמונה" , 
+	 'album:title'  =>  "כותרת" , 
+	 'album:desc'  =>  "תאור" , 
+	 'album:tags'  =>  "תגים" , 
+	 'album:cover'  =>  "קבע תמונה זו כעטיפה " , 
+	 'tidypics:quota'  =>  "שימוש מכסה" , 
+	 'image:total'  =>  "תמונות באלבום:" , 
+	 'image:by'  =>  "תמונה נוספה על ידי" , 
+	 'album:by'  =>  "אלבום נוצר על ידי" , 
+	 'album:created:on'  =>  "יצר/ה" , 
+	 'image:none'  =>  "טרם נוספו תמונות" , 
+	 'image:back'  =>  "הקודם" , 
+	 'image:next'  =>  "הבא" , 
+	 'tidypics:taginstruct'  =>  "בחר אזור להוספת תג" , 
+	 'tidypics:deltag_title'  =>  "בחר תגים למחיקה" , 
+	 'tidypics:finish_tagging'  =>  "הפסק לתייג" , 
+	 'tidypics:tagthisphoto'  =>  "תייג תמונה זו" , 
+	 'tidypics:deletetag'  =>  "מחק תג תמונה" , 
+	 'tidypics:actiontag'  =>  "תג" , 
+	 'tidypics:actiondelete'  =>  "מחיקה" , 
+	 'tidypics:actioncancel'  =>  "ביטול" , 
+	 'tidypics:inthisphoto'  =>  "בתמונה זו" , 
+	 'tidypics:usertag'  =>  "תמונות המתוייגות במשתמש %s" , 
+	 'tidypics:phototagging:success'  =>  "התג נוסף בהצלחה" , 
+	 'tidypics:phototagging:error'  =>  "אירע שגיאה בתהליך התיוג" , 
+	 'tidypics:deletetag:success'  =>  "התגים נמחקו בהצלחה" , 
+	 'tidypics:posted'  =>  "הוסיף/ה תמונה" , 
+	 'album:widget'  =>  "אלבומי תמונות" , 
+	 'album:more'  =>  "צפיה בכל האלבומים" , 
+	 'album:widget:description'  =>  "הצג את האלבומים החדשים שלך" , 
+	 'album:display:number'  =>  "מספר האלבומים לתצוגה" , 
+	 'album:num_albums'  =>  "מספר האלבומים לתצוגה" , 
+	 'image:river:created'  =>  "%s הוסיף/ה את התמונה %s לאלבום %s" , 
+	 'image:river:item'  =>  "תמונה" , 
+	 'image:river:annotate'  =>  "תגובה לתמונה" , 
+	 'album:river:created'  =>  "%s יצר/ה אלבום תמונות חדש" , 
+	 'album:river:group'  =>  "בקבוצה" , 
+	 'album:river:item'  =>  "אלבום" , 
+	 'album:river:annotate'  =>  "תגובה באלבום התמונות" , 
+	 'tidypics:newalbum'  =>  "אלבום תמונות חדש" , 
+	 'tidypics:upl_success'  =>  "התמונות הועלו בהצלחה" , 
+	 'image:saved'  =>  "התמונה נשמרה בהצלחה" , 
+	 'images:saved'  =>  "כל התמונות נשמרו בהצלחה" , 
+	 'image:deleted'  =>  "התמונה נמחקה בהצלחה" , 
+	 'image:delete:confirm'  =>  "בטוח?  למחוק תמונה זו?" , 
+	 'images:edited'  =>  "התמונות עודכנו בהצלחה" , 
+	 'album:edited'  =>  "האלבום עודכן בהצלחה" , 
+	 'album:saved'  =>  "האלבום נשמר בהצלחה" , 
+	 'album:deleted'  =>  "האלבום נמחק בהצלחה" , 
+	 'album:delete:confirm'  =>  "בטוח?  למחוק אלבום זה?" , 
+	 'album:created'  =>  "האלבום החדש נוצר" , 
+	 'tidypics:settings:save:ok'  =>  "הגדרות התוסף Tidypics נשמרו בהצלחה" , 
+	 'tidypics:upgrade:success'  =>  "Tidypics שודרג בהצלחה" , 
+	 'tidypics:partialuploadfailure'  =>  "אירעו שגיאות בהעלאת חלק מהתמונות (%s מתוך %s תמונות)." , 
+	 'tidypics:completeuploadfailure'  =>  "העלאת התמונות נכשל" , 
+	 'tidypics:exceedpostlimit'  =>  "יותר מדי תמונות גדולות - נסה פחות תמונות או תמונות קטנות יותר" , 
+	 'tidypics:noimages'  =>  "לא נבחרו תמונות" , 
+	 'tidypics:image_mem'  =>  "התמונה גדולה מדי - יותר מדי ביטים" , 
+	 'tidypics:image_pixels'  =>  "לתמונה יותר מדי פיקסלים" , 
+	 'tidypics:unk_error'  =>  "שגיאה לא מוכרת בהעלאת תמונות" , 
+	 'tidypics:save_error'  =>  "שגיאה לא מוכרת בשמירת תמונות" , 
+	 'tidypics:not_image'  =>  "סוק הקובץ לא מזוהה" , 
+	 'image:deletefailed'  =>  "לא ניתן היה למחוק תמונה זו " , 
+	 'image:downloadfailed'  =>  "מצטערים התמונה אינה זמינה כרגע" , 
+	 'tidypics:nosettings'  =>  "מנהל הרשת טרם קבע הגדרות עבור אלבומי תמונות" , 
+	 'tidypics:exceed_quota'  =>  "עברת את מגבלת המכסה הנקבע על ידי מנהל הרשת" , 
+	 'images:notedited'  =>  "לא עודכנו כל התמונות בהצלחה" , 
+	 'album:none'  =>  "טרם נוצרו אלבומים" , 
+	 'album:uploadfailed'  =>  "מצטערים לא הצלחנו לשמור את האלבום שלך" , 
+	 'album:deletefailed'  =>  "לא ניתן היה למחוק את האלבום" , 
+	 'album:blank'  =>  "אנא קבע שם ותאור עבור אלבום זה" , 
+	 'tidypics:upgrade:failed'  =>  "שדרוג Tidypics נכשל"
+); 
+
+add_translation('he', $hebrew); 
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 0a0fc516dcc7a7770d89c8e8a5dbb2e578850551 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 30 Jul 2009 11:38:40 +0000
Subject: added more stats

---
 views/default/tidypics/stats.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/views/default/tidypics/stats.php b/views/default/tidypics/stats.php
index ebaf9a061..8de3415a1 100644
--- a/views/default/tidypics/stats.php
+++ b/views/default/tidypics/stats.php
@@ -10,5 +10,26 @@
 	$total = get_data_row($query);
 	$num_albums = $total->total;
 
-	echo  $num_images . " Photos in " . $num_albums . " Albums";
-?>
\ No newline at end of file
+	$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment');
+	$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment');
+	
+	$num_views = count_annotations(0, 'object', 'image', 'tp_view');
+	
+	if (get_plugin_setting('tagging', 'tidypics') != "disabled")
+		$num_tags = count_annotations(0, 'object', 'image', 'phototag');
+?>
+
        
+
        
+Photos: 
        
+Albums: 
        
+Comments on photos: 
        
+Comments on albums: 
        
+Total views: 
        
+
+Photo tags: 
        
+
+
        
\ No newline at end of file
-- 
cgit v1.2.3


From b419b142276a3451bcc162e334172f0797ab54f5 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 30 Jul 2009 11:40:38 +0000
Subject: update notification text regardless of notification method type

---
 start.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/start.php b/start.php
index 0851a3e5c..c44c3cfc1 100644
--- a/start.php
+++ b/start.php
@@ -356,10 +356,8 @@
 		{
 			$descr = $entity->description;
 			$title = $entity->title;
-			if ($method == 'email') {
-				$owner = $entity->getOwnerEntity();
-				return sprintf(elgg_echo('album:river:created'), $owner->name) . ' ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
-			}
+			$owner = $entity->getOwnerEntity();
+			return sprintf(elgg_echo('album:river:created'), $owner->name) . ' ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
 		}
 		return null;
 	}
-- 
cgit v1.2.3


From cb92fa6bf0ec144504e59cfcaa49d97d386ece4d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 2 Aug 2009 22:10:48 +0000
Subject: should fix warnings that occur occasionally on array_search

---
 views/default/object/image.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index e5ccd2276..dc77c41ca 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -164,7 +164,8 @@ if ($photo_tags) {
 					array_push($_SESSION['image_sort'], $image->guid);
 				}
 
-				$current = array_search($file_guid, $_SESSION['image_sort']);
+				if ($_SESSION['image_sort'])
+					$current = array_search($file_guid, $_SESSION['image_sort']);
 			}
 
 			if ($current != 0)
-- 
cgit v1.2.3


From d7c368bbce0484ecedbf6f2d4ae756d1bd32896c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 2 Aug 2009 22:18:16 +0000
Subject: removed bad spanish file

---
 languages/es.php | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 languages/es.php

diff --git a/languages/es.php b/languages/es.php
deleted file mode 100644
index 4078452b0..000000000
--- a/languages/es.php
+++ /dev/null
@@ -1 +0,0 @@
- "Imagen",
			'images' => "Imagenes",
			'caption' => "Titulo",		
			'photos' => "Fotos",
			'images:upload' => "Subir Imagenes",
			'album' => "Albums de Fotos",
			'albums' => "Albums de Fotos",
			'album:yours' => "Tus albums de fotos",
			'album:yours:friends' => "Albums de fotos de tus amigos",
			'album:user' => "Albums de fotos de %s",
			'album:friends' => "Albums de fotos de los amigos de %s",
			'album:all' => "Todos los albums de fotos",
			'album:group' => "Albums de grupo",
	
		//actions
		
			'album:create' => "Crear Album",
			'album:add' => "Añadir Album de Fotos",
			'album:addpix' => "Añadir fotos",		
			'album:edit' => "Editar album",			
			'album:delete' => "Borrar album",		
			'image:edit' => "Editar imagen",
			'image:delete' => "Borrar imagen",
		
		//forms
		
			'album:title' => "Titulo",
			'album:desc' => "Descripcion",
			'album:tags' => "Tags",
			'album:cover' => "Hacer de esta foto la caratula del album?",
			'image:access:note' => "(Permisos de vision heredados del album)",
			
		//views 
		
			'image:total' => "Imagenes en album:",
			'image:by' => "Imagen añadida por",
			'album:by' => "Album creado por",
			'image:none' => "Ninguna imagen añadida.",
			'image:back' => "Anterior",
			'image:next' => "Siguente",
		
		//widgets
		
			'album:widget' => "Albums de Fotos",
			'album:more' => "Ver todos los albumns",
			'album:widget:description' => "Mostrar los ultimos albums de fotos",
			'album:display:number' => "Numero de albums a mostrar",
			'album:num_albums' => "Numero de albums a mostrar",
			
		//  river
		
			//images
			'image:river:created' => "%s ha añadido",
			'image:river:item' => "una imagen",
			'image:river:annotate' => "%s hizo un comentario en",	
		
			//albums
			'album:river:created' => "%s ha creado",
			'album:river:item' => "un album",
			'album:river:annotate' => "%s hizo un comentatio en",				
				
		//  Status messages
			
			'images:saved' => "Imagen grabada correctamente.",
			'images:saved' => "Todas las imagentes se grabaron correctamente.",
			'image:deleted' => "Imagen borrada correctamente.",			
			'image:delete:confirm' => "Desea borrar esta imagen?",
			
			'images:edited' => "Imagenes actualizadas correctamente.",
			'album:edited' => "Album actualizado correctamente.",
			'album:saved' => "Album grabado correctamente.",
			'album:deleted' => "Album borrado correctamente.",	
			'album:delete:confirm' => "Desea borrar este album?",
				
		//Error messages
				 
			'image:none' => "No se ha encontrado ninguna imagen.",
			'image:uploadfailed' => "Archivos no subidos:",
			'image:deletefailed' => "La imagen no se ha podido borrar.",
			
			'image:notimage' => 'Solo se aceptan los formatos jpeg, gif, o png.',
			'images:notedited' => 'No se han podido actualizar todas las imagenes',
		 
			'album:none' => "No se ha encontrado ningun album.",
			'album:uploadfailed' => "Disculpe; no se ha podido grabar el album.",
			'album:deletefailed' => "No se ha podido borrar el album.",
	
	);
					
	add_translation("es",$spanish);
?>
\ No newline at end of file
-- 
cgit v1.2.3


From bf652f34eb1546f1bff37b4caf80a161e88a416e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 2 Aug 2009 22:39:00 +0000
Subject: now sending the new album notification after the first set of photos
 are uploaded

---
 actions/addalbum.php | 7 ++++---
 actions/upload.php   | 9 +++++++--
 start.php            | 6 +++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/actions/addalbum.php b/actions/addalbum.php
index 909f04c9f..b53cf9692 100644
--- a/actions/addalbum.php
+++ b/actions/addalbum.php
@@ -41,19 +41,20 @@
 		$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
 		}
 		
-		// Now let's add tags. We can pass an array directly to the object property! Easy.
+		// Now let's add tags
 		if (is_array($tagarray)) {
 			$album->tags = $tagarray;
 		}
 		
-		// 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;
 		
 		
 		// Success message
diff --git a/actions/upload.php b/actions/upload.php
index 6911978b0..d5fb7d802 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -187,11 +187,16 @@
 		// update user/group size for checking quota
 		$image_repo_size += $sent_file['size'];
 
-		// successful upload so check if this is a new album and throw river event if so
+		// successful upload so check if this is a new album and throw river event/notification if so
 		if ($album->new_album == TP_NEW_ALBUM) {
+			$album->new_album = TP_OLD_ALBUM;
+
+			// we throw the notification manually here so users are not told about the new album until there
+			// is at least a few photos in it
+			object_notifications('create', 'object', $album);
+			
 			if (function_exists('add_to_river'))
 				add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
-			$album->new_album = TP_OLD_ALBUM;
 		}
 	
 		if ($img_river_view == "all") {
diff --git a/start.php b/start.php
index c44c3cfc1..5a225e053 100644
--- a/start.php
+++ b/start.php
@@ -354,10 +354,14 @@
 		$method = $params['method'];
 		if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'album'))
 		{
+			// block notification message when the album doesn't have any photos
+			if ($entity->new_album == TP_NEW_ALBUM)
+				return false;
+				
 			$descr = $entity->description;
 			$title = $entity->title;
 			$owner = $entity->getOwnerEntity();
-			return sprintf(elgg_echo('album:river:created'), $owner->name) . ' ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+			return sprintf(elgg_echo('album:river:created'), $owner->name) . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
 		}
 		return null;
 	}
-- 
cgit v1.2.3


From 2af2b7d75abd0cad74988c0b1b21d8e8a8f0d084 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 2 Aug 2009 22:47:46 +0000
Subject: fixed a core Elgg bug dealing with commenting on untitled objects

---
 languages/en.php                      |  2 ++
 views/default/annotation/annotate.php | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 views/default/annotation/annotate.php

diff --git a/languages/en.php b/languages/en.php
index 76604f543..6890ddfd8 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1,6 +1,8 @@
  "untitled",
 
 		// Menu items and titles
 
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
new file mode 100644
index 000000000..03dd097d8
--- /dev/null
+++ b/views/default/annotation/annotate.php
@@ -0,0 +1,17 @@
+subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+	$subtype = get_subtype_from_id($object->subtype);
+	$title = $object->title;
+	if (!$title)
+		$title = elgg_echo('untitled');
+
+	$url = "getURL()}\">{$performed_by->name}";
+	$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
+	$string .= elgg_echo("{$subtype}:river:annotate") . " getURL() . "\">" . $title . "";
+
+?>
+
+
\ No newline at end of file
-- 
cgit v1.2.3


From 6c9af8f91b34f9f2f31e58ede1f97f6e4d130928 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 2 Aug 2009 23:08:36 +0000
Subject: better description and caption box sizes

---
 views/default/tidypics/css.php              | 5 +++++
 views/default/tidypics/forms/edit.php       | 4 ++--
 views/default/tidypics/forms/edit_multi.php | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index c2adb899c..a68ff22f0 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -144,6 +144,11 @@ width:60%;
 font-size:1em;
 }
 
+.tidypics_caption_input {
+	width:98%;
+	height:100px;
+}
+
 /* ---- tidypics group css ----- */
 
 #tidypics_group_profile {
diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index a504cde60..2999578b9 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -53,14 +53,14 @@
 ?>
 		
        
 			
-			 "tidypicsbody","value" => $body,)); ?>
+			 "tidypicsdesc","value" => $body,)); ?>
 		
        
 
 		
        
 			
-			 "tidypicsbody","value" => $body,)); ?>
+			 "tidypicsbody","value" => $body,"class" => 'tidypics_caption_input')); ?>
 		
        
  "title[$key]", "value" => $title,)) . "\n";
 		echo '
        ';
 		echo '
        ";
-		echo elgg_view("input/text",array("internalname" => "caption[$key]", "value" => $body,)) . "\n";
+		echo elgg_view("input/longtext",array("internalname" => "caption[$key]", "value" => $body, "class" => 'tidypics_caption_input',)) . "\n";
 		echo "
        ";
 		echo '
        \n";
 		echo elgg_view("input/tags", array( "internalname" => "tags[$key]","value" => $tags)) . "\n";
-- 
cgit v1.2.3


From d124fec101c9b2a2be29587cb4eff5826b78623d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 2 Aug 2009 23:44:40 +0000
Subject: tags go to river now

---
 actions/addtag.php                       |   7 ++++++-
 graphics/icons/river_icon_tag.gif        | Bin 0 -> 184 bytes
 languages/en.php                         |   7 ++++---
 views/default/river/object/image/tag.php |  20 ++++++++++++++++++++
 views/default/tidypics/css.php           |   4 ++++
 5 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 graphics/icons/river_icon_tag.gif
 create mode 100644 views/default/river/object/image/tag.php

diff --git a/actions/addtag.php b/actions/addtag.php
index fb299dee6..fa2b4b3c6 100644
--- a/actions/addtag.php
+++ b/actions/addtag.php
@@ -74,8 +74,13 @@
 	if ($image->annotate('phototag', serialize($tag), $access_id, $owner_id)) {
 		// if tag is a user id, add relationship for searching (find all images with user x)
 		if ($relationships_type === 'user') {
-			if (!check_entity_relationship($user_id, 'phototag', $image_guid))
+			if (!check_entity_relationship($user_id, 'phototag', $image_guid)) {
 				add_entity_relationship($user_id, 'phototag', $image_guid);
+				
+				// also add this to the river
+				if (function_exists('add_to_river'))
+					add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id); // subject is image
+			}
 		}
 	
 		system_message(elgg_echo("tidypics:phototagging:success"));
diff --git a/graphics/icons/river_icon_tag.gif b/graphics/icons/river_icon_tag.gif
new file mode 100644
index 000000000..510696147
Binary files /dev/null and b/graphics/icons/river_icon_tag.gif differ
diff --git a/languages/en.php b/languages/en.php
index 6890ddfd8..de8a22db2 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -127,9 +127,10 @@
 		//  river
 
 			//images
-			'image:river:created' => "%s added the image %s to album %s",
-			'image:river:item' => "an image",
-			'image:river:annotate' => "a comment on the image",
+			'image:river:created' => "%s added the photo %s to album %s",
+			'image:river:item' => "an photo",
+			'image:river:annotate' => "a comment on the photo",
+			'image:river:tagged' => "was tagged in the photo",
 
 			//albums
 			'album:river:created' => "%s created a new photo album",
diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php
new file mode 100644
index 000000000..cfe01e444
--- /dev/null
+++ b/views/default/river/object/image/tag.php
@@ -0,0 +1,20 @@
+subject_guid);
+	$person_tagged = get_entity($vars['item']->object_guid);
+	if($image->title) {
+		$title = $image->title;
+	} else {
+		$title = "untitled";
+	}
+	
+	
+	
+	$image_url = "getURL()}\">{$title}";
+	$person_url = "getURL()}\">{$person_tagged->name}";
+	
+	$string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url;
+	
+	echo $string;
+
+?>
\ No newline at end of file
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index a68ff22f0..66d42c22a 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -175,6 +175,10 @@ padding:0 0 5px;
 	background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
 }
 
+.river_user_tag {
+	background: url(mod/tidypics/graphics/icons/river_icon_tag.gif) no-repeat left -1px;
+}}
+
 /* ----------- tagging ---------------- */
 #tidypics_tag_instructions {
 background:#BBDAF7; 
-- 
cgit v1.2.3


From 57d3328af74ccc959123a0d7bdfa74da940e21fd Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 2 Aug 2009 23:48:18 +0000
Subject: started some documentation on extending tidypics

---
 docs/extending_tidypics.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 docs/extending_tidypics.txt

diff --git a/docs/extending_tidypics.txt b/docs/extending_tidypics.txt
new file mode 100644
index 000000000..8d3674cbd
--- /dev/null
+++ b/docs/extending_tidypics.txt
@@ -0,0 +1,9 @@
+Extending Tidypics
+-----------------------------------
+
+We will include more information here in the future. For right now, we will 
+mention that we have included some code to make it easy to put the latest
+photos on your front page. See tidypics/lib/tidypics.php and the function
+tp_get_latest_photos().
+
+ 
\ No newline at end of file
-- 
cgit v1.2.3


From b560f65007a721d7ded49ab745e2f88430c50290 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 2 Aug 2009 23:52:25 +0000
Subject: Final 1.6 release

---
 contributions.txt | 4 +++-
 manifest.xml      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index 255e0059a..70cc63533 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -3,6 +3,7 @@ See individual change logs for contributors to those builds
 
 ------------------------------------------------------------------------
 Version 1.6.0 Change List
+Final Release Date: 08/02/2009
 Beta 4 Release Date: 07/17/2009
 Beta 3 Release Date: 07/16/2009
 Beta 2 Release Date: 07/10/2009
@@ -10,8 +11,9 @@ Beta 1 Release Date: 06/30/2009
 Contributors:
   * Cash Costello
   * Greg Froese
-  * tagging based on code by Predo Prez
+  * tagging based on code by Pedro Prez
   * RSS improvements by Torsten Wesolek
+  * language files submitted by Toto and Susan Tsairi
 ------------------------------------------------------------------------
 BEGIN VERSION 1.6.0 CHANGES
 ------------------------------------------------------------------------
diff --git a/manifest.xml b/manifest.xml
index 8fa5056d7..b29aeea6f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
         
-        
+        
         
         
         
-- 
cgit v1.2.3


From 05af6679375035bf05e9c5dd5344c513a2f1754f Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 2 Aug 2009 23:58:41 +0000
Subject: well, almost - using a better name for imagick php extension

---
 views/default/tidypics/forms/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 0ade3d885..74d3d992e 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -15,7 +15,7 @@
 	
 	
 	if (extension_loaded('imagick'))
-		$img_lib_options['ImageMagickPHP'] = 'ImageMagick';
+		$img_lib_options['ImageMagickPHP'] = 'IMagick PHP';
 		
 	$disablefunc = explode(',', ini_get('disable_functions'));
 	if (is_callable('exec') && !in_array('exec',$disablefunc))
-- 
cgit v1.2.3


From 1f9dc9606c5ff104b9f20fad7ca53674bd480931 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 3 Aug 2009 12:57:30 +0000
Subject: extra } in css file

---
 views/default/tidypics/css.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 66d42c22a..68db520e4 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -177,7 +177,7 @@ padding:0 0 5px;
 
 .river_user_tag {
 	background: url(mod/tidypics/graphics/icons/river_icon_tag.gif) no-repeat left -1px;
-}}
+}
 
 /* ----------- tagging ---------------- */
 #tidypics_tag_instructions {
-- 
cgit v1.2.3


From f4938a7c78fe660857b3aa0257db794157216ed9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 4 Aug 2009 10:45:13 +0000
Subject: new spanish translation using html markup

---
 languages/es.php | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 languages/es.php

diff --git a/languages/es.php b/languages/es.php
new file mode 100644
index 000000000..2e0d1cf81
--- /dev/null
+++ b/languages/es.php
@@ -0,0 +1,189 @@
+ "sin titulo",
+
+		// Menu items and titles
+			'image' => "Imagen",
+			'images' => "Imagenes",
+			'caption' => "Título",
+			'photos' => "Fotos",
+			'images:upload' => "Cargar Imagenes",
+			'images:multiupload' => "Herramienta MultiCarga de Flash",
+			'images:multiupload:todo' => "Selecciona uno a más archivos para cargar..",
+			'album' => "Álbum de Fotos",
+			'albums' => "Álbumnes de Fotos",
+			'album:slideshow' => "Ver presentación de fotos",
+			'album:yours' => "Tu álbum de fotos",
+			'album:yours:friends' => "Álbum de fotos de tus amigos",
+			'album:user' => "Álbum de fotos de %s",
+			'album:friends' => "Álbum de fotos de los amigos de %s",
+			'album:all' => "Todos los álbumnes de fotos",
+			'album:group' => "Grupo de álbumnes",
+			'item:object:image' => "Fotos",
+			'item:object:album' => "Álbumnes",
+			'tidypics:enablephotos' => 'Habilitar Álbumnes de foto del Grupo',
+			'tidypics:editprops' => 'Editar Propiedades de Imagen',
+			'tidypics:mostcommented' => 'imagenes más comentadas',
+			'tidypics:mostcommentedthismonth' => 'Más comentadas este mes',
+			'tidypics:mostcommentedtoday' => 'Más comentadas del día de hoy',
+			'tidypics:mostviewed' => 'Imagenes más vistas',
+			'tidypics:mostvieweddashboard' => 'tablero m&as visto',
+			'tidypics:mostviewedthisyear' => 'Más vistas este año',
+			'tidypics:mostviewedthismonth' => 'Más vistas este mes',
+			'tidypics:mostviewedlastmonth' => 'Más vistas el &ultimo mes',
+			'tidypics:mostviewedtoday' => 'Más vistas durante el día de hoy',
+			'tidypics:recentlyviewed' => 'Imagenes vistas recientemente',
+			'tidypics:mostrecent' => 'Imagenes vistas más recientemente',
+			'tidypics:yourmostviewed' => 'Tu imagen más vista',
+			'tidypics:yourmostrecent' => 'Tu imagen más reciente',
+			'tidypics:friendmostviewed' => "La imagen más vista de %s",
+			'tidypics:friendmostrecent' => "La imagen más reciente de %s",
+			'tidypics:highestrated' => "Imagenes mejor catalogadas",
+			'tidypics:viewsbyowner' => "Vistas: %s por  %s (no te incluye a ti)",
+			'tidypics:viewsbyothers' => "Vistas: %s (%s por ti)",
+			'tidypics:administration' => 'Administración de Tidypics',
+			'tidypics:stats' => 'Estatus',
+
+		//settings
+			'tidypics:settings' => 'Configuración',
+			'tidypics:admin:instructions' => 'Este es el corazón de las preferencias de Tidypics. Cambialas y luego guardalas.',
+			'tidypics:settings:image_lib' => "Libreria de Imagenes: ",
+			'tidypics:settings:download_link' => "Mostrar vinculo de descarga",
+			'tidypics:settings:tagging' => "Habilitar etiquetas en las fotos",
+			'tidypics:settings:photo_ratings' => "Habilitar ratings de fotos(requiere instalar el e plugin de Miguel Montes o compatible)",
+			'tidypics:settings:exif' => "Mostrar data de EXIF",
+			'tidypics:settings:view_count' => "Ver contador",
+			'tidypics:settings:grp_perm_override' => "Permitir acceso completo a los miembros de este grupo al album de fotos",
+			'tidypics:settings:maxfilesize' => "Tamao máximo de la imagen en megabytes (MB):",
+			'tidypics:settings:quota' => "Usuario/Grupo Cuota (MB) - 0 MB de cuota",
+			'tidypics:settings:watermark' => "Introduce el texto que aparecerá en la marca de agua - ImageMagick Cmdline debe ser seleccionado para la libreria de imagenes",
+			'tidypics:settings:im_path' => "Ingresa la ruta de tu ImageMagick commands (incluye el slash)",
+			'tidypics:settings:img_river_view' => "Cuántas entradas deseas para cada grupo de imágenes cargadas",
+			'tidypics:settings:album_river_view' => "Muestra la portada del álbum o el set de fotos para el álbum nuevo",
+			'tidypics:settings:largesize' => "Tamaño inicial de la imagen",
+			'tidypics:settings:smallsize' => "Tamaño de imagen de vista del álbum",
+			'tidypics:settings:thumbsize' => "Tamao de imagen miniatura",
+
+		//actions
+
+			'album:create' => "Crear nuevo álbum",
+			'album:add' => "Añadir Álbum de fotos",
+			'album:addpix' => "ñadir fotos al Álbum",
+			'album:edit' => "Editar álbum",
+			'album:delete' => "Borrar álbum",
+
+			'image:edit' => "Editar imagen",
+			'image:delete' => "Borrar imagen",
+			'image:download' => "Descargar imagen",
+
+		//forms
+
+			'album:title' => "Titulo",
+			'album:desc' => "Descripción",
+			'album:tags' => "Etiquetas",
+			'album:cover' => "Desea hacer de esta imagen la portada del álbum?",
+			'tidypics:quota' => "Cuota usada:",
+
+		//views
+
+			'image:total' => "Imagenes en  el álbum:",
+			'image:by' => "Imagenes añadidas por",
+			'album:by' => "Álbum creador por",
+			'album:created:on' => "Creado",
+			'image:none' => "Ninguna imagen ha sido añadida aún.",
+			'image:back' => "Anterior",
+			'image:next' => "Siguiente",
+
+		// tagging
+			'tidypics:taginstruct' => 'Seleccciona el  área que deseas etiquetar',
+			'tidypics:deltag_title' => 'Seleccionas las etiquetas a borrar',
+			'tidypics:finish_tagging' => 'Detener etiquetado',
+			'tidypics:tagthisphoto' => 'Etiquetar esta foto',
+			'tidypics:deletetag' => 'Borrar etiqueta de la foto',
+			'tidypics:actiontag' => 'Etiqueta',
+			'tidypics:actiondelete' => 'Borrar',
+			'tidypics:actioncancel' => 'Cancelar',
+			'tidypics:inthisphoto' => 'En esta foto',
+			'tidypics:usertag' => "Fotos etiquetadas con %s",
+			'tidypics:phototagging:success' => 'La etiqueta de la foto fue añadida exitosamente',
+			'tidypics:phototagging:error' => 'Ocurrió un error inesperado durante el etiquetado',
+			'tidypics:deletetag:success' => 'Las etiquetas seleccionadas fueron borradas exitosamente',
+
+
+		//rss
+			'tidypics:posted' => 'publicar una foto:',
+
+		//widgets
+
+			'album:widget' => "Álbumnes de fotos",
+			'album:more' => "Ver todos los álbumnes",
+			'album:widget:description' => "Mosrar tu último álbum de fotos",
+			'album:display:number' => "Número de álbumnes a mostrar",
+			'album:num_albums' => "Número de álbumnes a mostrar",
+
+		//  river
+
+			//images
+			'image:river:created' => "%s añadio la foto %s al álbum %s",
+			'image:river:item' => "una foto",
+			'image:river:annotate' => "un comentario en la foto",
+			'image:river:tagged' => "fue etiquetada en la foto",
+
+			//albums
+			'album:river:created' => "%s creo un nuevo álbum de fotos",
+			'album:river:group' => "en el grupo",
+			'album:river:item' => "un álbum",
+			'album:river:annotate' => "un comentario en el álbum de fotos",
+
+		// notifications
+			'tidypics:newalbum' => 'Nuevo álbum de fotos',
+
+
+		//  Status messages
+
+			'tidypics:upl_success' => "Tu imagen fue cargada exitosamente.",
+			'image:saved' => "Tu imagen fue guardada exitosamente.",
+			'images:saved' => "Todas tus imagenes fueron guardadas exitosamente.",
+			'image:deleted' => "Tu imagen fue borrada exitosamente.",
+			'image:delete:confirm' => "Estás seguro de que deseas borrar esta imagen?",
+			'images:edited' => "Tu imagen fue editada exitosamente.",
+
+			'album:edited' => "Tu álbum fue cargado exitosamente.",
+			'album:saved' => "Tu álbum fue guardado exitosamente.",
+			'album:deleted' => "Tu álbum fue borrado exitosamente.",
+			'album:delete:confirm' => "Estás seguro de que deseas borrar esta imagen?",
+			'album:created' => "Tu nuevo álbum ha sido creado.",
+			'tidypics:settings:save:ok' => 'Las preferencias del plugin de Tidypics han sido exitosamente guardadas',
+
+			'tidypics:upgrade:success' => 'La actualización de Tidypics ha sido un exito',
+
+		//Error messages
+
+			'tidypics:partialuploadfailure' => "Ocurrieron errores mientas se cargaban algunas de las imagenes (%s de %s imagenes).",
+			'tidypics:completeuploadfailure' => "Carga de imagenes fallidas.",
+			'tidypics:exceedpostlimit' => "Las imagenes son muy grandes - trate de cargar imagenes m&ás pequeñas.",
+			'tidypics:noimages' => "Ninguna imagen fue seleccionada.",
+			'tidypics:image_mem' => "La image is muy grande - demasiados bytes",
+			'tidypics:image_pixels' => "La image tiene demasiados pixeles",
+			'tidypics:unk_error' => "Error de carga desconocido",
+			'tidypics:save_error' => "Error desconocido guardando la imagen en el servidor",
+			'tidypics:not_image' => "Este no es un tipo de imagen soportada por el sistema",
+			'image:deletefailed' => "Tu imagen no pudo ser borrada en este momento.",
+			'image:downloadfailed' => "Lo sentimos; esta imagen no está disponible en este momento.",
+			'tidypics:nosettings' => "El Administrador de este sitio no ha configurado las preferencias de los álbumnes de fotos.",
+			'tidypics:exceed_quota' => "Has excedido la cuota asignada por el administrador",
+			'images:notedited' => "No todas las imagenes fueron actualizas exitosamente",
+
+			'album:none' => "No ha sido creado ningún álbum aún.",
+			'album:uploadfailed' => "Lo sentimos; no pudimos guardar tu álbum.",
+			'album:deletefailed' => "Tu álbum no pudo ser borrado en este momento.",
+			'album:blank' => "Por favor, dale a este Álbum un titulo y una descripción.",
+
+			'tidypics:upgrade:failed' => "La actualización de Tidypics ha fallado",
+	);
+
+	add_translation("es",$spanish);
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 9686e8d077d01924776a42526fec5f1379f8ef3a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 4 Aug 2009 10:52:51 +0000
Subject: tagging instructions width now works for other languages

---
 views/default/tidypics/css.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 68db520e4..84f6ee2d5 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -174,7 +174,6 @@ padding:0 0 5px;
 .river_object_album_comment {
 	background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
 }
-
 .river_user_tag {
 	background: url(mod/tidypics/graphics/icons/river_icon_tag.gif) no-repeat left -1px;
 }
@@ -185,7 +184,7 @@ background:#BBDAF7;
 border:1px solid #4690D6;  
 padding:10px;
 height:25px;
-width:360px;
+min-width:360px;
 display:none;
 overflow:hidden; 
 position:absolute; 
-- 
cgit v1.2.3


From 8b25b9c804013af2d0a7eb87fc9606279f7cc775 Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Tue, 4 Aug 2009 14:15:23 +0000
Subject: recently commented support

---
 languages/en.php                       |  1 +
 start.php                              | 12 ++++++++++++
 views/default/tidypics/forms/admin.php |  6 +++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index de8a22db2..7aef34094 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -36,6 +36,7 @@
 			'tidypics:mostviewedlastmonth' => 'Most viewed last month',
 			'tidypics:mostviewedtoday' => 'Most viewed today',
 			'tidypics:recentlyviewed' => 'Recently viewed images',
+			'tidypics:recentlycommented' => 'Recently commented images',
 			'tidypics:mostrecent' => 'Most recent images',
 			'tidypics:yourmostviewed' => 'Your most viewed images',
 			'tidypics:yourmostrecent' => 'Your most recent images',
diff --git a/start.php b/start.php
index 5a225e053..9c27cb854 100644
--- a/start.php
+++ b/start.php
@@ -175,6 +175,9 @@
 									$CONFIG->wwwroot . 'pg/photos/recentlyviewed',
 									'tidypics-z');
 			}
+			add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
+								$CONFIG->wwwroot . 'pg/photos/recentlycommented',
+								'tidypics-z');
 
 		}
 		
@@ -195,6 +198,7 @@
 		add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/mostcommentedimages.php");
 		add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/mostcommentedimagesthismonth.php");
 		add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/mostcommentedimagestoday.php");
+		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented');
 	}
 	/**
 	 * Sets up tidypics admin menu. Triggered on pagesetup.
@@ -309,6 +313,11 @@
 					include($CONFIG->pluginspath . "tidypics/recentlyviewed.php");
 				break;
 				
+				case "recentlycommented":
+					if (isset($page[1])) set_input('guid',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/recentlycommented.php");
+				break;
+				
 				case "highestrated":
 					if (isset($page[1])) set_input('guid',$page[1]);
 					include($CONFIG->pluginspath . "tidypics/highestrated.php");
@@ -387,6 +396,9 @@
 		return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title;
 	}
 
+	function tp_mostrecentimages($max = 8, $pagination = true) {
+		return list_entities("object", "image", 0, $max, false, false, $pagination);	
+	}
 
 	// Make sure tidypics_init is called on initialisation
 	register_elgg_event_handler('init','system','tidypics_init');
diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 74d3d992e..c3b366521 100644
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -67,11 +67,11 @@
 	$view_count = $plugin->view_count;
 	if(!$view_count) $view_count = "enabled";
 	$form_body .= '
        ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
        ";
-/*
+
 	// Watermark Text
 	$form_body .= "
        " . elgg_echo('tidypics:settings:watermark') . "
        ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
        ";
-*/
+
 	// Max Image Size
 	$maxfilesize = $plugin->maxfilesize;
 	if (!$maxfilesize) $maxfilesize = (int)5; // 5 MB
@@ -141,4 +141,4 @@
 
 	$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
 	
-	echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
\ No newline at end of file
+	echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
-- 
cgit v1.2.3


From c017e19649bfbfdec01fdf1e7f3be815524eff90 Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Tue, 11 Aug 2009 19:46:09 +0000
Subject: recently commented support

---
 recentlycommented.php | 45 +++++++++++++++++++++++++++++++++++++++++++++
 start.php             |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 recentlycommented.php

diff --git a/recentlycommented.php b/recentlycommented.php
new file mode 100644
index 000000000..aabf5cd9a
--- /dev/null
+++ b/recentlycommented.php
@@ -0,0 +1,45 @@
+dbprefix;
+	$max_limit = 200; //get extra because you'll have multiple views per image in the result set
+	$max = 16; //controls how many actually show on screen
+	
+	//this works but is wildly inefficient
+	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+	
+	$sql = "SELECT distinct ent.guid
+			FROM " . $prefix . "entities ent
+			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
+			AND sub.subtype = 'image'
+			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
+			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
+			AND ms.string = 'generic_comment'
+			GROUP BY ent.guid
+			ORDER BY ann1.id DESC
+			LIMIT $max_limit";
+	
+	$result = get_data($sql);
+
+	$entities = array();
+	foreach($result as $entity) {
+		if(!$entities[$entity->guid]) {
+			$entities[$entity->guid] = get_entity($entity->guid);	
+		}
+		if(count($entities) >= $max) break;
+	}
+	$title = elgg_echo("tidypics:recentlycommented");
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	page_draw($title, $body);
+?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 9c27cb854..9e061ad90 100644
--- a/start.php
+++ b/start.php
@@ -198,7 +198,7 @@
 		add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/mostcommentedimages.php");
 		add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/mostcommentedimagesthismonth.php");
 		add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/mostcommentedimagestoday.php");
-		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented');
+		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'mod/tidypics/recentlycommented');
 	}
 	/**
 	 * Sets up tidypics admin menu. Triggered on pagesetup.
-- 
cgit v1.2.3


From bd7608f89e6e98d05a781e546254604f1e0b8959 Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Tue, 11 Aug 2009 20:50:42 +0000
Subject: make the download link on the image itself respect the 'download
 link' setting in admin settings

---
 views/default/object/image.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index dc77c41ca..8ca20e75a 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -202,8 +202,13 @@ if ($photo_tags) {
 			
 		
        
 		
        
-			\"{$title}\""; ?>
-
+			\"{$title}\"";
+				} else {
+					echo "\"{$title}\"";
+				}
+			?>
 			
        
 		
        
 
Date: Wed, 12 Aug 2009 20:49:47 +0000
Subject: fixed minor bug in finding recently commented images

---
 recentlycommented.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/recentlycommented.php b/recentlycommented.php
index aabf5cd9a..bfb64981d 100644
--- a/recentlycommented.php
+++ b/recentlycommented.php
@@ -17,15 +17,14 @@
 	//this works but is wildly inefficient
 	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
 	
-	$sql = "SELECT distinct ent.guid
+	$sql = "SELECT distinct (ent.guid), ann1.time_created
 			FROM " . $prefix . "entities ent
 			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
 			AND sub.subtype = 'image'
 			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
 			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
-			AND ms.string = 'generic_comment'
-			GROUP BY ent.guid
-			ORDER BY ann1.id DESC
+			AND ms.string = 'generic_comment'			
+			ORDER BY ann1.time_created DESC
 			LIMIT $max_limit";
 	
 	$result = get_data($sql);
@@ -37,6 +36,14 @@
 		}
 		if(count($entities) >= $max) break;
 	}
+	
+	$user = get_loggedin_user();
+	if( $user->guid == 9 ) {
+		echo "
        ";
+		var_dump( $sql);
+//		var_dump( $result );
+		echo "
        ";
+	}
 	$title = elgg_echo("tidypics:recentlycommented");
 	$area2 = elgg_view_title($title);
 	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
-- 
cgit v1.2.3


From 6e0bd712df9ad0a2e97951dc33bbec0bcc332e07 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 17 Aug 2009 11:52:25 +0000
Subject: fixed echoing vars['url'] in tagging javascript - Issue 75

---
 views/default/js/tagging.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php
index 586291b4c..1d4188458 100644
--- a/views/default/js/tagging.php
+++ b/views/default/js/tagging.php
@@ -1,8 +1,8 @@
 
-
-
+
+
  
 
-
+
+
  
 
\ No newline at end of file
diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
index 7d6aa220c..3d31bd52e 100644
--- a/views/default/tidypics/admin/tidypics.php
+++ b/views/default/tidypics/admin/tidypics.php
@@ -6,6 +6,7 @@
 	
 	$settingsselect = ''; 
 	$statsselect = '';
+	$imagelibselect = '';
 	switch($tab) {
 		case 'settings':
 			$settingsselect = 'class="selected"';
@@ -13,6 +14,9 @@
 		case 'stats':
 			$statsselect = 'class="selected"';
 			break;
+		case 'imagelib':
+			$imagelibselect = 'class="selected"';
+			break;
 	}
 	
 ?>
@@ -21,6 +25,7 @@
 		
          
 			
        • >
          • 
 			
        • >
          • 
+			
        • >
          • 
 		
        
 	
      
 
 
      
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index d493a623b..9565ddb1f 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -28,7 +28,7 @@
 	// Image Library
 	$image_lib = $plugin->image_lib;
 	if (!$image_lib) $image_lib = 'GD';
-	$form_body = '
      ' . elgg_echo('tidypics:settings:image_lib');
+	$form_body = '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
 	$form_body .= elgg_view('input/pulldown', array(
 					'internalname' => 'params[image_lib]',
 					'options_values' => $img_lib_options,
-- 
cgit v1.2.3


From f0bb034d7b84190a0984e99a9dca56c9a7f0344d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 26 Aug 2009 11:29:21 +0000
Subject: started moving views code into image library

---
 lib/image.php | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/lib/image.php b/lib/image.php
index 7986335ed..f09377b64 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -19,6 +19,11 @@
 			parent::__construct($guid);
 		}
 		
+		/**
+		 * Has the photo been tagged with "in this photo" tags
+		 *
+		 * @return true/false
+		 */
 		public function isPhotoTagged()
 		{
 			$num_tags = count_annotations($this->getGUID(), 'object', 'image', 'phototag');
@@ -28,6 +33,11 @@
 				return false;
 		}
 		
+		/**
+		 * Get an array of photo tag information
+		 *
+		 * @return array of json representations of the tags and the tag link text
+		 */
 		public function getPhotoTags() 
 		{
 			global $CONFIG;
@@ -76,6 +86,45 @@
 			$ret_data = array('json' => $photo_tags_json, 'links' => $photo_tag_links);
 			return $ret_data;
 		}
+		
+		/**
+		 * 
+		 */
+		public function getViews($viewer_guid)
+		{
+			$views_a = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 9999);
+			$total_views = count($views_a);
+			
+			if ($this->owner_guid == $viewer_guid)
+			{
+				// get unique number of viewers
+				foreach ($views_a as $view)
+				{
+					$diff_viewers[$view->owner_guid] = 1;
+				}
+				$unique_viewers = count($diff_viewers);
+			} 
+			else if ($viewer_guid) 
+			{
+				// get the number of times this user has viewed the photo
+				$my_views = 0;
+				foreach ($views_a as $view)
+				{
+					if ($view->owner_guid == $viewer_guid)
+						$my_views++;
+				}
+			}
+			
+			$view_info = array("total" => $total_views, "unique" => $unique_viewers, "mine" => $my_views);
+			
+			return $view_info;
+		}
+		
+		public function addView($viewer_guid)
+		{
+			if ($viewer_guid != $this->owner_guid)
+				create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC);
+		}
 	}
 	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From 9f0433b31ea8c6e00b314f511ef4ca0d8a9c4ce7 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 27 Aug 2009 11:34:03 +0000
Subject: step 2 in moving views code to library completed - now using library
 code

---
 languages/en.php               |  5 ++--
 views/default/object/image.php | 60 +++++++++++++++---------------------------
 2 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 674c71207..c233e8090 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -43,8 +43,9 @@
 			'tidypics:friendmostviewed' => "%s's most viewed images",
 			'tidypics:friendmostrecent' => "%s's most recent images",
 			'tidypics:highestrated' => "Highest rated images",
-			'tidypics:viewsbyowner' => "Views: %s by %s users (not including you)",
-			'tidypics:viewsbyothers' => "Views: %s (%s by you)",
+			'tidypics:views' => "Views: %s",
+			'tidypics:viewsbyowner' => "by %s users (not including you)",
+			'tidypics:viewsbyothers' => "(%s by you)",
 			'tidypics:administration' => 'Tidypics Administration',
 			'tidypics:stats' => 'Stats',
 
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 025f37d40..db39bb4fa 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -14,7 +14,6 @@
 	$desc = $image->description;
 	$owner = $image->getOwnerEntity();
 	$friendlytime = friendly_time($image->time_created);
-	$mime = $image->mimetype;
 
 
 /********************************************************************
@@ -24,6 +23,7 @@
  ********************************************************************/
 	if (get_context() == "search") { 
 
+		// gallery view is a matrix view showing just the image - size: small
 		if (get_input('search_viewtype') == "gallery") {
 			?>
 			
      
@@ -32,7 +32,7 @@
 			'.$title.'
      ';
 			$info .= "
      username}\">{$owner->name} {$friendlytime}";
 			$numcomments = elgg_count_comments($image);
@@ -40,17 +40,21 @@
 				$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
 			$info .= "
      ";
 			$icon = "getURL()}\">" . '' . $title . '';
-
+			
 			echo elgg_view_listing($icon, $info);
 		}
+
 /***************************************************************
  *
  * front page view 
  *
  ****************************************************************/
 	} else if (get_context() == "front") {
+		// the front page view is a clikcable thumbnail of the image
 ?>
-		<?php echo $title; ?>
+
+<?php echo $title; ?>
+
 guid) {
-					$the_viewer = $viewer->guid;
-				} else {
-					$the_viewer = 0;
-				}
-				
-				// only non-owner views count
-				if ($owner->guid != $view->owner_guid)
-					create_annotation($image_guid, "tp_view", "1", "integer", $the_viewer, ACCESS_PUBLIC);
-				$views_a = get_annotations($image_guid, "object", "image", "tp_view", "", 0, 9999);
-				$views = count($views_a);
-			
-				$my_views = 0;
-				$owner_views = 0;
-				$diff_viewers = array();
-	//			echo "
      "; var_dump($owner); echo "
      ";
-				foreach($views_a as $view) {
-					if($view->owner_guid == $the_viewer && $the_viewer != 0) $my_views++;
-					if($owner->guid == $view->owner_guid) $owner_views++;
-					//count how many different people have viewed it
-					if($owner->guid != $view->owner_guid) $diff_viewers[$view->owner_guid] = 1;
-				}
-				//remove the owner's views from the total count (prevents artificially inflated view counts)
-				$views = $views - $owner_views;
-			}
 			
 			// Build back and next links
 			$back = '';
@@ -143,11 +117,19 @@
 		
      
 			 $album,) ); ?> 
      
 			guid == $the_viewer) {
-						echo sprintf(elgg_echo("tidypics:viewsbyowner"), $views, count($diff_viewers));
-					} else {
-						echo sprintf(elgg_echo("tidypics:viewsbyothers"), $views, $my_views);
+				if (get_plugin_setting('view_count', 'tidypics') != "disabled") {
+					
+					$image->addView($viewer->guid);
+					$views = $image->getViews($viewer->guid);
+					if (is_array($views)) {
+						echo sprintf(elgg_echo("tidypics:views"), $views['total']);
+						if ($owner->guid == $viewer->guid) {
+							echo ' ' . sprintf(elgg_echo("tidypics:viewsbyowner"), $views['unique']);
+						}
+						else {
+							if ($views['mine'])
+								echo ' ' . sprintf(elgg_echo("tidypics:viewsbyothers"), $views['mine']);
+						}
 					}
 				}
 			?>
-- 
cgit v1.2.3


From fc2f8a2b36162550d58a64fa518fbdfca3733a1c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 27 Aug 2009 11:42:30 +0000
Subject: fixed 2 display issues with the main image view

---
 views/default/object/image.php     |  2 ++
 views/default/tidypics/tagging.php | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index db39bb4fa..9c84a63f2 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -196,6 +196,8 @@
 ';
 
 			echo '
      ';  // content wrapper
 
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 7062d942a..1d307df08 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -36,7 +36,7 @@
 	
      
 getGUID(), false, 'user', '', 0, 'time_created desc', 1000);
 		
 		if ($friends) {
@@ -60,12 +60,13 @@
 				$content .= "
    21. {$friend_name}
      22. ";
 			}
 		}
+		
+		$content .= "
      ";
+		
+		$content .= "
      ";
+		
+		echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content));
 	}
-	$content .= "
      ";
-
-	$content .= "
      ";
-	
-	echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content));
 
 ?>
 
      
-- 
cgit v1.2.3


From 867c1b1db999f634070459c51685b322cf44160c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 28 Aug 2009 12:03:40 +0000
Subject: fixed bug where album description wasn't being set

---
 views/default/tidypics/forms/edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index 2999578b9..0acccaee0 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -53,7 +53,7 @@
 ?>
 		
      
 			
-			 "tidypicsdesc","value" => $body,)); ?>
+			 "tidypicsbody","value" => $body,)); ?>
 		
      
 
Date: Mon, 31 Aug 2009 11:54:22 +0000
Subject: fixed small bug with css class/id

---
 views/default/tidypics/css.php     | 2 +-
 views/default/tidypics/tagging.php | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index a614705bf..b65d73789 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -220,7 +220,7 @@ overflow:hidden;
 -moz-border-radius: 8px;
 }
 
-#tidypics_popup_header {
+.tidypics_popup_header {
 width:100%;
 margin-bottom:10px;
 }
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 1d307df08..5ba698d6d 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -33,10 +33,13 @@
 	
      
 
      
 
      
-	
      
+	
      
 getGUID(), false, 'user', '', 0, 'time_created desc', 1000);
 		
 		if ($friends) {
@@ -71,7 +74,7 @@
 ?>
 
      
 
      
-
      
+
      
 guid}' />";
-- 
cgit v1.2.3


From 61d7f7243d7c06fd7ea9b282cda6efddf63a6a38 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 31 Aug 2009 11:59:05 +0000
Subject: browsers were misinterpreting the div close tag

---
 views/default/object/image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 9c84a63f2..2d560f8bb 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -197,7 +197,7 @@
 
 			echo elgg_view_comments($image);
 			
-			echo '
      ';
+			echo '
      ';
 
 			echo '
      ';  // content wrapper
 
-- 
cgit v1.2.3


From ff7a4572ab0e91a3e18390c0a0f9706b36ee394b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 1 Sep 2009 01:26:02 +0000
Subject: moved tagging list to library and added group members

---
 languages/en.php                   |  2 +-
 lib/image.php                      | 95 ++++++++++++++++++++++++++++++--------
 lib/tidypics.php                   | 21 ++++++++-
 views/default/tidypics/tagging.php | 15 ++----
 4 files changed, 100 insertions(+), 33 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index c233e8090..83e600936 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -24,7 +24,7 @@
 			'album:group' => "Group albums",
 			'item:object:image' => "Photos",
 			'item:object:album' => "Albums",
-			'tidypics:enablephotos' => 'Enable Group Photo Albums',
+			'tidypics:enablephotos' => 'Enable group photo albums',
 			'tidypics:editprops' => 'Edit Image Properties',
 			'tidypics:mostcommented' => 'Most commented images',
 			'tidypics:mostcommentedthismonth' => 'Most commented this month',
diff --git a/lib/image.php b/lib/image.php
index f09377b64..f146aba1a 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -88,38 +88,54 @@
 		}
 		
 		/**
+		 * Get the view information for this image
 		 * 
+		 * @param $viewer_guid the guid of the viewer (0 if not logged in)
+		 * @return array with number of views, number of unique viewers, and number of views for this viewer
 		 */
 		public function getViews($viewer_guid)
 		{
-			$views_a = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 9999);
-			$total_views = count($views_a);
-			
-			if ($this->owner_guid == $viewer_guid)
+			$views = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 9999);
+			if ($views) 
 			{
-				// get unique number of viewers
-				foreach ($views_a as $view)
+				$total_views = count($views);
+				
+				if ($this->owner_guid == $viewer_guid)
 				{
-					$diff_viewers[$view->owner_guid] = 1;
-				}
-				$unique_viewers = count($diff_viewers);
-			} 
-			else if ($viewer_guid) 
-			{
-				// get the number of times this user has viewed the photo
-				$my_views = 0;
-				foreach ($views_a as $view)
+					// get unique number of viewers
+					foreach ($views as $view)
+					{
+						$diff_viewers[$view->owner_guid] = 1;
+					}
+					$unique_viewers = count($diff_viewers);
+				} 
+				else if ($viewer_guid) 
 				{
-					if ($view->owner_guid == $viewer_guid)
-						$my_views++;
+					// get the number of times this user has viewed the photo
+					$my_views = 0;
+					foreach ($views as $view)
+					{
+						if ($view->owner_guid == $viewer_guid)
+							$my_views++;
+					}
 				}
+				
+				$view_info = array("total" => $total_views, "unique" => $unique_viewers, "mine" => $my_views);
+			}
+			else
+			{
+				$view_info = array("total" => 0, "unique" => 0, "mine" => 0);
 			}
-			
-			$view_info = array("total" => $total_views, "unique" => $unique_viewers, "mine" => $my_views);
 			
 			return $view_info;
 		}
 		
+		/**
+		 * Add a tidypics view annotation to this image
+		 * 
+		 * @param $viewer_guid
+		 * @return none
+		 */
 		public function addView($viewer_guid)
 		{
 			if ($viewer_guid != $this->owner_guid)
@@ -127,4 +143,45 @@
 		}
 	}
 	
+	/**
+	 * get a list of people that can be tagged in an image
+	 * 
+	 * @param $viewer entity
+	 * @return array of guid->name for tagging
+	 */
+	function tp_get_tag_list($viewer)
+	{
+		$friends = get_user_friends($viewer->getGUID(), '', 999, 0); 
+		$friend_list = array();
+		if ($friends) {
+			foreach($friends as $friend) {
+				$friend_list[$friend->guid] = $friend->name;
+			}
+		}
+		
+		// is this a group
+		$is_group = tp_is_group_page();
+		if ($is_group)
+		{
+			$group_guid = page_owner();
+			$viewer_guid = $viewer->guid;
+			$members = get_group_members($group_guid, 999);
+			if (is_array($members))
+			{
+				foreach ($members as $member)
+				{
+					if ($viewer_guid != $member->guid)
+						$group_list[$member->guid] = $member->name;
+				}
+				
+				// combine group and friends list
+				$friend_list = array_merge($friend_list, $group_list);
+				$friend_list = array_unique($friend_list);
+			}
+		}
+		
+		sort($friend_list);
+		
+		return $friend_list;
+	}
 ?>
\ No newline at end of file
diff --git a/lib/tidypics.php b/lib/tidypics.php
index e9b3ad46d..6bed421ed 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -53,7 +53,15 @@
 	}
 	
 	
-	/**** these functions replace broken core functions ****/
+	
+	/*********************************************************************
+	 * the functions below replace broken core functions or add functions 
+	 * that should exist in the core
+	 */
+	 
+	/**
+	 *
+	 */
 	function tp_get_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null, $timelower = 0, $timeupper = 0)
 	{
 		global $CONFIG;
@@ -164,4 +172,15 @@
 		return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
 		
 	}
+	
+	function tp_is_group_page() {
+		
+		if ($group = page_owner_entity()) {
+			if ($group instanceof ElggGroup)
+				return true;
+		}
+		
+		return false;
+	}
+	
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 5ba698d6d..ed33c4702 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -38,16 +38,7 @@
 
 	if ($viewer) {
 		
-		tp_get_tag_list($viewer);
-		
-		$friends = get_entities_from_relationship('friend', $viewer->getGUID(), false, 'user', '', 0, 'time_created desc', 1000);
-		
-		if ($friends) {
-			foreach($friends as $friend) {
-				$friend_array[$friend->name] = $friend->getGUID();
-			}
-		}
-		ksort($friend_array);
+		$people_list = tp_get_tag_list($viewer);
 
 		$content = "
      ";
 		$content .= "";
@@ -58,8 +49,8 @@
 		$content .= "
        ";
 		$content .= "
      •  {$viewer->name} (" . elgg_echo('me') . ")
        • ";
 	
-		if ($friends) {
-			foreach($friend_array as $friend_name => $friend_guid) {
+		if ($people_list) {
+			foreach($people_list as $friend_guid => $friend_name) {
 				$content .= "
      • {$friend_name}
        • ";
 			}
 		}
-- 
cgit v1.2.3


From e223ee2fbe481219521157d3b8a3feee82f9011e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 1 Sep 2009 01:38:41 +0000
Subject: updated forms to use security tokens

---
 views/default/tidypics/forms/edit.php       | 4 +++-
 views/default/tidypics/forms/edit_multi.php | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index 0acccaee0..cec1945f0 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -107,7 +107,9 @@
 ?>
 			
 
 		
 		
diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php
index ceaf2dcd9..634c343bb 100644
--- a/views/default/tidypics/forms/edit_multi.php
+++ b/views/default/tidypics/forms/edit_multi.php
@@ -39,6 +39,7 @@
 		echo elgg_view("input/tags", array( "internalname" => "tags[$key]","value" => $tags)) . "\n";
 		echo '
        ';
 		echo '' . "\n";
+		echo elgg_view('input/securitytoken');
 		
 		echo elgg_view("input/radio", array("internalname" => "cover",
 											"value" => $val,
-- 
cgit v1.2.3


From 8a74a87356b54f907c341b8d6b3bcbe6b1e2ba18 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 1 Sep 2009 01:46:53 +0000
Subject: added security token to download button

---
 views/default/tidypics/image_menu.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index afbb34f21..b804c8491 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -42,9 +42,13 @@
 		}
 	}
 	
-	if (get_plugin_setting('download_link', 'tidypics') != "disabled") { 
+	if (get_plugin_setting('download_link', 'tidypics') != "disabled") {
+		$ts = time();
+		$token = generate_action_token($ts);
+	    	
+		$download_url = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&__elgg_token=$token&__elgg_ts=$ts"; 
 ?>
-
        • 
+
        • 
 
\ No newline at end of file
-- 
cgit v1.2.3


From a07057fc6d3f68c20f8f15c3573e74d2514ba8b6 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 1 Sep 2009 11:37:42 +0000
Subject: made sure all the actions are using the appropriate gatekeeper

---
 actions/addalbum.php   | 4 ++--
 actions/delete.php     | 6 +++---
 actions/download.php   | 1 +
 actions/edit.php       | 4 ++--
 actions/edit_multi.php | 4 ++--
 actions/settings.php   | 2 +-
 actions/upgrade.php    | 2 ++
 actions/upload.php     | 3 +++
 8 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/actions/addalbum.php b/actions/addalbum.php
index b53cf9692..ffc7ec9c7 100644
--- a/actions/addalbum.php
+++ b/actions/addalbum.php
@@ -4,8 +4,8 @@
 	 * 
 	 */
 
-	// Make sure we're logged in (send us to the front page if not)
-	if (!isloggedin()) forward();
+	// Make sure we're logged in 
+	gatekeeper();
 
 	// Get input data
 	$title = get_input('tidypicstitle');
diff --git a/actions/delete.php b/actions/delete.php
index 3deb69c5b..498c991c7 100644
--- a/actions/delete.php
+++ b/actions/delete.php
@@ -5,10 +5,10 @@
 	 * 
 	 */
 
-	$forward_url = 'pg/photos/world'; // by default forward to world photos
+	// must be logged in
+	gatekeeper();
 
-	 //if not logged in, see world pictures instead
-	if (!isloggedin()) forward($forward_url);
+	$forward_url = 'pg/photos/world'; // by default forward to world photos
 
 	$guid = (int) get_input('guid');
 
diff --git a/actions/download.php b/actions/download.php
index 2736e5438..0f9835e11 100644
--- a/actions/download.php
+++ b/actions/download.php
@@ -2,6 +2,7 @@
 	/**
 	 * Tidypics Download File Action
 	 * 
+	 * do not call this directly - call through action handler
 	 */
 	 
 	global $CONFIG;
diff --git a/actions/edit.php b/actions/edit.php
index f5c66a1d8..e8f2e3aca 100644
--- a/actions/edit.php
+++ b/actions/edit.php
@@ -5,8 +5,8 @@
 	 * 
 	 */
 	 
-	// Make sure we're logged in (send us to the front page if not)
-	if (!isloggedin()) forward();
+	// Make sure we're logged in 
+	gatekeeper();
 
 	// Get input data
 	$guid    = (int) get_input('guid');  // guid of image or album
diff --git a/actions/edit_multi.php b/actions/edit_multi.php
index 7c03244a5..08947f1a4 100644
--- a/actions/edit_multi.php
+++ b/actions/edit_multi.php
@@ -4,8 +4,8 @@
 	 * 
 	 */
 	 
-	// Make sure we're logged in (send us to the front page if not)
-	if (!isloggedin()) forward();
+	// Make sure we're logged in 
+	gatekeeper();
 
 	// Get input data
 	$title_array = get_input('title');
diff --git a/actions/settings.php b/actions/settings.php
index ae74b8945..6b115b049 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -6,7 +6,7 @@
 
 	global $CONFIG;
 
-	gatekeeper();
+	admin_gatekeeper();
 	action_gatekeeper();
 
 
diff --git a/actions/upgrade.php b/actions/upgrade.php
index 0ff04dadf..cb200380a 100644
--- a/actions/upgrade.php
+++ b/actions/upgrade.php
@@ -8,6 +8,8 @@
 
 	include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
  
+	admin_gatekeeper();
+	
 	$result = true;
 	
 	// add image class
diff --git a/actions/upload.php b/actions/upload.php
index 70480a498..f330cf782 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -9,6 +9,9 @@
 	include dirname(dirname(__FILE__)) . "/lib/resize.php";
 	include dirname(dirname(__FILE__)) . "/lib/exif.php";
 
+	// Make sure we're logged in 
+	gatekeeper();
+	
 	// Get common variables
 	$access_id = (int) get_input("access_id");
 	$container_guid = (int) get_input('container_guid', 0);
-- 
cgit v1.2.3


From bdc8df4e735666ab286ce3e14f7baf0dada68d11 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 1 Sep 2009 12:14:06 +0000
Subject: adjusting download links

---
 views/default/object/image.php        | 5 ++++-
 views/default/tidypics/image_menu.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 2d560f8bb..a97916b7a 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -147,7 +147,10 @@
 		
        
 			\"{$title}\"";
+					$ts = time();
+					$token = generate_action_token($ts);
+					$download_url = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&view=inline&__elgg_token={$token}&__elgg_ts={$ts}";
+					echo "\"{$title}\"";
 				} else {
 					echo "\"{$title}\"";
 				}
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index b804c8491..cb004395e 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -46,7 +46,7 @@
 		$ts = time();
 		$token = generate_action_token($ts);
 	    	
-		$download_url = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&__elgg_token=$token&__elgg_ts=$ts"; 
+		$download_url = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&__elgg_token={$token}&__elgg_ts={$ts}"; 
 ?>
 
        • 
 
Date: Tue, 1 Sep 2009 12:29:59 +0000
Subject: fixed tag list combining and sorting

---
 lib/image.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index f146aba1a..f782f0386 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -155,6 +155,7 @@
 		$friend_list = array();
 		if ($friends) {
 			foreach($friends as $friend) {
+				//error_log("friend $friend->name");
 				$friend_list[$friend->guid] = $friend->name;
 			}
 		}
@@ -170,17 +171,24 @@
 			{
 				foreach ($members as $member)
 				{
-					if ($viewer_guid != $member->guid)
+					if ($viewer_guid != $member->guid) 
+					{
 						$group_list[$member->guid] = $member->name;
+						//error_log("group $member->name");
+					}
 				}
 				
 				// combine group and friends list
-				$friend_list = array_merge($friend_list, $group_list);
-				$friend_list = array_unique($friend_list);
+				$intersect = array_intersect_key($friend_list, $group_list);
+				$unique_friends = array_diff_key($friend_list, $group_list);
+				$unique_members = array_diff_key($group_list, $friend_list);
+				//$friend_list = array_merge($friend_list, $group_list);
+				//$friend_list = array_unique($friend_list);
+				$friend_list = $intersect + $unique_friends + $unique_members;
 			}
 		}
 		
-		sort($friend_list);
+		asort($friend_list);
 		
 		return $friend_list;
 	}
-- 
cgit v1.2.3


From 4606134bb7d1924dc4f7c54da4ccdf1bcbefd89c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 3 Sep 2009 23:58:30 +0000
Subject: preparing for a bug to be fixed in Elgg with the fullview parameter

---
 pages/ownedalbums.php | 4 ++--
 pages/tagged.php      | 2 +-
 pages/world.php       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/ownedalbums.php b/pages/ownedalbums.php
index a28020216..c3dc54d24 100644
--- a/pages/ownedalbums.php
+++ b/pages/ownedalbums.php
@@ -39,9 +39,9 @@
 	set_context('search');
 	set_input('search_viewtype', 'gallery');
 	if ($owner instanceof ElggGroup)
-		$area2 .= list_entities("object", "album", $owner->guid, 12);
+		$area2 .= list_entities("object", "album", $owner->guid, 12, false);
 	else
-		$area2 .= list_entities("object", "album", $owner->guid, 12);
+		$area2 .= list_entities("object", "album", $owner->guid, 12, false);
 	
 	set_context('photos');
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
diff --git a/pages/tagged.php b/pages/tagged.php
index 0bc562f5b..fb07b392c 100644
--- a/pages/tagged.php
+++ b/pages/tagged.php
@@ -25,7 +25,7 @@
 	
 	set_context('search');
 	set_input('search_viewtype', 'gallery'); // need to force gallery view
-	$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image'); 
+	$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); 
 
 	// Set up submenus
 	if (isloggedin()) {
diff --git a/pages/world.php b/pages/world.php
index d88ab1969..514fd058c 100644
--- a/pages/world.php
+++ b/pages/world.php
@@ -15,7 +15,7 @@
 	
 	set_context('search');
 	set_input('search_viewtype', 'gallery');
-	$albums_html .= list_entities('object','album', 0, $num_albums);
+	$albums_html .= list_entities('object','album', 0, $num_albums, false);
 
 	
 	$area2 .= $albums_html;
-- 
cgit v1.2.3


From f160b9a366883dd4cc88cf7bbffefc240fa42757 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 4 Sep 2009 00:07:16 +0000
Subject: 1.6.2

---
 contributions.txt         | 29 +++++++++++++++++++++++++++++
 docs/configure_server.txt |  9 +++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index 70cc63533..0e947c122 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,34 @@
 See individual change logs for contributors to those builds
 
+------------------------------------------------------------------------
+Version 1.6.2 Change List
+Release Date: 
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.2 CHANGES
+------------------------------------------------------------------------
+ * Added widget for user's latest photos
+ * Added notifications to a user if that user is tagged in a photo
+ * Fixed some issues with tagging people in albums that belong to a closed group
+ * Added a test page for ImageMagick commandline
+ * Began restructuring the code for future capabilities
+ * Many more bug fixes and tweaks
+------------------------------------------------------------------------
+END VERSION 1.6.2 CHANGES
+------------------------------------------------------------------------
+
+
+------------------------------------------------------------------------
+Version 1.6.1 Change List
+Release Date: 08/04/2009
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.1 CHANGES
+------------------------------------------------------------------------
+ * Fixed css bug that caused problems with tagging
+ * Added Spanish language file from mylamilagros 
+------------------------------------------------------------------------
+END VERSION 1.6.1 CHANGES
+------------------------------------------------------------------------
+
 
 ------------------------------------------------------------------------
 Version 1.6.0 Change List
diff --git a/docs/configure_server.txt b/docs/configure_server.txt
index 4d77816d6..32fb5d86e 100644
--- a/docs/configure_server.txt
+++ b/docs/configure_server.txt
@@ -15,11 +15,12 @@ resizing. There are two versions GD and GD2. It generally does not matter
 which one you are using and it isn't always apparent which one you are
 running anyway.
 
-ImageMagick: A significantly better image library than GD. It uses less 
-memory during resizing. Use this if it is available.
+ImageMagick: A significantly better image library than GD. There is a command-line
+version that is commonly available on servers and a PHP extension call imagick that
+you can install on your server (if you have control of your server).
 
-exec: Calls to ImageMagick command line utilities like convert require that
-exec() be available. On some servers it will be for security reasons.
+exec: Calls to ImageMagick command-line utilities like convert require that
+exec() be available. On some servers it will be disabled for security reasons.
 
 Memory Available to PHP: The amount of RAM available to a single PHP 
 process. This can have an effect on how large an image you can resize
-- 
cgit v1.2.3


From ce396a3cf4cce3e74b79bb4c4512066404034c47 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 5 Sep 2009 22:16:55 +0000
Subject: fixed bug where image variable was being overwritten in image view

---
 views/default/object/image.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index a97916b7a..292399074 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -95,8 +95,8 @@
 				$count = get_entities("object","image", $album->guid, '', 999);
 				$_SESSION['image_sort'] = array();
 
-				foreach ($count as $image) {
-					array_push($_SESSION['image_sort'], $image->guid);
+				foreach ($count as $img) {
+					array_push($_SESSION['image_sort'], $img->guid);
 				}
 
 				if ($_SESSION['image_sort'])
-- 
cgit v1.2.3


From 5ccb3887f61af7b670f0fafe077401529c141700 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 9 Sep 2009 00:58:37 +0000
Subject: added ability to create thumbnails for images that previously failed

---
 actions/create_thumbnails.php               | 61 +++++++++++++++++++++++++++++
 actions/imtest.php                          |  2 +-
 actions/upload.php                          |  8 ++--
 contributions.txt                           |  2 +-
 languages/en.php                            |  4 +-
 views/default/tidypics/admin/imagelib.php   |  8 ++--
 views/default/tidypics/admin/thumbnails.php | 33 ++++++++++++++++
 views/default/tidypics/admin/tidypics.php   |  8 ++++
 8 files changed, 117 insertions(+), 9 deletions(-)
 create mode 100644 actions/create_thumbnails.php
 create mode 100644 views/default/tidypics/admin/thumbnails.php

diff --git a/actions/create_thumbnails.php b/actions/create_thumbnails.php
new file mode 100644
index 000000000..3fefb4f0d
--- /dev/null
+++ b/actions/create_thumbnails.php
@@ -0,0 +1,61 @@
+getFilename();
+	$container_guid = $image->container_guid;
+	if (!$filename || !$container_guid) {
+		echo "Error retrieving information about the image";
+		return;
+	}
+	
+	$title = $image->title;
+	$prefix = "image/" . $container_guid . "/";
+	$filestorename = substr($filename, strlen($prefix));
+	
+	$image_lib = get_plugin_setting('image_lib', 'tidypics');
+	if (!$image_lib)
+		$image_lib = "GD";
+	
+	if ($image_lib == 'ImageMagick') { // ImageMagick command line
+		
+		if (tp_create_imagick_cmdline_thumbnails($image, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
+			echo "Failed to create thumbnails";
+		}
+		
+	} else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP 
+		
+		if (tp_create_imagick_thumbnails($image, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
+			echo "Failed to create thumbnails";
+		}
+	
+	} else { 
+		
+		if (tp_create_gd_thumbnails($image, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
+			echo "Failed to create thumbnails";
+		}
+		
+	} // end of image library selector
+	
+	echo "wwwroot}mod/tidypics/thumbnail.php?file_guid={$guid}&size=large\" alt=\"{$title}\" />";
+				
+?>
diff --git a/actions/imtest.php b/actions/imtest.php
index 6ab2b7b8f..8d5171785 100644
--- a/actions/imtest.php
+++ b/actions/imtest.php
@@ -1,6 +1,6 @@
 guid);
 
 		// update user/group size for checking quota
diff --git a/contributions.txt b/contributions.txt
index 0e947c122..f3427eaca 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -2,7 +2,7 @@ See individual change logs for contributors to those builds
 
 ------------------------------------------------------------------------
 Version 1.6.2 Change List
-Release Date: 
+Release Date: 09/03/2009
 ------------------------------------------------------------------------
 BEGIN VERSION 1.6.2 CHANGES
 ------------------------------------------------------------------------
diff --git a/languages/en.php b/languages/en.php
index 83e600936..f3abfc27e 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -53,6 +53,7 @@
 			'tidypics:settings' => 'Settings',
 			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
 			'tidypics:settings:image_lib' => "Image Library",
+			'tidypics:settings:thumbnail' => "Thumbnail Creation",
 			'tidypics:settings:download_link' => "Show download link",
 			'tidypics:settings:tagging' => "Enable photo tagging",
 			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
@@ -68,7 +69,8 @@
 			'tidypics:settings:largesize' => "Primary image size",
 			'tidypics:settings:smallsize' => "Album view image size",
 			'tidypics:settings:thumbsize' => "Thumbnail image size",
-
+			'tidypics:settings:im_id' => "Image ID",
+	
 		//actions
 
 			'album:create' => "Create new album",
diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php
index 8f71c75f2..deb32d0f3 100644
--- a/views/default/tidypics/admin/imagelib.php
+++ b/views/default/tidypics/admin/imagelib.php
@@ -18,24 +18,26 @@
 	if (get_plugin_setting('tagging', 'tidypics') != "disabled")
 		$num_tags = count_annotations(0, 'object', 'image', 'phototag');
 ?>
-
        
 
        
+
        Overview
        
+
        
 An image library is required by Tidypics to perform various manipulations: resizing on upload, watermarking, rotation, and cropping.
 There are three image library options with Tidypics: PHP extension GD, 
 ImageMagick called via a system call, and the PHP extension 
 imagick. GD is the most common of the three on hosted servers but suffers 
 from serious memory usage problems when resizing photos. If you have access to ImageMagick (whether through system calls or the
 PHP extension), we recommend that you use that.
-
        
+
        
 
        Testing ImageMagick Commandline
        
+
        
 To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can check our 
 server analysis page to find out the 
 configuration of your server. Next, you need to determine the path to ImageMagick on your server. Your hosting service should 
 be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of 
 ImageMagick installed on your server.  
 
        
-
        
 
        
+
        
 
        
 
 
diff --git a/views/default/tidypics/admin/thumbnails.php b/views/default/tidypics/admin/thumbnails.php
new file mode 100644
index 000000000..0af59090e
--- /dev/null
+++ b/views/default/tidypics/admin/thumbnails.php
@@ -0,0 +1,33 @@
+
        
+
        Overview
        
+
        
+This page allows you to create thumbnails for images when the thumbnail creation failed during upload. 
+You may experience problems with thumbnail creation if your image library in not configured properly or
+if there is not enough memory for the GD library to load and resize an image. If your users have 
+experienced problems with thumbnail creation and you have modified your setup, you can try to redo the
+thumbnails. Find the unique identifier of the photo (it is the number near the end of the url when viewing
+a photo) and enter it below. 
+
        
+
        Thumbnail Creation
        
+
        
+:
+
+
+
        
+
        
+
\ No newline at end of file
diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
index 3d31bd52e..7aeb3a195 100644
--- a/views/default/tidypics/admin/tidypics.php
+++ b/views/default/tidypics/admin/tidypics.php
@@ -7,6 +7,7 @@
 	$settingsselect = ''; 
 	$statsselect = '';
 	$imagelibselect = '';
+	$thumbnailselect = '';
 	switch($tab) {
 		case 'settings':
 			$settingsselect = 'class="selected"';
@@ -17,6 +18,9 @@
 		case 'imagelib':
 			$imagelibselect = 'class="selected"';
 			break;
+		case 'thumbnail':
+			$thumbnailselect = 'class="selected"';
+			break;
 	}
 	
 ?>
@@ -26,6 +30,7 @@
 			
      • >
        • 
 			
      • >
        • 
 			
      • >
        • 
+			
      • >
        • 
 		
      
 	
      
 
 
      
-- 
cgit v1.2.3


From efa3b16151f59d57b7ac8280f10b5db83c29ce97 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 9 Sep 2009 01:11:15 +0000
Subject: using filename if no title given

---
 actions/edit_multi.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/actions/edit_multi.php b/actions/edit_multi.php
index 08947f1a4..92252b6dd 100644
--- a/actions/edit_multi.php
+++ b/actions/edit_multi.php
@@ -2,6 +2,7 @@
 	/**
 	 * Elgg album: multi image edit action
 	 * 
+	 * This is called when uploading images
 	 */
 	 
 	// Make sure we're logged in 
@@ -25,8 +26,11 @@
 			// Convert string of tags into a preformatted array
 			$tagarray = string_to_tag_array($tags_array[$key]);
 
-			//set description appropriately
-			$image->title = $title_array[$key];
+			//set title appropriately
+			if ($title_array[$key])
+				$image->title = $title_array[$key];
+			else
+				$image->title = substr($image->originalfilename, 0, strrpos($image->originalfilename, '.'));
 			
 			//set description appropriately
 			$image->description = $caption_array[$key];
-- 
cgit v1.2.3


From abb0bcd5c36a43ebc7bc5ed41c197566ed585113 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 9 Sep 2009 01:44:34 +0000
Subject: getting back to working on watermarking

---
 lib/watermark.php                         | 43 ++++++++++++++++++++++++++-----
 views/default/tidypics/forms/settings.php |  2 --
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/lib/watermark.php b/lib/watermark.php
index 2263bdd8f..160dd48b4 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -3,7 +3,7 @@
 function tp_process_watermark_text($text, $owner) {
 	global $CONFIG;
 
-	$text = str_replace("%username%", $owner->username, $text);
+	$text = str_replace("%name%", $owner->name, $text);
 	$text = str_replace("%sitename%", $CONFIG->sitename, $text);
 	
 	return $text;
@@ -45,7 +45,7 @@ function tp_gd_watermark($image) {
 	$top = $image_height - $line_height - 10;
 	$left = round(($image_width - $line_width) / 2);
 	
-	$textcolor = imagecolorallocate($image, 0, 0, 255);
+	$textcolor = imagecolorallocate($image, 50, 50, 50);
 	imagestring($image, $font, $left, $top, $watermark_text, $textcolor);
 }
 
@@ -63,10 +63,38 @@ function tp_imagick_watermark($filename) {
 	$ext = ".png";
 	
 	$user_stamp_base = tp_get_watermark_filename($watermark_text, $owner);
+
+	$watermark  = array();  
+	$image = new Imagick($filename);
+	$draw = new ImagickDraw();  
+	$draw->setGravity(Imagick::GRAVITY_CENTER);  
+	# $draw->setFont($font);  
+	# $draw->setFontSize($font_size);  
+	$textColor = new ImagickPixel("black");  
+	$draw->setFillColor($textColor);  
+	
+	$im = new imagick();  
+	$properties = $im->queryFontMetrics($draw, $watermark_text);  
+	$watermark['w'] = intval($properties["textWidth"] + 5);  
+	$watermark['h'] = intval($properties["textHeight"] + 5);  
+	$im->newImage($watermark['w'],$watermark['h'],new ImagickPixel("transparent"));  
+	$im->setImageFormat("jpg");  
+	$im->annotateImage($draw, 0, 0, 0, $watermark_text);  
+	$watermark = $im->clone();  
+	$watermark->setImageBackgroundColor($textColor);  
+	$watermark->shadowImage(80, 2, 2, 2);  
+	$watermark->compositeImage($im, Imagick::COMPOSITE_OVER, 0, 0);  
+	$image->compositeImage($watermark, Imagick::COMPOSITE_OVER, 0, 0);  
+
+	if ($image->writeImage($filename) != true) {
+		$image->destroy();
+		return false;
+	}
 	
-	
-	if ( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
+	$image->destroy();
 /*
+	if ( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
+
 	$commands = array();
 		$commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70  text 0,0  \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"';
 		$commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white  text  1,1  \''. $watermark_text . '\' text  0,0  \''. $watermark_text . '\' fill black  text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext;
@@ -78,9 +106,10 @@ function tp_imagick_watermark($filename) {
 		foreach( $commands as $command ) {
 			exec( $command );
 		}
-*/
-	}
 
+	}
+*/
+/*
 	try {
 		$img = new Imagick($filename);
 	} catch (ImagickException $e) {
@@ -112,7 +141,7 @@ function tp_imagick_watermark($filename) {
 	}
 	
 	$img->destroy();
-	
+*/	
 	return true;
 }
 
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index 9565ddb1f..6ab9dfcc9 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -70,10 +70,8 @@
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
 
 	// Watermark Text
-/*
 	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
-*/
 
 	// Max Image Size
 	$maxfilesize = $plugin->maxfilesize;
-- 
cgit v1.2.3


From 8f6b46e203c6deab1c1e06c5e2aadd70bbed765f Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 13 Sep 2009 14:08:47 +0000
Subject: updated to work with Elgg 1.6.1 - bug fix exposed problem with the
 lists code - not specifying full view = false

---
 pages/lists/friendmostviewed.php             | 2 +-
 pages/lists/highestrated.php                 | 2 +-
 pages/lists/mostcommentedimages.php          | 2 +-
 pages/lists/mostcommentedimagesthismonth.php | 2 +-
 pages/lists/mostcommentedimagestoday.php     | 2 +-
 pages/lists/mostviewedimages.php             | 2 +-
 pages/lists/mostviewedimageslastmonth.php    | 2 +-
 pages/lists/mostviewedimagesthismonth.php    | 2 +-
 pages/lists/mostviewedimagesthisyear.php     | 2 +-
 pages/lists/mostviewedimagestoday.php        | 2 +-
 pages/lists/recentlycommented.php            | 2 +-
 pages/lists/recentlyviewed.php               | 2 +-
 pages/lists/yourmostviewed.php               | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pages/lists/friendmostviewed.php b/pages/lists/friendmostviewed.php
index 793304edc..07fcd39b5 100644
--- a/pages/lists/friendmostviewed.php
+++ b/pages/lists/friendmostviewed.php
@@ -52,7 +52,7 @@
 	
 	$title = sprintf(elgg_echo("tidypics:friendmostviewed"), $friendname);
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 
diff --git a/pages/lists/highestrated.php b/pages/lists/highestrated.php
index bacb7ba86..e05e7a9ba 100644
--- a/pages/lists/highestrated.php
+++ b/pages/lists/highestrated.php
@@ -58,7 +58,7 @@
 	$album = get_entity($album_id);
 	$title = $album["title"] . ": " . elgg_echo("tidypics:highestrated");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 
diff --git a/pages/lists/mostcommentedimages.php b/pages/lists/mostcommentedimages.php
index e22d3863e..801409fdc 100644
--- a/pages/lists/mostcommentedimages.php
+++ b/pages/lists/mostcommentedimages.php
@@ -37,7 +37,7 @@
 	tidypics_mostviewed_submenus();
 	$title = elgg_echo("tidypics:mostcommented");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/mostcommentedimagesthismonth.php b/pages/lists/mostcommentedimagesthismonth.php
index 88b8371ee..d95e2aff5 100644
--- a/pages/lists/mostcommentedimagesthismonth.php
+++ b/pages/lists/mostcommentedimagesthismonth.php
@@ -44,7 +44,7 @@
 	tidypics_mostviewed_submenus();
 	$title = elgg_echo("tidypics:mostcommentedthismonth");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/mostcommentedimagestoday.php b/pages/lists/mostcommentedimagestoday.php
index d35ac468d..bd1a0cbec 100644
--- a/pages/lists/mostcommentedimagestoday.php
+++ b/pages/lists/mostcommentedimagestoday.php
@@ -44,7 +44,7 @@
 	tidypics_mostviewed_submenus();
 	$title = elgg_echo("tidypics:mostcommentedtoday");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index bd1b3ee92..da8a20b5f 100644
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -35,7 +35,7 @@
 	}
 	$title = elgg_echo("tidypics:mostviewed");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/mostviewedimageslastmonth.php b/pages/lists/mostviewedimageslastmonth.php
index c5edec3d9..1ed9161f7 100644
--- a/pages/lists/mostviewedimageslastmonth.php
+++ b/pages/lists/mostviewedimageslastmonth.php
@@ -44,7 +44,7 @@
 	tidypics_mostviewed_submenus();
 	$title = elgg_echo("tidypics:mostviewedlastmonth");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/mostviewedimagesthismonth.php b/pages/lists/mostviewedimagesthismonth.php
index dfdb6136a..bfe08e1da 100644
--- a/pages/lists/mostviewedimagesthismonth.php
+++ b/pages/lists/mostviewedimagesthismonth.php
@@ -44,7 +44,7 @@
 	tidypics_mostviewed_submenus();
 	$title = elgg_echo("tidypics:mostviewedthismonth");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/mostviewedimagesthisyear.php b/pages/lists/mostviewedimagesthisyear.php
index e6c8a53db..fe1a63d38 100644
--- a/pages/lists/mostviewedimagesthisyear.php
+++ b/pages/lists/mostviewedimagesthisyear.php
@@ -44,7 +44,7 @@
 	tidypics_mostviewed_submenus();
 	$title = elgg_echo("tidypics:mostviewedthisyear");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/mostviewedimagestoday.php b/pages/lists/mostviewedimagestoday.php
index 9845506eb..f8e844753 100644
--- a/pages/lists/mostviewedimagestoday.php
+++ b/pages/lists/mostviewedimagestoday.php
@@ -44,7 +44,7 @@
 	tidypics_mostviewed_submenus();
 	$title = elgg_echo("tidypics:mostviewedtoday");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index da0f2a12a..fd1a24454 100644
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -46,7 +46,7 @@
 	}
 	$title = elgg_echo("tidypics:recentlycommented");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/recentlyviewed.php b/pages/lists/recentlyviewed.php
index b8a5531b2..6189b07de 100644
--- a/pages/lists/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -39,7 +39,7 @@
 	
 	$title = elgg_echo("tidypics:recentlyviewed");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/yourmostviewed.php b/pages/lists/yourmostviewed.php
index 6a2114d19..b00ddafa1 100644
--- a/pages/lists/yourmostviewed.php
+++ b/pages/lists/yourmostviewed.php
@@ -36,7 +36,7 @@
 	
 	$title = elgg_echo("tidypics:yourmostviewed");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From a56e1fefd6beb9de67570dda6b939c126be9ca7e Mon Sep 17 00:00:00 2001
From: dkotrada 
Date: Sun, 13 Sep 2009 16:14:20 +0000
Subject: Alpha Version 0.1

---
 languages/de.php | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/languages/de.php b/languages/de.php
index bca483af1..fd5f1a61b 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -1,7 +1,7 @@
  "Deine Fotoalben",
 			'album:yours:friends' => "Fotoalben deiner Freunde",
 			'album:user' => "%s's Fotoalben",
-			'album:friends' => "%s's Fotoalben von Freunden",
+			'album:friends' => "Fotoalben von %s's Freunden",
 			'album:all' => "Alle Fotoalben",
 			'album:group' => "Gruppenalben",
 			'item:object:image' => "Fotos",
 			'item:object:album' => "Alben",
 			'tidypics:enablephotos' => 'Schalte Gruppenalben frei',
-			'tidypics:editprops' => 'Bearbeite Bildereigenschaften',
-			'tidypics:mostcommented' => 'Am häufigsten kommentierte Bilder',
-			'tidypics:mostcommentedthismonth' => 'Am häufigsten kommentierte Bilder des Monats',
-			'tidypics:mostcommentedtoday' => 'Am häufigsten kommentierte Bilder des Tages',
-			'tidypics:mostviewed' => 'Am häufigsten gezeigte Bilder',
-			'tidypics:mostvieweddashboard' => 'Am häufigsten gezeigteS dashboard',
-			'tidypics:mostviewedthisyear' => 'Am häufigsten gezeigte des Jahres',
-			'tidypics:mostviewedthismonth' => 'Am häufigsten gezeigte des Monats',
-			'tidypics:mostviewedlastmonth' => 'Am häufigsten gezeigte des letzten Monats',
+			'tidypics:editprops' => 'Bild bearbeiten',
+			'tidypics:mostcommented' => 'meist kommentierte',
+			'tidypics:mostcommentedthismonth' => 'Meist kommentierte des Monats',
+			'tidypics:mostcommentedtoday' => 'Meist kommentierte des Tages',
+			'tidypics:mostviewed' => 'Meist gesehene Bilder',
+			'tidypics:mostvieweddashboard' => 'Meist gesehene dashboard',
+			'tidypics:mostviewedthisyear' => 'Meist gesehene des Jahres',
+			'tidypics:mostviewedthismonth' => 'Meist gesehene des Monats',
+			'tidypics:mostviewedlastmonth' => 'Meist gesehen im letzten Monat',
 			'tidypics:mostviewedtoday' => 'Am häufigsten gezeigte des Tages',
 			'tidypics:recentlyviewed' => 'Zuletzt angezeigte Bilder',
-			'tidypics:mostrecent' => 'Letzte Bilder',
-			'tidypics:yourmostviewed' => 'Deine am häufigsten gezeigten Bilder',
-			'tidypics:yourmostrecent' => 'Deine letzten Bilder',
-			'tidypics:friendmostviewed' => "%s's m häufigsten gezeigten Bilder",
-			'tidypics:friendmostrecent' => "%s's letzte Bilder",
-			'tidypics:highestrated' => "Am höchsten bewertete Bilder",
+            'tidypics:recentlycommented' => 'Zuletzt kommentiert',
+			'tidypics:mostrecent' => 'Community neue Bilder',
+			'tidypics:yourmostviewed' => 'Deine meist gesehene',
+			'tidypics:yourmostrecent' => 'Zuletzt von dir hochgeladen',
+			'tidypics:friendmostviewed' => "%s's meist gesehene",
+			'tidypics:friendmostrecent' => "Zuletzt hochgeladen von %s",
+			'tidypics:highestrated' => "Am höchsten bewertet",
 			'tidypics:viewsbyowner' => "Aufrufe: %s von %s Mitglieder (du ausgeschlossen)",
 			'tidypics:viewsbyothers' => "Aufrufe: %s (%s von dir)",
 			'tidypics:administration' => 'Tidypics Administration',
@@ -74,8 +75,8 @@
 
 		//actions
 
-			'album:create' => "Lege neues Album an",
-			'album:add' => "Fotoalbum hinzufügen",
+			'album:create' => "Neues Album erstellen",
+			'album:add' => "Album hinzufügen",
 			'album:addpix' => "Fotos hinzufügen",
 			'album:edit' => "Album bearbeiten",
 			'album:delete' => "Album löschen",
@@ -89,7 +90,7 @@
 			'album:title' => "Titel",
 			'album:desc' => "Beschreibung",
 			'album:tags' => "Stichwörter",
-			'album:cover' => "Albumcover erstellen?",
+			'album:cover' => "Das bild als Albumcover nutzen",
 			'tidypics:quota' => "Quota usage:",
 
 		//views
-- 
cgit v1.2.3


From 35175e8b885c00f2120d19d89b8177c384db68d8 Mon Sep 17 00:00:00 2001
From: dkotrada 
Date: Sun, 13 Sep 2009 20:35:39 +0000
Subject: New Beta Languagefile for v1.6

---
 languages/de.php | 138 +++++++++++++++++++++++++++----------------------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/languages/de.php b/languages/de.php
index fd5f1a61b..c378b325c 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -1,7 +1,7 @@
  "Beschreibung",
 			'photos' => "Fotos",
 			'images:upload' => "Fotos hochladen",
-			'images:multiupload' => "Flash Multi Upload Tool",
+			'images:multiupload' => "Flash Multi-Upload Tool",
 			'images:multiupload:todo' => "Ein oder mehrere Bilder zum Hochladen wählen!",
 			'album' => "Fotoalbum",
 			'albums' => "Fotoalben",
@@ -25,7 +25,7 @@
 			'album:user' => "%s's Fotoalben",
 			'album:friends' => "Fotoalben von %s's Freunden",
 			'album:all' => "Alle Fotoalben",
-			'album:group' => "Gruppenalben",
+			'album:group' => "Gruppen-Alben",
 			'item:object:image' => "Fotos",
 			'item:object:album' => "Alben",
 			'tidypics:enablephotos' => 'Schalte Gruppenalben frei',
@@ -39,11 +39,11 @@
 			'tidypics:mostviewedthismonth' => 'Meist gesehene des Monats',
 			'tidypics:mostviewedlastmonth' => 'Meist gesehen im letzten Monat',
 			'tidypics:mostviewedtoday' => 'Am häufigsten gezeigte des Tages',
-			'tidypics:recentlyviewed' => 'Zuletzt angezeigte Bilder',
+			'tidypics:recentlyviewed' => 'Zuletzt angezeigt',
             'tidypics:recentlycommented' => 'Zuletzt kommentiert',
 			'tidypics:mostrecent' => 'Community neue Bilder',
 			'tidypics:yourmostviewed' => 'Deine meist gesehene',
-			'tidypics:yourmostrecent' => 'Zuletzt von dir hochgeladen',
+			'tidypics:yourmostrecent' => 'Zuletzt hochgeladen',
 			'tidypics:friendmostviewed' => "%s's meist gesehene",
 			'tidypics:friendmostrecent' => "Zuletzt hochgeladen von %s",
 			'tidypics:highestrated' => "Am höchsten bewertet",
@@ -54,29 +54,29 @@
 
 		//settings
 			'tidypics:settings' => 'Einstellungen',
-			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
+			'tidypics:admin:instructions' => 'Das sind die Tidypics Einstellungen',
 			'tidypics:settings:image_lib' => "Image Library: ",
-			'tidypics:settings:download_link' => "Show download link",
-			'tidypics:settings:tagging' => "Enable photo tagging",
-			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
-			'tidypics:settings:exif' => "Show EXIF data",
-			'tidypics:settings:view_count' => "View counter",
-			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
-			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
-			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
-			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick Cmdline must be selected for the image library",
-			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands (with trailing slash)",
-			'tidypics:settings:img_river_view' => "How many entries in river for each batch of uploaded images",
-			'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",
-			'tidypics:settings:largesize' => "Primary image size",
-			'tidypics:settings:smallsize' => "Album view image size",
-			'tidypics:settings:thumbsize' => "Thumbnail image size",
+			'tidypics:settings:download_link' => "Zeige Download-Link",
+			'tidypics:settings:tagging' => "Erlaube Foto-Links",
+			'tidypics:settings:photo_ratings' => "Erlaube Foto Bewertungen (benötigt rate plugin of Miguel Montes oder passendes)",
+			'tidypics:settings:exif' => "Zeige EXIF data",
+			'tidypics:settings:view_count' => "Zeige Zähler",
+			'tidypics:settings:grp_perm_override' => "Erlaube den Gruppen-Mitgliedern unbeschränkten zugagn zur verwaltung von Gruppen-Alben",
+			'tidypics:settings:maxfilesize' => "Maximale Bildgröße in Megabytes (MB):",
+			'tidypics:settings:quota' => "Benutzer/Gruppen Speicherplatz in (MB) (0 = Kein Speicherplatz)",
+			'tidypics:settings:watermark' => "Gib den Text für den Wasserzeichen ein - ImageMagick Cmdline muss ausgewählt sein für die Bildbibliothek",
+			'tidypics:settings:im_path' => "Gib den Pfad zu ImageMagick Befehle (mit abschließendem Slasch)",
+			'tidypics:settings:img_river_view' => "Wie viele Einträge in der aktivitäten Liste beim Upload von mehreren Bildern",
+			'tidypics:settings:album_river_view' => "Zeige Albumcover oder ein Set von Fotos für neuen Album",
+			'tidypics:settings:largesize' => "Bild-Größe",
+			'tidypics:settings:smallsize' => "Album-Tumbnail Bild-Größe",
+			'tidypics:settings:thumbsize' => "Thumbnail Bild-Größe",
 
 
 		//actions
 
-			'album:create' => "Neues Album erstellen",
-			'album:add' => "Album hinzufügen",
+			'album:create' => "Album hinzufügen",
+			'album:add' => "Neues Album hinzufügen",
 			'album:addpix' => "Fotos hinzufügen",
 			'album:edit' => "Album bearbeiten",
 			'album:delete' => "Album löschen",
@@ -91,7 +91,7 @@
 			'album:desc' => "Beschreibung",
 			'album:tags' => "Stichwörter",
 			'album:cover' => "Das bild als Albumcover nutzen",
-			'tidypics:quota' => "Quota usage:",
+			'tidypics:quota' => "Speicherplatz:",
 
 		//views
 
@@ -104,32 +104,32 @@
 			'image:next' => "Nächstes",
 
 		// tagging
-			'tidypics:taginstruct' => 'Wähle den Bereich, den du taggen möchstest, aus',
-			'tidypics:deltag_title' => 'Wähle zu löschende Tags',
-			'tidypics:finish_tagging' => 'Stop tagging',
-			'tidypics:tagthisphoto' => 'Tagge dieses Foto',
-			'tidypics:deletetag' => 'Lösche Foto tag',
-			'tidypics:actiontag' => 'Tag',
+			'tidypics:taginstruct' => 'Wähle ein Bereich auf dem Foto den du Verlinken willst',
+			'tidypics:deltag_title' => 'Wähle zu löschende Links',
+			'tidypics:finish_tagging' => 'Abbrechen',
+			'tidypics:tagthisphoto' => 'Link zum Foto hinzufügen',
+			'tidypics:deletetag' => 'Lösche Foto-Link',
+			'tidypics:actiontag' => 'Link',
 			'tidypics:actiondelete' => 'Löschen',
 			'tidypics:actioncancel' => 'Abbrechen',
 			'tidypics:inthisphoto' => 'in diesem Foto',
-			'tidypics:usertag' => "Foto tagged mit Mitglied %s",
-			'tidypics:phototagging:success' => 'Photo tag was successfully added',
-			'tidypics:phototagging:error' => 'Unerwarteter Fehler aufgetreten beim taggen',
-			'tidypics:deletetag:success' => 'Ausgewählte Tags wurden erfolgreich gelöscht',
+			'tidypics:usertag' => "Foto verlinkt mit Mitglied %s",
+			'tidypics:phototagging:success' => 'Foto-Link erfolgreich hinzugefügt',
+			'tidypics:phototagging:error' => 'Unerwarteter Fehler beim verlinken',
+			'tidypics:deletetag:success' => 'Ausgewählte Links wurden erfolgreich gelöscht',
 
 
 		//rss
-			'tidypics:posted' => 'posted a photo:',
+			'tidypics:posted' => 'Das Bild eingestellt:',
 
 		//widgets
 
 			'tidypics:widget:albums' => "Fotoalben",
-			'tidypics:widget:album_descr' => "Zeige Deine neuesten Fotoalben",
-			'tidypics:widget:num_albums' => "Anzahl der anzuzeigenden Alben",
-			'tidypics:widget:latest' => "Latest Photos",
-			'tidypics:widget:latest_descr' => "Display your latest photos",
-			'tidypics:widget:num_latest' => "Number of images to display",
+			'tidypics:widget:album_descr' => "Zeige neuste Alben",
+			'tidypics:widget:num_albums' => "Anzahl der Alben",
+			'tidypics:widget:latest' => "Neuste Bilder",
+			'tidypics:widget:latest_descr' => "Zeige neuste Bilder",
+			'tidypics:widget:num_latest' => "Anzahl der Bilder",
 			'album:more' => "Alle Alben ansehen",
 
 		//river
@@ -140,52 +140,52 @@
 			'image:river:annotate' => "einen Kommentar zum Bild",
 
 			//albums
-			'album:river:created' => "%s hat ein neues Fotoalbum erstellt",
+			'album:river:created' => "%s hat ein neues Album erstellt",
 			'album:river:group' => "in der Gruppe",
 			'album:river:item' => "ein Album",
-			'album:river:annotate' => "einen Kommentar zum Fotoalbum",
+			'album:river:annotate' => "einen Kommentar zum Album",
 
 		//notifications
 			'tidypics:newalbum' => 'Neues Fotoalbum',
 
 
 		//  Status messages
-			'tidypics:upl_success' => "Deine Bilder wurden erfolgreich hochgeladen.",
-			'image:saved' => "Dein Bild wurde gespeichert.",
-			'images:saved' => "Alle Bilder wurden gespeichert.",
-			'image:deleted' => "Dein Bild wurde gelöscht.",
+			'tidypics:upl_success' => "Die Bilder sind erfolgreich hochgeladen",
+			'image:saved' => "Das Bild wurde gespeichert",
+			'images:saved' => "Alle Bilder sind gespeichert",
+			'image:deleted' => "Das Bild wurde gelöscht",
 			'image:delete:confirm' => "Willst du das Bild wirklich löschen?",
 
-			'images:edited' => "Dein Bild wurde aktualisiert.",
-			'album:edited' => "Dein Album wurde aktualisiert.",
-			'album:saved' => "Dein Album wurde gespeichert.",
-			'album:deleted' => "Dein Album wurde gelöscht.",
+			'images:edited' => "Das Bild wurde aktualisiert",
+			'album:edited' => "Das Album wurde aktualisiert",
+			'album:saved' => "Das Album wurde gespeichert",
+			'album:deleted' => "Das Album wurde gelöscht",
 			'album:delete:confirm' => "Willst du das Album wirklich löschen?",
-			'album:created' => "Ihr neues Album ist hergestellt worden.",
-			'tidypics:settings:save:ok' => 'Tidypics plugin Einstellungen erfolgreich gespeichert',
+			'album:created' => "Dein neues Album ist erstellt",
+			'tidypics:settings:save:ok' => 'Tidypics Einstellungen erfolgreich gespeichert',
 			'tidypics:upgrade:success' => 'Upgrade von Tidypics erfolgreich',
 
 		//Error messages
 
-			'tidypics:partialuploadfailure' => "Es sind Fehler beim Hochladen einiger Bilder aufgetreten (%s von %s Bildern).",
-			'tidypics:completeuploadfailure' => "Upload of images failed.",
-			'tidypics:exceedpostlimit' => "Zuviel große Bilder - versuche weinger oder kleinere Bilder hochzuladen.",
-			'tidypics:noimages' => "Keine Bilder ausgewählt.",
-			'tidypics:image_mem' => "Bildgröße zu groß - zuviele Bytes",
-			'tidypics:image_pixels' => "Bild hat zuviele Pixel",
-			'tidypics:unk_error' => "Unbekannte upload Fehler",
-			'tidypics:save_error' => "Unknown error saving the image on server",
-			'tidypics:not_image' => "Bildtyp wurde nicht erkannt",
-			'image:deletefailed' => "Dein Bild konnte nicht gelöscht werden.",
-			'image:downloadfailed' => "Sorry; dieses Bild ist zur Zeit nicht vorhanden.",
-			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
-			'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator",
+			'tidypics:partialuploadfailure' => "Es sind Fehler beim Hochladen einiger Bilder aufgetreten (%s von %s Bildern)",
+			'tidypics:completeuploadfailure' => "Bilder-Upload fehlgeschlagen",
+			'tidypics:exceedpostlimit' => "Zuviele große Bilder auf einmal - versuche weniger oder kleinere Bilder hochzuladen",
+			'tidypics:noimages' => "Keine Bilder zum Upload ausgewählt",
+			'tidypics:image_mem' => "Das Bild ist zu groß",
+			'tidypics:image_pixels' => "Das Bild hat zuviele Pixel",
+			'tidypics:unk_error' => "Unbekannte Fehler beim Upload ",
+			'tidypics:save_error' => "Unbekanntes Fehler beim speichern des Bildes auf dem Server",
+			'tidypics:not_image' => "Das Bild-Typ wurde nicht erkannt",
+			'image:deletefailed' => "Dein Bild konnte nicht gelöscht werden",
+			'image:downloadfailed' => "Fehler: Das Bild ist zur Zeit nicht verfügbar",
+			'tidypics:nosettings' => "Admin dieser Seite hat keine Einstellungen für Fotoalben vorgenommen",
+			'tidypics:exceed_quota' => "Dir zugewiesener Speicherplatz ist ausgeschöpft!",
 			'images:notedited' => "Nicht alle Bilder konnten erfolgreich upgedated werden",
 
-			'album:none' => "Es wurde kein Album .",
-			'album:uploadfailed' => "Sorry; dein Album konnte nicht gespeichert werden.",
-			'album:deletefailed' => "Dein Album konnte nicht gelöscht werden.",
-			'album:blank' => "Bitte geib diesem Album einen Titel und eine Beschreibung.",
+			'album:none' => "Bis jetzt keine Alben erstellt",
+			'album:uploadfailed' => "Dein Album konnte nicht gespeichert werden",
+			'album:deletefailed' => "Dein Album konnte nicht gelöscht werden",
+			'album:blank' => "Bitte gib diesem Album einen Titel und eine Beschreibung",
 
 			'tidypics:upgrade:failed' => "Upgrade von Tidypics gescheitert",
 	);
-- 
cgit v1.2.3


From 6b156c9e10c6b832c8ab4c21edf6eac5ea301b98 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 13 Sep 2009 23:56:59 +0000
Subject: tweaked GD watermarking and added a better imagick watermarking

---
 languages/en.php  |  2 +-
 lib/watermark.php | 93 ++++++++++---------------------------------------------
 2 files changed, 18 insertions(+), 77 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index f3abfc27e..036884799 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -62,7 +62,7 @@
 			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
 			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
-			'tidypics:settings:watermark' => "Enter text to appear in the watermark - ImageMagick Cmdline must be selected for the image library",
+			'tidypics:settings:watermark' => "Enter text to appear in the watermark - not for production sites yet",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands (with trailing slash)",
 			'tidypics:settings:img_river_view' => "How many entries in river for each batch of uploaded images",
 			'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",
diff --git a/lib/watermark.php b/lib/watermark.php
index 160dd48b4..13eb598a0 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -45,103 +45,44 @@ function tp_gd_watermark($image) {
 	$top = $image_height - $line_height - 10;
 	$left = round(($image_width - $line_width) / 2);
 	
-	$textcolor = imagecolorallocate($image, 50, 50, 50);
+	imagealphablending($image, true);
+	$textcolor = imagecolorallocatealpha($image, 50, 50, 50, 50);
 	imagestring($image, $font, $left, $top, $watermark_text, $textcolor);
 }
 
 function tp_imagick_watermark($filename) {
+
 	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
 	if (!$watermark_text)
 		return;
 	
-
-	
 	$owner = get_loggedin_user();
 
 	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
 	
-	$ext = ".png";
-	
-	$user_stamp_base = tp_get_watermark_filename($watermark_text, $owner);
+    $img = new Imagick($filename);
 
-	$watermark  = array();  
-	$image = new Imagick($filename);
-	$draw = new ImagickDraw();  
-	$draw->setGravity(Imagick::GRAVITY_CENTER);  
-	# $draw->setFont($font);  
-	# $draw->setFontSize($font_size);  
-	$textColor = new ImagickPixel("black");  
-	$draw->setFillColor($textColor);  
-	
-	$im = new imagick();  
-	$properties = $im->queryFontMetrics($draw, $watermark_text);  
-	$watermark['w'] = intval($properties["textWidth"] + 5);  
-	$watermark['h'] = intval($properties["textHeight"] + 5);  
-	$im->newImage($watermark['w'],$watermark['h'],new ImagickPixel("transparent"));  
-	$im->setImageFormat("jpg");  
-	$im->annotateImage($draw, 0, 0, 0, $watermark_text);  
-	$watermark = $im->clone();  
-	$watermark->setImageBackgroundColor($textColor);  
-	$watermark->shadowImage(80, 2, 2, 2);  
-	$watermark->compositeImage($im, Imagick::COMPOSITE_OVER, 0, 0);  
-	$image->compositeImage($watermark, Imagick::COMPOSITE_OVER, 0, 0);  
-
-	if ($image->writeImage($filename) != true) {
-		$image->destroy();
-		return false;
-	}
-	
-	$image->destroy();
-/*
-	if ( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
+    $img->readImage($image);
 
-	$commands = array();
-		$commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70  text 0,0  \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"';
-		$commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white  text  1,1  \''. $watermark_text . '\' text  0,0  \''. $watermark_text . '\' fill black  text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext;
-		$commands[] = $im_path . 'composite -compose CopyOpacity  "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"';
-		$commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"';
-		$commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"';
-		$commands[] = 'rm "' . $user_stamp_base . '_fgnd' . $ext . '"';
-		
-		foreach( $commands as $command ) {
-			exec( $command );
-		}
+    $draw = new ImagickDraw();
 
-	}
-*/
-/*
-	try {
-		$img = new Imagick($filename);
-	} catch (ImagickException $e) {
-		return false;
-	}
-	
-	try {
-		$mask = new Imagick($user_stamp_base . $ext);
-	} catch (ImagickException $e) {
-		return false;
-	}
-	
-	$image_width = $img->getImageWidth();
-	$image_height = $img->getImageHeight();
-	$mask_width = $mask->getImageWidth();
-	$mask_height = $mask->getImageHeight();
-	
-	// matching -gravity south -geometry +0+10
-	$top = $image_height - $mask_height - 10;
-	$left = round(($image_width - $mask_width) / 2);
-	
-	$img->compositeImage($mask, Imagick::COMPOSITE_DEFAULT, $left, $top);
-	
-	$mask->destroy();
-	
+    //$draw->setFont("");
+
+    $draw->setFontSize(28);
+
+    $draw->setFillOpacity(0.5);
+
+    $draw->setGravity(Imagick::GRAVITY_SOUTH);
+
+    $img->annotateImage($draw, 0, 0, 0, $watermark_text);
+    	
 	if ($img->writeImage($filename) != true) {
 		$img->destroy();
 		return false;
 	}
 	
 	$img->destroy();
-*/	
+	
 	return true;
 }
 
-- 
cgit v1.2.3


From 2a7b64d3c02cd5eae83cfc215c6d64015035af99 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 14 Sep 2009 00:03:54 +0000
Subject: 1.6.3

---
 contributions.txt | 15 +++++++++++++++
 manifest.xml      |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/contributions.txt b/contributions.txt
index f3427eaca..4400b9689 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,20 @@
 See individual change logs for contributors to those builds
 
+------------------------------------------------------------------------
+Version 1.6.3 Change List
+Release Date: 09/13/2009
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.3 CHANGES
+------------------------------------------------------------------------
+ * Bug fixes
+ * Redo image resize if problem occurred
+ * Grab title from image by default
+ * New German language file by alfalive
+ * Preview of watermarking
+------------------------------------------------------------------------
+END VERSION 1.6.3 CHANGES
+------------------------------------------------------------------------
+
 ------------------------------------------------------------------------
 Version 1.6.2 Change List
 Release Date: 09/03/2009
diff --git a/manifest.xml b/manifest.xml
index 4da103ee5..4631aeb2d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
         
-        
+        
         
         
         
-- 
cgit v1.2.3


From e95b264ea6b476947254574e3be4ed3406a2d2fa Mon Sep 17 00:00:00 2001
From: Brett Profitt 
Date: Sun, 20 Sep 2009 02:20:05 +0000
Subject: Added functions help migrate images from Elgg's default file store to
 Tidypics.

---
 lib/migrate.php | 291 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 291 insertions(+)
 create mode 100644 lib/migrate.php

diff --git a/lib/migrate.php b/lib/migrate.php
new file mode 100644
index 000000000..43a003a3c
--- /dev/null
+++ b/lib/migrate.php
@@ -0,0 +1,291 @@
+ 0) {
+		foreach ($users as $user_guid) {
+			// reset the query cache.
+			$DB_QUERY_CACHE = array();
+			if (!$user = get_entity($user_guid)) {
+				continue;
+			}
+
+			$r = tidypics_migrate_user_pics($user);
+		}
+
+		//echo "Trying to grab $limit more users...\n";
+		$offset = $offset + $limit;
+		$users = tidypics_get_user_guids_with_pics_in_files($offset, $limit);
+	}
+
+	return $r;
+}
+
+
+/**
+ * Migrates all pictures owned by a user regardless of
+ * if they're group or user files.
+ * 
+ * @param ElggUser $user User to migrate.
+ * @return bool on success
+ */
+function tidypics_migrate_user_pics(ElggUser $user) {
+	global $CONFIG, $filestore;
+
+	// update all entity subtypes in a single go at the end.
+	$updated_guids = array();
+
+	if (!$pics = tidypics_get_user_pics_from_files($user_guid) OR count($pics) < 1) {
+		return false;
+	}
+
+	//echo "{$user->name} ({$user->getGUID()}) has " . count($pics) . " pics.\n";
+	
+	// get an album to migrate into if it already exists.
+	// will create later on if it doesn't.
+	$user_album_entities = get_entities_from_metadata('migrated_from_files', true, 'object', 'album', $user->getGUID(), 1);
+	$user_album_guid = isset($album_entities[0]) ? $album_entities[0]->getGUID() : false;
+
+	// a list of albums to randomly select a cover for on newly created albums.
+	$new_album_guids = array();
+
+	foreach ($pics as $pic) {
+		// check that it's not already in tidy pics
+		if (false !== strpos($pic->filename, 'image/')) {
+			//echo "{$pic->filename} ({$pic->getGUID()}) looks like it's already in tidy pics. Ignoring.\n";
+			continue;
+		}
+	
+		// blank some vars
+		$group_pic = $group_album_guid = $group_guid = false;
+		
+		// see if we're doing a group file migration.
+		if ($pic->container_guid != $user->getGUID() 
+			AND $group = get_entity($pic->container_guid)
+			AND $group instanceof ElggGroup
+		) {
+			//echo "{$pic->getGUID()} is in a group!\n";
+			$group_pic = true;
+			$group_guid = $group->getGUID();
+			
+			// yes, this is how you get entities by container_guid.
+			// yes, it's wrong, wrong, wrong for this function to work this way.
+			$group_album_entities = get_entities('object', 'album', $group_guid);
+			
+			// get_entities_from_metadata doesn't support container_guid (or owner_guid meaning container_guid)
+			// do it the hard way.
+			if (is_array($group_album_entities)) {
+				foreach ($group_album_entities as $group_album) {
+					if ($group_album->migrated_from_files == true) {
+						$group_album_guid = $group_album->getGUID();
+						break;
+					}
+				}
+			}
+			$album_guid = $group_album_guid;
+			$group_album_guids[] = $group_album_guid;
+		} else {
+			$album_guid = $user_album_guid;
+		}
+		
+		//echo "album_guid is $album_guid and group_pic is: $group_pic\n";
+		
+		// create an album if we need to.
+		if (!$album_guid) {
+			//echo "Creating new album...\n";
+			$album = new ElggObject();
+			$album->subtype = 'album';
+			$album->new_album = TP_NEW_ALBUM;
+			
+			if ($group_pic) {
+				$album->container_guid = $group_guid;
+				$album->owner_guid = $group->owner_guid;
+				$album->access_id = $group->group_acl;
+				$album->title = $group->name;
+			} else {
+				$album->container_guid = $user_guid;
+				$album->owner_guid = $user->getGUID();
+				$album->access_id = ACCESS_DEFAULT;
+				$album->title = $user->name;
+			}
+
+			if (!$album->save()) {
+				//echo "Couldn't migrate pics for {$user->name} ($user_guid)!\n";
+				return false;
+			}
+			$album->migrated_from_files = true;
+			$album_guid = $album->getGUID();
+			$new_album_guids[] = $album_guid;
+			
+			// save the album guid as the users
+			if (!$group_pic) {
+				$user_album_guid = $album_guid;
+			}
+		}
+		
+		if (!tidypics_migrate_pic_from_files($pic, $album_guid)) {
+			//echo "{$pic->filename} ({$pic->getGUID()}) Couldn't be migrated. Ignoring.\n";
+			continue;
+		}
+	}
+
+	// randomly pic an image to be the cover for the user gallery
+	//$album->cover = $pic_guids[array_rand($pic_guids)];
+	foreach ($new_album_guids as $guid) {
+		tidypics_set_random_cover_pic($guid);
+	}
+	
+	return true;
+}
+
+
+/**
+ * Randomly pics an image from an album to be the cover.
+ * @return bool on success
+ */
+function tidypics_set_random_cover_pic($album_guid) {
+	global $CONFIG;
+	
+	if ($album = get_entity($album_guid) AND $album instanceof TidypicsAlbum) {
+		$q = "SELECT guid FROM {$CONFIG->dbprefix}entities WHERE container_guid = $album_guid ORDER BY RAND() limit 1";
+		$pic = get_data($q);
+		
+		return $album->cover = $pic[0]->guid;
+	}
+	
+	return false;
+}
+
+/**
+ * Migrates a single pic from the file repo.
+ * @return bool on succes.
+ */
+function tidypics_migrate_pic_from_files($pic, $album_guid) {
+	global $CONFIG, $filestore;
+
+	// get the subtype id.
+	$image_subtype_id = get_subtype_id('object', 'image');
+
+	// hold which metadata on the files need to be changes
+	// also holds the images we need to move
+	$file_md_fields = array('filename', 'thumbnail', 'smallthumb', 'largethumb');
+
+	if (!$user = get_entity($pic->owner_guid)) {
+		return false;
+	}
+
+	// figure out where to move the files.
+	$matrix = $filestore->make_file_matrix($user->username);
+	$user_fs_path = $CONFIG->dataroot . $matrix;
+	$album_fs_path = $CONFIG->dataroot . $matrix . "image/$album_guid/";
+	if (!is_dir($album_fs_path)) {
+		if (!mkdir($album_fs_path, 0700, true)) {
+			return false;
+		}
+	}
+
+	// change all the 'file/'s to 'image/'s in certain metadata
+	// these are also the files we need to move.
+	foreach ($file_md_fields as $md_name) {
+		// $pic->$md_name = str_replace('file/', 'image/', $pic->$md_name);
+		$old_file = $pic->$md_name;
+		$new_file = str_replace('file/', "image/$album_guid", $old_file);
+
+		if (!($old_fp = fopen($user_fs_path . $old_file, 'r') 
+		AND $new_fp = fopen($user_fs_path . $new_file, 'w'))) {
+			//echo "Could not move {$user_fs_path}{$old_file} to {$user_fs_path}{$new_file}\n";
+			continue;
+		}
+
+		while (!feof($old_fp)) {
+			if (!fputs($new_fp, fread($old_fp, 8192))) {
+				//echo "Could not move {$user_fs_path}{$old_file} to {$user_fs_path}{$new_file} (Error writing.)\n";
+				break;
+			}
+		}
+
+		$pic->$md_name = $new_file;
+	}
+	// update container.
+	// this doesn't work...?
+	//$pic->container_guid = $album_guid;
+
+	// delete old one.
+	unlink($user_fs_path . $old_file);
+
+	$q = "UPDATE {$CONFIG->dbprefix}entities SET subtype = $image_subtype_id, container_guid = $album_guid WHERE guid = {$pic->getGUID()}";
+	//echo "Finished moving {$user_fs_path}{$old_file} to {$user_fs_path}{$new_file}\n";
+
+	return update_data($q);
+}
+
+
+/**
+ * Grabs all user IDs with images in the files repo.
+ * return mixed. False on fail, array of GUIDs on success.
+ */
+function tidypics_get_user_guids_with_pics_in_files($offset, $limit) {
+	global $CONFIG;
+	
+	//$simpletype_ms_id = add_metastring('simple_type');
+	//$image_ms_id = add_metastring('image');
+	
+	$q = "SELECT DISTINCT e.owner_guid 
+		FROM 
+			{$CONFIG->dbprefix}entities as e, 
+			{$CONFIG->dbprefix}entity_subtypes as st
+			
+		WHERE st.subtype = 'file'
+		AND e.subtype = st.id
+		LIMIT $offset, $limit";
+
+	if (!$data = get_data($q)) {
+		return false;
+	}
+	
+	// return an array of IDs
+	$r = array();
+	foreach ($data as $row) {
+		$r[] = $row->owner_guid;
+	}
+
+	return $r;
+}
+
+/**
+ * Gets a list of images for a single user.
+ * @return array of GUIDs, false on fail.
+ */
+function tidypics_get_user_pics_from_files($user_guid) {
+	if (!$user = get_entity($user_guid) AND $user instanceof ElggUser) {
+		return false;
+	}
+
+	// @todo Might have to cycle this through with standard while + foreach.
+	return get_entities_from_metadata('simpletype', 'image', 'object', 'file', $user_guid, 5000);
+}
-- 
cgit v1.2.3


From fcced216bea6c5d250c2c13cf251ef563fb99e07 Mon Sep 17 00:00:00 2001
From: Brett Profitt 
Date: Mon, 21 Sep 2009 14:43:15 +0000
Subject: Fix $user_guid that was removed in a function.

---
 lib/migrate.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/migrate.php b/lib/migrate.php
index 43a003a3c..ca68ec8c4 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -57,6 +57,8 @@ function tidypics_migrate_pics() {
 function tidypics_migrate_user_pics(ElggUser $user) {
 	global $CONFIG, $filestore;
 
+	$user_guid = $user->getGUID();
+
 	// update all entity subtypes in a single go at the end.
 	$updated_guids = array();
 
-- 
cgit v1.2.3


From a61747a62b53f342d55fef87be05b8abfbc8bf04 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 22 Sep 2009 23:30:43 +0000
Subject: small mod on server analysis to make distinction clearer between
 image magick and imagick

---
 pages/server_analysis.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/server_analysis.php b/pages/server_analysis.php
index f1f956f0b..ccffc1632 100644
--- a/pages/server_analysis.php
+++ b/pages/server_analysis.php
@@ -64,7 +64,7 @@
 			Elgg requires the GD extension to be loaded
 		
 		
-			ImageMagick PHP
+			IMagick PHP extension
 			
 			
 		
-- 
cgit v1.2.3


From 30362f5fabb71e6f0f5a7b6b9b733be11dac73e2 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 28 Sep 2009 22:08:02 +0000
Subject: consistent on owner link for search results - send to profile

---
 views/default/object/album.php | 2 +-
 views/default/object/image.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 988ad0f7c..6ef6bc356 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -58,7 +58,7 @@
  *****************************************************************************/
 
 			$info = '
      ' . $title . '
      ';
-			$info .= "
      username}\">{$owner->name} {$friendlytime}";
+			$info .= "
      username}\">{$owner->name} {$friendlytime}";
 			$numcomments = elgg_count_comments($album);
 			if ($numcomments)
 				$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 292399074..ae652fdfd 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -34,7 +34,7 @@
 		else{
 			// list view displays a thumbnail icon of the image, its title, and the number of comments
 			$info = '
      '.$title.'
      ';
-			$info .= "
      username}\">{$owner->name} {$friendlytime}";
+			$info .= "
      username}\">{$owner->name} {$friendlytime}";
 			$numcomments = elgg_count_comments($image);
 			if ($numcomments)
 				$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
-- 
cgit v1.2.3


From 28beb67d6262bd90f1b376da6eeb996faf38efe9 Mon Sep 17 00:00:00 2001
From: dkotrada 
Date: Mon, 28 Sep 2009 22:10:05 +0000
Subject: removed hardcoded language added language variable
 tidypics:uploading:images

---
 views/default/tidypics/forms/upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index 522a51c4b..077e90b1e 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -37,7 +37,7 @@
 	}
 ?>
 	
      
-		Uploading images
      
+			
      
 		
      ...
      
 	
      
 	
        
-- 
cgit v1.2.3


From c2441c3ed8d725902b262e35eb4671450b64f04d Mon Sep 17 00:00:00 2001
From: dkotrada 
Date: Mon, 28 Sep 2009 22:10:28 +0000
Subject: added language variable tidypics:uploading:images

---
 languages/en.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages/en.php b/languages/en.php
index 036884799..c9ef85f6b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -24,6 +24,7 @@
 			'album:group' => "Group albums",
 			'item:object:image' => "Photos",
 			'item:object:album' => "Albums",
+			'tidypics:uploading:images' => "Please wait. Uploading images",
 			'tidypics:enablephotos' => 'Enable group photo albums',
 			'tidypics:editprops' => 'Edit Image Properties',
 			'tidypics:mostcommented' => 'Most commented images',
-- 
cgit v1.2.3


From 69bbb4d1ca761998263c4aca5e65d6cc0fa7303b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 28 Sep 2009 22:10:29 +0000
Subject: latest was a horrible name for a widget - what was I thinking? - now
 I need to add an upgrade script

---
 start.php                                    |  2 +-
 views/default/widgets/latest/edit.php        | 15 ---------------
 views/default/widgets/latest/view.php        | 15 ---------------
 views/default/widgets/latest_photos/edit.php | 15 +++++++++++++++
 views/default/widgets/latest_photos/view.php | 15 +++++++++++++++
 5 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 views/default/widgets/latest/edit.php
 delete mode 100644 views/default/widgets/latest/view.php
 create mode 100644 views/default/widgets/latest_photos/edit.php
 create mode 100644 views/default/widgets/latest_photos/view.php

diff --git a/start.php b/start.php
index ba8d90aac..82c83227e 100644
--- a/start.php
+++ b/start.php
@@ -44,7 +44,7 @@
 		
 		// Add a new tidypics widget
 		add_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile');
-		add_widget_type('latest', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile');
+		add_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile');
 		
 		// Register a URL handler for files
 		register_entity_url_handler('tidypics_image_url', 'object', 'image');
diff --git a/views/default/widgets/latest/edit.php b/views/default/widgets/latest/edit.php
deleted file mode 100644
index 15a56af82..000000000
--- a/views/default/widgets/latest/edit.php
+++ /dev/null
@@ -1,15 +0,0 @@
-
        
-num_display == '') $vars['entity']->num_display = 6;
-	
-?>
-	
-
        
\ No newline at end of file
diff --git a/views/default/widgets/latest/view.php b/views/default/widgets/latest/view.php
deleted file mode 100644
index 0c3193907..000000000
--- a/views/default/widgets/latest/view.php
+++ /dev/null
@@ -1,15 +0,0 @@
-
         
-num_display;
-	//if no number has been set, default to 6
-	if (!$number)
-		$number = 6;
-
-	echo '
        ';
-	echo tp_get_latest_photos($number, page_owner());
-	echo '
        ';
-
-?>
-
        
\ No newline at end of file
diff --git a/views/default/widgets/latest_photos/edit.php b/views/default/widgets/latest_photos/edit.php
new file mode 100644
index 000000000..15a56af82
--- /dev/null
+++ b/views/default/widgets/latest_photos/edit.php
@@ -0,0 +1,15 @@
+
        
+num_display == '') $vars['entity']->num_display = 6;
+	
+?>
+	
+
        
\ No newline at end of file
diff --git a/views/default/widgets/latest_photos/view.php b/views/default/widgets/latest_photos/view.php
new file mode 100644
index 000000000..0c3193907
--- /dev/null
+++ b/views/default/widgets/latest_photos/view.php
@@ -0,0 +1,15 @@
+
         
+num_display;
+	//if no number has been set, default to 6
+	if (!$number)
+		$number = 6;
+
+	echo '
        ';
+	echo tp_get_latest_photos($number, page_owner());
+	echo '
        ';
+
+?>
+
        
\ No newline at end of file
-- 
cgit v1.2.3


From f8b538afa506146b42fddb203d22ed898d20d45d Mon Sep 17 00:00:00 2001
From: dkotrada 
Date: Mon, 28 Sep 2009 22:10:48 +0000
Subject: added language variable tidypics:uploading:images

---
 languages/de.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/languages/de.php b/languages/de.php
index c378b325c..08ac422bb 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -28,6 +28,7 @@
 			'album:group' => "Gruppen-Alben",
 			'item:object:image' => "Fotos",
 			'item:object:album' => "Alben",
+			'tidypics:uploading:images' => "Die Bilder werden hochgeladen",
 			'tidypics:enablephotos' => 'Schalte Gruppenalben frei',
 			'tidypics:editprops' => 'Bild bearbeiten',
 			'tidypics:mostcommented' => 'meist kommentierte',
-- 
cgit v1.2.3


From 357e2a558ecd8cff5014920f216efb5608731e6f Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 30 Sep 2009 01:01:15 +0000
Subject: fixed short tag

---
 views/default/settings/tidypics/edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php
index 81db3c5e8..eb391c8bc 100644
--- a/views/default/settings/tidypics/edit.php
+++ b/views/default/settings/tidypics/edit.php
@@ -1,4 +1,4 @@
-wwwroot . 'mod/tidypics/pages/server_analysis.php';
 	$settings_url = $CONFIG->wwwroot . 'mod/tidypics/pages/admin.php';
-- 
cgit v1.2.3


From 364ea2fc085056d842e8aa6a3823a6b3084e229f Mon Sep 17 00:00:00 2001
From: dkotrada 
Date: Wed, 30 Sep 2009 11:14:17 +0000
Subject: Version 0.8.1

---
 languages/de.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages/de.php b/languages/de.php
index 08ac422bb..511ddf771 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -1,7 +1,7 @@
  'Link',
 			'tidypics:actiondelete' => 'Löschen',
 			'tidypics:actioncancel' => 'Abbrechen',
-			'tidypics:inthisphoto' => 'in diesem Foto',
+			'tidypics:inthisphoto' => 'Links in dem Foto',
 			'tidypics:usertag' => "Foto verlinkt mit Mitglied %s",
 			'tidypics:phototagging:success' => 'Foto-Link erfolgreich hinzugefügt',
 			'tidypics:phototagging:error' => 'Unerwarteter Fehler beim verlinken',
-- 
cgit v1.2.3


From e1652f241d7ef5e4641af27fae22240232787568 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 2 Oct 2009 11:37:03 +0000
Subject: fixed delete tags bug

---
 actions/deletetag.php              | 6 +++---
 views/default/tidypics/tagging.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actions/deletetag.php b/actions/deletetag.php
index 748d00380..3a76f6e99 100644
--- a/actions/deletetag.php
+++ b/actions/deletetag.php
@@ -23,10 +23,10 @@
 		forward($_SERVER['HTTP_REFERER']);
 	}
 	
-	foreach ($tags as $id => $value) {
+	foreach ($tags as $id => $value) {		
 		// delete normal tag if it exists
 		if (is_array($image->tags)) {
-			$index = array_search($value[0], $image->tags);
+			$index = array_search($value, $image->tags);
 			if ($index !== false) {
 				$tagarray = $image->tags;
 				unset($tagarray[$index]);
@@ -34,7 +34,7 @@
 				$image->tags = $tagarray;
 			}
 		} else {
-			if ($value[0] === $image->tags) {
+			if ($value === $image->tags) {
 				$image->clearMetadata('tags');
 			}
 		}
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index ed33c4702..ebaf0dc94 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -70,8 +70,8 @@
 	if ($tag_info) {
 		$content = "";
 		foreach ($tag_info['links'] as $id => $link) {
-			$name = "tags[{$id}]";
-			$content .= elgg_view("input/checkboxes", array('options' => array($link['text'] => $link['text']), 'internalname' => $name, 'value' => '' ));
+			$text = htmlentities($link['text'], ENT_QUOTES, 'UTF-8');
+			$content .= "
        ";
 		}
 
 		$content .= "";
-- 
cgit v1.2.3


From 3979ea2bbe19b5f4666736901dcc918b259c33d3 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 3 Oct 2009 16:08:51 +0000
Subject: better GD watermarking

---
 fonts/LiberationSerif-Regular.ttf | Bin 0 -> 172964 bytes
 fonts/License.txt                 |  13 +++++++++++++
 lib/watermark.php                 |  30 +++++++++++++++++-------------
 3 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 fonts/LiberationSerif-Regular.ttf
 create mode 100644 fonts/License.txt

diff --git a/fonts/LiberationSerif-Regular.ttf b/fonts/LiberationSerif-Regular.ttf
new file mode 100644
index 000000000..1dd4aaa92
Binary files /dev/null and b/fonts/LiberationSerif-Regular.ttf differ
diff --git a/fonts/License.txt b/fonts/License.txt
new file mode 100644
index 000000000..e972b52de
--- /dev/null
+++ b/fonts/License.txt
@@ -0,0 +1,13 @@
+LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
+LIBERATION FONT SOFTWARE
+
+This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as our set forth in this End User License Agreement.
+
+ 1.The Software and License Exception. LIBERATION font software  (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions:  
+(a)As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
+(b)As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it.
+ 2.Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software. 
+ 3.Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation. 
+ 4.Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages. 
+ 5.General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply.
+Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc.
diff --git a/lib/watermark.php b/lib/watermark.php
index 13eb598a0..e28194b18 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -27,27 +27,31 @@ function tp_gd_watermark($image) {
 	if (!$watermark_text)
 		return;
 	
-	
+	global $CONFIG;
+		
 	$owner = get_loggedin_user();
 
 	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
+		
+	// transparent gray
+	imagealphablending($image, true);
+	$textcolor = imagecolorallocatealpha($image, 50, 50, 50, 60);
 	
+	// font and location
+	$font = $CONFIG->pluginspath . "tidypics/fonts/LiberationSerif-Regular.ttf"; 
+	$bbox = imagettfbbox(20, 0, $font, $watermark_text);
 	
+	$text_width = $bbox[2] - $bbox[0];
+	$text_height = $bbox[1] - $bbox[7];
 	
-	$font = 5;
-	$line_width = strlen($watermark_text) * imagefontwidth($font);
-	$line_height = imagefontheight($font);
-	
-	$image_width = 600;
-	$image_height = 450;
+	$image_width = imagesx($image);
+	$image_height = imagesy($image);
 	
-	// matching -gravity south -geometry +0+10
-	$top = $image_height - $line_height - 10;
-	$left = round(($image_width - $line_width) / 2);
+	$left = $image_width / 2 - $text_width / 2;
+	$top = $image_height - 20;
 	
-	imagealphablending($image, true);
-	$textcolor = imagecolorallocatealpha($image, 50, 50, 50, 50);
-	imagestring($image, $font, $left, $top, $watermark_text, $textcolor);
+	// write the text on the image
+	imagettftext($image, 20, 0, $left, $top, $textcolor, $font, $watermark_text);
 }
 
 function tp_imagick_watermark($filename) {
-- 
cgit v1.2.3


From 6263b1d67488acd66f457aee0ec8a70e418ea5dc Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 3 Oct 2009 17:16:08 +0000
Subject: first version of an album slideshow - initial integration by Torsten

---
 languages/en.php                         |   2 +-
 pages/viewalbum.php                      |   8 ++++++++
 start.php                                |  30 ++++++++++++++++++++++++++++++
 vendors/PicLensLite/NoFlash.jpg          | Bin 0 -> 72549 bytes
 vendors/PicLensLite/PicLensLite.swf      | Bin 0 -> 251875 bytes
 vendors/PicLensLite/piclens_optimized.js |  20 ++++++++++++++++++++
 views/default/js/slideshow.php           |   1 +
 7 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 vendors/PicLensLite/NoFlash.jpg
 create mode 100644 vendors/PicLensLite/PicLensLite.swf
 create mode 100644 vendors/PicLensLite/piclens_optimized.js
 create mode 100644 views/default/js/slideshow.php

diff --git a/languages/en.php b/languages/en.php
index c9ef85f6b..4b0d3e746 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -15,7 +15,7 @@
 			'images:multiupload:todo' => "Choose one or more files for upload.",
 			'album' => "Photo Album",
 			'albums' => "Photo Albums",
-			'album:slideshow' => "View Slideshow",
+			'album:slideshow' => "View slideshow",
 			'album:yours' => "Your photo albums",
 			'album:yours:friends' => "Your friends' photo albums",
 			'album:user' => "%s's photo albums",
diff --git a/pages/viewalbum.php b/pages/viewalbum.php
index b451b6993..4b3e6d703 100644
--- a/pages/viewalbum.php
+++ b/pages/viewalbum.php
@@ -31,6 +31,14 @@
 		add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name), 
 							$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
 	}
+	
+	// allow other plugins to override the slideshow
+	$slideshow_link = trigger_plugin_hook('tidypics:slideshow', 'album', $album, false);
+	if ($slideshow_link) {
+		add_submenu_item(elgg_echo('album:slideshow'),
+						$slideshow_link,
+						'photos' );
+	}
 
 	if (can_write_to_container(0, $album->container_guid)) {
 		if ($owner instanceof ElggGroup) {
diff --git a/start.php b/start.php
index 82c83227e..24189d44d 100644
--- a/start.php
+++ b/start.php
@@ -70,6 +70,9 @@
 			
 			register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message');
 		}
+		
+		// slideshow plugin hook
+		register_plugin_hook('tidypics:slideshow', 'album', 'tidypics_slideshow');
 	}
 	
 	/**
@@ -387,6 +390,33 @@
 		$title = friendly_title($title);
 		return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title;
 	}
+	
+	
+	/**
+	 * Catch the plugin hook and add the default album slideshow
+	 * 
+	 * @param $hook - 'tidypics:slideshow'
+	 * @param $entity_type - 'album'
+	 * @param $returnvalue - if set, return because another plugin has used the hook
+	 * @param $params - album entity
+	 * @return unknown_type
+	 */
+	function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
+		
+		if ($returnvalue) {
+			// someone has already added a slideshow
+			return $returnvalue;
+		}
+		
+		$slideshow_link = 'javascript:PicLensLite.start({maxScale:0,feedUrl:PicLensLite.indexFeeds()[0].url})';
+		
+		// add the slideshow javascript to the header
+		extend_view('metatags', 'js/slideshow');
+		
+		return $slideshow_link;
+	}
+	
+	
 
 	// Make sure tidypics_init is called on initialisation
 	register_elgg_event_handler('init','system','tidypics_init');
diff --git a/vendors/PicLensLite/NoFlash.jpg b/vendors/PicLensLite/NoFlash.jpg
new file mode 100644
index 000000000..94f643dc7
Binary files /dev/null and b/vendors/PicLensLite/NoFlash.jpg differ
diff --git a/vendors/PicLensLite/PicLensLite.swf b/vendors/PicLensLite/PicLensLite.swf
new file mode 100644
index 000000000..3bfd4ea49
Binary files /dev/null and b/vendors/PicLensLite/PicLensLite.swf differ
diff --git a/vendors/PicLensLite/piclens_optimized.js b/vendors/PicLensLite/piclens_optimized.js
new file mode 100644
index 000000000..48cea086b
--- /dev/null
+++ b/vendors/PicLensLite/piclens_optimized.js
@@ -0,0 +1,20 @@
+/* PicLens Lite: version 1.3.1 (14221)
+ * Copyright (c) 2008 Cooliris, Inc.  All Rights Reserved.
+ * 
+ * The JavaScript part of PicLens Lite (i.e., this file) is BSD licensed (see: http://lite.piclens.com/bsdlicense)
+ * This launcher includes and interacts with SWFObject (MIT), BrowserDetect (BSD Compatible), and Lytebox (CC Attribution 3.0).
+ * 
+ * There are two versions of this JS: 
+ * http://lite.piclens.com/current/piclens.js               full commented file         (~39KB)
+ * http://lite.piclens.com/current/piclens_optimized.js     lighter deployment file     (~21KB)
+ */
+var PicLensLite={start:function(B){this.determineBrowserParams();clearTimeout(this.REMOVE_TIMER_ID);clearTimeout(this.AUTO_CLOSE_TIMER_ID);this.ARGS={};if(typeof B!=="undefined"&&B!==null){this.ARGS=B;if(B.feedUrl){this.THE_FEED_URL=B.feedUrl;if(this.checkForPluginAndLaunchIfPossible(B.feedUrl,B.guid)){return }if(B.loadFeedInFlash){this.showFlashUI("")}else{this.loadViaXHR(B.feedUrl)}}if(typeof B.feedData!=="undefined"){this.showFlashUI(B.feedData)}}else{var A=this.indexFeeds();if(A.length!==0){var C=A[0];this.THE_FEED_URL=C.url;if(this.checkForPluginAndLaunchIfPossible(C.url)){return }this.loadViaXHR(C.url)}}},isRunning:function(){return this.LITE_IS_RUNNING},hasClient:function(){return this.hasCooliris()},addCustomButton:function(C,B,A){this.CUSTOM_BUTTON={targetURL:C,labelText:B,iconImage:A}},setCallbacks:function(A){if(A.onNoPlugins){this.ON_NO_PLUGINS=A.onNoPlugins}if(A.onExit){this.ON_EXIT=A.onExit}},setLiteURLs:function(A){if(!this.LITE_URL){if(A.swf){this.LITE_URL=A.swf}else{if(A.lite){this.LITE_URL=A.lite+"PicLensLite.swf"}}}if(!this.BUTTON_URL){if(A.button){this.BUTTON_URL=A.button}else{if(A.lite){this.BUTTON_URL=A.lite+"NoFlash.jpg"}}}var B="";if(A.lbox){B=A.lbox}else{if(A.lite){B=A.lite+"../lytebox/"}}if(!this.LBOX_CSS_URL){if(A.lboxcss){this.LBOX_CSS_URL=A.lboxcss}else{if(B!=""){this.LBOX_CSS_URL=B+"lytebox.css"}}}if(!this.LBOX_JS_URL){if(A.lboxjs){this.LBOX_JS_URL=A.lboxjs}else{if(B!=""){this.LBOX_JS_URL=B+"lytebox.js"}}}},ARGS:{},DEBUG_NOCLIENT:false,DEBUG_NOFLASH:false,HPAD:60,VPAD:20,LITE_BG_DIV:null,LITE_FG_DIV:null,LITE_URL:null,BUTTON_URL:null,LBOX_CSS_URL:null,LBOX_JS_URL:null,LBOX_COUNT:0,SHOW_LBOX:false,OS_WIN:false,OS_MAC:false,BROWSER_FFX:false,BROWSER_SAF:false,BROWSER_IE:false,BROWSER_IE6:false,OLD_B_MARGIN:null,OLD_B_OVERFLOW:null,OLD_B_HEIGHT:null,OLD_H_OVERFLOW:null,OLD_H_HEIGHT:null,THE_FEED:"",THE_FEED_URL:"",LITE_IS_RUNNING:false,piclensIsRunning_:false,FLASH_ID_1:"pllflash1",FLASH_ID_2:"pllflash2",FLASH_VER:null,FLASH_URL:"http://www.adobe.com/go/getflashplayer",PL_URL:"http://download.piclens.com/partner/",PLC:null,LEARN_PL_URL:"http://affiliate.piclens.com/partner/",FONT:"font-family: Lucida Grande, Myriad Pro, Verdana, Helvetica, Arial, sans-serif;",KEY_HANDLERS:"",ON_NO_PLUGINS:null,ON_EXIT:null,AUTO_CLOSE_TIMER_ID:0,REMOVE_TIMER_ID:0,RESIZE_TIMER_IE6:null,RESIZE_HANDLER_EXISTS:false,CUSTOM_BUTTON:null,addKeyHandlers:function(){var A=this;if(typeof document.onkeydown!=="undefined"){this.KEY_HANDLERS=document.onkeydown}document.onkeydown=function(C){var B;if(typeof C==="undefined"||C===null){B=window.event.keyCode}else{B=C.which}var D=A.handleKeyPress(B);if(typeof C!="undefined"&&C!=null){C.returnValue=D}return D}},addMouseHandlers:function(){if(window.addEventListener){window.addEventListener("DOMMouseScroll",this.handleMouseWheel,false)}else{if(document.attachEvent){document.attachEvent("onmousewheel",this.handleMouseWheel)}}window.onmousewheel=document.onmousewheel=this.handleMouseWheel},appendElementsToDocument:function(){if(this.BROWSER_FFX&&this.OS_MAC){this.LITE_BG_DIV.style.display="none"}document.body.appendChild(this.LITE_BG_DIV);document.body.appendChild(this.LITE_FG_DIV)},autoResize:function(){if(!this.isRunning()){clearInterval(this.RESIZE_TIMER_IE6);return }var C=this.getPageSize();var B=this.LITE_BG_DIV;if(B){B.style.height=C.h+"px";B.style.width=C.w+"px"}if(this.LITE_FG_DIV){var A=this.LITE_FG_DIV.style;this.resizeToPaddedBox(A);this.resizeToFitPaddedBox(A,C);this.resizeFlashToFitPaddedBox()}},checkForPluginAndLaunchIfPossible:function(B,A){if(this.hasCooliris()){if(typeof (A)!="undefined"){this.PLC.launch(B,"uid",A)}else{this.PLC.launch(B,"","")}return true}return false},createBackgroundOverlay:function(){var D=document.createElement("div");this.LITE_BG_DIV=D;D.id="lite_bg_div";var E=D.style;E.position="fixed";E.width=E.height="100%";if(this.BROWSER_IE6){var A=document.body;var C=A.currentStyle;var H=document.documentElement;var G=H.currentStyle;this.OLD_B_MARGIN=C.margin;this.OLD_B_OVERFLOW=C.overflow;this.OLD_B_HEIGHT=C.height;this.OLD_H_OVERFLOW=G.overflow;this.OLD_H_HEIGHT=G.height;this.OLD_SCROLL_Y=H.scrollTop;A.style.margin="0";A.style.overflow="auto";A.style.height="100%";H.style.overflow="auto";H.style.height="100%";E.position="absolute";var F=this.getPageSize();E.height=F.h+"px";E.width=F.w+"px"}E.left=E.right=E.top=E.bottom="0";E.backgroundColor="#000";E.zIndex=1000;E.opacity="0.5";E.filter="alpha(opacity=50)";var B=this;D.onclick=function(){B.exitPicLensLite()}},createForegroundFlashComponent:function(){var B=document.createElement("div");this.LITE_FG_DIV=B;B.id="lite_fg_div";var A=B.style;A.backgroundColor="#000";A.position="fixed";A.border="2px solid #555";A.zIndex=1001;this.resizeToPaddedBox(A);if(this.BROWSER_IE6){A.position="absolute";this.resizeToFitPaddedBox(A)}},closeFlashUI:function(C){var B=document;B.onkeydown=this.KEY_HANDLERS;window.onmousewheel=B.onmousewheel="";if(window.removeEventListener){window.removeEventListener("DOMMouseScroll",this.handleMouseWheel,false)}if(B.detachEvent){B.detachEvent("onmousewheel",this.handleMouseWheel)}this.LITE_BG_DIV.style.display=this.LITE_FG_DIV.style.display="none";this.REMOVE_TIMER_ID=setTimeout(function(){PicLensLite.removeChildren()},150);if(this.BROWSER_IE6){var A=document.body;var D=document.documentElement;A.style.margin=this.OLD_B_MARGIN;A.style.overflow=this.OLD_B_OVERFLOW;A.style.height=this.OLD_B_HEIGHT;D.style.overflow=this.OLD_H_OVERFLOW;D.style.height=this.OLD_H_HEIGHT;window.scrollTo(0,this.OLD_SCROLL_Y)}if(this.ON_EXIT!==null){this.ON_EXIT(C)}this.setRunningFlag(false)},determineBrowserParams:function(){var B=BrowserDetect.OS;var A=BrowserDetect.browser;this.OS_MAC=(B=="Mac");this.OS_WIN=(B=="Windows");this.BROWSER_FFX=(A=="Firefox");this.BROWSER_SAF=(A=="Safari");this.BROWSER_IE=(A=="Explorer");this.BROWSER_IE6=(this.BROWSER_IE&&BrowserDetect.version=="6");this.FLASH_VER=swfobjlite.getFlashPlayerVersion()},exitPicLensLite:function(){var A=this.getFlash();if(A!==null&&A.fl_exitPicLensLite){A.fl_exitPicLensLite();this.AUTO_CLOSE_TIMER_ID=setTimeout(function(){if(PicLensLite.isRunning()){PicLensLite.closeFlashUI()}},500)}else{this.closeFlashUI()}},findScriptLocation:function(){var E=document.getElementsByTagName("script");for(var C=0;C!=E.length;++C){var A=E[C];var D=A.getAttribute("type");if(D=="text/javascript"){var F=A.getAttribute("src");if(F===null){continue}var B=F.indexOf("piclens.js");if(B!=-1){this.setLiteURLs({lite:F.substring(0,B)});return }else{B=F.indexOf("piclens_optimized.js");if(B!=-1){this.setLiteURLs({lite:F.substring(0,B)});return }}}}},getPageSize:function(){var J,F,G,C;var I=document;var E=I.body;var D;if(window.innerHeight&&window.scrollMaxY){J=I.scrollWidth;F=(this.isFrame?parent.innerHeight:self.innerHeight)+(this.isFrame?parent.scrollMaxY:self.scrollMaxY)}else{if(E.scrollHeight>E.offsetHeight){J=E.scrollWidth;F=E.scrollHeight}else{D=I.getElementsByTagName("html").item(0);J=D.offsetWidth;F=D.offsetHeight;J=(J '}}}var E="
        ";return E},generateAlternativeContent:function(){var J='
        ';J+='
        ';var I=this.FLASH_VER;var G;if(I.major>0){G="update your Flash Player from version "+I.major+"."+I.minor+"."+I.release+" to version 9.0.28 or newer"}else{G="install the most recent Flash Player"}var D="";if(this.THE_FEED!==""){D=this.getBasicSlideShowHTML()}var A=this.PL_URL;var E=this.LEARN_PL_URL;var F=this.ARGS.pid;if(F){A+=F+"/";E+=F+"/"}else{var H="000000000001/";A+=H;E+=H}if(this.SHOW_LBOX){}else{var C=""+C+"1.5em; font-weight: bold; "+this.FONT+"'>You're clicks away from going full screen!
        "+C+".9em; padding-bottom: 15px; "+this.FONT+"'>You must get the Cooliris browser plugin, or "+G+".
        ";if(!this.BUTTON_URL){J+='Get Cooliris Now!'}else{var B=''+B+'"0,0,33,33" href="#" onclick="javascript:PicLensLite.closeFlashUI();" />'+B+'"35,35,325,325" href="'+A+'" />'+B+'"593,209,825,301" href="'+this.FLASH_URL+'" />'+B+'"327,148,448,178" href="'+E+'" />'}}J+="
        ";J+=D;J+='
        © 2008 Cooliris, Inc. All trademarks are property of their respective holders.


        ';J+="
      ";return J},generateFlashVars:function(){var C="";var B=this.ARGS;if(typeof B.guid!=="undefined"){C+="&startItemGUID="+B.guid}if(B.loadFeedInFlash){C+="&feedURL="+encodeURIComponent(this.THE_FEED_URL)}if(B.paused){C+="&paused="+B.paused}if(B.loop){C+="&loop="+B.loop}if(B.delay){C+="&delay="+B.delay}if(B.pid){C+="&pid="+B.pid}if(typeof B.maxScale!="undefined"){C+="&maxScale="+B.maxScale}if(typeof B.overlayToolbars!="undefined"){C+="&overlayToolbars="+B.overlayToolbars}var A=this.CUSTOM_BUTTON;if(A!=null){C+="&cButtonURL="+encodeURIComponent(A.targetURL);if(A.labelText!=null){C+="&cButtonLabel="+encodeURIComponent(A.labelText)}if(A.iconImage!=null){C+="&cButtonIcon="+encodeURIComponent(A.iconImage)}}C+="&swfURL="+encodeURIComponent(this.LITE_URL);C=C.substring(1);return C},getFlash:function(){if(this.BROWSER_SAF||this.BROWSER_IE){return document.getElementById(this.FLASH_ID_1)}else{return document.getElementById(this.FLASH_ID_2)}},getWindowSize:function(){var B=document.documentElement;var D=document.body;var A=0,C=0;if(typeof (window.innerWidth)=="number"){A=window.innerWidth;C=window.innerHeight}else{if(B&&(B.clientWidth||B.clientHeight)){A=B.clientWidth;C=B.clientHeight}else{if(D&&(D.clientWidth||D.clientHeight)){A=D.clientWidth;C=D.clientHeight}}}return{w:A,h:C}},handleKeyPress:function(A){if(!this.isRunning()){return true}var B=this.getFlash();if(B!=null&&B.fl_keyPressed){B.fl_keyPressed(A)}else{if(A==27){this.closeFlashUI();return false}}if(A==9||A==13){return false}return true},handleMouseWheel:function(A){var C=0;if(!A){A=window.event}if(A.wheelDelta){C=A.wheelDelta/120;if(window.opera){C=-C}}else{if(A.detail){var B=A.detail;if(Math.abs(B)<3){C=-B}else{C=-B/3}}}if(C){PicLensLite.sendMouseScrollToFlash(C)}if(A.preventDefault){A.preventDefault()}A.returnValue=false;return false},hasPicLensClient:function(){return this.hasCooliris()},hasCooliris:function(){if(this.DEBUG_NOCLIENT){return false}var E=false;if(this.PLC){E=true}else{if(window.piclens&&window.piclens.launch){this.PLC=window.piclens;E=true}else{var B=null;if(typeof PicLensContext!="undefined"){B=new PicLensContext()}else{try{B=new ActiveXObject("PicLens.Context")}catch(D){if(navigator.mimeTypes["application/x-cooliris"]){B=document.createElement("object");B.style.height="0px";B.style.width="0px";B.type="application/x-cooliris";document.documentElement.appendChild(B)}else{B=null}}}this.PLC=B;if(this.PLC){E=true}}}if(E){if(this.BROWSER_SAF){return true}var A;try{A=this.PLC.version}catch(D){return false}var C=A.split(".");if(C[0]>1){return true}else{if(C[0]==1){if(C[1]>6){return true}else{if(C[1]==6){if(C[2]>0){return true}else{if(C[2]==0){if(C[3]>=824){return true}}}}}}}return false}else{return false}},invokeLytebox:function(){this.SHOW_LBOX=true;myLytebox.start(document.getElementById("lboxImage"),false,false);this.closeFlashUI()},showLyteboxLink:function(){myLytebox.updateLyteboxItems();myLytebox.doAnimations=false;var A=document.getElementById("lightbox_images");if(A!=null){A.style.display="block";if(this.SHOW_LBOX&&this.getFlash()==null){this.invokeLytebox()}}},startLytebox:function(){if(typeof myLytebox!="undefined"){this.showLyteboxLink()}else{if(typeof initLytebox!="undefined"){initLytebox();this.showLyteboxLink()}else{if(this.LBOX_COUNT>=4){return }setTimeout(function(){PicLensLite.startLytebox()},150);this.LBOX_COUNT++}}},injectFlashPlayer:function(){var A=this.LITE_FG_DIV;var D;var F;D=F="100%";if(this.BROWSER_IE6){D=F="0"}var E=this.generateFlashVars();var B=this.generateAlternativeContent();if(this.meetsReqs()){var C="'+C+'"movie" value="'+this.LITE_URL+'" />'+C+'"quality" value="high"/> '+C+'"bgcolor" value="#000000"/> '+C+'"allowScriptAccess" value="always"/> '+C+'"FlashVars" value="'+E+'"/> '+C+'"allowFullScreen" value="true"/> '+C+'"wmode" value="window"/> '+C+'"scale" value="noscale"/> '+B+""}else{if(this.ON_NO_PLUGINS){this.ON_NO_PLUGINS()}else{A.innerHTML=B;A.style.minWidth="860px";A.style.minHeight="550px"}}if(this.BROWSER_SAF){this.resizeUI()}},indexFeeds:function(){var E=document.getElementsByTagName("link");var A=[];for(var B=0;B!=E.length;++B){var D=E[B],C=D.getAttribute("type");if(C=="application/rss+xml"||C=="text/xml"){A.push({title:D.getAttribute("title"),url:D.getAttribute("href")})}}return A},loadViaXHR:function(B){var A=this;var D=window.XMLHttpRequest?new XMLHttpRequest():new ActiveXObject("MSXML2.XMLHTTP.3.0");try{D.open("GET",B,true);D.onreadystatechange=function(){if(D.readyState==4){if((D.status==200||D.status==0)){if(D.responseText){A.showFlashUI(D.responseText)}}else{if(console){console.log("PicLens Lite could not load the RSS Feed: "+B)}}}};D.send("")}catch(C){this.ARGS.loadFeedInFlash=true;this.showFlashUI("")}},meetsReqs:function(){if(this.DEBUG_NOFLASH){return false}var B=(this.FLASH_VER.major==0)&&this.BROWSER_IE;var A=swfobjlite.hasFlashPlayerVersion("9.0.28");return A||B},removeChildren:function(){this.REMOVE_TIMER_ID=0;if(this.LITE_BG_DIV!==null){document.body.removeChild(this.LITE_BG_DIV);this.LITE_BG_DIV=null}if(this.LITE_FG_DIV!==null){document.body.removeChild(this.LITE_FG_DIV);this.LITE_FG_DIV=null}},resizeFlashToFitPaddedBox:function(){var B=this.getFlash();if(B){var C=this.getPageSize();var A=C.w-this.HPAD*2;var D=C.h-this.VPAD*2;B.style.width=A;B.style.height=D;B.width=A;B.height=D}},resizeToFitPaddedBox:function(B,A){if(typeof A=="undefined"){A=this.getPageSize()}B.width=(A.w-this.HPAD*2)+"px";B.height=(A.h-this.VPAD*2)+"px"},resizeToPaddedBox:function(A){A.left=A.right=this.HPAD+"px";A.top=A.bottom=this.VPAD+"px"},resizeUI:function(){if(this.LITE_FG_DIV){var A=this.LITE_FG_DIV.style;this.resizeToPaddedBox(A);this.resizeToFitPaddedBox(A);this.resizeFlashToFitPaddedBox()}},setRunningFlag:function(A){this.LITE_IS_RUNNING=A;this.piclensIsRunning_=A},setResizeHandler:function(){if(!this.RESIZE_HANDLER_EXISTS&&this.BROWSER_SAF){var A=this;window.addEventListener("resize",function(){A.resizeUI()},false);this.RESIZE_HANDLER_EXISTS=true}},setResizeTimer:function(){if(this.BROWSER_IE6){this.RESIZE_TIMER_IE6=setInterval(function(){PicLensLite.autoResize()},1000)}},showFlashUI:function(A){this.THE_FEED=A;this.findScriptLocation();this.createBackgroundOverlay();this.createForegroundFlashComponent();if(this.BROWSER_IE){this.appendElementsToDocument()}this.injectFlashPlayer();if(!this.BROWSER_IE){this.appendElementsToDocument()}this.addKeyHandlers();this.addMouseHandlers();this.setRunningFlag(true);this.setResizeTimer();this.setResizeHandler();this.startLytebox()},sendMouseScrollToFlash:function(B){if(!this.isRunning()){return }var A=this.getFlash();if(A!=null&&A.fl_mouseMoved){A.fl_mouseMoved(B)}}};var swfobjlite=function(){var UNDEF="undefined",OBJECT="object",SHOCKWAVE_FLASH="Shockwave Flash",SHOCKWAVE_FLASH_AX="ShockwaveFlash.ShockwaveFlash",win=window,doc=document,nav=navigator;var ua=function(){var w3cdom=typeof doc.getElementById!=UNDEF&&typeof doc.getElementsByTagName!=UNDEF&&typeof doc.createElement!=UNDEF&&typeof doc.appendChild!=UNDEF&&typeof doc.replaceChild!=UNDEF&&typeof doc.removeChild!=UNDEF&&typeof doc.cloneNode!=UNDEF,playerVersion=[0,0,0],d=null;if(typeof nav.plugins!=UNDEF&&typeof nav.plugins[SHOCKWAVE_FLASH]==OBJECT){d=nav.plugins[SHOCKWAVE_FLASH].description;if(d){d=d.replace(/^.*\s+(\S+\s+\S+$)/,"$1");playerVersion[0]=parseInt(d.replace(/^(.*)\..*$/,"$1"),10);playerVersion[1]=parseInt(d.replace(/^.*\.(.*)\s.*$/,"$1"),10);playerVersion[2]=/r/.test(d)?parseInt(d.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof win.ActiveXObject!=UNDEF){var a=null,fp6Crash=false;try{a=new ActiveXObject(SHOCKWAVE_FLASH_AX+".7")}catch(e){try{a=new ActiveXObject(SHOCKWAVE_FLASH_AX+".6");playerVersion=[6,0,21];a.AllowScriptAccess="always"}catch(e){if(playerVersion[0]==6){fp6Crash=true}}if(!fp6Crash){try{a=new ActiveXObject(SHOCKWAVE_FLASH_AX)}catch(e){}}}if(!fp6Crash&&a){try{d=a.GetVariable("$version");if(d){d=d.split(" ")[1].split(",");playerVersion=[parseInt(d[0],10),parseInt(d[1],10),parseInt(d[2],10)]}}catch(e){}}}}var u=nav.userAgent.toLowerCase(),p=nav.platform.toLowerCase(),webkit=/webkit/.test(u)?parseFloat(u.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,ie=false,windows=p?/win/.test(p):/win/.test(u),mac=p?/mac/.test(p):/mac/.test(u);
+/*@cc_on
+			ie = true;
+			@if (@_win32)
+				windows = true;
+			@elif (@_mac)
+				mac = true;
+			@end
+		@*/
+return{w3cdom:w3cdom,pv:playerVersion,webkit:webkit,ie:ie,win:windows,mac:mac}}();return{hasFlashPlayerVersion:function(rv){var pv=ua.pv,v=rv.split(".");v[0]=parseInt(v[0],10);v[1]=parseInt(v[1],10);v[2]=parseInt(v[2],10);return(pv[0]>v[0]||(pv[0]==v[0]&&pv[1]>v[1])||(pv[0]==v[0]&&pv[1]==v[1]&&pv[2]>=v[2]))?true:false},getFlashPlayerVersion:function(){return{major:ua.pv[0],minor:ua.pv[1],release:ua.pv[2]}}}}();var BrowserDetect={init:function(){this.browser=this.searchString(this.dataBrowser)||"Unknown Browser";this.version=this.searchVersion(navigator.userAgent)||this.searchVersion(navigator.appVersion)||"Unknown Version";this.OS=this.searchString(this.dataOS)||"Unknown OS"},searchString:function(D){for(var A=0;A
\ No newline at end of file
-- 
cgit v1.2.3


From 82ed7baf78c3005309487fc4e8b075cba9249e8b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 3 Oct 2009 18:20:59 +0000
Subject: cleaned up events and plugin hooks

---
 actions/delete.php          |  4 ++--
 actions/edit.php            |  2 +-
 docs/extending_tidypics.txt | 27 ++++++++++++++++++++++-----
 pages/viewalbum.php         |  2 +-
 start.php                   |  6 +++---
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/actions/delete.php b/actions/delete.php
index 498c991c7..1a518af9e 100644
--- a/actions/delete.php
+++ b/actions/delete.php
@@ -38,14 +38,14 @@
 		$forward_url = $container->getURL(); //forward back to album after deleting pictures
 		$images = array($entity);
 		// plugins can register to be told when a Tidypics image has been deleted
-		trigger_elgg_event('upload', 'tp_album', $entity);
+		trigger_elgg_event('delete', 'tp_image', $entity);
 	} else { //deleting an album
 		$owner_guid = $entity->container_guid;
 		$forward_url = 'pg/photos/owned/' . $container->username;
 		//get all the images from this album as long as less than 999 images
 		$images = get_entities("object", "image", $guid, '', 999); 
 		// plugins can register to be told when a Tidypics album has been deleted
-		trigger_elgg_event('upload', 'tp_album', $entity);
+		trigger_elgg_event('delete', 'tp_album', $entity);
 	}
 
 	// make sure we decrease the repo size for the size quota
diff --git a/actions/edit.php b/actions/edit.php
index e8f2e3aca..91c465828 100644
--- a/actions/edit.php
+++ b/actions/edit.php
@@ -74,7 +74,7 @@
 	} else {
 		system_message(elgg_echo('images:edited'));
 		// plugins can register to be told when a Tidypics image has been updated
-		trigger_elgg_event('update', 'tp_album', $entity);
+		trigger_elgg_event('update', 'tp_image', $entity);
 	}
 
 	forward($entity->getURL());
diff --git a/docs/extending_tidypics.txt b/docs/extending_tidypics.txt
index 8d3674cbd..0fd544119 100644
--- a/docs/extending_tidypics.txt
+++ b/docs/extending_tidypics.txt
@@ -1,9 +1,26 @@
 Extending Tidypics
 -----------------------------------
 
-We will include more information here in the future. For right now, we will 
-mention that we have included some code to make it easy to put the latest
-photos on your front page. See tidypics/lib/tidypics.php and the function
-tp_get_latest_photos().
+*** DISPLAYING THE LATEST PHOTOS ***
+In tidypics/lib/tidypics.php, there is a function tp_get_latest_photos().
+It can be used to display the site-wide latest photos or an individual
+user's latest photos. The documentation explains how you could use that
+function to display the latest photos on your front page if you are using
+the custom front page tutorial plugin from Curverider. 
 
- 
\ No newline at end of file
+
+*** MAKING TIDYPICS MATCH YOUR THEME ***
+Please check the css guid found in this directory. This will list the 
+different css elements and where they are used.
+
+
+*** TIDYPICS EVENTS ***
+1. album created: 'add', 'tp_album'
+2. album updated: 'update', 'tp_album'
+3. album deleted: 'delete', 'tp_album'
+4. photos uploaded: 'upload', 'tp_album'
+5. photo edited: 'update', 'tp_image'
+6. photo deleted: 'delete', 'tp_image'  
+
+*** TIDYPICS PLUGIN HOOKS ***
+1. album slideshow: 'tp_slideshow', 'album' - return false to not have a slideshow, otherwise return link to slideshow 
\ No newline at end of file
diff --git a/pages/viewalbum.php b/pages/viewalbum.php
index 4b3e6d703..3cc854c94 100644
--- a/pages/viewalbum.php
+++ b/pages/viewalbum.php
@@ -33,7 +33,7 @@
 	}
 	
 	// allow other plugins to override the slideshow
-	$slideshow_link = trigger_plugin_hook('tidypics:slideshow', 'album', $album, false);
+	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', $album, null);
 	if ($slideshow_link) {
 		add_submenu_item(elgg_echo('album:slideshow'),
 						$slideshow_link,
diff --git a/start.php b/start.php
index 24189d44d..a15215118 100644
--- a/start.php
+++ b/start.php
@@ -72,7 +72,7 @@
 		}
 		
 		// slideshow plugin hook
-		register_plugin_hook('tidypics:slideshow', 'album', 'tidypics_slideshow');
+		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
 	}
 	
 	/**
@@ -403,8 +403,8 @@
 	 */
 	function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
 		
-		if ($returnvalue) {
-			// someone has already added a slideshow
+		if ($returnvalue !== null) {
+			// someone has already added a slideshow or requested that the slideshow is not used
 			return $returnvalue;
 		}
 		
-- 
cgit v1.2.3


From 29da1ff8d4e70f81c401730117a832a1238399dc Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 3 Oct 2009 18:28:36 +0000
Subject: cleaned up the names of ImageMagick functions

---
 actions/create_thumbnails.php |  4 ++--
 actions/upload.php            |  4 ++--
 lib/resize.php                | 40 ++++++++++++++++++++--------------------
 lib/watermark.php             |  2 +-
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/actions/create_thumbnails.php b/actions/create_thumbnails.php
index 3fefb4f0d..3869e2dcf 100644
--- a/actions/create_thumbnails.php
+++ b/actions/create_thumbnails.php
@@ -35,12 +35,12 @@
 	
 	if ($image_lib == 'ImageMagick') { // ImageMagick command line
 		
-		if (tp_create_imagick_cmdline_thumbnails($image, $prefix, $filestorename) != true) {
+		if (tp_create_im_cmdline_thumbnails($image, $prefix, $filestorename) != true) {
 			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
 			echo "Failed to create thumbnails";
 		}
 		
-	} else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP 
+	} else if ($image_lib == 'ImageMagickPHP') {  // imagick PHP extension 
 		
 		if (tp_create_imagick_thumbnails($image, $prefix, $filestorename) != true) {
 			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
diff --git a/actions/upload.php b/actions/upload.php
index 209d8e17d..228253ddd 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -164,11 +164,11 @@
 		// resize photos to create thumbnails
 		if ($image_lib == 'ImageMagick') { // ImageMagick command line
 			
-			if (tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
+			if (tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
 				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
 			}
 			
-		} else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP 
+		} else if ($image_lib == 'ImageMagickPHP') {  // imagick php extension 
 			
 			if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
 				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
diff --git a/lib/resize.php b/lib/resize.php
index 803cb8fa7..9f4ecd4bc 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -204,7 +204,7 @@
 
 
 	/**
-	 * Create thumbnails using PHP ImageMagick Library
+	 * Create thumbnails using PHP imagick extension
 	 *
 	 * @param ElggFile holds the image that was uploaded
 	 * @param string   folder to store thumbnail in
@@ -270,7 +270,7 @@
 
 	
 	/**
-	 * Resize using PHP ImageMagick Library
+	 * Resize using PHP imagick extension
 	 *
 	 * Writes resized version of an already uploaded image
 	 * 
@@ -382,7 +382,7 @@
 	 * @param string   name of the thumbnail
 	 * @return bool    true on success 
 	 */
-	function tp_create_imagick_cmdline_thumbnails($file, $prefix, $filestorename)
+	function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename)
 	{
 		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
 		if (!$image_sizes) {
@@ -397,11 +397,11 @@
 		// tiny thumbnail
 		$thumb->setFilename($prefix."thumb".$filestorename);
 		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_imagick_cmdline_resize(	$file->getFilenameOnFilestore(),
-										$thumbname,
-										$image_sizes['thumb_image_width'],
-										$image_sizes['thumb_image_height'], 
-										true);
+		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
+											$thumbname,
+											$image_sizes['thumb_image_width'],
+											$image_sizes['thumb_image_height'], 
+											true);
 		if (!$rtn_code)
 			return false;
 		$file->thumbnail = $prefix."thumb".$filestorename;
@@ -410,11 +410,11 @@
 		// album thumbnail
 		$thumb->setFilename($prefix."smallthumb".$filestorename);
 		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_imagick_cmdline_resize(	$file->getFilenameOnFilestore(),
-										$thumbname,
-										$image_sizes['small_image_width'],
-										$image_sizes['small_image_height'], 
-										true); 
+		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
+											$thumbname,
+											$image_sizes['small_image_width'],
+											$image_sizes['small_image_height'], 
+											true); 
 		if (!$rtn_code)
 			return false;
 		$file->smallthumb = $prefix."smallthumb".$filestorename;
@@ -423,17 +423,17 @@
 		// main image
 		$thumb->setFilename($prefix."largethumb".$filestorename);
 		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_imagick_cmdline_resize(	$file->getFilenameOnFilestore(),
-										$thumbname,
-										$image_sizes['large_image_width'],
-										$image_sizes['large_image_height'], 
-										false); 
+		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
+											$thumbname,
+											$image_sizes['large_image_width'],
+											$image_sizes['large_image_height'], 
+											false); 
 		if (!$rtn_code)
 			return false;
 		$file->largethumb = $prefix."largethumb".$filestorename;
 		
 		
-		tp_imagick_cmdline_watermark($thumbname);
+		tp_im_cmdline_watermark($thumbname);
 		
 
 
@@ -453,7 +453,7 @@
 	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
 	 * @return bool
 	 */
-	function tp_imagick_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+	function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 		
 		
 		// Get the size information from the image
diff --git a/lib/watermark.php b/lib/watermark.php
index e28194b18..896be72fa 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -90,7 +90,7 @@ function tp_imagick_watermark($filename) {
 	return true;
 }
 
-function tp_imagick_cmdline_watermark($filename) {
+function tp_im_cmdline_watermark($filename) {
 	
 	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
 	if (!$watermark_text)
-- 
cgit v1.2.3


From bdf9f7fe79f5c8077d20dbb1029903ed90e77d36 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 3 Oct 2009 18:42:21 +0000
Subject: added watermark plugin hooks

---
 docs/extending_tidypics.txt | 15 +++++++++++++--
 languages/en.php            |  2 +-
 lib/watermark.php           | 13 ++++++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/docs/extending_tidypics.txt b/docs/extending_tidypics.txt
index 0fd544119..916cfa4ee 100644
--- a/docs/extending_tidypics.txt
+++ b/docs/extending_tidypics.txt
@@ -10,7 +10,7 @@ the custom front page tutorial plugin from Curverider.
 
 
 *** MAKING TIDYPICS MATCH YOUR THEME ***
-Please check the css guid found in this directory. This will list the 
+Please check the css guide found in this directory. This will list the 
 different css elements and where they are used.
 
 
@@ -23,4 +23,15 @@ different css elements and where they are used.
 6. photo deleted: 'delete', 'tp_image'  
 
 *** TIDYPICS PLUGIN HOOKS ***
-1. album slideshow: 'tp_slideshow', 'album' - return false to not have a slideshow, otherwise return link to slideshow 
\ No newline at end of file
+1. album slideshow: 'tp_slideshow', 'album' - return false to not have a slideshow, otherwise return link to slideshow
+2. watermark - return false to prevent default watermark
+    'tp_watermark', 'gd' 
+    'tp_watermark', 'imagick'
+    'tp_watermark', 'imagemagick'
+    
+    
+*** IMAGE MENU EXTENSIONS ***
+Below an image is a div called tidypics_controls. By default it contains controls
+like tagging or downloading an image. You can change what is shown there by overridding
+or extending the tidypics/image_menu view.
+
diff --git a/languages/en.php b/languages/en.php
index 4b0d3e746..7dd7636dd 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -24,7 +24,7 @@
 			'album:group' => "Group albums",
 			'item:object:image' => "Photos",
 			'item:object:album' => "Albums",
-			'tidypics:uploading:images' => "Please wait. Uploading images",
+			'tidypics:uploading:images' => "Please wait. Uploading images...",
 			'tidypics:enablephotos' => 'Enable group photo albums',
 			'tidypics:editprops' => 'Edit Image Properties',
 			'tidypics:mostcommented' => 'Most commented images',
diff --git a/lib/watermark.php b/lib/watermark.php
index 896be72fa..c7b8503c5 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -27,6 +27,10 @@ function tp_gd_watermark($image) {
 	if (!$watermark_text)
 		return;
 	
+	// plugins can do their own watermark and return false to prevent this function from running
+	if (trigger_plugin_hook('tp_watermark', 'gd', $image, true) === false)
+		return;
+	
 	global $CONFIG;
 		
 	$owner = get_loggedin_user();
@@ -60,6 +64,10 @@ function tp_imagick_watermark($filename) {
 	if (!$watermark_text)
 		return;
 	
+	// plugins can do their own watermark and return false to prevent this function from running
+	if (trigger_plugin_hook('tp_watermark', 'imagick', $filename, true) === false)
+		return;
+	
 	$owner = get_loggedin_user();
 
 	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
@@ -96,7 +104,10 @@ function tp_im_cmdline_watermark($filename) {
 	if (!$watermark_text)
 		return;
 	
-
+	// plugins can do their own watermark and return false to prevent this function from running
+	if (trigger_plugin_hook('tp_watermark', 'imagemagick', $filename, true) === false)
+		return;
+	
 	$im_path = get_plugin_setting('im_path', 'tidypics');
 	if (!$im_path) {
 		$im_path = "/usr/bin/";
-- 
cgit v1.2.3


From a587ad4ed1867743ea9e698f98a156f4f763e86a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 3 Oct 2009 18:53:57 +0000
Subject: added plugin hook for image links - allows people to do creative
 things

---
 docs/extending_tidypics.txt    |  1 +
 views/default/object/image.php | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/extending_tidypics.txt b/docs/extending_tidypics.txt
index 916cfa4ee..58fba6721 100644
--- a/docs/extending_tidypics.txt
+++ b/docs/extending_tidypics.txt
@@ -28,6 +28,7 @@ different css elements and where they are used.
     'tp_watermark', 'gd' 
     'tp_watermark', 'imagick'
     'tp_watermark', 'imagemagick'
+3. image link: 'tp_image_link', 'image' - return false for no link or a url otherwise - params passed to this will porbably change in 1.7
     
     
 *** IMAGE MENU EXTENSIONS ***
diff --git a/views/default/object/image.php b/views/default/object/image.php
index ae652fdfd..01beb25f6 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -146,15 +146,24 @@
 		
      
 		
      
 			\"{$title}\"";
+					$image_link = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&view=inline&__elgg_token={$token}&__elgg_ts={$ts}";
+				}
+				// does any plugin want to override the link
+				$image_link = trigger_plugin_hook('tp_image_link', 'image', $image, $image_link); 				
+				// add link if set
+				if ($image_link) {
+					echo "\"{$title}\"";
 				} else {
+					// no link for this image
 					echo "\"{$title}\"";
 				}
-			?>
+				?>
 			
      
 		
      
 
Date: Sat, 3 Oct 2009 19:26:12 +0000
Subject: allowing browser to cache photos now

---
 actions/download.php | 17 ++++++++++++++---
 thumbnail.php        | 13 +++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/actions/download.php b/actions/download.php
index 0f9835e11..b382c56bc 100644
--- a/actions/download.php
+++ b/actions/download.php
@@ -16,7 +16,7 @@
 		$filename = $file->originalfilename;
 		$mime = $file->mimetype;
 		
-		header("Content-type: $mime");
+		header("Content-Type: $mime");
 		if ($view == "inline")
 			header("Content-Disposition: inline; filename=\"$filename\"");
 		else
@@ -28,10 +28,21 @@
 		
 		$contents = $readfile->grabFile();
 		
-		if (empty($contents))
+		if (empty($contents)) {
 			echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );
-		else
+		} else {
+			
+			// expires every 60 days
+			$expires = 60 * 60*60*24;
+			
+			header("Content-Length: " . strlen($contents));
+			header("Cache-Control: public", true);
+			header("Pragma: public", true);
+			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+			
+			
 			echo $contents;
+		}
 		
 		exit;
 	}
diff --git a/thumbnail.php b/thumbnail.php
index eaca0849f..f310aee95 100644
--- a/thumbnail.php
+++ b/thumbnail.php
@@ -60,10 +60,19 @@
 	if (!$contents) {
 		forward('mod/tidypics/graphics/' . $error_image);
 	}
+	
+	// expires every 14 days
+	$expires = 14 * 60*60*24;
 
-	// Return the thumbnail and exit
+	// overwrite header caused by php session code so images can be cached
 	$mime = $file->getMimeType();
-	header("Content-type: $mime");
+	header("Content-Type: $mime");
+	header("Content-Length: " . strlen($contents));
+	header("Cache-Control: public", true);
+	header("Pragma: public", true);
+	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+	
+	// Return the thumbnail and exit
 	echo $contents;
 	exit;
 ?>
-- 
cgit v1.2.3


From 39060653573bf4dd51e891aecdb571c78a866675 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 5 Oct 2009 23:20:10 +0000
Subject: not using action token validation for image download

---
 start.php                             | 18 ++++++++++++++++++
 views/default/object/image.php        |  6 ++----
 views/default/tidypics/image_menu.php |  5 +----
 views/default/tidypics/tagging.php    |  1 +
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/start.php b/start.php
index a15215118..c777331c6 100644
--- a/start.php
+++ b/start.php
@@ -73,6 +73,9 @@
 		
 		// slideshow plugin hook
 		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
+		
+		// no checking security token for download
+		register_plugin_hook('action', 'tidypics/download', 'tidypics_download_override');
 	}
 	
 	/**
@@ -417,6 +420,21 @@
 	}
 	
 	
+	/**
+	 * Called before validating the security token on a download link
+	 * We don't need security as this is not a true action (it doesn't change any data)
+	 * 
+	 * @return false (shouldn't return though since the action exits
+	 */
+	function tidypics_download_override($hook, $action)
+	{
+		global $CONFIG;
+		
+		include $CONFIG->actions[$action]['file'];
+		
+		return false;
+	}
+	
 
 	// Make sure tidypics_init is called on initialisation
 	register_elgg_event_handler('init','system','tidypics_init');
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 01beb25f6..dd52f872e 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -149,10 +149,8 @@
 				// this code controls whether the photo is a hyperlink or not and what it links to 
 				$image_link = false;
 				if (get_plugin_setting('download_link', 'tidypics') != "disabled") {
-					// admin allows downloads so default to download link
-					$ts = time();
-					$token = generate_action_token($ts);
-					$image_link = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&view=inline&__elgg_token={$token}&__elgg_ts={$ts}";
+					// admin allows downloads so default to inline download link
+					$image_link = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&view=inline";
 				}
 				// does any plugin want to override the link
 				$image_link = trigger_plugin_hook('tp_image_link', 'image', $image, $image_link); 				
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index cb004395e..299f4b026 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -43,10 +43,7 @@
 	}
 	
 	if (get_plugin_setting('download_link', 'tidypics') != "disabled") {
-		$ts = time();
-		$token = generate_action_token($ts);
-	    	
-		$download_url = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&__elgg_token={$token}&__elgg_ts={$ts}"; 
+		$download_url = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid; 
 ?>
 
      23. 
 
+
      
 
      
 
      
 
      
-- 
cgit v1.2.3


From 1a7154ad17d69107cafd1f80e71e7cd5406f811c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 5 Oct 2009 23:37:49 +0000
Subject: using delete action so security token is not skipped

---
 pages/viewalbum.php | 4 +++-
 pages/viewimage.php | 4 +++-
 start.php           | 5 -----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pages/viewalbum.php b/pages/viewalbum.php
index 3cc854c94..402c2d7e6 100644
--- a/pages/viewalbum.php
+++ b/pages/viewalbum.php
@@ -52,8 +52,10 @@
 		add_submenu_item(	elgg_echo('album:edit'),
 							$CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid,
 							'photos');
+		$ts = time();
+		$token = generate_action_token($ts);
 		add_submenu_item(	elgg_echo('album:delete'),
-							$CONFIG->wwwroot . 'pg/photos/delete/' . $album_guid,
+							$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $album_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
 							'photos',
 							true);
 	}
diff --git a/pages/viewimage.php b/pages/viewimage.php
index 5caccdf06..5f23fc685 100644
--- a/pages/viewimage.php
+++ b/pages/viewimage.php
@@ -39,8 +39,10 @@
 		add_submenu_item(	elgg_echo('image:edit'),
 							$CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid,
 							'photos');
+		$ts = time();
+		$token = generate_action_token($ts);
 		add_submenu_item(	elgg_echo('image:delete'),
-							$CONFIG->wwwroot . 'pg/photos/delete/' . $photo_guid,
+							$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $photo_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
 							'photos',
 							true);
 	}
diff --git a/start.php b/start.php
index c777331c6..f0c35c62f 100644
--- a/start.php
+++ b/start.php
@@ -261,11 +261,6 @@
 					include($CONFIG->pluginspath . "tidypics/pages/edit.php");
 				break;
 
-				case "delete": //edit image or album
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/actions/delete.php");
-				break;
-
 				case "friends": // albums of friends
 					if (isset($page[1])) set_input('username',$page[1]);
 					include($CONFIG->pluginspath . "tidypics/pages/friends.php");
-- 
cgit v1.2.3


From 8fdbddca3d0f4712036675d5e32d5db9a8a7931b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 5 Oct 2009 23:45:29 +0000
Subject: only counting human viewers now

---
 lib/image.php    |  2 +-
 lib/tidypics.php | 28 +++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index f782f0386..34b054898 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -138,7 +138,7 @@
 		 */
 		public function addView($viewer_guid)
 		{
-			if ($viewer_guid != $this->owner_guid)
+			if ($viewer_guid != $this->owner_guid && tp_is_person())
 				create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC);
 		}
 	}
diff --git a/lib/tidypics.php b/lib/tidypics.php
index 6bed421ed..38afc27f2 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -56,7 +56,7 @@
 	
 	/*********************************************************************
 	 * the functions below replace broken core functions or add functions 
-	 * that should exist in the core
+	 * that could/should exist in the core
 	 */
 	 
 	/**
@@ -173,6 +173,11 @@
 		
 	}
 	
+	/**
+	 * Is page owner a group - convenience function
+	 * 
+	 * @return true/false
+	 */
 	function tp_is_group_page() {
 		
 		if ($group = page_owner_entity()) {
@@ -183,4 +188,25 @@
 		return false;
 	}
 	
+	
+	/**
+	 * Is the request from a known browser
+	 * 
+	 * @return true/false
+	 */
+	function tp_is_person()
+	{
+		$known = array('msie', 'mozilla', 'firefox', 'safari', 'webkit', 'opera', 'netscape', 'konqueror', 'gecko');
+		
+		$agent = strtolower($_SERVER['HTTP_USER_AGENT']);
+		
+		foreach ($known as $browser)
+		{
+			if (strpos($agent, $browser) !== false) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From 2791c3adc9c576d939e793750bed2d30f5963254 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 6 Oct 2009 00:11:14 +0000
Subject: 1.6.4

---
 actions/upload.php          |  3 +++
 contributions.txt           | 13 +++++++++++++
 docs/extending_tidypics.txt |  7 ++++---
 languages/en.php            |  2 +-
 manifest.xml                |  4 ++--
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index 228253ddd..3aa739414 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -192,6 +192,9 @@
 		// update user/group size for checking quota
 		$image_repo_size += $sent_file['size'];
 
+		// plugins can register to be told when a new image has been uploaded
+		trigger_elgg_event('upload', 'tp_image', $file);
+		
 		// successful upload so check if this is a new album and throw river event/notification if so
 		if ($album->new_album == TP_NEW_ALBUM) {
 			$album->new_album = TP_OLD_ALBUM;
diff --git a/contributions.txt b/contributions.txt
index 4400b9689..e324f71f5 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,18 @@
 See individual change logs for contributors to those builds
 
+------------------------------------------------------------------------
+Version 1.6.4 Change List
+Release Date: 10/05/2009
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.4 CHANGES
+------------------------------------------------------------------------
+ * Bug fixes
+ * Improved watermarking
+ * Add slideshow code by Torsten
+------------------------------------------------------------------------
+END VERSION 1.6.4 CHANGES
+------------------------------------------------------------------------
+
 ------------------------------------------------------------------------
 Version 1.6.3 Change List
 Release Date: 09/13/2009
diff --git a/docs/extending_tidypics.txt b/docs/extending_tidypics.txt
index 58fba6721..55e6b5dd5 100644
--- a/docs/extending_tidypics.txt
+++ b/docs/extending_tidypics.txt
@@ -18,9 +18,10 @@ different css elements and where they are used.
 1. album created: 'add', 'tp_album'
 2. album updated: 'update', 'tp_album'
 3. album deleted: 'delete', 'tp_album'
-4. photos uploaded: 'upload', 'tp_album'
-5. photo edited: 'update', 'tp_image'
-6. photo deleted: 'delete', 'tp_image'  
+4. photos uploaded: 'upload', 'tp_album' - triggered after a set have been uploaded and resized
+5. photo uploaded: 'upload', 'tp_image' - triggered after each image is resized
+6. photo edited: 'update', 'tp_image'
+7. photo deleted: 'delete', 'tp_image'  
 
 *** TIDYPICS PLUGIN HOOKS ***
 1. album slideshow: 'tp_slideshow', 'album' - return false to not have a slideshow, otherwise return link to slideshow
diff --git a/languages/en.php b/languages/en.php
index 7dd7636dd..4fc9bcd64 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -24,7 +24,7 @@
 			'album:group' => "Group albums",
 			'item:object:image' => "Photos",
 			'item:object:album' => "Albums",
-			'tidypics:uploading:images' => "Please wait. Uploading images...",
+			'tidypics:uploading:images' => "Please wait. Uploading images.",
 			'tidypics:enablephotos' => 'Enable group photo albums',
 			'tidypics:editprops' => 'Edit Image Properties',
 			'tidypics:mostcommented' => 'Most commented images',
diff --git a/manifest.xml b/manifest.xml
index 4631aeb2d..d58672722 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
-        
-        
+        
+        
         
         
         
-- 
cgit v1.2.3


From 4c7bfd269e323bc63472ebfae19a99844856ce3e Mon Sep 17 00:00:00 2001
From: dkotrada 
Date: Tue, 6 Oct 2009 11:18:22 +0000
Subject: updated some strings added new strings

---
 languages/de.php | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/languages/de.php b/languages/de.php
index 511ddf771..a2a97c0c7 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -1,12 +1,14 @@
  "Unbenannt",
 
 		// Menu items and titles
 
@@ -48,15 +50,18 @@
 			'tidypics:friendmostviewed' => "%s's meist gesehene",
 			'tidypics:friendmostrecent' => "Zuletzt hochgeladen von %s",
 			'tidypics:highestrated' => "Am höchsten bewertet",
-			'tidypics:viewsbyowner' => "Aufrufe: %s von %s Mitglieder (du ausgeschlossen)",
-			'tidypics:viewsbyothers' => "Aufrufe: %s (%s von dir)",
+			'tidypics:views' => "Zugriffe: %s",
+			'tidypics:viewsbyowner' => "Zugriffe: %s von %s Mitglieder (du ausgeschlossen)",
+			'tidypics:viewsbyothers' => "Zugriffe: %s (%s deine)",
 			'tidypics:administration' => 'Tidypics Administration',
 			'tidypics:stats' => 'Statitik',
 
 		//settings
 			'tidypics:settings' => 'Einstellungen',
 			'tidypics:admin:instructions' => 'Das sind die Tidypics Einstellungen',
+
 			'tidypics:settings:image_lib' => "Image Library: ",
+			'tidypics:settings:thumbnail' => "Thumbnail Creation",			
 			'tidypics:settings:download_link' => "Zeige Download-Link",
 			'tidypics:settings:tagging' => "Erlaube Foto-Links",
 			'tidypics:settings:photo_ratings' => "Erlaube Foto Bewertungen (benötigt rate plugin of Miguel Montes oder passendes)",
@@ -66,12 +71,14 @@
 			'tidypics:settings:maxfilesize' => "Maximale Bildgröße in Megabytes (MB):",
 			'tidypics:settings:quota' => "Benutzer/Gruppen Speicherplatz in (MB) (0 = Kein Speicherplatz)",
 			'tidypics:settings:watermark' => "Gib den Text für den Wasserzeichen ein - ImageMagick Cmdline muss ausgewählt sein für die Bildbibliothek",
+
 			'tidypics:settings:im_path' => "Gib den Pfad zu ImageMagick Befehle (mit abschließendem Slasch)",
 			'tidypics:settings:img_river_view' => "Wie viele Einträge in der aktivitäten Liste beim Upload von mehreren Bildern",
 			'tidypics:settings:album_river_view' => "Zeige Albumcover oder ein Set von Fotos für neuen Album",
 			'tidypics:settings:largesize' => "Bild-Größe",
 			'tidypics:settings:smallsize' => "Album-Tumbnail Bild-Größe",
 			'tidypics:settings:thumbsize' => "Thumbnail Bild-Größe",
+            'tidypics:settings:im_id' => "Bild ID",
 
 
 		//actions
@@ -119,6 +126,11 @@
 			'tidypics:phototagging:error' => 'Unerwarteter Fehler beim verlinken',
 			'tidypics:deletetag:success' => 'Ausgewählte Links wurden erfolgreich gelöscht',
 
+			'tidypics:tag:subject' => "Du wurdest in einem Foto verlinkt",
+			'tidypics:tag:body' => "Du wurdest in diesem Foto verlinkt %s von %s.
+			
+Das Foto kanns du hier sehen: %s",
+
 
 		//rss
 			'tidypics:posted' => 'Das Bild eingestellt:',
@@ -139,6 +151,7 @@
 			'image:river:created' => "%s hat ein Bild %s zum Album %s hinzugefügt",
 			'image:river:item' => "ein Bild",
 			'image:river:annotate' => "einen Kommentar zum Bild",
+			'image:river:tagged' => "was tagged in the photo",
 
 			//albums
 			'album:river:created' => "%s hat ein neues Album erstellt",
@@ -150,7 +163,8 @@
 			'tidypics:newalbum' => 'Neues Fotoalbum',
 
 
-		//  Status messages
+
+			//  Status messages
 			'tidypics:upl_success' => "Die Bilder sind erfolgreich hochgeladen",
 			'image:saved' => "Das Bild wurde gespeichert",
 			'images:saved' => "Alle Bilder sind gespeichert",
@@ -164,6 +178,17 @@
 			'album:delete:confirm' => "Willst du das Album wirklich löschen?",
 			'album:created' => "Dein neues Album ist erstellt",
 			'tidypics:settings:save:ok' => 'Tidypics Einstellungen erfolgreich gespeichert',
+
+
+
+
+
+
+
+
+               
+
+
 			'tidypics:upgrade:success' => 'Upgrade von Tidypics erfolgreich',
 
 		//Error messages
@@ -171,6 +196,7 @@
 			'tidypics:partialuploadfailure' => "Es sind Fehler beim Hochladen einiger Bilder aufgetreten (%s von %s Bildern)",
 			'tidypics:completeuploadfailure' => "Bilder-Upload fehlgeschlagen",
 			'tidypics:exceedpostlimit' => "Zuviele große Bilder auf einmal - versuche weniger oder kleinere Bilder hochzuladen",
+
 			'tidypics:noimages' => "Keine Bilder zum Upload ausgewählt",
 			'tidypics:image_mem' => "Das Bild ist zu groß",
 			'tidypics:image_pixels' => "Das Bild hat zuviele Pixel",
@@ -179,15 +205,21 @@
 			'tidypics:not_image' => "Das Bild-Typ wurde nicht erkannt",
 			'image:deletefailed' => "Dein Bild konnte nicht gelöscht werden",
 			'image:downloadfailed' => "Fehler: Das Bild ist zur Zeit nicht verfügbar",
+
+
 			'tidypics:nosettings' => "Admin dieser Seite hat keine Einstellungen für Fotoalben vorgenommen",
 			'tidypics:exceed_quota' => "Dir zugewiesener Speicherplatz ist ausgeschöpft!",
+
 			'images:notedited' => "Nicht alle Bilder konnten erfolgreich upgedated werden",
 
 			'album:none' => "Bis jetzt keine Alben erstellt",
+
 			'album:uploadfailed' => "Dein Album konnte nicht gespeichert werden",
 			'album:deletefailed' => "Dein Album konnte nicht gelöscht werden",
 			'album:blank' => "Bitte gib diesem Album einen Titel und eine Beschreibung",
 
+			
+			
 			'tidypics:upgrade:failed' => "Upgrade von Tidypics gescheitert",
 	);
 
-- 
cgit v1.2.3


From 6b00bdba17af611726eb950fb51758556694e80f Mon Sep 17 00:00:00 2001
From: dkotrada 
Date: Tue, 6 Oct 2009 11:25:09 +0000
Subject: translated image:river:tagged

---
 languages/de.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/languages/de.php b/languages/de.php
index a2a97c0c7..7b014bc0d 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -1,7 +1,7 @@
  "%s hat ein Bild %s zum Album %s hinzugefügt",
 			'image:river:item' => "ein Bild",
 			'image:river:annotate' => "einen Kommentar zum Bild",
-			'image:river:tagged' => "was tagged in the photo",
+			'image:river:tagged' => "war im Foto verlinkt",
 
 			//albums
 			'album:river:created' => "%s hat ein neues Album erstellt",
@@ -186,7 +186,7 @@ Das Foto kanns du hier sehen: %s",
 
 
 
-               
+
 
 
 			'tidypics:upgrade:success' => 'Upgrade von Tidypics erfolgreich',
-- 
cgit v1.2.3


From 24f3f2f0d304254451c46a3b28a8e1f4678bc02f Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Thu, 8 Oct 2009 04:38:19 +0000
Subject: flickr integration

---
 actions/flickrImportPhotoset.php             |  347 +++++
 actions/flickrSetup.php                      |   32 +
 lib/flickr.php                               |    8 +
 lib/phpFlickr/PEAR/DB.php                    | 1388 +++++++++++++++++
 lib/phpFlickr/PEAR/DB/common.php             | 2157 ++++++++++++++++++++++++++
 lib/phpFlickr/PEAR/DB/mysql.php              | 1034 ++++++++++++
 lib/phpFlickr/PEAR/DB/pgsql.php              | 1097 +++++++++++++
 lib/phpFlickr/PEAR/DB/storage.php            |  504 ++++++
 lib/phpFlickr/PEAR/HTTP/Request.php          | 1484 ++++++++++++++++++
 lib/phpFlickr/PEAR/HTTP/Request/Listener.php |  106 ++
 lib/phpFlickr/PEAR/Net/Socket.php            |  528 +++++++
 lib/phpFlickr/PEAR/Net/URL.php               |  410 +++++
 lib/phpFlickr/PEAR/PEAR.php                  | 1108 +++++++++++++
 lib/phpFlickr/README.txt                     |  215 +++
 lib/phpFlickr/auth.php                       |   37 +
 lib/phpFlickr/example.php                    |   30 +
 lib/phpFlickr/getToken.php                   |   19 +
 lib/phpFlickr/phpFlickr.php                  | 1453 +++++++++++++++++
 mostvieweddashboard.php                      |    1 +
 pages/flickr/error_log                       |   23 +
 pages/flickr/importPhotosets.php             |   44 +
 pages/flickr/setup.php                       |   17 +
 pages/lists/flickr.php                       |   60 +
 pages/lists/mostrecentimages.php             |    4 +-
 start.php                                    |   15 +-
 views/default/tidypics/forms/edit_multi.php  |    1 +
 views/default/tidypics/forms/setupFlickr.php |   17 +
 27 files changed, 12137 insertions(+), 2 deletions(-)
 create mode 100644 actions/flickrImportPhotoset.php
 create mode 100644 actions/flickrSetup.php
 create mode 100644 lib/flickr.php
 create mode 100644 lib/phpFlickr/PEAR/DB.php
 create mode 100644 lib/phpFlickr/PEAR/DB/common.php
 create mode 100644 lib/phpFlickr/PEAR/DB/mysql.php
 create mode 100644 lib/phpFlickr/PEAR/DB/pgsql.php
 create mode 100644 lib/phpFlickr/PEAR/DB/storage.php
 create mode 100644 lib/phpFlickr/PEAR/HTTP/Request.php
 create mode 100644 lib/phpFlickr/PEAR/HTTP/Request/Listener.php
 create mode 100644 lib/phpFlickr/PEAR/Net/Socket.php
 create mode 100644 lib/phpFlickr/PEAR/Net/URL.php
 create mode 100644 lib/phpFlickr/PEAR/PEAR.php
 create mode 100644 lib/phpFlickr/README.txt
 create mode 100644 lib/phpFlickr/auth.php
 create mode 100644 lib/phpFlickr/example.php
 create mode 100644 lib/phpFlickr/getToken.php
 create mode 100644 lib/phpFlickr/phpFlickr.php
 create mode 100644 pages/flickr/error_log
 create mode 100644 pages/flickr/importPhotosets.php
 create mode 100644 pages/flickr/setup.php
 create mode 100644 pages/lists/flickr.php
 create mode 100644 views/default/tidypics/forms/setupFlickr.php

diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php
new file mode 100644
index 000000000..fe4041b2c
--- /dev/null
+++ b/actions/flickrImportPhotoset.php
@@ -0,0 +1,347 @@
+guid, "flickr_id" );
+
+if( empty( $flickr_id )) {
+	register_error( "You must enter a username" );
+	forward( $return_url );
+	die; //just in case
+}
+
+// Get the friendly URL of the user's photos
+$photos_url = $f->urls_getUserPhotos( $flickr_id->value );
+$photos = $f->photosets_getPhotos( $set_id, null, null, 10, $page_pp );
+/* TODO:
+* 1. create album if a matching one doesn't exist
+* 2. create metadata for entity so it goes into the new album
+* 3. check for id of photo in image data to make sure we haven't downloaded it already
+*/
+
+$photos_to_upload = array();
+foreach( $photos["photoset"]["photo"] as $photo ) {
+	
+	//check if we already have this image
+	$meta = get_metadata_byname( $user->guid, $photo["id"] );
+	if( $meta->value == 1 ) { //we've downloaded this already
+		register_error( "This image has already been imported" );
+		continue;
+	}
+	//store this so we don't download the same photo multiple times
+	create_metadata( $user->guid, $photo["id"], "1", "text", $user->guid, ACCESS_PUBLIC );
+
+	$photo_info = $f->photos_getInfo( $photo["id"], $photo["secret"] );
+	$tags = array();
+	foreach( $photo_info["tags"]["tag"] as $tag ) {
+		$tags[] = $tag["raw"];
+	}
+	$tags = implode( ", ", $tags );
+	
+	$image_url = $f->buildPhotoURL( $photo );
+	$photos_to_upload[ $photo_info["id"] . ".jpg" ] = array( "url"=> $image_url, "tags" => $tags, "title" => $photo_info["title"], "description" => $photo_info["description"], "flickr_page" => "$photos_url$photo[id]" );
+
+	$body .= "
      ";
+	$body .= "$photo_info[title]
      Views: $photo_info[views]
      ";
+	$body .= "";
+	$body .= "$photo[title]";
+	$body .= "";
+}
+//	echo "
      "; var_dump( $photos_to_upload );; die;
+
+/**
+ * Elgg multi-image uploader action
+* 
+* This will upload up to 10 images at at time to an album
+ */
+
+global $CONFIG;
+include dirname(dirname(__FILE__)) . "/lib/resize.php";
+include dirname(dirname(__FILE__)) . "/lib/exif.php";
+
+// Make sure we're logged in 
+gatekeeper();
+
+// Get common variables
+$access_id = (int) get_input("access_id");
+$container_guid = (int) get_input('container_guid', 0);
+$container_guid = 990; //force it to my test album for now
+
+if (!$container_guid)
+	$container_guid == $_SESSION['user']->getGUID();
+
+$album = get_entity($container_guid);
+
+$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); 
+if (!$maxfilesize)
+	$maxfilesize = 5; // default to 5 MB if not set 
+$maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs
+
+$quota = get_plugin_setting('quota','tidypics');
+$quota = 1024 * 1024 * $quota;
+$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
+$image_repo_size = (int)$image_repo_size_md->value;
+
+$image_lib = get_plugin_setting('image_lib', 'tidypics');
+if (!$image_lib)
+	$image_lib = "GD";
+
+/*
+// post limit exceeded
+if (count($_FILES) == 0) {
+	trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
+	register_error(elgg_echo('tidypics:exceedpostlimit'));
+	forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
+}
+*/
+
+/*
+// test to make sure at least 1 image was selected by user
+$num_images = 0;
+foreach($_FILES as $key => $sent_file) {
+	if (!empty($sent_file['name']))
+		$num_images++;
+}
+*/
+if ( count( $photos_to_upload ) == 0 ) {
+	// have user try again
+	register_error(elgg_echo('tidypics:noimages'));
+	forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
+	die; //just in case
+}
+
+$uploaded_images = array();
+$not_uploaded = array();
+$error_msgs = array();
+
+$img_river_view = get_plugin_setting('img_river_view', 'tidypics');
+
+/*
+$accepted_formats = array(
+							'image/jpeg',
+							'image/png',
+							'image/gif',
+							'image/pjpeg',
+							'image/x-png',
+							);
+
+*/
+//foreach($_FILES as $key => $sent_file) {
+foreach( $photos_to_upload as $name => $photo ) {
+
+/*	
+	// skip empty entries 
+	if (empty($sent_file['name']))
+		continue;
+	
+	$name = $sent_file['name'];
+	$mime = $sent_file['type'];
+
+	if ($sent_file['error']) {
+		array_push($not_uploaded, $sent_file['name']);
+		if ($sent_file['error'] == 1) {
+			trigger_error('Tidypics warning: image exceed server php upload limit', E_USER_WARNING);
+			array_push($error_msgs, elgg_echo('tidypics:image_mem'));
+		}
+		else {
+			array_push($error_msgs, elgg_echo('tidypics:unk_error'));
+		}
+		continue;
+	}
+	
+	//make sure file is an image
+	if (!in_array($mime, $accepted_formats)) {
+		array_push($not_uploaded, $sent_file['name']);
+		array_push($error_msgs, elgg_echo('tidypics:not_image'));
+		continue;
+	}
+
+*/
+/* I'm not going to check filesize here because flickr has already resized it for me 
+	// check quota
+	if ($quota) {
+		if ($image_repo_size + $sent_file['size'] > $quota) {
+			array_push($not_uploaded, $sent_file['name']);
+			array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
+			continue;
+		}
+	}
+	
+	// make sure file does not exceed memory limit
+	if ($sent_file['size'] > $maxfilesize) {
+		array_push($not_uploaded, $sent_file['name']);
+		array_push($error_msgs, elgg_echo('tidypics:image_mem'));
+		continue;
+	}
+	
+	// make sure the in memory image size does not exceed memory available - GD only
+	$imginfo = getimagesize($sent_file['tmp_name']);
+	$mem_avail = ini_get('memory_limit');
+	$mem_avail = rtrim($mem_avail, 'M');
+	$mem_avail = $mem_avail * 1024 * 1024;
+	if ($image_lib == 'GD') {
+		$mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);
+		
+		$mem_used = memory_get_usage();
+			
+		$mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer
+		if ($mem_required > $mem_avail) {
+			array_push($not_uploaded, $sent_file['name']);
+			array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
+			trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
+			continue;
+		}
+	} else if ($image_lib == 'ImageMagickPHP') {
+		// haven't been able to determine a limit like there is for GD
+	}
+*/
+	$mime = "image/jpeg"; //not sure how to get this from the file if we aren't posting it
+	
+	//this will save to users folder in /image/ and organize by photo album
+	$prefix = "image/" . $container_guid . "/";
+	$file = new ElggFile();
+	$filestorename = strtolower(time().$name);
+	$file->setFilename($prefix.$filestorename . ".jpg"); //that's all flickr stores so I think this is safe
+	$file->setMimeType($mime);
+	$file->originalfilename = $name;
+	$file->subtype="image";
+	$file->simpletype="image";
+	$file->access_id = $access_id;
+	if ($container_guid) {
+		$file->container_guid = $container_guid;
+	}
+
+	// get the file from flickr and save it locally
+	$filename = $file->getFilenameOnFilestore(); 
+	$destination=fopen($filename,"w");
+	$source=fopen($photo["url"],"r");
+
+	while ($a=fread($source,1024)) fwrite($destination,$a);
+	fclose($source);
+	fclose($destination);
+
+	/*
+	$file->open("write");
+	$file->write();
+	$file->write(get_uploaded_file($key));
+	$file->close();
+	*/	
+	$result = $file->save();
+
+	if (!$result) {
+		array_push($not_uploaded, $sent_file['name']);
+		array_push($error_msgs, elgg_echo('tidypics:save_error'));
+		continue;
+	}
+	
+	//add tags
+	create_metadata( $file->guid, "tags", $photo["tags"], "text", $user->guid, ACCESS_PUBLIC );
+	
+	//add title and description
+	create_object_entity( $file->guid, $photo["title"], $photo["description"] );
+	
+	//get and store the exif data
+	td_get_exif($file);
+	
+	// resize photos to create thumbnails
+	if ($image_lib == 'ImageMagick') { // ImageMagick command line
+		
+		if (tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
+		}
+		
+	} else if ($image_lib == 'ImageMagickPHP') {  // imagick php extension 
+		
+		if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
+		}
+	
+	} else { 
+		
+		if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
+		}
+		
+	} // end of image library selector
+
+	//keep one file handy so we can add a notice to the river if single image option selected
+	if(!$file_for_river) {
+		$file_for_river = $file;
+	}
+
+	array_push($uploaded_images, $file->guid);
+
+	// update user/group size for checking quota
+	$image_repo_size += $sent_file['size'];
+
+	// successful upload so check if this is a new album and throw river event/notification if so
+	if ($album->new_album == TP_NEW_ALBUM) {
+		$album->new_album = TP_OLD_ALBUM;
+
+		// we throw the notification manually here so users are not told about the new album until there
+		// is at least a few photos in it
+		object_notifications('create', 'object', $album);
+		
+		if (function_exists('add_to_river'))
+			add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
+	}
+
+	if ($img_river_view == "all") {
+		add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
+	}
+	unset($file);  // may not be needed but there seems to be a memory leak
+
+} //end of for loop
+			
+if (count($not_uploaded) > 0) {
+	if (count($uploaded_images) > 0)
+		$error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images))  . '
      ';
+	else
+		$error = elgg_echo("tidypics:completeuploadfailure") . '
      ';
+
+	$num_failures = count($not_uploaded);
+	for ($i = 0; $i < $num_failures; $i++) {
+		$error .= "{$not_uploaded[$i]}: {$error_msgs[$i]} 
      ";
+	}
+	register_error($error);
+	
+	if (count($uploaded_images) == 0)
+		forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page
+	else {
+		// some images did upload so we fall through
+	}
+} else {
+		system_message(elgg_echo('tidypics:upl_success'));
+}
+
+if (count($uploaded_images) && $img_river_view == "1") {
+	if (function_exists('add_to_river')) {
+		add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
+	}
+}
+
+// update image repo size
+create_metadata($album->container_guid, "image_repo_size", $image_repo_size, 'integer', $album->container_guid);
+
+// plugins can register to be told when a Tidypics album has had images added
+trigger_elgg_event('upload', 'tp_album', $album);
+
+//forward to multi-image edit page
+
+$url = $CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images);
+forward($url); 
+
+?>
diff --git a/actions/flickrSetup.php b/actions/flickrSetup.php
new file mode 100644
index 000000000..e272ee141
--- /dev/null
+++ b/actions/flickrSetup.php
@@ -0,0 +1,32 @@
+people_findByUsername( $flickr_username );
+	if( !empty( $flickr_user["id"] )) {
+		create_metadata( $user->guid, "flickr_username", $flickr_username, "text", $user->guid, ACCESS_PUBLIC );
+		create_metadata( $user->guid, "flickr_id", $flickr_user["id"], "text", $user->guid, ACCESS_PUBLIC );
+		
+		system_message( "Successfully saved Flickr username of $flickr_username" );
+		system_message( "flickr user id: $flickr_user[id]" );
+	} else {
+		register_error( "Username $flickr_username not found on Flickr" );
+	}
+}
+
+forward($_SERVER['HTTP_REFERER']);
+//echo "
      "; var_dump( array($flickr_username, $return_url )); echo "
      ";
+
+?>
\ No newline at end of file
diff --git a/lib/flickr.php b/lib/flickr.php
new file mode 100644
index 000000000..ec54e2867
--- /dev/null
+++ b/lib/flickr.php
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/lib/phpFlickr/PEAR/DB.php b/lib/phpFlickr/PEAR/DB.php
new file mode 100644
index 000000000..a3eede070
--- /dev/null
+++ b/lib/phpFlickr/PEAR/DB.php
@@ -0,0 +1,1388 @@
+
+ * @author     Tomas V.V.Cox 
+ * @author     Daniel Convissor 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: DB.php 32 2005-08-01 06:21:02Z dancoulter $
+ * @link       http://pear.php.net/package/DB
+ */
+
+/**
+ * Obtain the PEAR class so it can be extended from
+ */
+require_once 'PEAR.php';
+
+
+// {{{ constants
+// {{{ error codes
+
+/**#@+
+ * One of PEAR DB's portable error codes.
+ * @see DB_common::errorCode(), DB::errorMessage()
+ *
+ * {@internal If you add an error code here, make sure you also add a textual
+ * version of it in DB::errorMessage().}}
+ */
+
+/**
+ * The code returned by many methods upon success
+ */
+define('DB_OK', 1);
+
+/**
+ * Unkown error
+ */
+define('DB_ERROR', -1);
+
+/**
+ * Syntax error
+ */
+define('DB_ERROR_SYNTAX', -2);
+
+/**
+ * Tried to insert a duplicate value into a primary or unique index
+ */
+define('DB_ERROR_CONSTRAINT', -3);
+
+/**
+ * An identifier in the query refers to a non-existant object
+ */
+define('DB_ERROR_NOT_FOUND', -4);
+
+/**
+ * Tried to create a duplicate object
+ */
+define('DB_ERROR_ALREADY_EXISTS', -5);
+
+/**
+ * The current driver does not support the action you attempted
+ */
+define('DB_ERROR_UNSUPPORTED', -6);
+
+/**
+ * The number of parameters does not match the number of placeholders
+ */
+define('DB_ERROR_MISMATCH', -7);
+
+/**
+ * A literal submitted did not match the data type expected
+ */
+define('DB_ERROR_INVALID', -8);
+
+/**
+ * The current DBMS does not support the action you attempted
+ */
+define('DB_ERROR_NOT_CAPABLE', -9);
+
+/**
+ * A literal submitted was too long so the end of it was removed
+ */
+define('DB_ERROR_TRUNCATED', -10);
+
+/**
+ * A literal number submitted did not match the data type expected
+ */
+define('DB_ERROR_INVALID_NUMBER', -11);
+
+/**
+ * A literal date submitted did not match the data type expected
+ */
+define('DB_ERROR_INVALID_DATE', -12);
+
+/**
+ * Attempt to divide something by zero
+ */
+define('DB_ERROR_DIVZERO', -13);
+
+/**
+ * A database needs to be selected
+ */
+define('DB_ERROR_NODBSELECTED', -14);
+
+/**
+ * Could not create the object requested
+ */
+define('DB_ERROR_CANNOT_CREATE', -15);
+
+/**
+ * Could not drop the database requested because it does not exist
+ */
+define('DB_ERROR_CANNOT_DROP', -17);
+
+/**
+ * An identifier in the query refers to a non-existant table
+ */
+define('DB_ERROR_NOSUCHTABLE', -18);
+
+/**
+ * An identifier in the query refers to a non-existant column
+ */
+define('DB_ERROR_NOSUCHFIELD', -19);
+
+/**
+ * The data submitted to the method was inappropriate
+ */
+define('DB_ERROR_NEED_MORE_DATA', -20);
+
+/**
+ * The attempt to lock the table failed
+ */
+define('DB_ERROR_NOT_LOCKED', -21);
+
+/**
+ * The number of columns doesn't match the number of values
+ */
+define('DB_ERROR_VALUE_COUNT_ON_ROW', -22);
+
+/**
+ * The DSN submitted has problems
+ */
+define('DB_ERROR_INVALID_DSN', -23);
+
+/**
+ * Could not connect to the database
+ */
+define('DB_ERROR_CONNECT_FAILED', -24);
+
+/**
+ * The PHP extension needed for this DBMS could not be found
+ */
+define('DB_ERROR_EXTENSION_NOT_FOUND',-25);
+
+/**
+ * The present user has inadequate permissions to perform the task requestd
+ */
+define('DB_ERROR_ACCESS_VIOLATION', -26);
+
+/**
+ * The database requested does not exist
+ */
+define('DB_ERROR_NOSUCHDB', -27);
+
+/**
+ * Tried to insert a null value into a column that doesn't allow nulls
+ */
+define('DB_ERROR_CONSTRAINT_NOT_NULL',-29);
+/**#@-*/
+
+
+// }}}
+// {{{ prepared statement-related
+
+
+/**#@+
+ * Identifiers for the placeholders used in prepared statements.
+ * @see DB_common::prepare()
+ */
+
+/**
+ * Indicates a scalar (?) placeholder was used
+ *
+ * Quote and escape the value as necessary.
+ */
+define('DB_PARAM_SCALAR', 1);
+
+/**
+ * Indicates an opaque (&) placeholder was used
+ *
+ * The value presented is a file name.  Extract the contents of that file
+ * and place them in this column.
+ */
+define('DB_PARAM_OPAQUE', 2);
+
+/**
+ * Indicates a misc (!) placeholder was used
+ *
+ * The value should not be quoted or escaped.
+ */
+define('DB_PARAM_MISC',   3);
+/**#@-*/
+
+
+// }}}
+// {{{ binary data-related
+
+
+/**#@+
+ * The different ways of returning binary data from queries.
+ */
+
+/**
+ * Sends the fetched data straight through to output
+ */
+define('DB_BINMODE_PASSTHRU', 1);
+
+/**
+ * Lets you return data as usual
+ */
+define('DB_BINMODE_RETURN', 2);
+
+/**
+ * Converts the data to hex format before returning it
+ *
+ * For example the string "123" would become "313233".
+ */
+define('DB_BINMODE_CONVERT', 3);
+/**#@-*/
+
+
+// }}}
+// {{{ fetch modes
+
+
+/**#@+
+ * Fetch Modes.
+ * @see DB_common::setFetchMode()
+ */
+
+/**
+ * Indicates the current default fetch mode should be used
+ * @see DB_common::$fetchmode
+ */
+define('DB_FETCHMODE_DEFAULT', 0);
+
+/**
+ * Column data indexed by numbers, ordered from 0 and up
+ */
+define('DB_FETCHMODE_ORDERED', 1);
+
+/**
+ * Column data indexed by column names
+ */
+define('DB_FETCHMODE_ASSOC', 2);
+
+/**
+ * Column data as object properties
+ */
+define('DB_FETCHMODE_OBJECT', 3);
+
+/**
+ * For multi-dimensional results, make the column name the first level
+ * of the array and put the row number in the second level of the array
+ *
+ * This is flipped from the normal behavior, which puts the row numbers
+ * in the first level of the array and the column names in the second level.
+ */
+define('DB_FETCHMODE_FLIPPED', 4);
+/**#@-*/
+
+/**#@+
+ * Old fetch modes.  Left here for compatibility.
+ */
+define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED);
+define('DB_GETMODE_ASSOC',   DB_FETCHMODE_ASSOC);
+define('DB_GETMODE_FLIPPED', DB_FETCHMODE_FLIPPED);
+/**#@-*/
+
+
+// }}}
+// {{{ tableInfo() && autoPrepare()-related
+
+
+/**#@+
+ * The type of information to return from the tableInfo() method.
+ *
+ * Bitwised constants, so they can be combined using |
+ * and removed using ^.
+ *
+ * @see DB_common::tableInfo()
+ *
+ * {@internal Since the TABLEINFO constants are bitwised, if more of them are
+ * added in the future, make sure to adjust DB_TABLEINFO_FULL accordingly.}}
+ */
+define('DB_TABLEINFO_ORDER', 1);
+define('DB_TABLEINFO_ORDERTABLE', 2);
+define('DB_TABLEINFO_FULL', 3);
+/**#@-*/
+
+
+/**#@+
+ * The type of query to create with the automatic query building methods.
+ * @see DB_common::autoPrepare(), DB_common::autoExecute()
+ */
+define('DB_AUTOQUERY_INSERT', 1);
+define('DB_AUTOQUERY_UPDATE', 2);
+/**#@-*/
+
+
+// }}}
+// {{{ portability modes
+
+
+/**#@+
+ * Portability Modes.
+ *
+ * Bitwised constants, so they can be combined using |
+ * and removed using ^.
+ *
+ * @see DB_common::setOption()
+ *
+ * {@internal Since the PORTABILITY constants are bitwised, if more of them are
+ * added in the future, make sure to adjust DB_PORTABILITY_ALL accordingly.}}
+ */
+
+/**
+ * Turn off all portability features
+ */
+define('DB_PORTABILITY_NONE', 0);
+
+/**
+ * Convert names of tables and fields to lower case
+ * when using the get*(), fetch*() and tableInfo() methods
+ */
+define('DB_PORTABILITY_LOWERCASE', 1);
+
+/**
+ * Right trim the data output by get*() and fetch*()
+ */
+define('DB_PORTABILITY_RTRIM', 2);
+
+/**
+ * Force reporting the number of rows deleted
+ */
+define('DB_PORTABILITY_DELETE_COUNT', 4);
+
+/**
+ * Enable hack that makes numRows() work in Oracle
+ */
+define('DB_PORTABILITY_NUMROWS', 8);
+
+/**
+ * Makes certain error messages in certain drivers compatible
+ * with those from other DBMS's
+ *
+ * + mysql, mysqli:  change unique/primary key constraints
+ *   DB_ERROR_ALREADY_EXISTS -> DB_ERROR_CONSTRAINT
+ *
+ * + odbc(access):  MS's ODBC driver reports 'no such field' as code
+ *   07001, which means 'too few parameters.'  When this option is on
+ *   that code gets mapped to DB_ERROR_NOSUCHFIELD.
+ */
+define('DB_PORTABILITY_ERRORS', 16);
+
+/**
+ * Convert null values to empty strings in data output by
+ * get*() and fetch*()
+ */
+define('DB_PORTABILITY_NULL_TO_EMPTY', 32);
+
+/**
+ * Turn on all portability features
+ */
+define('DB_PORTABILITY_ALL', 63);
+/**#@-*/
+
+// }}}
+
+
+// }}}
+// {{{ class DB
+
+/**
+ * Database independent query interface
+ *
+ * The main "DB" class is simply a container class with some static
+ * methods for creating DB objects as well as some utility functions
+ * common to all parts of DB.
+ *
+ * The object model of DB is as follows (indentation means inheritance):
+ * 
      + * DB           The main DB class.  This is simply a utility class
+ *              with some "static" methods for creating DB objects as
+ *              well as common utility functions for other DB classes.
+ *
+ * DB_common    The base for each DB implementation.  Provides default
+ * |            implementations (in OO lingo virtual methods) for
+ * |            the actual DB implementations as well as a bunch of
+ * |            query utility functions.
+ * |
+ * +-DB_mysql   The DB implementation for MySQL.  Inherits DB_common.
+ *              When calling DB::factory or DB::connect for MySQL
+ *              connections, the object returned is an instance of this
+ *              class.
+ * 
      
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Stig Bakken 
+ * @author     Tomas V.V.Cox 
+ * @author     Daniel Convissor 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/DB
+ */
+class DB
+{
+    // {{{ &factory()
+
+    /**
+     * Create a new DB object for the specified database type but don't
+     * connect to the database
+     *
+     * @param string $type     the database type (eg "mysql")
+     * @param array  $options  an associative array of option names and values
+     *
+     * @return object  a new DB object.  A DB_Error object on failure.
+     *
+     * @see DB_common::setOption()
+     */
+    function &factory($type, $options = false)
+    {
+        if (!is_array($options)) {
+            $options = array('persistent' => $options);
+        }
+
+        if (isset($options['debug']) && $options['debug'] >= 2) {
+            // expose php errors with sufficient debug level
+            include_once "DB/{$type}.php";
+        } else {
+            @include_once "DB/{$type}.php";
+        }
+
+        $classname = "DB_${type}";
+
+        if (!class_exists($classname)) {
+            $tmp = PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null,
+                                    "Unable to include the DB/{$type}.php"
+                                    . " file for '$dsn'",
+                                    'DB_Error', true);
+            return $tmp;
+        }
+
+        @$obj =& new $classname;
+
+        foreach ($options as $option => $value) {
+            $test = $obj->setOption($option, $value);
+            if (DB::isError($test)) {
+                return $test;
+            }
+        }
+
+        return $obj;
+    }
+
+    // }}}
+    // {{{ &connect()
+
+    /**
+     * Create a new DB object including a connection to the specified database
+     *
+     * Example 1.
+     * 
+     * require_once 'DB.php';
+     *
+     * $dsn = 'pgsql://user:password@host/database';
+     * $options = array(
+     *     'debug'       => 2,
+     *     'portability' => DB_PORTABILITY_ALL,
+     * );
+     *
+     * $db =& DB::connect($dsn, $options);
+     * if (PEAR::isError($db)) {
+     *     die($db->getMessage());
+     * }
+     * 
+     *
+     * @param mixed $dsn      the string "data source name" or array in the
+     *                         format returned by DB::parseDSN()
+     * @param array $options  an associative array of option names and values
+     *
+     * @return object  a new DB object.  A DB_Error object on failure.
+     *
+     * @uses DB_dbase::connect(), DB_fbsql::connect(), DB_ibase::connect(),
+     *       DB_ifx::connect(), DB_msql::connect(), DB_mssql::connect(),
+     *       DB_mysql::connect(), DB_mysqli::connect(), DB_oci8::connect(),
+     *       DB_odbc::connect(), DB_pgsql::connect(), DB_sqlite::connect(),
+     *       DB_sybase::connect()
+     *
+     * @uses DB::parseDSN(), DB_common::setOption(), PEAR::isError()
+     */
+    function &connect($dsn, $options = array())
+    {
+        $dsninfo = DB::parseDSN($dsn);
+        $type = $dsninfo['phptype'];
+
+        if (!is_array($options)) {
+            /*
+             * For backwards compatibility.  $options used to be boolean,
+             * indicating whether the connection should be persistent.
+             */
+            $options = array('persistent' => $options);
+        }
+
+        if (isset($options['debug']) && $options['debug'] >= 2) {
+            // expose php errors with sufficient debug level
+            include_once "DB/${type}.php";
+        } else {
+            @include_once "DB/${type}.php";
+        }
+
+        $classname = "DB_${type}";
+        if (!class_exists($classname)) {
+            $tmp = PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null,
+                                    "Unable to include the DB/{$type}.php"
+                                    . " file for '$dsn'",
+                                    'DB_Error', true);
+            return $tmp;
+        }
+
+        @$obj =& new $classname;
+
+        foreach ($options as $option => $value) {
+            $test = $obj->setOption($option, $value);
+            if (DB::isError($test)) {
+                return $test;
+            }
+        }
+
+        $err = $obj->connect($dsninfo, $obj->getOption('persistent'));
+        if (DB::isError($err)) {
+            $err->addUserInfo($dsn);
+            return $err;
+        }
+
+        return $obj;
+    }
+
+    // }}}
+    // {{{ apiVersion()
+
+    /**
+     * Return the DB API version
+     *
+     * @return string  the DB API version number
+     */
+    function apiVersion()
+    {
+        return '@package_version@';
+    }
+
+    // }}}
+    // {{{ isError()
+
+    /**
+     * Determines if a variable is a DB_Error object
+     *
+     * @param mixed $value  the variable to check
+     *
+     * @return bool  whether $value is DB_Error object
+     */
+    function isError($value)
+    {
+        return is_a($value, 'DB_Error');
+    }
+
+    // }}}
+    // {{{ isConnection()
+
+    /**
+     * Determines if a value is a DB_ object
+     *
+     * @param mixed $value  the value to test
+     *
+     * @return bool  whether $value is a DB_ object
+     */
+    function isConnection($value)
+    {
+        return (is_object($value) &&
+                is_subclass_of($value, 'db_common') &&
+                method_exists($value, 'simpleQuery'));
+    }
+
+    // }}}
+    // {{{ isManip()
+
+    /**
+     * Tell whether a query is a data manipulation or data definition query
+     *
+     * Examples of data manipulation queries are INSERT, UPDATE and DELETE.
+     * Examples of data definition queries are CREATE, DROP, ALTER, GRANT,
+     * REVOKE.
+     *
+     * @param string $query  the query
+     *
+     * @return boolean  whether $query is a data manipulation query
+     */
+    function isManip($query)
+    {
+        $manips = 'INSERT|UPDATE|DELETE|REPLACE|'
+                . 'CREATE|DROP|'
+                . 'LOAD DATA|SELECT .* INTO|COPY|'
+                . 'ALTER|GRANT|REVOKE|'
+                . 'LOCK|UNLOCK';
+        if (preg_match('/^\s*"?(' . $manips . ')\s+/i', $query)) {
+            return true;
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ errorMessage()
+
+    /**
+     * Return a textual error message for a DB error code
+     *
+     * @param integer $value  the DB error code
+     *
+     * @return string  the error message or false if the error code was
+     *                  not recognized
+     */
+    function errorMessage($value)
+    {
+        static $errorMessages;
+        if (!isset($errorMessages)) {
+            $errorMessages = array(
+                DB_ERROR                    => 'unknown error',
+                DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions',
+                DB_ERROR_ALREADY_EXISTS     => 'already exists',
+                DB_ERROR_CANNOT_CREATE      => 'can not create',
+                DB_ERROR_CANNOT_DROP        => 'can not drop',
+                DB_ERROR_CONNECT_FAILED     => 'connect failed',
+                DB_ERROR_CONSTRAINT         => 'constraint violation',
+                DB_ERROR_CONSTRAINT_NOT_NULL=> 'null value violates not-null constraint',
+                DB_ERROR_DIVZERO            => 'division by zero',
+                DB_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
+                DB_ERROR_INVALID            => 'invalid',
+                DB_ERROR_INVALID_DATE       => 'invalid date or time',
+                DB_ERROR_INVALID_DSN        => 'invalid DSN',
+                DB_ERROR_INVALID_NUMBER     => 'invalid number',
+                DB_ERROR_MISMATCH           => 'mismatch',
+                DB_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
+                DB_ERROR_NODBSELECTED       => 'no database selected',
+                DB_ERROR_NOSUCHDB           => 'no such database',
+                DB_ERROR_NOSUCHFIELD        => 'no such field',
+                DB_ERROR_NOSUCHTABLE        => 'no such table',
+                DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
+                DB_ERROR_NOT_FOUND          => 'not found',
+                DB_ERROR_NOT_LOCKED         => 'not locked',
+                DB_ERROR_SYNTAX             => 'syntax error',
+                DB_ERROR_UNSUPPORTED        => 'not supported',
+                DB_ERROR_TRUNCATED          => 'truncated',
+                DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+                DB_OK                       => 'no error',
+            );
+        }
+
+        if (DB::isError($value)) {
+            $value = $value->getCode();
+        }
+
+        return isset($errorMessages[$value]) ? $errorMessages[$value]
+                     : $errorMessages[DB_ERROR];
+    }
+
+    // }}}
+    // {{{ parseDSN()
+
+    /**
+     * Parse a data source name
+     *
+     * Additional keys can be added by appending a URI query string to the
+     * end of the DSN.
+     *
+     * The format of the supplied DSN is in its fullest form:
+     * 
+     *  phptype(dbsyntax)://username:password@protocol+hostspec/database?option=8&another=true
+     * 
+     *
+     * Most variations are allowed:
+     * 
+     *  phptype://username:password@protocol+hostspec:110//usr/db_file.db?mode=0644
+     *  phptype://username:password@hostspec/database_name
+     *  phptype://username:password@hostspec
+     *  phptype://username@hostspec
+     *  phptype://hostspec/database
+     *  phptype://hostspec
+     *  phptype(dbsyntax)
+     *  phptype
+     * 
+     *
+     * @param string $dsn Data Source Name to be parsed
+     *
+     * @return array an associative array with the following keys:
+     *  + phptype:  Database backend used in PHP (mysql, odbc etc.)
+     *  + dbsyntax: Database used with regards to SQL syntax etc.
+     *  + protocol: Communication protocol to use (tcp, unix etc.)
+     *  + hostspec: Host specification (hostname[:port])
+     *  + database: Database to use on the DBMS server
+     *  + username: User name for login
+     *  + password: Password for login
+     */
+    function parseDSN($dsn)
+    {
+        $parsed = array(
+            'phptype'  => false,
+            'dbsyntax' => false,
+            'username' => false,
+            'password' => false,
+            'protocol' => false,
+            'hostspec' => false,
+            'port'     => false,
+            'socket'   => false,
+            'database' => false,
+        );
+
+        if (is_array($dsn)) {
+            $dsn = array_merge($parsed, $dsn);
+            if (!$dsn['dbsyntax']) {
+                $dsn['dbsyntax'] = $dsn['phptype'];
+            }
+            return $dsn;
+        }
+
+        // Find phptype and dbsyntax
+        if (($pos = strpos($dsn, '://')) !== false) {
+            $str = substr($dsn, 0, $pos);
+            $dsn = substr($dsn, $pos + 3);
+        } else {
+            $str = $dsn;
+            $dsn = null;
+        }
+
+        // Get phptype and dbsyntax
+        // $str => phptype(dbsyntax)
+        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
+            $parsed['phptype']  = $arr[1];
+            $parsed['dbsyntax'] = !$arr[2] ? $arr[1] : $arr[2];
+        } else {
+            $parsed['phptype']  = $str;
+            $parsed['dbsyntax'] = $str;
+        }
+
+        if (!count($dsn)) {
+            return $parsed;
+        }
+
+        // Get (if found): username and password
+        // $dsn => username:password@protocol+hostspec/database
+        if (($at = strrpos($dsn,'@')) !== false) {
+            $str = substr($dsn, 0, $at);
+            $dsn = substr($dsn, $at + 1);
+            if (($pos = strpos($str, ':')) !== false) {
+                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
+                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
+            } else {
+                $parsed['username'] = rawurldecode($str);
+            }
+        }
+
+        // Find protocol and hostspec
+
+        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
+            // $dsn => proto(proto_opts)/database
+            $proto       = $match[1];
+            $proto_opts  = $match[2] ? $match[2] : false;
+            $dsn         = $match[3];
+
+        } else {
+            // $dsn => protocol+hostspec/database (old format)
+            if (strpos($dsn, '+') !== false) {
+                list($proto, $dsn) = explode('+', $dsn, 2);
+            }
+            if (strpos($dsn, '/') !== false) {
+                list($proto_opts, $dsn) = explode('/', $dsn, 2);
+            } else {
+                $proto_opts = $dsn;
+                $dsn = null;
+            }
+        }
+
+        // process the different protocol options
+        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
+        $proto_opts = rawurldecode($proto_opts);
+        if ($parsed['protocol'] == 'tcp') {
+            if (strpos($proto_opts, ':') !== false) {
+                list($parsed['hostspec'],
+                     $parsed['port']) = explode(':', $proto_opts);
+            } else {
+                $parsed['hostspec'] = $proto_opts;
+            }
+        } elseif ($parsed['protocol'] == 'unix') {
+            $parsed['socket'] = $proto_opts;
+        }
+
+        // Get dabase if any
+        // $dsn => database
+        if ($dsn) {
+            if (($pos = strpos($dsn, '?')) === false) {
+                // /database
+                $parsed['database'] = rawurldecode($dsn);
+            } else {
+                // /database?param1=value1¶m2=value2
+                $parsed['database'] = rawurldecode(substr($dsn, 0, $pos));
+                $dsn = substr($dsn, $pos + 1);
+                if (strpos($dsn, '&') !== false) {
+                    $opts = explode('&', $dsn);
+                } else { // database?param1=value1
+                    $opts = array($dsn);
+                }
+                foreach ($opts as $opt) {
+                    list($key, $value) = explode('=', $opt);
+                    if (!isset($parsed[$key])) {
+                        // don't allow params overwrite
+                        $parsed[$key] = rawurldecode($value);
+                    }
+                }
+            }
+        }
+
+        return $parsed;
+    }
+
+    // }}}
+}
+
+// }}}
+// {{{ class DB_Error
+
+/**
+ * DB_Error implements a class for reporting portable database error
+ * messages
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Stig Bakken 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/DB
+ */
+class DB_Error extends PEAR_Error
+{
+    // {{{ constructor
+
+    /**
+     * DB_Error constructor
+     *
+     * @param mixed $code       DB error code, or string with error message
+     * @param int   $mode       what "error mode" to operate in
+     * @param int   $level      what error level to use for $mode &
+     *                           PEAR_ERROR_TRIGGER
+     * @param mixed $debuginfo  additional debug info, such as the last query
+     *
+     * @see PEAR_Error
+     */
+    function DB_Error($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
+                      $level = E_USER_NOTICE, $debuginfo = null)
+    {
+        if (is_int($code)) {
+            $this->PEAR_Error('DB Error: ' . DB::errorMessage($code), $code,
+                              $mode, $level, $debuginfo);
+        } else {
+            $this->PEAR_Error("DB Error: $code", DB_ERROR,
+                              $mode, $level, $debuginfo);
+        }
+    }
+
+    // }}}
+}
+
+// }}}
+// {{{ class DB_result
+
+/**
+ * This class implements a wrapper for a DB result set
+ *
+ * A new instance of this class will be returned by the DB implementation
+ * after processing a query that returns data.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Stig Bakken 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/DB
+ */
+class DB_result
+{
+    // {{{ properties
+
+    /**
+     * Should results be freed automatically when there are no more rows?
+     * @var boolean
+     * @see DB_common::$options
+     */
+    var $autofree;
+
+    /**
+     * A reference to the DB_ object
+     * @var object
+     */
+    var $dbh;
+
+    /**
+     * The current default fetch mode
+     * @var integer
+     * @see DB_common::$fetchmode
+     */
+    var $fetchmode;
+
+    /**
+     * The name of the class into which results should be fetched when
+     * DB_FETCHMODE_OBJECT is in effect
+     *
+     * @var string
+     * @see DB_common::$fetchmode_object_class
+     */
+    var $fetchmode_object_class;
+
+    /**
+     * The number of rows to fetch from a limit query
+     * @var integer
+     */
+    var $limit_count = null;
+
+    /**
+     * The row to start fetching from in limit queries
+     * @var integer
+     */
+    var $limit_from = null;
+
+    /**
+     * The execute parameters that created this result
+     * @var array
+     * @since Property available since Release 1.7.0
+     */
+    var $parameters;
+
+    /**
+     * The query string that created this result
+     *
+     * Copied here incase it changes in $dbh, which is referenced
+     *
+     * @var string
+     * @since Property available since Release 1.7.0
+     */
+    var $query;
+
+    /**
+     * The query result resource id created by PHP
+     * @var resource
+     */
+    var $result;
+
+    /**
+     * The present row being dealt with
+     * @var integer
+     */
+    var $row_counter = null;
+
+    /**
+     * The prepared statement resource id created by PHP in $dbh
+     *
+     * This resource is only available when the result set was created using
+     * a driver's native execute() method, not PEAR DB's emulated one.
+     *
+     * Copied here incase it changes in $dbh, which is referenced
+     *
+     * {@internal  Mainly here because the InterBase/Firebird API is only
+     * able to retrieve data from result sets if the statemnt handle is
+     * still in scope.}}
+     *
+     * @var resource
+     * @since Property available since Release 1.7.0
+     */
+    var $statement;
+
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * This constructor sets the object's properties
+     *
+     * @param object   &$dbh     the DB object reference
+     * @param resource $result   the result resource id
+     * @param array    $options  an associative array with result options
+     *
+     * @return void
+     */
+    function DB_result(&$dbh, $result, $options = array())
+    {
+        $this->autofree    = $dbh->options['autofree'];
+        $this->dbh         = &$dbh;
+        $this->fetchmode   = $dbh->fetchmode;
+        $this->fetchmode_object_class = $dbh->fetchmode_object_class;
+        $this->parameters  = $dbh->last_parameters;
+        $this->query       = $dbh->last_query;
+        $this->result      = $result;
+        $this->statement   = empty($dbh->last_stmt) ? null : $dbh->last_stmt;
+        foreach ($options as $key => $value) {
+            $this->setOption($key, $value);
+        }
+    }
+
+    /**
+     * Set options for the DB_result object
+     *
+     * @param string $key    the option to set
+     * @param mixed  $value  the value to set the option to
+     *
+     * @return void
+     */
+    function setOption($key, $value = null)
+    {
+        switch ($key) {
+            case 'limit_from':
+                $this->limit_from = $value;
+                break;
+            case 'limit_count':
+                $this->limit_count = $value;
+        }
+    }
+
+    // }}}
+    // {{{ fetchRow()
+
+    /**
+     * Fetch a row of data and return it by reference into an array
+     *
+     * The type of array returned can be controlled either by setting this
+     * method's $fetchmode parameter or by changing the default
+     * fetch mode setFetchMode() before calling this method.
+     *
+     * There are two options for standardizing the information returned
+     * from databases, ensuring their values are consistent when changing
+     * DBMS's.  These portability options can be turned on when creating a
+     * new DB object or by using setOption().
+     *
+     *   + DB_PORTABILITY_LOWERCASE
+     *     convert names of fields to lower case
+     *
+     *   + DB_PORTABILITY_RTRIM
+     *     right trim the data
+     *
+     * @param int $fetchmode  the constant indicating how to format the data
+     * @param int $rownum     the row number to fetch (index starts at 0)
+     *
+     * @return mixed  an array or object containing the row's data,
+     *                 NULL when the end of the result set is reached
+     *                 or a DB_Error object on failure.
+     *
+     * @see DB_common::setOption(), DB_common::setFetchMode()
+     */
+    function &fetchRow($fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null)
+    {
+        if ($fetchmode === DB_FETCHMODE_DEFAULT) {
+            $fetchmode = $this->fetchmode;
+        }
+        if ($fetchmode === DB_FETCHMODE_OBJECT) {
+            $fetchmode = DB_FETCHMODE_ASSOC;
+            $object_class = $this->fetchmode_object_class;
+        }
+        if ($this->limit_from !== null) {
+            if ($this->row_counter === null) {
+                $this->row_counter = $this->limit_from;
+                // Skip rows
+                if ($this->dbh->features['limit'] === false) {
+                    $i = 0;
+                    while ($i++ < $this->limit_from) {
+                        $this->dbh->fetchInto($this->result, $arr, $fetchmode);
+                    }
+                }
+            }
+            if ($this->row_counter >= ($this->limit_from + $this->limit_count))
+            {
+                if ($this->autofree) {
+                    $this->free();
+                }
+                $tmp = null;
+                return $tmp;
+            }
+            if ($this->dbh->features['limit'] === 'emulate') {
+                $rownum = $this->row_counter;
+            }
+            $this->row_counter++;
+        }
+        $res = $this->dbh->fetchInto($this->result, $arr, $fetchmode, $rownum);
+        if ($res === DB_OK) {
+            if (isset($object_class)) {
+                // The default mode is specified in the
+                // DB_common::fetchmode_object_class property
+                if ($object_class == 'stdClass') {
+                    $arr = (object) $arr;
+                } else {
+                    $arr = &new $object_class($arr);
+                }
+            }
+            return $arr;
+        }
+        if ($res == null && $this->autofree) {
+            $this->free();
+        }
+        return $res;
+    }
+
+    // }}}
+    // {{{ fetchInto()
+
+    /**
+     * Fetch a row of data into an array which is passed by reference
+     *
+     * The type of array returned can be controlled either by setting this
+     * method's $fetchmode parameter or by changing the default
+     * fetch mode setFetchMode() before calling this method.
+     *
+     * There are two options for standardizing the information returned
+     * from databases, ensuring their values are consistent when changing
+     * DBMS's.  These portability options can be turned on when creating a
+     * new DB object or by using setOption().
+     *
+     *   + DB_PORTABILITY_LOWERCASE
+     *     convert names of fields to lower case
+     *
+     *   + DB_PORTABILITY_RTRIM
+     *     right trim the data
+     *
+     * @param array &$arr       the variable where the data should be placed
+     * @param int   $fetchmode  the constant indicating how to format the data
+     * @param int   $rownum     the row number to fetch (index starts at 0)
+     *
+     * @return mixed  DB_OK if a row is processed, NULL when the end of the
+     *                 result set is reached or a DB_Error object on failure
+     *
+     * @see DB_common::setOption(), DB_common::setFetchMode()
+     */
+    function fetchInto(&$arr, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null)
+    {
+        if ($fetchmode === DB_FETCHMODE_DEFAULT) {
+            $fetchmode = $this->fetchmode;
+        }
+        if ($fetchmode === DB_FETCHMODE_OBJECT) {
+            $fetchmode = DB_FETCHMODE_ASSOC;
+            $object_class = $this->fetchmode_object_class;
+        }
+        if ($this->limit_from !== null) {
+            if ($this->row_counter === null) {
+                $this->row_counter = $this->limit_from;
+                // Skip rows
+                if ($this->dbh->features['limit'] === false) {
+                    $i = 0;
+                    while ($i++ < $this->limit_from) {
+                        $this->dbh->fetchInto($this->result, $arr, $fetchmode);
+                    }
+                }
+            }
+            if ($this->row_counter >= (
+                    $this->limit_from + $this->limit_count))
+            {
+                if ($this->autofree) {
+                    $this->free();
+                }
+                return null;
+            }
+            if ($this->dbh->features['limit'] === 'emulate') {
+                $rownum = $this->row_counter;
+            }
+
+            $this->row_counter++;
+        }
+        $res = $this->dbh->fetchInto($this->result, $arr, $fetchmode, $rownum);
+        if ($res === DB_OK) {
+            if (isset($object_class)) {
+                // default mode specified in the
+                // DB_common::fetchmode_object_class property
+                if ($object_class == 'stdClass') {
+                    $arr = (object) $arr;
+                } else {
+                    $arr = new $object_class($arr);
+                }
+            }
+            return DB_OK;
+        }
+        if ($res == null && $this->autofree) {
+            $this->free();
+        }
+        return $res;
+    }
+
+    // }}}
+    // {{{ numCols()
+
+    /**
+     * Get the the number of columns in a result set
+     *
+     * @return int  the number of columns.  A DB_Error object on failure.
+     */
+    function numCols()
+    {
+        return $this->dbh->numCols($this->result);
+    }
+
+    // }}}
+    // {{{ numRows()
+
+    /**
+     * Get the number of rows in a result set
+     *
+     * @return int  the number of rows.  A DB_Error object on failure.
+     */
+    function numRows()
+    {
+        if ($this->dbh->features['numrows'] === 'emulate'
+            && $this->dbh->options['portability'] & DB_PORTABILITY_NUMROWS)
+        {
+            if ($this->dbh->features['prepare']) {
+                $res = $this->dbh->query($this->query, $this->parameters);
+            } else {
+                $res = $this->dbh->query($this->query);
+            }
+            if (DB::isError($res)) {
+                return $res;
+            }
+            $i = 0;
+            while ($res->fetchInto($tmp, DB_FETCHMODE_ORDERED)) {
+                $i++;
+            }
+            return $i;
+        } else {
+            return $this->dbh->numRows($this->result);
+        }
+    }
+
+    // }}}
+    // {{{ nextResult()
+
+    /**
+     * Get the next result if a batch of queries was executed
+     *
+     * @return bool  true if a new result is available or false if not
+     */
+    function nextResult()
+    {
+        return $this->dbh->nextResult($this->result);
+    }
+
+    // }}}
+    // {{{ free()
+
+    /**
+     * Frees the resources allocated for this result set
+     *
+     * @return bool  true on success.  A DB_Error object on failure.
+     */
+    function free()
+    {
+        $err = $this->dbh->freeResult($this->result);
+        if (DB::isError($err)) {
+            return $err;
+        }
+        $this->result = false;
+        $this->statement = false;
+        return true;
+    }
+
+    // }}}
+    // {{{ tableInfo()
+
+    /**
+     * @see DB_common::tableInfo()
+     * @deprecated Method deprecated some time before Release 1.2
+     */
+    function tableInfo($mode = null)
+    {
+        if (is_string($mode)) {
+            return $this->dbh->raiseError(DB_ERROR_NEED_MORE_DATA);
+        }
+        return $this->dbh->tableInfo($this, $mode);
+    }
+
+    // }}}
+    // {{{ getQuery()
+
+    /**
+     * Determine the query string that created this result
+     *
+     * @return string  the query string
+     *
+     * @since Method available since Release 1.7.0
+     */
+    function getQuery()
+    {
+        return $this->query;
+    }
+
+    // }}}
+    // {{{ getRowCounter()
+
+    /**
+     * Tells which row number is currently being processed
+     *
+     * @return integer  the current row being looked at.  Starts at 1.
+     */
+    function getRowCounter()
+    {
+        return $this->row_counter;
+    }
+
+    // }}}
+}
+
+// }}}
+// {{{ class DB_row
+
+/**
+ * PEAR DB Row Object
+ *
+ * The object contains a row of data from a result set.  Each column's data
+ * is placed in a property named for the column.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Stig Bakken 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/DB
+ * @see        DB_common::setFetchMode()
+ */
+class DB_row
+{
+    // {{{ constructor
+
+    /**
+     * The constructor places a row's data into properties of this object
+     *
+     * @param array  the array containing the row's data
+     *
+     * @return void
+     */
+    function DB_row(&$arr)
+    {
+        foreach ($arr as $key => $value) {
+            $this->$key = &$arr[$key];
+        }
+    }
+
+    // }}}
+}
+
+// }}}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+
+?>
diff --git a/lib/phpFlickr/PEAR/DB/common.php b/lib/phpFlickr/PEAR/DB/common.php
new file mode 100644
index 000000000..04e71ff52
--- /dev/null
+++ b/lib/phpFlickr/PEAR/DB/common.php
@@ -0,0 +1,2157 @@
+
+ * @author     Tomas V.V. Cox 
+ * @author     Daniel Convissor 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: common.php 32 2005-08-01 06:21:02Z dancoulter $
+ * @link       http://pear.php.net/package/DB
+ */
+
+/**
+ * Obtain the PEAR class so it can be extended from
+ */
+require_once 'PEAR.php';
+
+/**
+ * DB_common is the base class from which each database driver class extends
+ *
+ * All common methods are declared here.  If a given DBMS driver contains
+ * a particular method, that method will overload the one here.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Stig Bakken 
+ * @author     Tomas V.V. Cox 
+ * @author     Daniel Convissor 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/DB
+ */
+class DB_common extends PEAR
+{
+    // {{{ properties
+
+    /**
+     * The current default fetch mode
+     * @var integer
+     */
+    var $fetchmode = DB_FETCHMODE_ORDERED;
+
+    /**
+     * The name of the class into which results should be fetched when
+     * DB_FETCHMODE_OBJECT is in effect
+     *
+     * @var string
+     */
+    var $fetchmode_object_class = 'stdClass';
+
+    /**
+     * Was a connection present when the object was serialized()?
+     * @var bool
+     * @see DB_common::__sleep(), DB_common::__wake()
+     */
+    var $was_connected = null;
+
+    /**
+     * The most recently executed query
+     * @var string
+     */
+    var $last_query = '';
+
+    /**
+     * Run-time configuration options
+     *
+     * The 'optimize' option has been deprecated.  Use the 'portability'
+     * option instead.
+     *
+     * @var array
+     * @see DB_common::setOption()
+     */
+    var $options = array(
+        'result_buffering' => 500,
+        'persistent' => false,
+        'ssl' => false,
+        'debug' => 0,
+        'seqname_format' => '%s_seq',
+        'autofree' => false,
+        'portability' => DB_PORTABILITY_NONE,
+        'optimize' => 'performance',  // Deprecated.  Use 'portability'.
+    );
+
+    /**
+     * The parameters from the most recently executed query
+     * @var array
+     * @since Property available since Release 1.7.0
+     */
+    var $last_parameters = array();
+
+    /**
+     * The elements from each prepared statement
+     * @var array
+     */
+    var $prepare_tokens = array();
+
+    /**
+     * The data types of the various elements in each prepared statement
+     * @var array
+     */
+    var $prepare_types = array();
+
+    /**
+     * The prepared queries
+     * @var array
+     */
+    var $prepared_queries = array();
+
+
+    // }}}
+    // {{{ DB_common
+
+    /**
+     * This constructor calls $this->PEAR('DB_Error')
+     *
+     * @return void
+     */
+    function DB_common()
+    {
+        $this->PEAR('DB_Error');
+    }
+
+    // }}}
+    // {{{ __sleep()
+
+    /**
+     * Automatically indicates which properties should be saved
+     * when PHP's serialize() function is called
+     *
+     * @return array  the array of properties names that should be saved
+     */
+    function __sleep()
+    {
+        if ($this->connection) {
+            // Don't disconnect(), people use serialize() for many reasons
+            $this->was_connected = true;
+        } else {
+            $this->was_connected = false;
+        }
+        if (isset($this->autocommit)) {
+            return array('autocommit',
+                         'dbsyntax',
+                         'dsn',
+                         'features',
+                         'fetchmode',
+                         'fetchmode_object_class',
+                         'options',
+                         'was_connected',
+                   );
+        } else {
+            return array('dbsyntax',
+                         'dsn',
+                         'features',
+                         'fetchmode',
+                         'fetchmode_object_class',
+                         'options',
+                         'was_connected',
+                   );
+        }
+    }
+
+    // }}}
+    // {{{ __wakeup()
+
+    /**
+     * Automatically reconnects to the database when PHP's unserialize()
+     * function is called
+     *
+     * The reconnection attempt is only performed if the object was connected
+     * at the time PHP's serialize() function was run.
+     *
+     * @return void
+     */
+    function __wakeup()
+    {
+        if ($this->was_connected) {
+            $this->connect($this->dsn, $this->options);
+        }
+    }
+
+    // }}}
+    // {{{ __toString()
+
+    /**
+     * Automatic string conversion for PHP 5
+     *
+     * @return string  a string describing the current PEAR DB object
+     *
+     * @since Method available since Release 1.7.0
+     */
+    function __toString()
+    {
+        $info = strtolower(get_class($this));
+        $info .=  ': (phptype=' . $this->phptype .
+                  ', dbsyntax=' . $this->dbsyntax .
+                  ')';
+        if ($this->connection) {
+            $info .= ' [connected]';
+        }
+        return $info;
+    }
+
+    // }}}
+    // {{{ toString()
+
+    /**
+     * DEPRECATED:  String conversion method
+     *
+     * @return string  a string describing the current PEAR DB object
+     *
+     * @deprecated Method deprecated in Release 1.7.0
+     */
+    function toString()
+    {
+        return $this->__toString();
+    }
+
+    // }}}
+    // {{{ quoteString()
+
+    /**
+     * DEPRECATED: Quotes a string so it can be safely used within string
+     * delimiters in a query
+     *
+     * @param string $string  the string to be quoted
+     *
+     * @return string  the quoted string
+     *
+     * @see DB_common::quoteSmart(), DB_common::escapeSimple()
+     * @deprecated Method deprecated some time before Release 1.2
+     */
+    function quoteString($string)
+    {
+        $string = $this->quote($string);
+        if ($string{0} == "'") {
+            return substr($string, 1, -1);
+        }
+        return $string;
+    }
+
+    // }}}
+    // {{{ quote()
+
+    /**
+     * DEPRECATED: Quotes a string so it can be safely used in a query
+     *
+     * @param string $string  the string to quote
+     *
+     * @return string  the quoted string or the string NULL
+     *                  if the value submitted is null.
+     *
+     * @see DB_common::quoteSmart(), DB_common::escapeSimple()
+     * @deprecated Deprecated in release 1.6.0
+     */
+    function quote($string = null)
+    {
+        return ($string === null) ? 'NULL'
+                                  : "'" . str_replace("'", "''", $string) . "'";
+    }
+
+    // }}}
+    // {{{ quoteIdentifier()
+
+    /**
+     * Quotes a string so it can be safely used as a table or column name
+     *
+     * Delimiting style depends on which database driver is being used.
+     *
+     * NOTE: just because you CAN use delimited identifiers doesn't mean
+     * you SHOULD use them.  In general, they end up causing way more
+     * problems than they solve.
+     *
+     * Portability is broken by using the following characters inside
+     * delimited identifiers:
+     *   + backtick (`) -- due to MySQL
+     *   + double quote (") -- due to Oracle
+     *   + brackets ([ or ]) -- due to Access
+     *
+     * Delimited identifiers are known to generally work correctly under
+     * the following drivers:
+     *   + mssql
+     *   + mysql
+     *   + mysqli
+     *   + oci8
+     *   + odbc(access)
+     *   + odbc(db2)
+     *   + pgsql
+     *   + sqlite
+     *   + sybase (must execute set quoted_identifier on sometime
+     *     prior to use)
+     *
+     * InterBase doesn't seem to be able to use delimited identifiers
+     * via PHP 4.  They work fine under PHP 5.
+     *
+     * @param string $str  the identifier name to be quoted
+     *
+     * @return string  the quoted identifier
+     *
+     * @since Method available since Release 1.6.0
+     */
+    function quoteIdentifier($str)
+    {
+        return '"' . str_replace('"', '""', $str) . '"';
+    }
+
+    // }}}
+    // {{{ quoteSmart()
+
+    /**
+     * Formats input so it can be safely used in a query
+     *
+     * The output depends on the PHP data type of input and the database
+     * type being used.
+     *
+     * @param mixed $in  the data to be formatted
+     *
+     * @return mixed  the formatted data.  The format depends on the input's
+     *                 PHP type:
+     * 
        
+     *  
      • 
+     *    input -> returns
+     *  
        • 
+     *  
      • 
+     *    null -> the string NULL
+     *  
        • 
+     *  
      • 
+     *    integer or double -> the unquoted number
+     *  
        • 
+     *  
      • 
+     *    bool -> output depends on the driver in use
+     *    Most drivers return integers: 1 if
+     *    true or 0 if
+     *    false.
+     *    Some return strings: TRUE if
+     *    true or FALSE if
+     *    false.
+     *    Finally one returns strings: T if
+     *    true or F if
+     *    false. Here is a list of each DBMS,
+     *    the values returned and the suggested column type:
+     *    
          
+     *      
        • 
+     *        dbase -> T/F
+     *        (Logical)
+     *      
          • 
+     *      
        • 
+     *        fbase -> TRUE/FALSE
+     *        (BOOLEAN)
+     *      
          • 
+     *      
        • 
+     *        ibase -> 1/0
+     *        (SMALLINT) [1]
+     *      
          • 
+     *      
        • 
+     *        ifx -> 1/0
+     *        (SMALLINT) [1]
+     *      
          • 
+     *      
        • 
+     *        msql -> 1/0
+     *        (INTEGER)
+     *      
          • 
+     *      
        • 
+     *        mssql -> 1/0
+     *        (BIT)
+     *      
          • 
+     *      
        • 
+     *        mysql -> 1/0
+     *        (TINYINT(1))
+     *      
          • 
+     *      
        • 
+     *        mysqli -> 1/0
+     *        (TINYINT(1))
+     *      
          • 
+     *      
        • 
+     *        oci8 -> 1/0
+     *        (NUMBER(1))
+     *      
          • 
+     *      
        • 
+     *        odbc -> 1/0
+     *        (SMALLINT) [1]
+     *      
          • 
+     *      
        • 
+     *        pgsql -> TRUE/FALSE
+     *        (BOOLEAN)
+     *      
          • 
+     *      
        • 
+     *        sqlite -> 1/0
+     *        (INTEGER)
+     *      
          • 
+     *      
        • 
+     *        sybase -> 1/0
+     *        (TINYINT(1))
+     *      
          • 
+     *    
        
+     *    [1] Accommodate the lowest common denominator because not all
+     *    versions of have BOOLEAN.
+     *  
        • 
+     *  
      • 
+     *    other (including strings and numeric strings) ->
+     *    the data with single quotes escaped by preceeding
+     *    single quotes, backslashes are escaped by preceeding
+     *    backslashes, then the whole string is encapsulated
+     *    between single quotes
+     *  
        • 
+     * 
      
+     *
+     * @see DB_common::escapeSimple()
+     * @since Method available since Release 1.6.0
+     */
+    function quoteSmart($in)
+    {
+        if (is_int($in) || is_double($in)) {
+            return $in;
+        } elseif (is_bool($in)) {
+            return $in ? 1 : 0;
+        } elseif (is_null($in)) {
+            return 'NULL';
+        } else {
+            return "'" . $this->escapeSimple($in) . "'";
+        }
+    }
+
+    // }}}
+    // {{{ escapeSimple()
+
+    /**
+     * Escapes a string according to the current DBMS's standards
+     *
+     * In SQLite, this makes things safe for inserts/updates, but may
+     * cause problems when performing text comparisons against columns
+     * containing binary data. See the
+     * {@link http://php.net/sqlite_escape_string PHP manual} for more info.
+     *
+     * @param string $str  the string to be escaped
+     *
+     * @return string  the escaped string
+     *
+     * @see DB_common::quoteSmart()
+     * @since Method available since Release 1.6.0
+     */
+    function escapeSimple($str)
+    {
+        return str_replace("'", "''", $str);
+    }
+
+    // }}}
+    // {{{ provides()
+
+    /**
+     * Tells whether the present driver supports a given feature
+     *
+     * @param string $feature  the feature you're curious about
+     *
+     * @return bool  whether this driver supports $feature
+     */
+    function provides($feature)
+    {
+        return $this->features[$feature];
+    }
+
+    // }}}
+    // {{{ setFetchMode()
+
+    /**
+     * Sets the fetch mode that should be used by default for query results
+     *
+     * @param integer $fetchmode    DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC
+     *                               or DB_FETCHMODE_OBJECT
+     * @param string $object_class  the class name of the object to be returned
+     *                               by the fetch methods when the
+     *                               DB_FETCHMODE_OBJECT mode is selected.
+     *                               If no class is specified by default a cast
+     *                               to object from the assoc array row will be
+     *                               done.  There is also the posibility to use
+     *                               and extend the 'DB_row' class.
+     *
+     * @see DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC, DB_FETCHMODE_OBJECT
+     */
+    function setFetchMode($fetchmode, $object_class = 'stdClass')
+    {
+        switch ($fetchmode) {
+            case DB_FETCHMODE_OBJECT:
+                $this->fetchmode_object_class = $object_class;
+            case DB_FETCHMODE_ORDERED:
+            case DB_FETCHMODE_ASSOC:
+                $this->fetchmode = $fetchmode;
+                break;
+            default:
+                return $this->raiseError('invalid fetchmode mode');
+        }
+    }
+
+    // }}}
+    // {{{ setOption()
+
+    /**
+     * Sets run-time configuration options for PEAR DB
+     *
+     * Options, their data types, default values and description:
+     * 
        
+     * 
      • 
+     * autofree boolean = false
+     *      
        should results be freed automatically when there are no
+     *            more rows?
+     * 
      • 
+     * result_buffering integer = 500
+     *      
        how many rows of the result set should be buffered?
+     *      
        In mysql: mysql_unbuffered_query() is used instead of
+     *            mysql_query() if this value is 0.  (Release 1.7.0)
+     *      
        In oci8: this value is passed to ocisetprefetch().
+     *            (Release 1.7.0)
+     * 
      • 
+     * debug integer = 0
+     *      
        debug level
+     * 
      • 
+     * persistent boolean = false
+     *      
        should the connection be persistent?
+     * 
      • 
+     * portability integer = DB_PORTABILITY_NONE
+     *      
        portability mode constant (see below)
+     * 
      • 
+     * seqname_format string = %s_seq
+     *      
        the sprintf() format string used on sequence names.  This
+     *            format is applied to sequence names passed to
+     *            createSequence(), nextID() and dropSequence().
+     * 
      • 
+     * ssl boolean = false
+     *      
        use ssl to connect?
+     * 
        • 
+     * 
      
+     *
+     * -----------------------------------------
+     *
+     * PORTABILITY MODES
+     *
+     * These modes are bitwised, so they can be combined using |
+     * and removed using ^.  See the examples section below on how
+     * to do this.
+     *
+     * DB_PORTABILITY_NONE
+     * turn off all portability features
+     *
+     * This mode gets automatically turned on if the deprecated
+     * optimize option gets set to performance.
+     *
+     *
+     * DB_PORTABILITY_LOWERCASE
+     * convert names of tables and fields to lower case when using
+     * get*(), fetch*() and tableInfo()
+     *
+     * This mode gets automatically turned on in the following databases
+     * if the deprecated option optimize gets set to
+     * portability:
+     * + oci8
+     *
+     *
+     * DB_PORTABILITY_RTRIM
+     * right trim the data output by get*() fetch*()
+     *
+     *
+     * DB_PORTABILITY_DELETE_COUNT
+     * force reporting the number of rows deleted
+     *
+     * Some DBMS's don't count the number of rows deleted when performing
+     * simple DELETE FROM tablename queries.  This portability
+     * mode tricks such DBMS's into telling the count by adding
+     * WHERE 1=1 to the end of DELETE queries.
+     *
+     * This mode gets automatically turned on in the following databases
+     * if the deprecated option optimize gets set to
+     * portability:
+     * + fbsql
+     * + mysql
+     * + mysqli
+     * + sqlite
+     *
+     *
+     * DB_PORTABILITY_NUMROWS
+     * enable hack that makes numRows() work in Oracle
+     *
+     * This mode gets automatically turned on in the following databases
+     * if the deprecated option optimize gets set to
+     * portability:
+     * + oci8
+     *
+     *
+     * DB_PORTABILITY_ERRORS
+     * makes certain error messages in certain drivers compatible
+     * with those from other DBMS's
+     *
+     * + mysql, mysqli:  change unique/primary key constraints
+     *   DB_ERROR_ALREADY_EXISTS -> DB_ERROR_CONSTRAINT
+     *
+     * + odbc(access):  MS's ODBC driver reports 'no such field' as code
+     *   07001, which means 'too few parameters.'  When this option is on
+     *   that code gets mapped to DB_ERROR_NOSUCHFIELD.
+     *   DB_ERROR_MISMATCH -> DB_ERROR_NOSUCHFIELD
+     *
+     * DB_PORTABILITY_NULL_TO_EMPTY
+     * convert null values to empty strings in data output by get*() and
+     * fetch*().  Needed because Oracle considers empty strings to be null,
+     * while most other DBMS's know the difference between empty and null.
+     *
+     *
+     * DB_PORTABILITY_ALL
+     * turn on all portability features
+     *
+     * -----------------------------------------
+     *
+     * Example 1. Simple setOption() example
+     * 
+     * $db->setOption('autofree', true);
+     * 
+     *
+     * Example 2. Portability for lowercasing and trimming
+     * 
+     * $db->setOption('portability',
+     *                 DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_RTRIM);
+     * 
+     *
+     * Example 3. All portability options except trimming
+     * 
+     * $db->setOption('portability',
+     *                 DB_PORTABILITY_ALL ^ DB_PORTABILITY_RTRIM);
+     * 
+     *
+     * @param string $option option name
+     * @param mixed  $value value for the option
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::$options
+     */
+    function setOption($option, $value)
+    {
+        if (isset($this->options[$option])) {
+            $this->options[$option] = $value;
+
+            /*
+             * Backwards compatibility check for the deprecated 'optimize'
+             * option.  Done here in case settings change after connecting.
+             */
+            if ($option == 'optimize') {
+                if ($value == 'portability') {
+                    switch ($this->phptype) {
+                        case 'oci8':
+                            $this->options['portability'] =
+                                    DB_PORTABILITY_LOWERCASE |
+                                    DB_PORTABILITY_NUMROWS;
+                            break;
+                        case 'fbsql':
+                        case 'mysql':
+                        case 'mysqli':
+                        case 'sqlite':
+                            $this->options['portability'] =
+                                    DB_PORTABILITY_DELETE_COUNT;
+                            break;
+                    }
+                } else {
+                    $this->options['portability'] = DB_PORTABILITY_NONE;
+                }
+            }
+
+            return DB_OK;
+        }
+        return $this->raiseError("unknown option $option");
+    }
+
+    // }}}
+    // {{{ getOption()
+
+    /**
+     * Returns the value of an option
+     *
+     * @param string $option  the option name you're curious about
+     *
+     * @return mixed  the option's value
+     */
+    function getOption($option)
+    {
+        if (isset($this->options[$option])) {
+            return $this->options[$option];
+        }
+        return $this->raiseError("unknown option $option");
+    }
+
+    // }}}
+    // {{{ prepare()
+
+    /**
+     * Prepares a query for multiple execution with execute()
+     *
+     * Creates a query that can be run multiple times.  Each time it is run,
+     * the placeholders, if any, will be replaced by the contents of
+     * execute()'s $data argument.
+     *
+     * Three types of placeholders can be used:
+     *   + ?  scalar value (i.e. strings, integers).  The system
+     *                   will automatically quote and escape the data.
+     *   + !  value is inserted 'as is'
+     *   + &  requires a file name.  The file's contents get
+     *                   inserted into the query (i.e. saving binary
+     *                   data in a db)
+     *
+     * Example 1.
+     * 
+     * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
+     * $data = array(
+     *     "John's text",
+     *     "'it''s good'",
+     *     'filename.txt'
+     * );
+     * $res = $db->execute($sth, $data);
+     * 
+     *
+     * Use backslashes to escape placeholder characters if you don't want
+     * them to be interpreted as placeholders:
+     * 
      +     *    "UPDATE foo SET col=? WHERE col='over \& under'"
+     * 
      
+     *
+     * With some database backends, this is emulated.
+     *
+     * {@internal ibase and oci8 have their own prepare() methods.}}
+     *
+     * @param string $query  the query to be prepared
+     *
+     * @return mixed  DB statement resource on success. A DB_Error object
+     *                 on failure.
+     *
+     * @see DB_common::execute()
+     */
+    function prepare($query)
+    {
+        $tokens   = preg_split('/((?prepare_tokens[] = &$newtokens;
+        end($this->prepare_tokens);
+
+        $k = key($this->prepare_tokens);
+        $this->prepare_types[$k] = $types;
+        $this->prepared_queries[$k] = implode(' ', $newtokens);
+
+        return $k;
+    }
+
+    // }}}
+    // {{{ autoPrepare()
+
+    /**
+     * Automaticaly generates an insert or update query and pass it to prepare()
+     *
+     * @param string $table         the table name
+     * @param array  $table_fields  the array of field names
+     * @param int    $mode          a type of query to make:
+     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
+     * @param string $where         for update queries: the WHERE clause to
+     *                               append to the SQL statement.  Don't
+     *                               include the "WHERE" keyword.
+     *
+     * @return resource  the query handle
+     *
+     * @uses DB_common::prepare(), DB_common::buildManipSQL()
+     */
+    function autoPrepare($table, $table_fields, $mode = DB_AUTOQUERY_INSERT,
+                         $where = false)
+    {
+        $query = $this->buildManipSQL($table, $table_fields, $mode, $where);
+        if (DB::isError($query)) {
+            return $query;
+        }
+        return $this->prepare($query);
+    }
+
+    // }}}
+    // {{{ autoExecute()
+
+    /**
+     * Automaticaly generates an insert or update query and call prepare()
+     * and execute() with it
+     *
+     * @param string $table         the table name
+     * @param array  $fields_values the associative array where $key is a
+     *                               field name and $value its value
+     * @param int    $mode          a type of query to make:
+     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
+     * @param string $where         for update queries: the WHERE clause to
+     *                               append to the SQL statement.  Don't
+     *                               include the "WHERE" keyword.
+     *
+     * @return mixed  a new DB_result object for successful SELECT queries
+     *                 or DB_OK for successul data manipulation queries.
+     *                 A DB_Error object on failure.
+     *
+     * @uses DB_common::autoPrepare(), DB_common::execute()
+     */
+    function autoExecute($table, $fields_values, $mode = DB_AUTOQUERY_INSERT,
+                         $where = false)
+    {
+        $sth = $this->autoPrepare($table, array_keys($fields_values), $mode,
+                                  $where);
+        if (DB::isError($sth)) {
+            return $sth;
+        }
+        $ret =& $this->execute($sth, array_values($fields_values));
+        $this->freePrepared($sth);
+        return $ret;
+
+    }
+
+    // }}}
+    // {{{ buildManipSQL()
+
+    /**
+     * Produces an SQL query string for autoPrepare()
+     *
+     * Example:
+     * 
      +     * buildManipSQL('table_sql', array('field1', 'field2', 'field3'),
+     *               DB_AUTOQUERY_INSERT);
+     * 
      
+     *
+     * That returns
+     * 
+     * INSERT INTO table_sql (field1,field2,field3) VALUES (?,?,?)
+     * 
+     *
+     * NOTES:
+     *   - This belongs more to a SQL Builder class, but this is a simple
+     *     facility.
+     *   - Be carefull! If you don't give a $where param with an UPDATE
+     *     query, all the records of the table will be updated!
+     *
+     * @param string $table         the table name
+     * @param array  $table_fields  the array of field names
+     * @param int    $mode          a type of query to make:
+     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
+     * @param string $where         for update queries: the WHERE clause to
+     *                               append to the SQL statement.  Don't
+     *                               include the "WHERE" keyword.
+     *
+     * @return string  the sql query for autoPrepare()
+     */
+    function buildManipSQL($table, $table_fields, $mode, $where = false)
+    {
+        if (count($table_fields) == 0) {
+            return $this->raiseError(DB_ERROR_NEED_MORE_DATA);
+        }
+        $first = true;
+        switch ($mode) {
+            case DB_AUTOQUERY_INSERT:
+                $values = '';
+                $names = '';
+                foreach ($table_fields as $value) {
+                    if ($first) {
+                        $first = false;
+                    } else {
+                        $names .= ',';
+                        $values .= ',';
+                    }
+                    $names .= $value;
+                    $values .= '?';
+                }
+                return "INSERT INTO $table ($names) VALUES ($values)";
+            case DB_AUTOQUERY_UPDATE:
+                $set = '';
+                foreach ($table_fields as $value) {
+                    if ($first) {
+                        $first = false;
+                    } else {
+                        $set .= ',';
+                    }
+                    $set .= "$value = ?";
+                }
+                $sql = "UPDATE $table SET $set";
+                if ($where) {
+                    $sql .= " WHERE $where";
+                }
+                return $sql;
+            default:
+                return $this->raiseError(DB_ERROR_SYNTAX);
+        }
+    }
+
+    // }}}
+    // {{{ execute()
+
+    /**
+     * Executes a DB statement prepared with prepare()
+     *
+     * Example 1.
+     * 
+     * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
+     * $data = array(
+     *     "John's text",
+     *     "'it''s good'",
+     *     'filename.txt'
+     * );
+     * $res =& $db->execute($sth, $data);
+     * 
+     *
+     * @param resource $stmt  a DB statement resource returned from prepare()
+     * @param mixed    $data  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return mixed  a new DB_result object for successful SELECT queries
+     *                 or DB_OK for successul data manipulation queries.
+     *                 A DB_Error object on failure.
+     *
+     * {@internal ibase and oci8 have their own execute() methods.}}
+     *
+     * @see DB_common::prepare()
+     */
+    function &execute($stmt, $data = array())
+    {
+        $realquery = $this->executeEmulateQuery($stmt, $data);
+        if (DB::isError($realquery)) {
+            return $realquery;
+        }
+        $result = $this->simpleQuery($realquery);
+
+        if ($result === DB_OK || DB::isError($result)) {
+            return $result;
+        } else {
+            $tmp =& new DB_result($this, $result);
+            return $tmp;
+        }
+    }
+
+    // }}}
+    // {{{ executeEmulateQuery()
+
+    /**
+     * Emulates executing prepared statements if the DBMS not support them
+     *
+     * @param resource $stmt  a DB statement resource returned from execute()
+     * @param mixed    $data  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return mixed  a string containing the real query run when emulating
+     *                 prepare/execute.  A DB_Error object on failure.
+     *
+     * @access protected
+     * @see DB_common::execute()
+     */
+    function executeEmulateQuery($stmt, $data = array())
+    {
+        $stmt = (int)$stmt;
+        $data = (array)$data;
+        $this->last_parameters = $data;
+
+        if (count($this->prepare_types[$stmt]) != count($data)) {
+            $this->last_query = $this->prepared_queries[$stmt];
+            return $this->raiseError(DB_ERROR_MISMATCH);
+        }
+
+        $realquery = $this->prepare_tokens[$stmt][0];
+
+        $i = 0;
+        foreach ($data as $value) {
+            if ($this->prepare_types[$stmt][$i] == DB_PARAM_SCALAR) {
+                $realquery .= $this->quoteSmart($value);
+            } elseif ($this->prepare_types[$stmt][$i] == DB_PARAM_OPAQUE) {
+                $fp = @fopen($value, 'rb');
+                if (!$fp) {
+                    return $this->raiseError(DB_ERROR_ACCESS_VIOLATION);
+                }
+                $realquery .= $this->quoteSmart(fread($fp, filesize($value)));
+                fclose($fp);
+            } else {
+                $realquery .= $value;
+            }
+
+            $realquery .= $this->prepare_tokens[$stmt][++$i];
+        }
+
+        return $realquery;
+    }
+
+    // }}}
+    // {{{ executeMultiple()
+
+    /**
+     * Performs several execute() calls on the same statement handle
+     *
+     * $data must be an array indexed numerically
+     * from 0, one execute call is done for every "row" in the array.
+     *
+     * If an error occurs during execute(), executeMultiple() does not
+     * execute the unfinished rows, but rather returns that error.
+     *
+     * @param resource $stmt  query handle from prepare()
+     * @param array    $data  numeric array containing the
+     *                         data to insert into the query
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::prepare(), DB_common::execute()
+     */
+    function executeMultiple($stmt, $data)
+    {
+        foreach ($data as $value) {
+            $res =& $this->execute($stmt, $value);
+            if (DB::isError($res)) {
+                return $res;
+            }
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ freePrepared()
+
+    /**
+     * Frees the internal resources associated with a prepared query
+     *
+     * @param resource $stmt           the prepared statement's PHP resource
+     * @param bool     $free_resource  should the PHP resource be freed too?
+     *                                  Use false if you need to get data
+     *                                  from the result set later.
+     *
+     * @return bool  TRUE on success, FALSE if $result is invalid
+     *
+     * @see DB_common::prepare()
+     */
+    function freePrepared($stmt, $free_resource = true)
+    {
+        $stmt = (int)$stmt;
+        if (isset($this->prepare_tokens[$stmt])) {
+            unset($this->prepare_tokens[$stmt]);
+            unset($this->prepare_types[$stmt]);
+            unset($this->prepared_queries[$stmt]);
+            return true;
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ modifyQuery()
+
+    /**
+     * Changes a query string for various DBMS specific reasons
+     *
+     * It is defined here to ensure all drivers have this method available.
+     *
+     * @param string $query  the query string to modify
+     *
+     * @return string  the modified query string
+     *
+     * @access protected
+     * @see DB_mysql::modifyQuery(), DB_oci8::modifyQuery(),
+     *      DB_sqlite::modifyQuery()
+     */
+    function modifyQuery($query)
+    {
+        return $query;
+    }
+
+    // }}}
+    // {{{ modifyLimitQuery()
+
+    /**
+     * Adds LIMIT clauses to a query string according to current DBMS standards
+     *
+     * It is defined here to assure that all implementations
+     * have this method defined.
+     *
+     * @param string $query   the query to modify
+     * @param int    $from    the row to start to fetching (0 = the first row)
+     * @param int    $count   the numbers of rows to fetch
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return string  the query string with LIMIT clauses added
+     *
+     * @access protected
+     */
+    function modifyLimitQuery($query, $from, $count, $params = array())
+    {
+        return $query;
+    }
+
+    // }}}
+    // {{{ query()
+
+    /**
+     * Sends a query to the database server
+     *
+     * The query string can be either a normal statement to be sent directly
+     * to the server OR if $params are passed the query can have
+     * placeholders and it will be passed through prepare() and execute().
+     *
+     * @param string $query   the SQL query or the statement to prepare
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return mixed  a new DB_result object for successful SELECT queries
+     *                 or DB_OK for successul data manipulation queries.
+     *                 A DB_Error object on failure.
+     *
+     * @see DB_result, DB_common::prepare(), DB_common::execute()
+     */
+    function &query($query, $params = array())
+    {
+        if (sizeof($params) > 0) {
+            $sth = $this->prepare($query);
+            if (DB::isError($sth)) {
+                return $sth;
+            }
+            $ret =& $this->execute($sth, $params);
+            $this->freePrepared($sth, false);
+            return $ret;
+        } else {
+            $this->last_parameters = array();
+            $result = $this->simpleQuery($query);
+            if ($result === DB_OK || DB::isError($result)) {
+                return $result;
+            } else {
+                $tmp =& new DB_result($this, $result);
+                return $tmp;
+            }
+        }
+    }
+
+    // }}}
+    // {{{ limitQuery()
+
+    /**
+     * Generates and executes a LIMIT query
+     *
+     * @param string $query   the query
+     * @param intr   $from    the row to start to fetching (0 = the first row)
+     * @param int    $count   the numbers of rows to fetch
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return mixed  a new DB_result object for successful SELECT queries
+     *                 or DB_OK for successul data manipulation queries.
+     *                 A DB_Error object on failure.
+     */
+    function &limitQuery($query, $from, $count, $params = array())
+    {
+        $query = $this->modifyLimitQuery($query, $from, $count, $params);
+        if (DB::isError($query)){
+            return $query;
+        }
+        $result =& $this->query($query, $params);
+        if (is_a($result, 'DB_result')) {
+            $result->setOption('limit_from', $from);
+            $result->setOption('limit_count', $count);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ getOne()
+
+    /**
+     * Fetches the first column of the first row from a query result
+     *
+     * Takes care of doing the query and freeing the results when finished.
+     *
+     * @param string $query   the SQL query
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return mixed  the returned value of the query.
+     *                 A DB_Error object on failure.
+     */
+    function &getOne($query, $params = array())
+    {
+        $params = (array)$params;
+        // modifyLimitQuery() would be nice here, but it causes BC issues
+        if (sizeof($params) > 0) {
+            $sth = $this->prepare($query);
+            if (DB::isError($sth)) {
+                return $sth;
+            }
+            $res =& $this->execute($sth, $params);
+            $this->freePrepared($sth);
+        } else {
+            $res =& $this->query($query);
+        }
+
+        if (DB::isError($res)) {
+            return $res;
+        }
+
+        $err = $res->fetchInto($row, DB_FETCHMODE_ORDERED);
+        $res->free();
+
+        if ($err !== DB_OK) {
+            return $err;
+        }
+
+        return $row[0];
+    }
+
+    // }}}
+    // {{{ getRow()
+
+    /**
+     * Fetches the first row of data returned from a query result
+     *
+     * Takes care of doing the query and freeing the results when finished.
+     *
+     * @param string $query   the SQL query
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     * @param int $fetchmode  the fetch mode to use
+     *
+     * @return array  the first row of results as an array.
+     *                 A DB_Error object on failure.
+     */
+    function &getRow($query, $params = array(),
+                     $fetchmode = DB_FETCHMODE_DEFAULT)
+    {
+        // compat check, the params and fetchmode parameters used to
+        // have the opposite order
+        if (!is_array($params)) {
+            if (is_array($fetchmode)) {
+                if ($params === null) {
+                    $tmp = DB_FETCHMODE_DEFAULT;
+                } else {
+                    $tmp = $params;
+                }
+                $params = $fetchmode;
+                $fetchmode = $tmp;
+            } elseif ($params !== null) {
+                $fetchmode = $params;
+                $params = array();
+            }
+        }
+        // modifyLimitQuery() would be nice here, but it causes BC issues
+        if (sizeof($params) > 0) {
+            $sth = $this->prepare($query);
+            if (DB::isError($sth)) {
+                return $sth;
+            }
+            $res =& $this->execute($sth, $params);
+            $this->freePrepared($sth);
+        } else {
+            $res =& $this->query($query);
+        }
+
+        if (DB::isError($res)) {
+            return $res;
+        }
+
+        $err = $res->fetchInto($row, $fetchmode);
+
+        $res->free();
+
+        if ($err !== DB_OK) {
+            return $err;
+        }
+
+        return $row;
+    }
+
+    // }}}
+    // {{{ getCol()
+
+    /**
+     * Fetches a single column from a query result and returns it as an
+     * indexed array
+     *
+     * @param string $query   the SQL query
+     * @param mixed  $col     which column to return (integer [column number,
+     *                         starting at 0] or string [column name])
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return array  the results as an array.  A DB_Error object on failure.
+     *
+     * @see DB_common::query()
+     */
+    function &getCol($query, $col = 0, $params = array())
+    {
+        $params = (array)$params;
+        if (sizeof($params) > 0) {
+            $sth = $this->prepare($query);
+
+            if (DB::isError($sth)) {
+                return $sth;
+            }
+
+            $res =& $this->execute($sth, $params);
+            $this->freePrepared($sth);
+        } else {
+            $res =& $this->query($query);
+        }
+
+        if (DB::isError($res)) {
+            return $res;
+        }
+
+        $fetchmode = is_int($col) ? DB_FETCHMODE_ORDERED : DB_FETCHMODE_ASSOC;
+
+        if (!is_array($row = $res->fetchRow($fetchmode))) {
+            $ret = array();
+        } else {
+            if (!array_key_exists($col, $row)) {
+                $ret =& $this->raiseError(DB_ERROR_NOSUCHFIELD);
+            } else {
+                $ret = array($row[$col]);
+                while (is_array($row = $res->fetchRow($fetchmode))) {
+                    $ret[] = $row[$col];
+                }
+            }
+        }
+
+        $res->free();
+
+        if (DB::isError($row)) {
+            $ret = $row;
+        }
+
+        return $ret;
+    }
+
+    // }}}
+    // {{{ getAssoc()
+
+    /**
+     * Fetches an entire query result and returns it as an
+     * associative array using the first column as the key
+     *
+     * If the result set contains more than two columns, the value
+     * will be an array of the values from column 2-n.  If the result
+     * set contains only two columns, the returned value will be a
+     * scalar with the value of the second column (unless forced to an
+     * array with the $force_array parameter).  A DB error code is
+     * returned on errors.  If the result set contains fewer than two
+     * columns, a DB_ERROR_TRUNCATED error is returned.
+     *
+     * For example, if the table "mytable" contains:
+     *
+     * 
      +     *  ID      TEXT       DATE
+     * --------------------------------
+     *  1       'one'      944679408
+     *  2       'two'      944679408
+     *  3       'three'    944679408
+     * 
      
+     *
+     * Then the call getAssoc('SELECT id,text FROM mytable') returns:
+     * 
      +     *   array(
+     *     '1' => 'one',
+     *     '2' => 'two',
+     *     '3' => 'three',
+     *   )
+     * 
      
+     *
+     * ...while the call getAssoc('SELECT id,text,date FROM mytable') returns:
+     * 
      +     *   array(
+     *     '1' => array('one', '944679408'),
+     *     '2' => array('two', '944679408'),
+     *     '3' => array('three', '944679408')
+     *   )
+     * 
      
+     *
+     * If the more than one row occurs with the same value in the
+     * first column, the last row overwrites all previous ones by
+     * default.  Use the $group parameter if you don't want to
+     * overwrite like this.  Example:
+     *
+     * 
      +     * getAssoc('SELECT category,id,name FROM mytable', false, null,
+     *          DB_FETCHMODE_ASSOC, true) returns:
+     *
+     *   array(
+     *     '1' => array(array('id' => '4', 'name' => 'number four'),
+     *                  array('id' => '6', 'name' => 'number six')
+     *            ),
+     *     '9' => array(array('id' => '4', 'name' => 'number four'),
+     *                  array('id' => '6', 'name' => 'number six')
+     *            )
+     *   )
+     * 
      
+     *
+     * Keep in mind that database functions in PHP usually return string
+     * values for results regardless of the database's internal type.
+     *
+     * @param string $query        the SQL query
+     * @param bool   $force_array  used only when the query returns
+     *                              exactly two columns.  If true, the values
+     *                              of the returned array will be one-element
+     *                              arrays instead of scalars.
+     * @param mixed  $params       array, string or numeric data to be used in
+     *                              execution of the statement.  Quantity of
+     *                              items passed must match quantity of
+     *                              placeholders in query:  meaning 1
+     *                              placeholder for non-array parameters or
+     *                              1 placeholder per array element.
+     * @param int   $fetchmode     the fetch mode to use
+     * @param bool  $group         if true, the values of the returned array
+     *                              is wrapped in another array.  If the same
+     *                              key value (in the first column) repeats
+     *                              itself, the values will be appended to
+     *                              this array instead of overwriting the
+     *                              existing values.
+     *
+     * @return array  the associative array containing the query results.
+     *                A DB_Error object on failure.
+     */
+    function &getAssoc($query, $force_array = false, $params = array(),
+                       $fetchmode = DB_FETCHMODE_DEFAULT, $group = false)
+    {
+        $params = (array)$params;
+        if (sizeof($params) > 0) {
+            $sth = $this->prepare($query);
+
+            if (DB::isError($sth)) {
+                return $sth;
+            }
+
+            $res =& $this->execute($sth, $params);
+            $this->freePrepared($sth);
+        } else {
+            $res =& $this->query($query);
+        }
+
+        if (DB::isError($res)) {
+            return $res;
+        }
+        if ($fetchmode == DB_FETCHMODE_DEFAULT) {
+            $fetchmode = $this->fetchmode;
+        }
+        $cols = $res->numCols();
+
+        if ($cols < 2) {
+            $tmp =& $this->raiseError(DB_ERROR_TRUNCATED);
+            return $tmp;
+        }
+
+        $results = array();
+
+        if ($cols > 2 || $force_array) {
+            // return array values
+            // XXX this part can be optimized
+            if ($fetchmode == DB_FETCHMODE_ASSOC) {
+                while (is_array($row = $res->fetchRow(DB_FETCHMODE_ASSOC))) {
+                    reset($row);
+                    $key = current($row);
+                    unset($row[key($row)]);
+                    if ($group) {
+                        $results[$key][] = $row;
+                    } else {
+                        $results[$key] = $row;
+                    }
+                }
+            } elseif ($fetchmode == DB_FETCHMODE_OBJECT) {
+                while ($row = $res->fetchRow(DB_FETCHMODE_OBJECT)) {
+                    $arr = get_object_vars($row);
+                    $key = current($arr);
+                    if ($group) {
+                        $results[$key][] = $row;
+                    } else {
+                        $results[$key] = $row;
+                    }
+                }
+            } else {
+                while (is_array($row = $res->fetchRow(DB_FETCHMODE_ORDERED))) {
+                    // we shift away the first element to get
+                    // indices running from 0 again
+                    $key = array_shift($row);
+                    if ($group) {
+                        $results[$key][] = $row;
+                    } else {
+                        $results[$key] = $row;
+                    }
+                }
+            }
+            if (DB::isError($row)) {
+                $results = $row;
+            }
+        } else {
+            // return scalar values
+            while (is_array($row = $res->fetchRow(DB_FETCHMODE_ORDERED))) {
+                if ($group) {
+                    $results[$row[0]][] = $row[1];
+                } else {
+                    $results[$row[0]] = $row[1];
+                }
+            }
+            if (DB::isError($row)) {
+                $results = $row;
+            }
+        }
+
+        $res->free();
+
+        return $results;
+    }
+
+    // }}}
+    // {{{ getAll()
+
+    /**
+     * Fetches all of the rows from a query result
+     *
+     * @param string $query      the SQL query
+     * @param mixed  $params     array, string or numeric data to be used in
+     *                            execution of the statement.  Quantity of
+     *                            items passed must match quantity of
+     *                            placeholders in query:  meaning 1
+     *                            placeholder for non-array parameters or
+     *                            1 placeholder per array element.
+     * @param int    $fetchmode  the fetch mode to use:
+     *                            + DB_FETCHMODE_ORDERED
+     *                            + DB_FETCHMODE_ASSOC
+     *                            + DB_FETCHMODE_ORDERED | DB_FETCHMODE_FLIPPED
+     *                            + DB_FETCHMODE_ASSOC | DB_FETCHMODE_FLIPPED
+     *
+     * @return array  the nested array.  A DB_Error object on failure.
+     */
+    function &getAll($query, $params = array(),
+                     $fetchmode = DB_FETCHMODE_DEFAULT)
+    {
+        // compat check, the params and fetchmode parameters used to
+        // have the opposite order
+        if (!is_array($params)) {
+            if (is_array($fetchmode)) {
+                if ($params === null) {
+                    $tmp = DB_FETCHMODE_DEFAULT;
+                } else {
+                    $tmp = $params;
+                }
+                $params = $fetchmode;
+                $fetchmode = $tmp;
+            } elseif ($params !== null) {
+                $fetchmode = $params;
+                $params = array();
+            }
+        }
+
+        if (sizeof($params) > 0) {
+            $sth = $this->prepare($query);
+
+            if (DB::isError($sth)) {
+                return $sth;
+            }
+
+            $res =& $this->execute($sth, $params);
+            $this->freePrepared($sth);
+        } else {
+            $res =& $this->query($query);
+        }
+
+        if ($res === DB_OK || DB::isError($res)) {
+            return $res;
+        }
+
+        $results = array();
+        while (DB_OK === $res->fetchInto($row, $fetchmode)) {
+            if ($fetchmode & DB_FETCHMODE_FLIPPED) {
+                foreach ($row as $key => $val) {
+                    $results[$key][] = $val;
+                }
+            } else {
+                $results[] = $row;
+            }
+        }
+
+        $res->free();
+
+        if (DB::isError($row)) {
+            $tmp =& $this->raiseError($row);
+            return $tmp;
+        }
+        return $results;
+    }
+
+    // }}}
+    // {{{ autoCommit()
+
+    /**
+     * Enables or disables automatic commits
+     *
+     * @param bool $onoff  true turns it on, false turns it off
+     *
+     * @return int  DB_OK on success.  A DB_Error object if the driver
+     *               doesn't support auto-committing transactions.
+     */
+    function autoCommit($onoff = false)
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ commit()
+
+    /**
+     * Commits the current transaction
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     */
+    function commit()
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ rollback()
+
+    /**
+     * Reverts the current transaction
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     */
+    function rollback()
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ numRows()
+
+    /**
+     * Determines the number of rows in a query result
+     *
+     * @param resource $result  the query result idenifier produced by PHP
+     *
+     * @return int  the number of rows.  A DB_Error object on failure.
+     */
+    function numRows($result)
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ affectedRows()
+
+    /**
+     * Determines the number of rows affected by a data maniuplation query
+     *
+     * 0 is returned for queries that don't manipulate data.
+     *
+     * @return int  the number of rows.  A DB_Error object on failure.
+     */
+    function affectedRows()
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ getSequenceName()
+
+    /**
+     * Generates the name used inside the database for a sequence
+     *
+     * The createSequence() docblock contains notes about storing sequence
+     * names.
+     *
+     * @param string $sqn  the sequence's public name
+     *
+     * @return string  the sequence's name in the backend
+     *
+     * @access protected
+     * @see DB_common::createSequence(), DB_common::dropSequence(),
+     *      DB_common::nextID(), DB_common::setOption()
+     */
+    function getSequenceName($sqn)
+    {
+        return sprintf($this->getOption('seqname_format'),
+                       preg_replace('/[^a-z0-9_.]/i', '_', $sqn));
+    }
+
+    // }}}
+    // {{{ nextId()
+
+    /**
+     * Returns the next free id in a sequence
+     *
+     * @param string  $seq_name  name of the sequence
+     * @param boolean $ondemand  when true, the seqence is automatically
+     *                            created if it does not exist
+     *
+     * @return int  the next id number in the sequence.
+     *               A DB_Error object on failure.
+     *
+     * @see DB_common::createSequence(), DB_common::dropSequence(),
+     *      DB_common::getSequenceName()
+     */
+    function nextId($seq_name, $ondemand = true)
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ createSequence()
+
+    /**
+     * Creates a new sequence
+     *
+     * The name of a given sequence is determined by passing the string
+     * provided in the $seq_name argument through PHP's sprintf()
+     * function using the value from the seqname_format option as
+     * the sprintf()'s format argument.
+     *
+     * seqname_format is set via setOption().
+     *
+     * @param string $seq_name  name of the new sequence
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
+     *      DB_common::nextID()
+     */
+    function createSequence($seq_name)
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ dropSequence()
+
+    /**
+     * Deletes a sequence
+     *
+     * @param string $seq_name  name of the sequence to be deleted
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::createSequence(), DB_common::getSequenceName(),
+     *      DB_common::nextID()
+     */
+    function dropSequence($seq_name)
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ raiseError()
+
+    /**
+     * Communicates an error and invoke error callbacks, etc
+     *
+     * Basically a wrapper for PEAR::raiseError without the message string.
+     *
+     * @param mixed   integer error code, or a PEAR error object (all
+     *                 other parameters are ignored if this parameter is
+     *                 an object
+     * @param int     error mode, see PEAR_Error docs
+     * @param mixed   if error mode is PEAR_ERROR_TRIGGER, this is the
+     *                 error level (E_USER_NOTICE etc).  If error mode is
+     *                 PEAR_ERROR_CALLBACK, this is the callback function,
+     *                 either as a function name, or as an array of an
+     *                 object and method name.  For other error modes this
+     *                 parameter is ignored.
+     * @param string  extra debug information.  Defaults to the last
+     *                 query and native error code.
+     * @param mixed   native error code, integer or string depending the
+     *                 backend
+     *
+     * @return object  the PEAR_Error object
+     *
+     * @see PEAR_Error
+     */
+    function &raiseError($code = DB_ERROR, $mode = null, $options = null,
+                         $userinfo = null, $nativecode = null)
+    {
+        // The error is yet a DB error object
+        if (is_object($code)) {
+            // because we the static PEAR::raiseError, our global
+            // handler should be used if it is set
+            if ($mode === null && !empty($this->_default_error_mode)) {
+                $mode    = $this->_default_error_mode;
+                $options = $this->_default_error_options;
+            }
+            $tmp = PEAR::raiseError($code, null, $mode, $options,
+                                    null, null, true);
+            return $tmp;
+        }
+
+        if ($userinfo === null) {
+            $userinfo = $this->last_query;
+        }
+
+        if ($nativecode) {
+            $userinfo .= ' [nativecode=' . trim($nativecode) . ']';
+        } else {
+            $userinfo .= ' [DB Error: ' . DB::errorMessage($code) . ']';
+        }
+
+        $tmp = PEAR::raiseError(null, $code, $mode, $options, $userinfo,
+                                'DB_Error', true);
+        return $tmp;
+    }
+
+    // }}}
+    // {{{ errorNative()
+
+    /**
+     * Gets the DBMS' native error code produced by the last query
+     *
+     * @return mixed  the DBMS' error code.  A DB_Error object on failure.
+     */
+    function errorNative()
+    {
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ errorCode()
+
+    /**
+     * Maps native error codes to DB's portable ones
+     *
+     * Uses the $errorcode_map property defined in each driver.
+     *
+     * @param string|int $nativecode  the error code returned by the DBMS
+     *
+     * @return int  the portable DB error code.  Return DB_ERROR if the
+     *               current driver doesn't have a mapping for the
+     *               $nativecode submitted.
+     */
+    function errorCode($nativecode)
+    {
+        if (isset($this->errorcode_map[$nativecode])) {
+            return $this->errorcode_map[$nativecode];
+        }
+        // Fall back to DB_ERROR if there was no mapping.
+        return DB_ERROR;
+    }
+
+    // }}}
+    // {{{ errorMessage()
+
+    /**
+     * Maps a DB error code to a textual message
+     *
+     * @param integer $dbcode  the DB error code
+     *
+     * @return string  the error message corresponding to the error code
+     *                  submitted.  FALSE if the error code is unknown.
+     *
+     * @see DB::errorMessage()
+     */
+    function errorMessage($dbcode)
+    {
+        return DB::errorMessage($this->errorcode_map[$dbcode]);
+    }
+
+    // }}}
+    // {{{ tableInfo()
+
+    /**
+     * Returns information about a table or a result set
+     *
+     * The format of the resulting array depends on which $mode
+     * you select.  The sample output below is based on this query:
+     * 
      +     *    SELECT tblFoo.fldID, tblFoo.fldPhone, tblBar.fldId
+     *    FROM tblFoo
+     *    JOIN tblBar ON tblFoo.fldId = tblBar.fldId
+     * 
      
+     *
+     * 
        
+     * 
      • 
+     *
+     * null (default)
+     *   
        +     *   [0] => Array (
+     *       [table] => tblFoo
+     *       [name] => fldId
+     *       [type] => int
+     *       [len] => 11
+     *       [flags] => primary_key not_null
+     *   )
+     *   [1] => Array (
+     *       [table] => tblFoo
+     *       [name] => fldPhone
+     *       [type] => string
+     *       [len] => 20
+     *       [flags] =>
+     *   )
+     *   [2] => Array (
+     *       [table] => tblBar
+     *       [name] => fldId
+     *       [type] => int
+     *       [len] => 11
+     *       [flags] => primary_key not_null
+     *   )
+     *   
        
+     *
+     * 
      • 
+     *
+     * DB_TABLEINFO_ORDER
+     *
+     *   
        In addition to the information found in the default output,
+     *   a notation of the number of columns is provided by the
+     *   num_fields element while the order
+     *   element provides an array with the column names as the keys and
+     *   their location index number (corresponding to the keys in the
+     *   the default output) as the values.
        
+     *
+     *   
        If a result set has identical field names, the last one is
+     *   used.
        
+     *
+     *   
        +     *   [num_fields] => 3
+     *   [order] => Array (
+     *       [fldId] => 2
+     *       [fldTrans] => 1
+     *   )
+     *   
        
+     *
+     * 
      • 
+     *
+     * DB_TABLEINFO_ORDERTABLE
+     *
+     *   
        Similar to DB_TABLEINFO_ORDER but adds more
+     *   dimensions to the array in which the table names are keys and
+     *   the field names are sub-keys.  This is helpful for queries that
+     *   join tables which have identical field names.
        
+     *
+     *   
        +     *   [num_fields] => 3
+     *   [ordertable] => Array (
+     *       [tblFoo] => Array (
+     *           [fldId] => 0
+     *           [fldPhone] => 1
+     *       )
+     *       [tblBar] => Array (
+     *           [fldId] => 2
+     *       )
+     *   )
+     *   
        
+     *
+     * 
        • 
+     * 
      
+     *
+     * The flags element contains a space separated list
+     * of extra information about the field.  This data is inconsistent
+     * between DBMS's due to the way each DBMS works.
+     *   + primary_key
+     *   + unique_key
+     *   + multiple_key
+     *   + not_null
+     *
+     * Most DBMS's only provide the table and flags
+     * elements if $result is a table name.  The following DBMS's
+     * provide full information from queries:
+     *   + fbsql
+     *   + mysql
+     *
+     * If the 'portability' option has DB_PORTABILITY_LOWERCASE
+     * turned on, the names of tables and fields will be lowercased.
+     *
+     * @param object|string  $result  DB_result object from a query or a
+     *                                string containing the name of a table.
+     *                                While this also accepts a query result
+     *                                resource identifier, this behavior is
+     *                                deprecated.
+     * @param int  $mode   either unused or one of the tableInfo modes:
+     *                     DB_TABLEINFO_ORDERTABLE,
+     *                     DB_TABLEINFO_ORDER or
+     *                     DB_TABLEINFO_FULL (which does both).
+     *                     These are bitwise, so the first two can be
+     *                     combined using |.
+     *
+     * @return array  an associative array with the information requested.
+     *                 A DB_Error object on failure.
+     *
+     * @see DB_common::setOption()
+     */
+    function tableInfo($result, $mode = null)
+    {
+        /*
+         * If the DB_ class has a tableInfo() method, that one
+         * overrides this one.  But, if the driver doesn't have one,
+         * this method runs and tells users about that fact.
+         */
+        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
+    }
+
+    // }}}
+    // {{{ getTables()
+
+    /**
+     * Lists the tables in the current database
+     *
+     * @return array  the list of tables.  A DB_Error object on failure.
+     *
+     * @deprecated Method deprecated some time before Release 1.2
+     */
+    function getTables()
+    {
+        return $this->getListOf('tables');
+    }
+
+    // }}}
+    // {{{ getListOf()
+
+    /**
+     * Lists internal database information
+     *
+     * @param string $type  type of information being sought.
+     *                       Common items being sought are:
+     *                       tables, databases, users, views, functions
+     *                       Each DBMS's has its own capabilities.
+     *
+     * @return array  an array listing the items sought.
+     *                 A DB DB_Error object on failure.
+     */
+    function getListOf($type)
+    {
+        $sql = $this->getSpecialQuery($type);
+        if ($sql === null) {
+            $this->last_query = '';
+            return $this->raiseError(DB_ERROR_UNSUPPORTED);
+        } elseif (is_int($sql) || DB::isError($sql)) {
+            // Previous error
+            return $this->raiseError($sql);
+        } elseif (is_array($sql)) {
+            // Already the result
+            return $sql;
+        }
+        // Launch this query
+        return $this->getCol($sql);
+    }
+
+    // }}}
+    // {{{ getSpecialQuery()
+
+    /**
+     * Obtains the query string needed for listing a given type of objects
+     *
+     * @param string $type  the kind of objects you want to retrieve
+     *
+     * @return string  the SQL query string or null if the driver doesn't
+     *                  support the object type requested
+     *
+     * @access protected
+     * @see DB_common::getListOf()
+     */
+    function getSpecialQuery($type)
+    {
+        return $this->raiseError(DB_ERROR_UNSUPPORTED);
+    }
+
+    // }}}
+    // {{{ _rtrimArrayValues()
+
+    /**
+     * Right-trims all strings in an array
+     *
+     * @param array $array  the array to be trimmed (passed by reference)
+     *
+     * @return void
+     *
+     * @access protected
+     */
+    function _rtrimArrayValues(&$array)
+    {
+        foreach ($array as $key => $value) {
+            if (is_string($value)) {
+                $array[$key] = rtrim($value);
+            }
+        }
+    }
+
+    // }}}
+    // {{{ _convertNullArrayValuesToEmpty()
+
+    /**
+     * Converts all null values in an array to empty strings
+     *
+     * @param array  $array  the array to be de-nullified (passed by reference)
+     *
+     * @return void
+     *
+     * @access protected
+     */
+    function _convertNullArrayValuesToEmpty(&$array)
+    {
+        foreach ($array as $key => $value) {
+            if (is_null($value)) {
+                $array[$key] = '';
+            }
+        }
+    }
+
+    // }}}
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+
+?>
diff --git a/lib/phpFlickr/PEAR/DB/mysql.php b/lib/phpFlickr/PEAR/DB/mysql.php
new file mode 100644
index 000000000..3ae0adf86
--- /dev/null
+++ b/lib/phpFlickr/PEAR/DB/mysql.php
@@ -0,0 +1,1034 @@
+
+ * @author     Daniel Convissor 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: mysql.php 32 2005-08-01 06:21:02Z dancoulter $
+ * @link       http://pear.php.net/package/DB
+ */
+
+/**
+ * Obtain the DB_common class so it can be extended from
+ */
+require_once 'DB/common.php';
+
+/**
+ * The methods PEAR DB uses to interact with PHP's mysql extension
+ * for interacting with MySQL databases
+ *
+ * These methods overload the ones declared in DB_common.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Stig Bakken 
+ * @author     Daniel Convissor 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/DB
+ */
+class DB_mysql extends DB_common
+{
+    // {{{ properties
+
+    /**
+     * The DB driver type (mysql, oci8, odbc, etc.)
+     * @var string
+     */
+    var $phptype = 'mysql';
+
+    /**
+     * The database syntax variant to be used (db2, access, etc.), if any
+     * @var string
+     */
+    var $dbsyntax = 'mysql';
+
+    /**
+     * The capabilities of this DB implementation
+     *
+     * The 'new_link' element contains the PHP version that first provided
+     * new_link support for this DBMS.  Contains false if it's unsupported.
+     *
+     * Meaning of the 'limit' element:
+     *   + 'emulate' = emulate with fetch row by number
+     *   + 'alter'   = alter the query
+     *   + false     = skip rows
+     *
+     * @var array
+     */
+    var $features = array(
+        'limit'         => 'alter',
+        'new_link'      => '4.2.0',
+        'numrows'       => true,
+        'pconnect'      => true,
+        'prepare'       => false,
+        'ssl'           => false,
+        'transactions'  => true,
+    );
+
+    /**
+     * A mapping of native error codes to DB error codes
+     * @var array
+     */
+    var $errorcode_map = array(
+        1004 => DB_ERROR_CANNOT_CREATE,
+        1005 => DB_ERROR_CANNOT_CREATE,
+        1006 => DB_ERROR_CANNOT_CREATE,
+        1007 => DB_ERROR_ALREADY_EXISTS,
+        1008 => DB_ERROR_CANNOT_DROP,
+        1022 => DB_ERROR_ALREADY_EXISTS,
+        1044 => DB_ERROR_ACCESS_VIOLATION,
+        1046 => DB_ERROR_NODBSELECTED,
+        1048 => DB_ERROR_CONSTRAINT,
+        1049 => DB_ERROR_NOSUCHDB,
+        1050 => DB_ERROR_ALREADY_EXISTS,
+        1051 => DB_ERROR_NOSUCHTABLE,
+        1054 => DB_ERROR_NOSUCHFIELD,
+        1061 => DB_ERROR_ALREADY_EXISTS,
+        1062 => DB_ERROR_ALREADY_EXISTS,
+        1064 => DB_ERROR_SYNTAX,
+        1091 => DB_ERROR_NOT_FOUND,
+        1100 => DB_ERROR_NOT_LOCKED,
+        1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
+        1142 => DB_ERROR_ACCESS_VIOLATION,
+        1146 => DB_ERROR_NOSUCHTABLE,
+        1216 => DB_ERROR_CONSTRAINT,
+        1217 => DB_ERROR_CONSTRAINT,
+    );
+
+    /**
+     * The raw database connection created by PHP
+     * @var resource
+     */
+    var $connection;
+
+    /**
+     * The DSN information for connecting to a database
+     * @var array
+     */
+    var $dsn = array();
+
+
+    /**
+     * Should data manipulation queries be committed automatically?
+     * @var bool
+     * @access private
+     */
+    var $autocommit = true;
+
+    /**
+     * The quantity of transactions begun
+     *
+     * {@internal  While this is private, it can't actually be designated
+     * private in PHP 5 because it is directly accessed in the test suite.}}
+     *
+     * @var integer
+     * @access private
+     */
+    var $transaction_opcount = 0;
+
+    /**
+     * The database specified in the DSN
+     *
+     * It's a fix to allow calls to different databases in the same script.
+     *
+     * @var string
+     * @access private
+     */
+    var $_db = '';
+
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * This constructor calls $this->DB_common()
+     *
+     * @return void
+     */
+    function DB_mysql()
+    {
+        $this->DB_common();
+    }
+
+    // }}}
+    // {{{ connect()
+
+    /**
+     * Connect to the database server, log in and open the database
+     *
+     * Don't call this method directly.  Use DB::connect() instead.
+     *
+     * PEAR DB's mysql driver supports the following extra DSN options:
+     *   + new_link      If set to true, causes subsequent calls to connect()
+     *                    to return a new connection link instead of the
+     *                    existing one.  WARNING: this is not portable to
+     *                    other DBMS's. Available since PEAR DB 1.7.0.
+     *   + client_flags  Any combination of MYSQL_CLIENT_* constants.
+     *                    Only used if PHP is at version 4.3.0 or greater.
+     *                    Available since PEAR DB 1.7.0.
+     *
+     * @param array $dsn         the data source name
+     * @param bool  $persistent  should the connection be persistent?
+     *
+     * @return int  DB_OK on success. A DB_Error object on failure.
+     */
+    function connect($dsn, $persistent = false)
+    {
+        if (!PEAR::loadExtension('mysql')) {
+            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
+        }
+
+        $this->dsn = $dsn;
+        if ($dsn['dbsyntax']) {
+            $this->dbsyntax = $dsn['dbsyntax'];
+        }
+
+        $params = array();
+        if ($dsn['protocol'] && $dsn['protocol'] == 'unix') {
+            $params[0] = ':' . $dsn['socket'];
+        } else {
+            $params[0] = $dsn['hostspec'] ? $dsn['hostspec']
+                         : 'localhost';
+            if ($dsn['port']) {
+                $params[0] .= ':' . $dsn['port'];
+            }
+        }
+        $params[] = $dsn['username'] ? $dsn['username'] : null;
+        $params[] = $dsn['password'] ? $dsn['password'] : null;
+
+        if (!$persistent) {
+            if (isset($dsn['new_link'])
+                && ($dsn['new_link'] == 'true' || $dsn['new_link'] === true))
+            {
+                $params[] = true;
+            } else {
+                $params[] = false;
+            }
+        }
+        if (version_compare(phpversion(), '4.3.0', '>=')) {
+            $params[] = isset($dsn['client_flags'])
+                        ? $dsn['client_flags'] : null;
+        }
+
+        $connect_function = $persistent ? 'mysql_pconnect' : 'mysql_connect';
+
+        $ini = ini_get('track_errors');
+        $php_errormsg = '';
+        if ($ini) {
+            $this->connection = @call_user_func_array($connect_function,
+                                                      $params);
+        } else {
+            ini_set('track_errors', 1);
+            $this->connection = @call_user_func_array($connect_function,
+                                                      $params);
+            ini_set('track_errors', $ini);
+        }
+
+        if (!$this->connection) {
+            if (($err = @mysql_error()) != '') {
+                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
+                                         null, null, null, 
+                                         $err);
+            } else {
+                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
+                                         null, null, null,
+                                         $php_errormsg);
+            }
+        }
+
+        if ($dsn['database']) {
+            if (!@mysql_select_db($dsn['database'], $this->connection)) {
+                return $this->mysqlRaiseError();
+            }
+            $this->_db = $dsn['database'];
+        }
+
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ disconnect()
+
+    /**
+     * Disconnects from the database server
+     *
+     * @return bool  TRUE on success, FALSE on failure
+     */
+    function disconnect()
+    {
+        $ret = @mysql_close($this->connection);
+        $this->connection = null;
+        return $ret;
+    }
+
+    // }}}
+    // {{{ simpleQuery()
+
+    /**
+     * Sends a query to the database server
+     *
+     * Generally uses mysql_query().  If you want to use
+     * mysql_unbuffered_query() set the "result_buffering" option to 0 using
+     * setOptions().  This option was added in Release 1.7.0.
+     *
+     * @param string  the SQL query string
+     *
+     * @return mixed  + a PHP result resrouce for successful SELECT queries
+     *                + the DB_OK constant for other successful queries
+     *                + a DB_Error object on failure
+     */
+    function simpleQuery($query)
+    {
+        $ismanip = DB::isManip($query);
+        $this->last_query = $query;
+        $query = $this->modifyQuery($query);
+        if ($this->_db) {
+            if (!@mysql_select_db($this->_db, $this->connection)) {
+                return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
+            }
+        }
+        if (!$this->autocommit && $ismanip) {
+            if ($this->transaction_opcount == 0) {
+                $result = @mysql_query('SET AUTOCOMMIT=0', $this->connection);
+                $result = @mysql_query('BEGIN', $this->connection);
+                if (!$result) {
+                    return $this->mysqlRaiseError();
+                }
+            }
+            $this->transaction_opcount++;
+        }
+        if (!$this->options['result_buffering']) {
+            $result = @mysql_unbuffered_query($query, $this->connection);
+        } else {
+            $result = @mysql_query($query, $this->connection);
+        }
+        if (!$result) {
+            return $this->mysqlRaiseError();
+        }
+        if (is_resource($result)) {
+            return $result;
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ nextResult()
+
+    /**
+     * Move the internal mysql result pointer to the next available result
+     *
+     * This method has not been implemented yet.
+     *
+     * @param a valid sql result resource
+     *
+     * @return false
+     */
+    function nextResult($result)
+    {
+        return false;
+    }
+
+    // }}}
+    // {{{ fetchInto()
+
+    /**
+     * Places a row from the result set into the given array
+     *
+     * Formating of the array and the data therein are configurable.
+     * See DB_result::fetchInto() for more information.
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result    the query result resource
+     * @param array    $arr       the referenced array to put the data in
+     * @param int      $fetchmode how the resulting array should be indexed
+     * @param int      $rownum    the row number to fetch (0 = first row)
+     *
+     * @return mixed  DB_OK on success, NULL when the end of a result set is
+     *                 reached or on failure
+     *
+     * @see DB_result::fetchInto()
+     */
+    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
+    {
+        if ($rownum !== null) {
+            if (!@mysql_data_seek($result, $rownum)) {
+                return null;
+            }
+        }
+        if ($fetchmode & DB_FETCHMODE_ASSOC) {
+            $arr = @mysql_fetch_array($result, MYSQL_ASSOC);
+            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
+                $arr = array_change_key_case($arr, CASE_LOWER);
+            }
+        } else {
+            $arr = @mysql_fetch_row($result);
+        }
+        if (!$arr) {
+            return null;
+        }
+        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
+            /*
+             * Even though this DBMS already trims output, we do this because
+             * a field might have intentional whitespace at the end that
+             * gets removed by DB_PORTABILITY_RTRIM under another driver.
+             */
+            $this->_rtrimArrayValues($arr);
+        }
+        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
+            $this->_convertNullArrayValuesToEmpty($arr);
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ freeResult()
+
+    /**
+     * Deletes the result set and frees the memory occupied by the result set
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::free() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result  PHP's query result resource
+     *
+     * @return bool  TRUE on success, FALSE if $result is invalid
+     *
+     * @see DB_result::free()
+     */
+    function freeResult($result)
+    {
+        return @mysql_free_result($result);
+    }
+
+    // }}}
+    // {{{ numCols()
+
+    /**
+     * Gets the number of columns in a result set
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::numCols() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result  PHP's query result resource
+     *
+     * @return int  the number of columns.  A DB_Error object on failure.
+     *
+     * @see DB_result::numCols()
+     */
+    function numCols($result)
+    {
+        $cols = @mysql_num_fields($result);
+        if (!$cols) {
+            return $this->mysqlRaiseError();
+        }
+        return $cols;
+    }
+
+    // }}}
+    // {{{ numRows()
+
+    /**
+     * Gets the number of rows in a result set
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::numRows() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result  PHP's query result resource
+     *
+     * @return int  the number of rows.  A DB_Error object on failure.
+     *
+     * @see DB_result::numRows()
+     */
+    function numRows($result)
+    {
+        $rows = @mysql_num_rows($result);
+        if ($rows === null) {
+            return $this->mysqlRaiseError();
+        }
+        return $rows;
+    }
+
+    // }}}
+    // {{{ autoCommit()
+
+    /**
+     * Enables or disables automatic commits
+     *
+     * @param bool $onoff  true turns it on, false turns it off
+     *
+     * @return int  DB_OK on success.  A DB_Error object if the driver
+     *               doesn't support auto-committing transactions.
+     */
+    function autoCommit($onoff = false)
+    {
+        // XXX if $this->transaction_opcount > 0, we should probably
+        // issue a warning here.
+        $this->autocommit = $onoff ? true : false;
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ commit()
+
+    /**
+     * Commits the current transaction
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     */
+    function commit()
+    {
+        if ($this->transaction_opcount > 0) {
+            if ($this->_db) {
+                if (!@mysql_select_db($this->_db, $this->connection)) {
+                    return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
+                }
+            }
+            $result = @mysql_query('COMMIT', $this->connection);
+            $result = @mysql_query('SET AUTOCOMMIT=1', $this->connection);
+            $this->transaction_opcount = 0;
+            if (!$result) {
+                return $this->mysqlRaiseError();
+            }
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ rollback()
+
+    /**
+     * Reverts the current transaction
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     */
+    function rollback()
+    {
+        if ($this->transaction_opcount > 0) {
+            if ($this->_db) {
+                if (!@mysql_select_db($this->_db, $this->connection)) {
+                    return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
+                }
+            }
+            $result = @mysql_query('ROLLBACK', $this->connection);
+            $result = @mysql_query('SET AUTOCOMMIT=1', $this->connection);
+            $this->transaction_opcount = 0;
+            if (!$result) {
+                return $this->mysqlRaiseError();
+            }
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ affectedRows()
+
+    /**
+     * Determines the number of rows affected by a data maniuplation query
+     *
+     * 0 is returned for queries that don't manipulate data.
+     *
+     * @return int  the number of rows.  A DB_Error object on failure.
+     */
+    function affectedRows()
+    {
+        if (DB::isManip($this->last_query)) {
+            return @mysql_affected_rows($this->connection);
+        } else {
+            return 0;
+        }
+     }
+
+    // }}}
+    // {{{ nextId()
+
+    /**
+     * Returns the next free id in a sequence
+     *
+     * @param string  $seq_name  name of the sequence
+     * @param boolean $ondemand  when true, the seqence is automatically
+     *                            created if it does not exist
+     *
+     * @return int  the next id number in the sequence.
+     *               A DB_Error object on failure.
+     *
+     * @see DB_common::nextID(), DB_common::getSequenceName(),
+     *      DB_mysql::createSequence(), DB_mysql::dropSequence()
+     */
+    function nextId($seq_name, $ondemand = true)
+    {
+        $seqname = $this->getSequenceName($seq_name);
+        do {
+            $repeat = 0;
+            $this->pushErrorHandling(PEAR_ERROR_RETURN);
+            $result = $this->query("UPDATE ${seqname} ".
+                                   'SET id=LAST_INSERT_ID(id+1)');
+            $this->popErrorHandling();
+            if ($result === DB_OK) {
+                // COMMON CASE
+                $id = @mysql_insert_id($this->connection);
+                if ($id != 0) {
+                    return $id;
+                }
+                // EMPTY SEQ TABLE
+                // Sequence table must be empty for some reason, so fill
+                // it and return 1 and obtain a user-level lock
+                $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
+                if (DB::isError($result)) {
+                    return $this->raiseError($result);
+                }
+                if ($result == 0) {
+                    // Failed to get the lock
+                    return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
+                }
+
+                // add the default value
+                $result = $this->query("REPLACE INTO ${seqname} (id) VALUES (0)");
+                if (DB::isError($result)) {
+                    return $this->raiseError($result);
+                }
+
+                // Release the lock
+                $result = $this->getOne('SELECT RELEASE_LOCK('
+                                        . "'${seqname}_lock')");
+                if (DB::isError($result)) {
+                    return $this->raiseError($result);
+                }
+                // We know what the result will be, so no need to try again
+                return 1;
+
+            } elseif ($ondemand && DB::isError($result) &&
+                $result->getCode() == DB_ERROR_NOSUCHTABLE)
+            {
+                // ONDEMAND TABLE CREATION
+                $result = $this->createSequence($seq_name);
+                if (DB::isError($result)) {
+                    return $this->raiseError($result);
+                } else {
+                    $repeat = 1;
+                }
+
+            } elseif (DB::isError($result) &&
+                      $result->getCode() == DB_ERROR_ALREADY_EXISTS)
+            {
+                // BACKWARDS COMPAT
+                // see _BCsequence() comment
+                $result = $this->_BCsequence($seqname);
+                if (DB::isError($result)) {
+                    return $this->raiseError($result);
+                }
+                $repeat = 1;
+            }
+        } while ($repeat);
+
+        return $this->raiseError($result);
+    }
+
+    // }}}
+    // {{{ createSequence()
+
+    /**
+     * Creates a new sequence
+     *
+     * @param string $seq_name  name of the new sequence
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::createSequence(), DB_common::getSequenceName(),
+     *      DB_mysql::nextID(), DB_mysql::dropSequence()
+     */
+    function createSequence($seq_name)
+    {
+        $seqname = $this->getSequenceName($seq_name);
+        $res = $this->query('CREATE TABLE ' . $seqname
+                            . ' (id INTEGER UNSIGNED AUTO_INCREMENT NOT NULL,'
+                            . ' PRIMARY KEY(id))');
+        if (DB::isError($res)) {
+            return $res;
+        }
+        // insert yields value 1, nextId call will generate ID 2
+        $res = $this->query("INSERT INTO ${seqname} (id) VALUES (0)");
+        if (DB::isError($res)) {
+            return $res;
+        }
+        // so reset to zero
+        return $this->query("UPDATE ${seqname} SET id = 0");
+    }
+
+    // }}}
+    // {{{ dropSequence()
+
+    /**
+     * Deletes a sequence
+     *
+     * @param string $seq_name  name of the sequence to be deleted
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
+     *      DB_mysql::nextID(), DB_mysql::createSequence()
+     */
+    function dropSequence($seq_name)
+    {
+        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
+    }
+
+    // }}}
+    // {{{ _BCsequence()
+
+    /**
+     * Backwards compatibility with old sequence emulation implementation
+     * (clean up the dupes)
+     *
+     * @param string $seqname  the sequence name to clean up
+     *
+     * @return bool  true on success.  A DB_Error object on failure.
+     *
+     * @access private
+     */
+    function _BCsequence($seqname)
+    {
+        // Obtain a user-level lock... this will release any previous
+        // application locks, but unlike LOCK TABLES, it does not abort
+        // the current transaction and is much less frequently used.
+        $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
+        if (DB::isError($result)) {
+            return $result;
+        }
+        if ($result == 0) {
+            // Failed to get the lock, can't do the conversion, bail
+            // with a DB_ERROR_NOT_LOCKED error
+            return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
+        }
+
+        $highest_id = $this->getOne("SELECT MAX(id) FROM ${seqname}");
+        if (DB::isError($highest_id)) {
+            return $highest_id;
+        }
+        // This should kill all rows except the highest
+        // We should probably do something if $highest_id isn't
+        // numeric, but I'm at a loss as how to handle that...
+        $result = $this->query('DELETE FROM ' . $seqname
+                               . " WHERE id <> $highest_id");
+        if (DB::isError($result)) {
+            return $result;
+        }
+
+        // If another thread has been waiting for this lock,
+        // it will go thru the above procedure, but will have no
+        // real effect
+        $result = $this->getOne("SELECT RELEASE_LOCK('${seqname}_lock')");
+        if (DB::isError($result)) {
+            return $result;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ quoteIdentifier()
+
+    /**
+     * Quotes a string so it can be safely used as a table or column name
+     *
+     * MySQL can't handle the backtick character (`) in
+     * table or column names.
+     *
+     * @param string $str  identifier name to be quoted
+     *
+     * @return string  quoted identifier string
+     *
+     * @see DB_common::quoteIdentifier()
+     * @since Method available since Release 1.6.0
+     */
+    function quoteIdentifier($str)
+    {
+        return '`' . $str . '`';
+    }
+
+    // }}}
+    // {{{ quote()
+
+    /**
+     * @deprecated  Deprecated in release 1.6.0
+     */
+    function quote($str)
+    {
+        return $this->quoteSmart($str);
+    }
+
+    // }}}
+    // {{{ escapeSimple()
+
+    /**
+     * Escapes a string according to the current DBMS's standards
+     *
+     * @param string $str  the string to be escaped
+     *
+     * @return string  the escaped string
+     *
+     * @see DB_common::quoteSmart()
+     * @since Method available since Release 1.6.0
+     */
+    function escapeSimple($str)
+    {
+        if (function_exists('mysql_real_escape_string')) {
+            return @mysql_real_escape_string($str, $this->connection);
+        } else {
+            return @mysql_escape_string($str);
+        }
+    }
+
+    // }}}
+    // {{{ modifyQuery()
+
+    /**
+     * Changes a query string for various DBMS specific reasons
+     *
+     * This little hack lets you know how many rows were deleted
+     * when running a "DELETE FROM table" query.  Only implemented
+     * if the DB_PORTABILITY_DELETE_COUNT portability option is on.
+     *
+     * @param string $query  the query string to modify
+     *
+     * @return string  the modified query string
+     *
+     * @access protected
+     * @see DB_common::setOption()
+     */
+    function modifyQuery($query)
+    {
+        if ($this->options['portability'] & DB_PORTABILITY_DELETE_COUNT) {
+            // "DELETE FROM table" gives 0 affected rows in MySQL.
+            // This little hack lets you know how many rows were deleted.
+            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
+                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
+                                      'DELETE FROM \1 WHERE 1=1', $query);
+            }
+        }
+        return $query;
+    }
+
+    // }}}
+    // {{{ modifyLimitQuery()
+
+    /**
+     * Adds LIMIT clauses to a query string according to current DBMS standards
+     *
+     * @param string $query   the query to modify
+     * @param int    $from    the row to start to fetching (0 = the first row)
+     * @param int    $count   the numbers of rows to fetch
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return string  the query string with LIMIT clauses added
+     *
+     * @access protected
+     */
+    function modifyLimitQuery($query, $from, $count, $params = array())
+    {
+        if (DB::isManip($query)) {
+            return $query . " LIMIT $count";
+        } else {
+            return $query . " LIMIT $from, $count";
+        }
+    }
+
+    // }}}
+    // {{{ mysqlRaiseError()
+
+    /**
+     * Produces a DB_Error object regarding the current problem
+     *
+     * @param int $errno  if the error is being manually raised pass a
+     *                     DB_ERROR* constant here.  If this isn't passed
+     *                     the error information gathered from the DBMS.
+     *
+     * @return object  the DB_Error object
+     *
+     * @see DB_common::raiseError(),
+     *      DB_mysql::errorNative(), DB_common::errorCode()
+     */
+    function mysqlRaiseError($errno = null)
+    {
+        if ($errno === null) {
+            if ($this->options['portability'] & DB_PORTABILITY_ERRORS) {
+                $this->errorcode_map[1022] = DB_ERROR_CONSTRAINT;
+                $this->errorcode_map[1048] = DB_ERROR_CONSTRAINT_NOT_NULL;
+                $this->errorcode_map[1062] = DB_ERROR_CONSTRAINT;
+            } else {
+                // Doing this in case mode changes during runtime.
+                $this->errorcode_map[1022] = DB_ERROR_ALREADY_EXISTS;
+                $this->errorcode_map[1048] = DB_ERROR_CONSTRAINT;
+                $this->errorcode_map[1062] = DB_ERROR_ALREADY_EXISTS;
+            }
+            $errno = $this->errorCode(mysql_errno($this->connection));
+        }
+        return $this->raiseError($errno, null, null, null,
+                                 @mysql_errno($this->connection) . ' ** ' .
+                                 @mysql_error($this->connection));
+    }
+
+    // }}}
+    // {{{ errorNative()
+
+    /**
+     * Gets the DBMS' native error code produced by the last query
+     *
+     * @return int  the DBMS' error code
+     */
+    function errorNative()
+    {
+        return @mysql_errno($this->connection);
+    }
+
+    // }}}
+    // {{{ tableInfo()
+
+    /**
+     * Returns information about a table or a result set
+     *
+     * @param object|string  $result  DB_result object from a query or a
+     *                                 string containing the name of a table.
+     *                                 While this also accepts a query result
+     *                                 resource identifier, this behavior is
+     *                                 deprecated.
+     * @param int            $mode    a valid tableInfo mode
+     *
+     * @return array  an associative array with the information requested.
+     *                 A DB_Error object on failure.
+     *
+     * @see DB_common::tableInfo()
+     */
+    function tableInfo($result, $mode = null)
+    {
+        if (is_string($result)) {
+            /*
+             * Probably received a table name.
+             * Create a result resource identifier.
+             */
+            $id = @mysql_list_fields($this->dsn['database'],
+                                     $result, $this->connection);
+            $got_string = true;
+        } elseif (isset($result->result)) {
+            /*
+             * Probably received a result object.
+             * Extract the result resource identifier.
+             */
+            $id = $result->result;
+            $got_string = false;
+        } else {
+            /*
+             * Probably received a result resource identifier.
+             * Copy it.
+             * Deprecated.  Here for compatibility only.
+             */
+            $id = $result;
+            $got_string = false;
+        }
+
+        if (!is_resource($id)) {
+            return $this->mysqlRaiseError(DB_ERROR_NEED_MORE_DATA);
+        }
+
+        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
+            $case_func = 'strtolower';
+        } else {
+            $case_func = 'strval';
+        }
+
+        $count = @mysql_num_fields($id);
+        $res   = array();
+
+        if ($mode) {
+            $res['num_fields'] = $count;
+        }
+
+        for ($i = 0; $i < $count; $i++) {
+            $res[$i] = array(
+                'table' => $case_func(@mysql_field_table($id, $i)),
+                'name'  => $case_func(@mysql_field_name($id, $i)),
+                'type'  => @mysql_field_type($id, $i),
+                'len'   => @mysql_field_len($id, $i),
+                'flags' => @mysql_field_flags($id, $i),
+            );
+            if ($mode & DB_TABLEINFO_ORDER) {
+                $res['order'][$res[$i]['name']] = $i;
+            }
+            if ($mode & DB_TABLEINFO_ORDERTABLE) {
+                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
+            }
+        }
+
+        // free the result only if we were called on a table
+        if ($got_string) {
+            @mysql_free_result($id);
+        }
+        return $res;
+    }
+
+    // }}}
+    // {{{ getSpecialQuery()
+
+    /**
+     * Obtains the query string needed for listing a given type of objects
+     *
+     * @param string $type  the kind of objects you want to retrieve
+     *
+     * @return string  the SQL query string or null if the driver doesn't
+     *                  support the object type requested
+     *
+     * @access protected
+     * @see DB_common::getListOf()
+     */
+    function getSpecialQuery($type)
+    {
+        switch ($type) {
+            case 'tables':
+                return 'SHOW TABLES';
+            case 'users':
+                return 'SELECT DISTINCT User FROM mysql.user';
+            case 'databases':
+                return 'SHOW DATABASES';
+            default:
+                return null;
+        }
+    }
+
+    // }}}
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+
+?>
diff --git a/lib/phpFlickr/PEAR/DB/pgsql.php b/lib/phpFlickr/PEAR/DB/pgsql.php
new file mode 100644
index 000000000..1e58f48d6
--- /dev/null
+++ b/lib/phpFlickr/PEAR/DB/pgsql.php
@@ -0,0 +1,1097 @@
+
+ * @author     Stig Bakken 
+ * @author     Daniel Convissor 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: pgsql.php 32 2005-08-01 06:21:02Z dancoulter $
+ * @link       http://pear.php.net/package/DB
+ */
+
+/**
+ * Obtain the DB_common class so it can be extended from
+ */
+require_once 'DB/common.php';
+
+/**
+ * The methods PEAR DB uses to interact with PHP's pgsql extension
+ * for interacting with PostgreSQL databases
+ *
+ * These methods overload the ones declared in DB_common.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Rui Hirokawa 
+ * @author     Stig Bakken 
+ * @author     Daniel Convissor 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/DB
+ */
+class DB_pgsql extends DB_common
+{
+    // {{{ properties
+
+    /**
+     * The DB driver type (mysql, oci8, odbc, etc.)
+     * @var string
+     */
+    var $phptype = 'pgsql';
+
+    /**
+     * The database syntax variant to be used (db2, access, etc.), if any
+     * @var string
+     */
+    var $dbsyntax = 'pgsql';
+
+    /**
+     * The capabilities of this DB implementation
+     *
+     * The 'new_link' element contains the PHP version that first provided
+     * new_link support for this DBMS.  Contains false if it's unsupported.
+     *
+     * Meaning of the 'limit' element:
+     *   + 'emulate' = emulate with fetch row by number
+     *   + 'alter'   = alter the query
+     *   + false     = skip rows
+     *
+     * @var array
+     */
+    var $features = array(
+        'limit'         => 'alter',
+        'new_link'      => '4.3.0',
+        'numrows'       => true,
+        'pconnect'      => true,
+        'prepare'       => false,
+        'ssl'           => true,
+        'transactions'  => true,
+    );
+
+    /**
+     * A mapping of native error codes to DB error codes
+     * @var array
+     */
+    var $errorcode_map = array(
+    );
+
+    /**
+     * The raw database connection created by PHP
+     * @var resource
+     */
+    var $connection;
+
+    /**
+     * The DSN information for connecting to a database
+     * @var array
+     */
+    var $dsn = array();
+
+
+    /**
+     * Should data manipulation queries be committed automatically?
+     * @var bool
+     * @access private
+     */
+    var $autocommit = true;
+
+    /**
+     * The quantity of transactions begun
+     *
+     * {@internal  While this is private, it can't actually be designated
+     * private in PHP 5 because it is directly accessed in the test suite.}}
+     *
+     * @var integer
+     * @access private
+     */
+    var $transaction_opcount = 0;
+
+    /**
+     * The number of rows affected by a data manipulation query
+     * @var integer
+     */
+    var $affected = 0;
+
+    /**
+     * The current row being looked at in fetchInto()
+     * @var array
+     * @access private
+     */
+    var $row = array();
+
+    /**
+     * The number of rows in a given result set
+     * @var array
+     * @access private
+     */
+    var $_num_rows = array();
+
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * This constructor calls $this->DB_common()
+     *
+     * @return void
+     */
+    function DB_pgsql()
+    {
+        $this->DB_common();
+    }
+
+    // }}}
+    // {{{ connect()
+
+    /**
+     * Connect to the database server, log in and open the database
+     *
+     * Don't call this method directly.  Use DB::connect() instead.
+     *
+     * PEAR DB's pgsql driver supports the following extra DSN options:
+     *   + connect_timeout  How many seconds to wait for a connection to
+     *                       be established.  Available since PEAR DB 1.7.0.
+     *   + new_link         If set to true, causes subsequent calls to
+     *                       connect() to return a new connection link
+     *                       instead of the existing one.  WARNING: this is
+     *                       not portable to other DBMS's.  Available only
+     *                       if PHP is >= 4.3.0 and PEAR DB is >= 1.7.0.
+     *   + options          Command line options to be sent to the server.
+     *                       Available since PEAR DB 1.6.4.
+     *   + service          Specifies a service name in pg_service.conf that
+     *                       holds additional connection parameters.
+     *                       Available since PEAR DB 1.7.0.
+     *   + sslmode          How should SSL be used when connecting?  Values:
+     *                       disable, allow, prefer or require.
+     *                       Available since PEAR DB 1.7.0.
+     *   + tty              This was used to specify where to send server
+     *                       debug output.  Available since PEAR DB 1.6.4.
+     *
+     * Example of connecting to a new link via a socket:
+     * 
+     * require_once 'DB.php';
+     * 
+     * $dsn = 'pgsql://user:pass@unix(/tmp)/dbname?new_link=true';
+     * $options = array(
+     *     'portability' => DB_PORTABILITY_ALL,
+     * );
+     * 
+     * $db =& DB::connect($dsn, $options);
+     * if (PEAR::isError($db)) {
+     *     die($db->getMessage());
+     * }
+     * 
+     *
+     * @param array $dsn         the data source name
+     * @param bool  $persistent  should the connection be persistent?
+     *
+     * @return int  DB_OK on success. A DB_Error object on failure.
+     *
+     * @link http://www.postgresql.org/docs/current/static/libpq.html#LIBPQ-CONNECT
+     */
+    function connect($dsn, $persistent = false)
+    {
+        if (!PEAR::loadExtension('pgsql')) {
+            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
+        }
+
+        $this->dsn = $dsn;
+        if ($dsn['dbsyntax']) {
+            $this->dbsyntax = $dsn['dbsyntax'];
+        }
+
+        $protocol = $dsn['protocol'] ? $dsn['protocol'] : 'tcp';
+
+        $params = array('');
+        if ($protocol == 'tcp') {
+            if ($dsn['hostspec']) {
+                $params[0] .= 'host=' . $dsn['hostspec'];
+            }
+            if ($dsn['port']) {
+                $params[0] .= ' port=' . $dsn['port'];
+            }
+        } elseif ($protocol == 'unix') {
+            // Allow for pg socket in non-standard locations.
+            if ($dsn['socket']) {
+                $params[0] .= 'host=' . $dsn['socket'];
+            }
+            if ($dsn['port']) {
+                $params[0] .= ' port=' . $dsn['port'];
+            }
+        }
+        if ($dsn['database']) {
+            $params[0] .= ' dbname=\'' . addslashes($dsn['database']) . '\'';
+        }
+        if ($dsn['username']) {
+            $params[0] .= ' user=\'' . addslashes($dsn['username']) . '\'';
+        }
+        if ($dsn['password']) {
+            $params[0] .= ' password=\'' . addslashes($dsn['password']) . '\'';
+        }
+        if (!empty($dsn['options'])) {
+            $params[0] .= ' options=' . $dsn['options'];
+        }
+        if (!empty($dsn['tty'])) {
+            $params[0] .= ' tty=' . $dsn['tty'];
+        }
+        if (!empty($dsn['connect_timeout'])) {
+            $params[0] .= ' connect_timeout=' . $dsn['connect_timeout'];
+        }
+        if (!empty($dsn['sslmode'])) {
+            $params[0] .= ' sslmode=' . $dsn['sslmode'];
+        }
+        if (!empty($dsn['service'])) {
+            $params[0] .= ' service=' . $dsn['service'];
+        }
+
+        if (isset($dsn['new_link'])
+            && ($dsn['new_link'] == 'true' || $dsn['new_link'] === true))
+        {
+            if (version_compare(phpversion(), '4.3.0', '>=')) {
+                $params[] = PGSQL_CONNECT_FORCE_NEW;
+            }
+        }
+
+        $connect_function = $persistent ? 'pg_pconnect' : 'pg_connect';
+
+        $ini = ini_get('track_errors');
+        $php_errormsg = '';
+        if ($ini) {
+            $this->connection = @call_user_func_array($connect_function,
+                                                      $params);
+        } else {
+            ini_set('track_errors', 1);
+            $this->connection = @call_user_func_array($connect_function,
+                                                      $params);
+            ini_set('track_errors', $ini);
+        }
+
+        if (!$this->connection) {
+            return $this->raiseError(DB_ERROR_CONNECT_FAILED,
+                                     null, null, null,
+                                     $php_errormsg);
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ disconnect()
+
+    /**
+     * Disconnects from the database server
+     *
+     * @return bool  TRUE on success, FALSE on failure
+     */
+    function disconnect()
+    {
+        $ret = @pg_close($this->connection);
+        $this->connection = null;
+        return $ret;
+    }
+
+    // }}}
+    // {{{ simpleQuery()
+
+    /**
+     * Sends a query to the database server
+     *
+     * @param string  the SQL query string
+     *
+     * @return mixed  + a PHP result resrouce for successful SELECT queries
+     *                + the DB_OK constant for other successful queries
+     *                + a DB_Error object on failure
+     */
+    function simpleQuery($query)
+    {
+        $ismanip = DB::isManip($query);
+        $this->last_query = $query;
+        $query = $this->modifyQuery($query);
+        if (!$this->autocommit && $ismanip) {
+            if ($this->transaction_opcount == 0) {
+                $result = @pg_exec($this->connection, 'begin;');
+                if (!$result) {
+                    return $this->pgsqlRaiseError();
+                }
+            }
+            $this->transaction_opcount++;
+        }
+        $result = @pg_exec($this->connection, $query);
+        if (!$result) {
+            return $this->pgsqlRaiseError();
+        }
+        // Determine which queries that should return data, and which
+        // should return an error code only.
+        if ($ismanip) {
+            $this->affected = @pg_affected_rows($result);
+            return DB_OK;
+        } elseif (preg_match('/^\s*\(*\s*(SELECT|EXPLAIN|SHOW)\s/si', $query)) {
+            /* PostgreSQL commands:
+               ABORT, ALTER, BEGIN, CLOSE, CLUSTER, COMMIT, COPY,
+               CREATE, DECLARE, DELETE, DROP TABLE, EXPLAIN, FETCH,
+               GRANT, INSERT, LISTEN, LOAD, LOCK, MOVE, NOTIFY, RESET,
+               REVOKE, ROLLBACK, SELECT, SELECT INTO, SET, SHOW,
+               UNLISTEN, UPDATE, VACUUM
+            */
+            $this->row[(int)$result] = 0; // reset the row counter.
+            $numrows = $this->numRows($result);
+            if (is_object($numrows)) {
+                return $numrows;
+            }
+            $this->_num_rows[(int)$result] = $numrows;
+            $this->affected = 0;
+            return $result;
+        } else {
+            $this->affected = 0;
+            return DB_OK;
+        }
+    }
+
+    // }}}
+    // {{{ nextResult()
+
+    /**
+     * Move the internal pgsql result pointer to the next available result
+     *
+     * @param a valid fbsql result resource
+     *
+     * @access public
+     *
+     * @return true if a result is available otherwise return false
+     */
+    function nextResult($result)
+    {
+        return false;
+    }
+
+    // }}}
+    // {{{ fetchInto()
+
+    /**
+     * Places a row from the result set into the given array
+     *
+     * Formating of the array and the data therein are configurable.
+     * See DB_result::fetchInto() for more information.
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::fetchInto() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result    the query result resource
+     * @param array    $arr       the referenced array to put the data in
+     * @param int      $fetchmode how the resulting array should be indexed
+     * @param int      $rownum    the row number to fetch (0 = first row)
+     *
+     * @return mixed  DB_OK on success, NULL when the end of a result set is
+     *                 reached or on failure
+     *
+     * @see DB_result::fetchInto()
+     */
+    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
+    {
+        $result_int = (int)$result;
+        $rownum = ($rownum !== null) ? $rownum : $this->row[$result_int];
+        if ($rownum >= $this->_num_rows[$result_int]) {
+            return null;
+        }
+        if ($fetchmode & DB_FETCHMODE_ASSOC) {
+            $arr = @pg_fetch_array($result, $rownum, PGSQL_ASSOC);
+            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
+                $arr = array_change_key_case($arr, CASE_LOWER);
+            }
+        } else {
+            $arr = @pg_fetch_row($result, $rownum);
+        }
+        if (!$arr) {
+            return null;
+        }
+        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
+            $this->_rtrimArrayValues($arr);
+        }
+        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
+            $this->_convertNullArrayValuesToEmpty($arr);
+        }
+        $this->row[$result_int] = ++$rownum;
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ freeResult()
+
+    /**
+     * Deletes the result set and frees the memory occupied by the result set
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::free() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result  PHP's query result resource
+     *
+     * @return bool  TRUE on success, FALSE if $result is invalid
+     *
+     * @see DB_result::free()
+     */
+    function freeResult($result)
+    {
+        if (is_resource($result)) {
+            unset($this->row[(int)$result]);
+            unset($this->_num_rows[(int)$result]);
+            $this->affected = 0;
+            return @pg_freeresult($result);
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ quote()
+
+    /**
+     * @deprecated  Deprecated in release 1.6.0
+     * @internal
+     */
+    function quote($str)
+    {
+        return $this->quoteSmart($str);
+    }
+
+    // }}}
+    // {{{ quoteSmart()
+
+    /**
+     * Formats input so it can be safely used in a query
+     *
+     * @param mixed $in  the data to be formatted
+     *
+     * @return mixed  the formatted data.  The format depends on the input's
+     *                 PHP type:
+     *                 + null = the string NULL
+     *                 + boolean = string TRUE or FALSE
+     *                 + integer or double = the unquoted number
+     *                 + other (including strings and numeric strings) =
+     *                   the data escaped according to MySQL's settings
+     *                   then encapsulated between single quotes
+     *
+     * @see DB_common::quoteSmart()
+     * @since Method available since Release 1.6.0
+     */
+    function quoteSmart($in)
+    {
+        if (is_int($in) || is_double($in)) {
+            return $in;
+        } elseif (is_bool($in)) {
+            return $in ? 'TRUE' : 'FALSE';
+        } elseif (is_null($in)) {
+            return 'NULL';
+        } else {
+            return "'" . $this->escapeSimple($in) . "'";
+        }
+    }
+
+    // }}}
+    // {{{ escapeSimple()
+
+    /**
+     * Escapes a string according to the current DBMS's standards
+     *
+     * {@internal PostgreSQL treats a backslash as an escape character,
+     * so they are escaped as well.
+     *
+     * Not using pg_escape_string() yet because it requires PostgreSQL
+     * to be at version 7.2 or greater.}}
+     *
+     * @param string $str  the string to be escaped
+     *
+     * @return string  the escaped string
+     *
+     * @see DB_common::quoteSmart()
+     * @since Method available since Release 1.6.0
+     */
+    function escapeSimple($str)
+    {
+        return str_replace("'", "''", str_replace('\\', '\\\\', $str));
+    }
+
+    // }}}
+    // {{{ numCols()
+
+    /**
+     * Gets the number of columns in a result set
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::numCols() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result  PHP's query result resource
+     *
+     * @return int  the number of columns.  A DB_Error object on failure.
+     *
+     * @see DB_result::numCols()
+     */
+    function numCols($result)
+    {
+        $cols = @pg_numfields($result);
+        if (!$cols) {
+            return $this->pgsqlRaiseError();
+        }
+        return $cols;
+    }
+
+    // }}}
+    // {{{ numRows()
+
+    /**
+     * Gets the number of rows in a result set
+     *
+     * This method is not meant to be called directly.  Use
+     * DB_result::numRows() instead.  It can't be declared "protected"
+     * because DB_result is a separate object.
+     *
+     * @param resource $result  PHP's query result resource
+     *
+     * @return int  the number of rows.  A DB_Error object on failure.
+     *
+     * @see DB_result::numRows()
+     */
+    function numRows($result)
+    {
+        $rows = @pg_numrows($result);
+        if ($rows === null) {
+            return $this->pgsqlRaiseError();
+        }
+        return $rows;
+    }
+
+    // }}}
+    // {{{ autoCommit()
+
+    /**
+     * Enables or disables automatic commits
+     *
+     * @param bool $onoff  true turns it on, false turns it off
+     *
+     * @return int  DB_OK on success.  A DB_Error object if the driver
+     *               doesn't support auto-committing transactions.
+     */
+    function autoCommit($onoff = false)
+    {
+        // XXX if $this->transaction_opcount > 0, we should probably
+        // issue a warning here.
+        $this->autocommit = $onoff ? true : false;
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ commit()
+
+    /**
+     * Commits the current transaction
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     */
+    function commit()
+    {
+        if ($this->transaction_opcount > 0) {
+            // (disabled) hack to shut up error messages from libpq.a
+            //@fclose(@fopen("php://stderr", "w"));
+            $result = @pg_exec($this->connection, 'end;');
+            $this->transaction_opcount = 0;
+            if (!$result) {
+                return $this->pgsqlRaiseError();
+            }
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ rollback()
+
+    /**
+     * Reverts the current transaction
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     */
+    function rollback()
+    {
+        if ($this->transaction_opcount > 0) {
+            $result = @pg_exec($this->connection, 'abort;');
+            $this->transaction_opcount = 0;
+            if (!$result) {
+                return $this->pgsqlRaiseError();
+            }
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ affectedRows()
+
+    /**
+     * Determines the number of rows affected by a data maniuplation query
+     *
+     * 0 is returned for queries that don't manipulate data.
+     *
+     * @return int  the number of rows.  A DB_Error object on failure.
+     */
+    function affectedRows()
+    {
+        return $this->affected;
+    }
+
+    // }}}
+    // {{{ nextId()
+
+    /**
+     * Returns the next free id in a sequence
+     *
+     * @param string  $seq_name  name of the sequence
+     * @param boolean $ondemand  when true, the seqence is automatically
+     *                            created if it does not exist
+     *
+     * @return int  the next id number in the sequence.
+     *               A DB_Error object on failure.
+     *
+     * @see DB_common::nextID(), DB_common::getSequenceName(),
+     *      DB_pgsql::createSequence(), DB_pgsql::dropSequence()
+     */
+    function nextId($seq_name, $ondemand = true)
+    {
+        $seqname = $this->getSequenceName($seq_name);
+        $repeat = false;
+        do {
+            $this->pushErrorHandling(PEAR_ERROR_RETURN);
+            $result =& $this->query("SELECT NEXTVAL('${seqname}')");
+            $this->popErrorHandling();
+            if ($ondemand && DB::isError($result) &&
+                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
+                $repeat = true;
+                $this->pushErrorHandling(PEAR_ERROR_RETURN);
+                $result = $this->createSequence($seq_name);
+                $this->popErrorHandling();
+                if (DB::isError($result)) {
+                    return $this->raiseError($result);
+                }
+            } else {
+                $repeat = false;
+            }
+        } while ($repeat);
+        if (DB::isError($result)) {
+            return $this->raiseError($result);
+        }
+        $arr = $result->fetchRow(DB_FETCHMODE_ORDERED);
+        $result->free();
+        return $arr[0];
+    }
+
+    // }}}
+    // {{{ createSequence()
+
+    /**
+     * Creates a new sequence
+     *
+     * @param string $seq_name  name of the new sequence
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::createSequence(), DB_common::getSequenceName(),
+     *      DB_pgsql::nextID(), DB_pgsql::dropSequence()
+     */
+    function createSequence($seq_name)
+    {
+        $seqname = $this->getSequenceName($seq_name);
+        $result = $this->query("CREATE SEQUENCE ${seqname}");
+        return $result;
+    }
+
+    // }}}
+    // {{{ dropSequence()
+
+    /**
+     * Deletes a sequence
+     *
+     * @param string $seq_name  name of the sequence to be deleted
+     *
+     * @return int  DB_OK on success.  A DB_Error object on failure.
+     *
+     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
+     *      DB_pgsql::nextID(), DB_pgsql::createSequence()
+     */
+    function dropSequence($seq_name)
+    {
+        return $this->query('DROP SEQUENCE '
+                            . $this->getSequenceName($seq_name));
+    }
+
+    // }}}
+    // {{{ modifyLimitQuery()
+
+    /**
+     * Adds LIMIT clauses to a query string according to current DBMS standards
+     *
+     * @param string $query   the query to modify
+     * @param int    $from    the row to start to fetching (0 = the first row)
+     * @param int    $count   the numbers of rows to fetch
+     * @param mixed  $params  array, string or numeric data to be used in
+     *                         execution of the statement.  Quantity of items
+     *                         passed must match quantity of placeholders in
+     *                         query:  meaning 1 placeholder for non-array
+     *                         parameters or 1 placeholder per array element.
+     *
+     * @return string  the query string with LIMIT clauses added
+     *
+     * @access protected
+     */
+    function modifyLimitQuery($query, $from, $count, $params = array())
+    {
+        return "$query LIMIT $count OFFSET $from";
+    }
+
+    // }}}
+    // {{{ pgsqlRaiseError()
+
+    /**
+     * Produces a DB_Error object regarding the current problem
+     *
+     * @param int $errno  if the error is being manually raised pass a
+     *                     DB_ERROR* constant here.  If this isn't passed
+     *                     the error information gathered from the DBMS.
+     *
+     * @return object  the DB_Error object
+     *
+     * @see DB_common::raiseError(),
+     *      DB_pgsql::errorNative(), DB_pgsql::errorCode()
+     */
+    function pgsqlRaiseError($errno = null)
+    {
+        $native = $this->errorNative();
+        if ($errno === null) {
+            $errno = $this->errorCode($native);
+        }
+        return $this->raiseError($errno, null, null, null, $native);
+    }
+
+    // }}}
+    // {{{ errorNative()
+
+    /**
+     * Gets the DBMS' native error message produced by the last query
+     *
+     * {@internal Error messages are used instead of error codes 
+     * in order to support older versions of PostgreSQL.}}
+     *
+     * @return string  the DBMS' error message
+     */
+    function errorNative()
+    {
+        return @pg_errormessage($this->connection);
+    }
+
+    // }}}
+    // {{{ errorCode()
+
+    /**
+     * Determines PEAR::DB error code from the database's text error message.
+     *
+     * @param  string  $errormsg  error message returned from the database
+     * @return integer  an error number from a DB error constant
+     */
+    function errorCode($errormsg)
+    {
+        static $error_regexps;
+        if (!isset($error_regexps)) {
+            $error_regexps = array(
+                '/(relation|sequence|table).*does not exist|class .* not found/i'
+                    => DB_ERROR_NOSUCHTABLE,
+                '/index .* does not exist/'
+                    => DB_ERROR_NOT_FOUND,
+                '/column .* does not exist/i'
+                    => DB_ERROR_NOSUCHFIELD,
+                '/relation .* already exists/i'
+                    => DB_ERROR_ALREADY_EXISTS,
+                '/(divide|division) by zero$/i'
+                    => DB_ERROR_DIVZERO,
+                '/pg_atoi: error in .*: can\'t parse /i'
+                    => DB_ERROR_INVALID_NUMBER,
+                '/invalid input syntax for( type)? (integer|numeric)/i'
+                    => DB_ERROR_INVALID_NUMBER,
+                '/value .* is out of range for type \w*int/i'
+                    => DB_ERROR_INVALID_NUMBER,
+                '/integer out of range/i'
+                    => DB_ERROR_INVALID_NUMBER,
+                '/value too long for type character/i'
+                    => DB_ERROR_INVALID,
+                '/attribute .* not found|relation .* does not have attribute/i'
+                    => DB_ERROR_NOSUCHFIELD,
+                '/column .* specified in USING clause does not exist in (left|right) table/i'
+                    => DB_ERROR_NOSUCHFIELD,
+                '/parser: parse error at or near/i'
+                    => DB_ERROR_SYNTAX,
+                '/syntax error at/'
+                    => DB_ERROR_SYNTAX,
+                '/column reference .* is ambiguous/i'
+                    => DB_ERROR_SYNTAX,
+                '/permission denied/'
+                    => DB_ERROR_ACCESS_VIOLATION,
+                '/violates not-null constraint/'
+                    => DB_ERROR_CONSTRAINT_NOT_NULL,
+                '/violates [\w ]+ constraint/'
+                    => DB_ERROR_CONSTRAINT,
+                '/referential integrity violation/'
+                    => DB_ERROR_CONSTRAINT,
+                '/more expressions than target columns/i'
+                    => DB_ERROR_VALUE_COUNT_ON_ROW,
+            );
+        }
+        foreach ($error_regexps as $regexp => $code) {
+            if (preg_match($regexp, $errormsg)) {
+                return $code;
+            }
+        }
+        // Fall back to DB_ERROR if there was no mapping.
+        return DB_ERROR;
+    }
+
+    // }}}
+    // {{{ tableInfo()
+
+    /**
+     * Returns information about a table or a result set
+     *
+     * NOTE: only supports 'table' and 'flags' if $result
+     * is a table name.
+     *
+     * @param object|string  $result  DB_result object from a query or a
+     *                                 string containing the name of a table.
+     *                                 While this also accepts a query result
+     *                                 resource identifier, this behavior is
+     *                                 deprecated.
+     * @param int            $mode    a valid tableInfo mode
+     *
+     * @return array  an associative array with the information requested.
+     *                 A DB_Error object on failure.
+     *
+     * @see DB_common::tableInfo()
+     */
+    function tableInfo($result, $mode = null)
+    {
+        if (is_string($result)) {
+            /*
+             * Probably received a table name.
+             * Create a result resource identifier.
+             */
+            $id = @pg_exec($this->connection, "SELECT * FROM $result LIMIT 0");
+            $got_string = true;
+        } elseif (isset($result->result)) {
+            /*
+             * Probably received a result object.
+             * Extract the result resource identifier.
+             */
+            $id = $result->result;
+            $got_string = false;
+        } else {
+            /*
+             * Probably received a result resource identifier.
+             * Copy it.
+             * Deprecated.  Here for compatibility only.
+             */
+            $id = $result;
+            $got_string = false;
+        }
+
+        if (!is_resource($id)) {
+            return $this->pgsqlRaiseError(DB_ERROR_NEED_MORE_DATA);
+        }
+
+        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
+            $case_func = 'strtolower';
+        } else {
+            $case_func = 'strval';
+        }
+
+        $count = @pg_numfields($id);
+        $res   = array();
+
+        if ($mode) {
+            $res['num_fields'] = $count;
+        }
+
+        for ($i = 0; $i < $count; $i++) {
+            $res[$i] = array(
+                'table' => $got_string ? $case_func($result) : '',
+                'name'  => $case_func(@pg_fieldname($id, $i)),
+                'type'  => @pg_fieldtype($id, $i),
+                'len'   => @pg_fieldsize($id, $i),
+                'flags' => $got_string
+                           ? $this->_pgFieldFlags($id, $i, $result)
+                           : '',
+            );
+            if ($mode & DB_TABLEINFO_ORDER) {
+                $res['order'][$res[$i]['name']] = $i;
+            }
+            if ($mode & DB_TABLEINFO_ORDERTABLE) {
+                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
+            }
+        }
+
+        // free the result only if we were called on a table
+        if ($got_string) {
+            @pg_freeresult($id);
+        }
+        return $res;
+    }
+
+    // }}}
+    // {{{ _pgFieldFlags()
+
+    /**
+     * Get a column's flags
+     *
+     * Supports "not_null", "default_value", "primary_key", "unique_key"
+     * and "multiple_key".  The default value is passed through
+     * rawurlencode() in case there are spaces in it.
+     *
+     * @param int $resource   the PostgreSQL result identifier
+     * @param int $num_field  the field number
+     *
+     * @return string  the flags
+     *
+     * @access private
+     */
+    function _pgFieldFlags($resource, $num_field, $table_name)
+    {
+        $field_name = @pg_fieldname($resource, $num_field);
+
+        $result = @pg_exec($this->connection, "SELECT f.attnotnull, f.atthasdef
+                                FROM pg_attribute f, pg_class tab, pg_type typ
+                                WHERE tab.relname = typ.typname
+                                AND typ.typrelid = f.attrelid
+                                AND f.attname = '$field_name'
+                                AND tab.relname = '$table_name'");
+        if (@pg_numrows($result) > 0) {
+            $row = @pg_fetch_row($result, 0);
+            $flags  = ($row[0] == 't') ? 'not_null ' : '';
+
+            if ($row[1] == 't') {
+                $result = @pg_exec($this->connection, "SELECT a.adsrc
+                                    FROM pg_attribute f, pg_class tab, pg_type typ, pg_attrdef a
+                                    WHERE tab.relname = typ.typname AND typ.typrelid = f.attrelid
+                                    AND f.attrelid = a.adrelid AND f.attname = '$field_name'
+                                    AND tab.relname = '$table_name' AND f.attnum = a.adnum");
+                $row = @pg_fetch_row($result, 0);
+                $num = preg_replace("/'(.*)'::\w+/", "\\1", $row[0]);
+                $flags .= 'default_' . rawurlencode($num) . ' ';
+            }
+        } else {
+            $flags = '';
+        }
+        $result = @pg_exec($this->connection, "SELECT i.indisunique, i.indisprimary, i.indkey
+                                FROM pg_attribute f, pg_class tab, pg_type typ, pg_index i
+                                WHERE tab.relname = typ.typname
+                                AND typ.typrelid = f.attrelid
+                                AND f.attrelid = i.indrelid
+                                AND f.attname = '$field_name'
+                                AND tab.relname = '$table_name'");
+        $count = @pg_numrows($result);
+
+        for ($i = 0; $i < $count ; $i++) {
+            $row = @pg_fetch_row($result, $i);
+            $keys = explode(' ', $row[2]);
+
+            if (in_array($num_field + 1, $keys)) {
+                $flags .= ($row[0] == 't' && $row[1] == 'f') ? 'unique_key ' : '';
+                $flags .= ($row[1] == 't') ? 'primary_key ' : '';
+                if (count($keys) > 1)
+                    $flags .= 'multiple_key ';
+            }
+        }
+
+        return trim($flags);
+    }
+
+    // }}}
+    // {{{ getSpecialQuery()
+
+    /**
+     * Obtains the query string needed for listing a given type of objects
+     *
+     * @param string $type  the kind of objects you want to retrieve
+     *
+     * @return string  the SQL query string or null if the driver doesn't
+     *                  support the object type requested
+     *
+     * @access protected
+     * @see DB_common::getListOf()
+     */
+    function getSpecialQuery($type)
+    {
+        switch ($type) {
+            case 'tables':
+                return 'SELECT c.relname AS "Name"'
+                        . ' FROM pg_class c, pg_user u'
+                        . ' WHERE c.relowner = u.usesysid'
+                        . " AND c.relkind = 'r'"
+                        . ' AND NOT EXISTS'
+                        . ' (SELECT 1 FROM pg_views'
+                        . '  WHERE viewname = c.relname)'
+                        . " AND c.relname !~ '^(pg_|sql_)'"
+                        . ' UNION'
+                        . ' SELECT c.relname AS "Name"'
+                        . ' FROM pg_class c'
+                        . " WHERE c.relkind = 'r'"
+                        . ' AND NOT EXISTS'
+                        . ' (SELECT 1 FROM pg_views'
+                        . '  WHERE viewname = c.relname)'
+                        . ' AND NOT EXISTS'
+                        . ' (SELECT 1 FROM pg_user'
+                        . '  WHERE usesysid = c.relowner)'
+                        . " AND c.relname !~ '^pg_'";
+            case 'schema.tables':
+                return "SELECT schemaname || '.' || tablename"
+                        . ' AS "Name"'
+                        . ' FROM pg_catalog.pg_tables'
+                        . ' WHERE schemaname NOT IN'
+                        . " ('pg_catalog', 'information_schema', 'pg_toast')";
+            case 'views':
+                // Table cols: viewname | viewowner | definition
+                return 'SELECT viewname from pg_views WHERE schemaname'
+                        . " NOT IN ('information_schema', 'pg_catalog')";
+            case 'users':
+                // cols: usename |usesysid|usecreatedb|usetrace|usesuper|usecatupd|passwd  |valuntil
+                return 'SELECT usename FROM pg_user';
+            case 'databases':
+                return 'SELECT datname FROM pg_database';
+            case 'functions':
+            case 'procedures':
+                return 'SELECT proname FROM pg_proc WHERE proowner <> 1';
+            default:
+                return null;
+        }
+    }
+
+    // }}}
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+
+?>
diff --git a/lib/phpFlickr/PEAR/DB/storage.php b/lib/phpFlickr/PEAR/DB/storage.php
new file mode 100644
index 000000000..f597b36d7
--- /dev/null
+++ b/lib/phpFlickr/PEAR/DB/storage.php
@@ -0,0 +1,504 @@
+
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: storage.php 32 2005-08-01 06:21:02Z dancoulter $
+ * @link       http://pear.php.net/package/DB
+ */
+
+/**
+ * Obtain the DB class so it can be extended from
+ */
+require_once 'DB.php';
+
+/**
+ * Provides an object interface to a table row
+ *
+ * It lets you add, delete and change rows using objects rather than SQL
+ * statements.
+ *
+ * @category   Database
+ * @package    DB
+ * @author     Stig Bakken 
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/DB
+ */
+class DB_storage extends PEAR
+{
+    // {{{ properties
+
+    /** the name of the table (or view, if the backend database supports
+        updates in views) we hold data from */
+    var $_table = null;
+
+    /** which column(s) in the table contains primary keys, can be a
+        string for single-column primary keys, or an array of strings
+        for multiple-column primary keys */
+    var $_keycolumn = null;
+
+    /** DB connection handle used for all transactions */
+    var $_dbh = null;
+
+    /** an assoc with the names of database fields stored as properties
+        in this object */
+    var $_properties = array();
+
+    /** an assoc with the names of the properties in this object that
+        have been changed since they were fetched from the database */
+    var $_changes = array();
+
+    /** flag that decides if data in this object can be changed.
+        objects that don't have their table's key column in their
+        property lists will be flagged as read-only. */
+    var $_readonly = false;
+
+    /** function or method that implements a validator for fields that
+        are set, this validator function returns true if the field is
+        valid, false if not */
+    var $_validator = null;
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * Constructor
+     *
+     * @param $table string the name of the database table
+     *
+     * @param $keycolumn mixed string with name of key column, or array of
+     * strings if the table has a primary key of more than one column
+     *
+     * @param $dbh object database connection object
+     *
+     * @param $validator mixed function or method used to validate
+     * each new value, called with three parameters: the name of the
+     * field/column that is changing, a reference to the new value and
+     * a reference to this object
+     *
+     */
+    function DB_storage($table, $keycolumn, &$dbh, $validator = null)
+    {
+        $this->PEAR('DB_Error');
+        $this->_table = $table;
+        $this->_keycolumn = $keycolumn;
+        $this->_dbh = $dbh;
+        $this->_readonly = false;
+        $this->_validator = $validator;
+    }
+
+    // }}}
+    // {{{ _makeWhere()
+
+    /**
+     * Utility method to build a "WHERE" clause to locate ourselves in
+     * the table.
+     *
+     * XXX future improvement: use rowids?
+     *
+     * @access private
+     */
+    function _makeWhere($keyval = null)
+    {
+        if (is_array($this->_keycolumn)) {
+            if ($keyval === null) {
+                for ($i = 0; $i < sizeof($this->_keycolumn); $i++) {
+                    $keyval[] = $this->{$this->_keycolumn[$i]};
+                }
+            }
+            $whereclause = '';
+            for ($i = 0; $i < sizeof($this->_keycolumn); $i++) {
+                if ($i > 0) {
+                    $whereclause .= ' AND ';
+                }
+                $whereclause .= $this->_keycolumn[$i];
+                if (is_null($keyval[$i])) {
+                    // there's not much point in having a NULL key,
+                    // but we support it anyway
+                    $whereclause .= ' IS NULL';
+                } else {
+                    $whereclause .= ' = ' . $this->_dbh->quote($keyval[$i]);
+                }
+            }
+        } else {
+            if ($keyval === null) {
+                $keyval = @$this->{$this->_keycolumn};
+            }
+            $whereclause = $this->_keycolumn;
+            if (is_null($keyval)) {
+                // there's not much point in having a NULL key,
+                // but we support it anyway
+                $whereclause .= ' IS NULL';
+            } else {
+                $whereclause .= ' = ' . $this->_dbh->quote($keyval);
+            }
+        }
+        return $whereclause;
+    }
+
+    // }}}
+    // {{{ setup()
+
+    /**
+     * Method used to initialize a DB_storage object from the
+     * configured table.
+     *
+     * @param $keyval mixed the key[s] of the row to fetch (string or array)
+     *
+     * @return int DB_OK on success, a DB error if not
+     */
+    function setup($keyval)
+    {
+        $whereclause = $this->_makeWhere($keyval);
+        $query = 'SELECT * FROM ' . $this->_table . ' WHERE ' . $whereclause;
+        $sth = $this->_dbh->query($query);
+        if (DB::isError($sth)) {
+            return $sth;
+        }
+        $row = $sth->fetchRow(DB_FETCHMODE_ASSOC);
+        if (DB::isError($row)) {
+            return $row;
+        }
+        if (!$row) {
+            return $this->raiseError(null, DB_ERROR_NOT_FOUND, null, null,
+                                     $query, null, true);
+        }
+        foreach ($row as $key => $value) {
+            $this->_properties[$key] = true;
+            $this->$key = $value;
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ insert()
+
+    /**
+     * Create a new (empty) row in the configured table for this
+     * object.
+     */
+    function insert($newpk)
+    {
+        if (is_array($this->_keycolumn)) {
+            $primarykey = $this->_keycolumn;
+        } else {
+            $primarykey = array($this->_keycolumn);
+        }
+        settype($newpk, "array");
+        for ($i = 0; $i < sizeof($primarykey); $i++) {
+            $pkvals[] = $this->_dbh->quote($newpk[$i]);
+        }
+
+        $sth = $this->_dbh->query("INSERT INTO $this->_table (" .
+                                  implode(",", $primarykey) . ") VALUES(" .
+                                  implode(",", $pkvals) . ")");
+        if (DB::isError($sth)) {
+            return $sth;
+        }
+        if (sizeof($newpk) == 1) {
+            $newpk = $newpk[0];
+        }
+        $this->setup($newpk);
+    }
+
+    // }}}
+    // {{{ toString()
+
+    /**
+     * Output a simple description of this DB_storage object.
+     * @return string object description
+     */
+    function toString()
+    {
+        $info = strtolower(get_class($this));
+        $info .= " (table=";
+        $info .= $this->_table;
+        $info .= ", keycolumn=";
+        if (is_array($this->_keycolumn)) {
+            $info .= "(" . implode(",", $this->_keycolumn) . ")";
+        } else {
+            $info .= $this->_keycolumn;
+        }
+        $info .= ", dbh=";
+        if (is_object($this->_dbh)) {
+            $info .= $this->_dbh->toString();
+        } else {
+            $info .= "null";
+        }
+        $info .= ")";
+        if (sizeof($this->_properties)) {
+            $info .= " [loaded, key=";
+            $keyname = $this->_keycolumn;
+            if (is_array($keyname)) {
+                $info .= "(";
+                for ($i = 0; $i < sizeof($keyname); $i++) {
+                    if ($i > 0) {
+                        $info .= ",";
+                    }
+                    $info .= $this->$keyname[$i];
+                }
+                $info .= ")";
+            } else {
+                $info .= $this->$keyname;
+            }
+            $info .= "]";
+        }
+        if (sizeof($this->_changes)) {
+            $info .= " [modified]";
+        }
+        return $info;
+    }
+
+    // }}}
+    // {{{ dump()
+
+    /**
+     * Dump the contents of this object to "standard output".
+     */
+    function dump()
+    {
+        foreach ($this->_properties as $prop => $foo) {
+            print "$prop = ";
+            print htmlentities($this->$prop);
+            print "
      \n";
+        }
+    }
+
+    // }}}
+    // {{{ &create()
+
+    /**
+     * Static method used to create new DB storage objects.
+     * @param $data assoc. array where the keys are the names
+     *              of properties/columns
+     * @return object a new instance of DB_storage or a subclass of it
+     */
+    function &create($table, &$data)
+    {
+        $classname = strtolower(get_class($this));
+        $obj =& new $classname($table);
+        foreach ($data as $name => $value) {
+            $obj->_properties[$name] = true;
+            $obj->$name = &$value;
+        }
+        return $obj;
+    }
+
+    // }}}
+    // {{{ loadFromQuery()
+
+    /**
+     * Loads data into this object from the given query.  If this
+     * object already contains table data, changes will be saved and
+     * the object re-initialized first.
+     *
+     * @param $query SQL query
+     *
+     * @param $params parameter list in case you want to use
+     * prepare/execute mode
+     *
+     * @return int DB_OK on success, DB_WARNING_READ_ONLY if the
+     * returned object is read-only (because the object's specified
+     * key column was not found among the columns returned by $query),
+     * or another DB error code in case of errors.
+     */
+// XXX commented out for now
+/*
+    function loadFromQuery($query, $params = null)
+    {
+        if (sizeof($this->_properties)) {
+            if (sizeof($this->_changes)) {
+                $this->store();
+                $this->_changes = array();
+            }
+            $this->_properties = array();
+        }
+        $rowdata = $this->_dbh->getRow($query, DB_FETCHMODE_ASSOC, $params);
+        if (DB::isError($rowdata)) {
+            return $rowdata;
+        }
+        reset($rowdata);
+        $found_keycolumn = false;
+        while (list($key, $value) = each($rowdata)) {
+            if ($key == $this->_keycolumn) {
+                $found_keycolumn = true;
+            }
+            $this->_properties[$key] = true;
+            $this->$key = &$value;
+            unset($value); // have to unset, or all properties will
+                           // refer to the same value
+        }
+        if (!$found_keycolumn) {
+            $this->_readonly = true;
+            return DB_WARNING_READ_ONLY;
+        }
+        return DB_OK;
+    }
+ */
+
+    // }}}
+    // {{{ set()
+
+    /**
+     * Modify an attriute value.
+     */
+    function set($property, $newvalue)
+    {
+        // only change if $property is known and object is not
+        // read-only
+        if ($this->_readonly) {
+            return $this->raiseError(null, DB_WARNING_READ_ONLY, null,
+                                     null, null, null, true);
+        }
+        if (@isset($this->_properties[$property])) {
+            if (empty($this->_validator)) {
+                $valid = true;
+            } else {
+                $valid = @call_user_func($this->_validator,
+                                         $this->_table,
+                                         $property,
+                                         $newvalue,
+                                         $this->$property,
+                                         $this);
+            }
+            if ($valid) {
+                $this->$property = $newvalue;
+                if (empty($this->_changes[$property])) {
+                    $this->_changes[$property] = 0;
+                } else {
+                    $this->_changes[$property]++;
+                }
+            } else {
+                return $this->raiseError(null, DB_ERROR_INVALID, null,
+                                         null, "invalid field: $property",
+                                         null, true);
+            }
+            return true;
+        }
+        return $this->raiseError(null, DB_ERROR_NOSUCHFIELD, null,
+                                 null, "unknown field: $property",
+                                 null, true);
+    }
+
+    // }}}
+    // {{{ &get()
+
+    /**
+     * Fetch an attribute value.
+     *
+     * @param string attribute name
+     *
+     * @return attribute contents, or null if the attribute name is
+     * unknown
+     */
+    function &get($property)
+    {
+        // only return if $property is known
+        if (isset($this->_properties[$property])) {
+            return $this->$property;
+        }
+        $tmp = null;
+        return $tmp;
+    }
+
+    // }}}
+    // {{{ _DB_storage()
+
+    /**
+     * Destructor, calls DB_storage::store() if there are changes
+     * that are to be kept.
+     */
+    function _DB_storage()
+    {
+        if (sizeof($this->_changes)) {
+            $this->store();
+        }
+        $this->_properties = array();
+        $this->_changes = array();
+        $this->_table = null;
+    }
+
+    // }}}
+    // {{{ store()
+
+    /**
+     * Stores changes to this object in the database.
+     *
+     * @return DB_OK or a DB error
+     */
+    function store()
+    {
+        foreach ($this->_changes as $name => $foo) {
+            $params[] = &$this->$name;
+            $vars[] = $name . ' = ?';
+        }
+        if ($vars) {
+            $query = 'UPDATE ' . $this->_table . ' SET ' .
+                implode(', ', $vars) . ' WHERE ' .
+                $this->_makeWhere();
+            $stmt = $this->_dbh->prepare($query);
+            $res = $this->_dbh->execute($stmt, $params);
+            if (DB::isError($res)) {
+                return $res;
+            }
+            $this->_changes = array();
+        }
+        return DB_OK;
+    }
+
+    // }}}
+    // {{{ remove()
+
+    /**
+     * Remove the row represented by this object from the database.
+     *
+     * @return mixed DB_OK or a DB error
+     */
+    function remove()
+    {
+        if ($this->_readonly) {
+            return $this->raiseError(null, DB_WARNING_READ_ONLY, null,
+                                     null, null, null, true);
+        }
+        $query = 'DELETE FROM ' . $this->_table .' WHERE '.
+            $this->_makeWhere();
+        $res = $this->_dbh->query($query);
+        if (DB::isError($res)) {
+            return $res;
+        }
+        foreach ($this->_properties as $prop => $foo) {
+            unset($this->$prop);
+        }
+        $this->_properties = array();
+        $this->_changes = array();
+        return DB_OK;
+    }
+
+    // }}}
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+
+?>
diff --git a/lib/phpFlickr/PEAR/HTTP/Request.php b/lib/phpFlickr/PEAR/HTTP/Request.php
new file mode 100644
index 000000000..55e227b3a
--- /dev/null
+++ b/lib/phpFlickr/PEAR/HTTP/Request.php
@@ -0,0 +1,1484 @@
+
+ * @author      Alexey Borzov 
+ * @copyright   2002-2007 Richard Heyes
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: Request.php 127 2008-01-17 20:21:37Z dcoulter $
+ * @link        http://pear.php.net/package/HTTP_Request/ 
+ */
+
+/**
+ * PEAR and PEAR_Error classes (for error handling)
+ */
+require_once 'PEAR.php';
+/**
+ * Socket class
+ */
+require_once 'Net/Socket.php';
+/**
+ * URL handling class
+ */ 
+require_once 'Net/URL.php';
+
+/**#@+
+ * Constants for HTTP request methods
+ */ 
+define('HTTP_REQUEST_METHOD_GET',     'GET',     true);
+define('HTTP_REQUEST_METHOD_HEAD',    'HEAD',    true);
+define('HTTP_REQUEST_METHOD_POST',    'POST',    true);
+define('HTTP_REQUEST_METHOD_PUT',     'PUT',     true);
+define('HTTP_REQUEST_METHOD_DELETE',  'DELETE',  true);
+define('HTTP_REQUEST_METHOD_OPTIONS', 'OPTIONS', true);
+define('HTTP_REQUEST_METHOD_TRACE',   'TRACE',   true);
+/**#@-*/
+
+/**#@+
+ * Constants for HTTP request error codes
+ */ 
+define('HTTP_REQUEST_ERROR_FILE',             1);
+define('HTTP_REQUEST_ERROR_URL',              2);
+define('HTTP_REQUEST_ERROR_PROXY',            4);
+define('HTTP_REQUEST_ERROR_REDIRECTS',        8);
+define('HTTP_REQUEST_ERROR_RESPONSE',        16);  
+define('HTTP_REQUEST_ERROR_GZIP_METHOD',     32);
+define('HTTP_REQUEST_ERROR_GZIP_READ',       64);
+define('HTTP_REQUEST_ERROR_GZIP_DATA',      128);
+define('HTTP_REQUEST_ERROR_GZIP_CRC',       256);
+/**#@-*/
+
+/**#@+
+ * Constants for HTTP protocol versions
+ */
+define('HTTP_REQUEST_HTTP_VER_1_0', '1.0', true);
+define('HTTP_REQUEST_HTTP_VER_1_1', '1.1', true);
+/**#@-*/
+
+if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
+   /**
+    * Whether string functions are overloaded by their mbstring equivalents 
+    */
+    define('HTTP_REQUEST_MBSTRING', true);
+} else {
+   /**
+    * @ignore
+    */
+    define('HTTP_REQUEST_MBSTRING', false);
+}
+
+/**
+ * Class for performing HTTP requests
+ *
+ * Simple example (fetches yahoo.com and displays it):
+ * 
+ * $a = &new HTTP_Request('http://www.yahoo.com/');
+ * $a->sendRequest();
+ * echo $a->getResponseBody();
+ * 
+ *
+ * @category    HTTP
+ * @package     HTTP_Request
+ * @author      Richard Heyes 
+ * @author      Alexey Borzov 
+ * @version     Release: 1.4.2
+ */
+class HTTP_Request
+{
+   /**#@+
+    * @access private
+    */
+    /**
+    * Instance of Net_URL
+    * @var Net_URL
+    */
+    var $_url;
+
+    /**
+    * Type of request
+    * @var string
+    */
+    var $_method;
+
+    /**
+    * HTTP Version
+    * @var string
+    */
+    var $_http;
+
+    /**
+    * Request headers
+    * @var array
+    */
+    var $_requestHeaders;
+
+    /**
+    * Basic Auth Username
+    * @var string
+    */
+    var $_user;
+    
+    /**
+    * Basic Auth Password
+    * @var string
+    */
+    var $_pass;
+
+    /**
+    * Socket object
+    * @var Net_Socket
+    */
+    var $_sock;
+    
+    /**
+    * Proxy server
+    * @var string
+    */
+    var $_proxy_host;
+    
+    /**
+    * Proxy port
+    * @var integer
+    */
+    var $_proxy_port;
+    
+    /**
+    * Proxy username
+    * @var string
+    */
+    var $_proxy_user;
+    
+    /**
+    * Proxy password
+    * @var string
+    */
+    var $_proxy_pass;
+
+    /**
+    * Post data
+    * @var array
+    */
+    var $_postData;
+
+   /**
+    * Request body  
+    * @var string
+    */
+    var $_body;
+
+   /**
+    * A list of methods that MUST NOT have a request body, per RFC 2616
+    * @var array
+    */
+    var $_bodyDisallowed = array('TRACE');
+
+   /**
+    * Files to post 
+    * @var array
+    */
+    var $_postFiles = array();
+
+    /**
+    * Connection timeout.
+    * @var float
+    */
+    var $_timeout;
+    
+    /**
+    * HTTP_Response object
+    * @var HTTP_Response
+    */
+    var $_response;
+    
+    /**
+    * Whether to allow redirects
+    * @var boolean
+    */
+    var $_allowRedirects;
+    
+    /**
+    * Maximum redirects allowed
+    * @var integer
+    */
+    var $_maxRedirects;
+    
+    /**
+    * Current number of redirects
+    * @var integer
+    */
+    var $_redirects;
+
+   /**
+    * Whether to append brackets [] to array variables
+    * @var bool
+    */
+    var $_useBrackets = true;
+
+   /**
+    * Attached listeners
+    * @var array
+    */
+    var $_listeners = array();
+
+   /**
+    * Whether to save response body in response object property  
+    * @var bool
+    */
+    var $_saveBody = true;
+
+   /**
+    * Timeout for reading from socket (array(seconds, microseconds))
+    * @var array
+    */
+    var $_readTimeout = null;
+
+   /**
+    * Options to pass to Net_Socket::connect. See stream_context_create
+    * @var array
+    */
+    var $_socketOptions = null;
+   /**#@-*/
+
+    /**
+    * Constructor
+    *
+    * Sets up the object
+    * @param    string  The url to fetch/access
+    * @param    array   Associative array of parameters which can have the following keys:
+    * 
        
+    *   
      • method         - Method to use, GET, POST etc (string)
        • 
+    *   
      • http           - HTTP Version to use, 1.0 or 1.1 (string)
        • 
+    *   
      • user           - Basic Auth username (string)
        • 
+    *   
      • pass           - Basic Auth password (string)
        • 
+    *   
      • proxy_host     - Proxy server host (string)
        • 
+    *   
      • proxy_port     - Proxy server port (integer)
        • 
+    *   
      • proxy_user     - Proxy auth username (string)
        • 
+    *   
      • proxy_pass     - Proxy auth password (string)
        • 
+    *   
      • timeout        - Connection timeout in seconds (float)
        • 
+    *   
      • allowRedirects - Whether to follow redirects or not (bool)
        • 
+    *   
      • maxRedirects   - Max number of redirects to follow (integer)
        • 
+    *   
      • useBrackets    - Whether to append [] to array variable names (bool)
        • 
+    *   
      • saveBody       - Whether to save response body in response object property (bool)
        • 
+    *   
      • readTimeout    - Timeout for reading / writing data over the socket (array (seconds, microseconds))
        • 
+    *   
      • socketOptions  - Options to pass to Net_Socket object (array)
        • 
+    * 
      
+    * @access public
+    */
+    function HTTP_Request($url = '', $params = array())
+    {
+        $this->_method         =  HTTP_REQUEST_METHOD_GET;
+        $this->_http           =  HTTP_REQUEST_HTTP_VER_1_1;
+        $this->_requestHeaders = array();
+        $this->_postData       = array();
+        $this->_body           = null;
+
+        $this->_user = null;
+        $this->_pass = null;
+
+        $this->_proxy_host = null;
+        $this->_proxy_port = null;
+        $this->_proxy_user = null;
+        $this->_proxy_pass = null;
+
+        $this->_allowRedirects = false;
+        $this->_maxRedirects   = 3;
+        $this->_redirects      = 0;
+
+        $this->_timeout  = null;
+        $this->_response = null;
+
+        foreach ($params as $key => $value) {
+            $this->{'_' . $key} = $value;
+        }
+
+        if (!empty($url)) {
+            $this->setURL($url);
+        }
+
+        // Default useragent
+        $this->addHeader('User-Agent', 'PEAR HTTP_Request class ( http://pear.php.net/ )');
+
+        // We don't do keep-alives by default
+        $this->addHeader('Connection', 'close');
+
+        // Basic authentication
+        if (!empty($this->_user)) {
+            $this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
+        }
+
+        // Proxy authentication (see bug #5913)
+        if (!empty($this->_proxy_user)) {
+            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
+        }
+
+        // Use gzip encoding if possible
+        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib')) {
+            $this->addHeader('Accept-Encoding', 'gzip');
+        }
+    }
+    
+    /**
+    * Generates a Host header for HTTP/1.1 requests
+    *
+    * @access private
+    * @return string
+    */
+    function _generateHostHeader()
+    {
+        if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
+            $host = $this->_url->host . ':' . $this->_url->port;
+
+        } elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
+            $host = $this->_url->host . ':' . $this->_url->port;
+
+        } elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
+            $host = $this->_url->host . ':' . $this->_url->port;
+        
+        } else {
+            $host = $this->_url->host;
+        }
+
+        return $host;
+    }
+    
+    /**
+    * Resets the object to its initial state (DEPRECATED).
+    * Takes the same parameters as the constructor.
+    *
+    * @param  string $url    The url to be requested
+    * @param  array  $params Associative array of parameters
+    *                        (see constructor for details)
+    * @access public
+    * @deprecated deprecated since 1.2, call the constructor if this is necessary
+    */
+    function reset($url, $params = array())
+    {
+        $this->HTTP_Request($url, $params);
+    }
+
+    /**
+    * Sets the URL to be requested
+    *
+    * @param  string The url to be requested
+    * @access public
+    */
+    function setURL($url)
+    {
+        $this->_url = &new Net_URL($url, $this->_useBrackets);
+
+        if (!empty($this->_url->user) || !empty($this->_url->pass)) {
+            $this->setBasicAuth($this->_url->user, $this->_url->pass);
+        }
+
+        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http) {
+            $this->addHeader('Host', $this->_generateHostHeader());
+        }
+
+        // set '/' instead of empty path rather than check later (see bug #8662)
+        if (empty($this->_url->path)) {
+            $this->_url->path = '/';
+        } 
+    }
+    
+   /**
+    * Returns the current request URL  
+    *
+    * @return   string  Current request URL
+    * @access   public
+    */
+    function getUrl()
+    {
+        return empty($this->_url)? '': $this->_url->getUrl();
+    }
+
+    /**
+    * Sets a proxy to be used
+    *
+    * @param string     Proxy host
+    * @param int        Proxy port
+    * @param string     Proxy username
+    * @param string     Proxy password
+    * @access public
+    */
+    function setProxy($host, $port = 8080, $user = null, $pass = null)
+    {
+        $this->_proxy_host = $host;
+        $this->_proxy_port = $port;
+        $this->_proxy_user = $user;
+        $this->_proxy_pass = $pass;
+
+        if (!empty($user)) {
+            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+        }
+    }
+
+    /**
+    * Sets basic authentication parameters
+    *
+    * @param string     Username
+    * @param string     Password
+    */
+    function setBasicAuth($user, $pass)
+    {
+        $this->_user = $user;
+        $this->_pass = $pass;
+
+        $this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+    }
+
+    /**
+    * Sets the method to be used, GET, POST etc.
+    *
+    * @param string     Method to use. Use the defined constants for this
+    * @access public
+    */
+    function setMethod($method)
+    {
+        $this->_method = $method;
+    }
+
+    /**
+    * Sets the HTTP version to use, 1.0 or 1.1
+    *
+    * @param string     Version to use. Use the defined constants for this
+    * @access public
+    */
+    function setHttpVer($http)
+    {
+        $this->_http = $http;
+    }
+
+    /**
+    * Adds a request header
+    *
+    * @param string     Header name
+    * @param string     Header value
+    * @access public
+    */
+    function addHeader($name, $value)
+    {
+        $this->_requestHeaders[strtolower($name)] = $value;
+    }
+
+    /**
+    * Removes a request header
+    *
+    * @param string     Header name to remove
+    * @access public
+    */
+    function removeHeader($name)
+    {
+        if (isset($this->_requestHeaders[strtolower($name)])) {
+            unset($this->_requestHeaders[strtolower($name)]);
+        }
+    }
+
+    /**
+    * Adds a querystring parameter
+    *
+    * @param string     Querystring parameter name
+    * @param string     Querystring parameter value
+    * @param bool       Whether the value is already urlencoded or not, default = not
+    * @access public
+    */
+    function addQueryString($name, $value, $preencoded = false)
+    {
+        $this->_url->addQueryString($name, $value, $preencoded);
+    }    
+    
+    /**
+    * Sets the querystring to literally what you supply
+    *
+    * @param string     The querystring data. Should be of the format foo=bar&x=y etc
+    * @param bool       Whether data is already urlencoded or not, default = already encoded
+    * @access public
+    */
+    function addRawQueryString($querystring, $preencoded = true)
+    {
+        $this->_url->addRawQueryString($querystring, $preencoded);
+    }
+
+    /**
+    * Adds postdata items
+    *
+    * @param string     Post data name
+    * @param string     Post data value
+    * @param bool       Whether data is already urlencoded or not, default = not
+    * @access public
+    */
+    function addPostData($name, $value, $preencoded = false)
+    {
+        if ($preencoded) {
+            $this->_postData[$name] = $value;
+        } else {
+            $this->_postData[$name] = $this->_arrayMapRecursive('urlencode', $value);
+        }
+    }
+
+   /**
+    * Recursively applies the callback function to the value
+    * 
+    * @param    mixed   Callback function
+    * @param    mixed   Value to process
+    * @access   private
+    * @return   mixed   Processed value
+    */
+    function _arrayMapRecursive($callback, $value)
+    {
+        if (!is_array($value)) {
+            return call_user_func($callback, $value);
+        } else {
+            $map = array();
+            foreach ($value as $k => $v) {
+                $map[$k] = $this->_arrayMapRecursive($callback, $v);
+            }
+            return $map;
+        }
+    }
+
+   /**
+    * Adds a file to upload
+    * 
+    * This also changes content-type to 'multipart/form-data' for proper upload
+    * 
+    * @access public
+    * @param  string    name of file-upload field
+    * @param  mixed     file name(s)
+    * @param  mixed     content-type(s) of file(s) being uploaded
+    * @return bool      true on success
+    * @throws PEAR_Error
+    */
+    function addFile($inputName, $fileName, $contentType = 'application/octet-stream')
+    {
+        if (!is_array($fileName) && !is_readable($fileName)) {
+            return PEAR::raiseError("File '{$fileName}' is not readable", HTTP_REQUEST_ERROR_FILE);
+        } elseif (is_array($fileName)) {
+            foreach ($fileName as $name) {
+                if (!is_readable($name)) {
+                    return PEAR::raiseError("File '{$name}' is not readable", HTTP_REQUEST_ERROR_FILE);
+                }
+            }
+        }
+        $this->addHeader('Content-Type', 'multipart/form-data');
+        $this->_postFiles[$inputName] = array(
+            'name' => $fileName,
+            'type' => $contentType
+        );
+        return true;
+    }
+
+    /**
+    * Adds raw postdata (DEPRECATED)
+    *
+    * @param string     The data
+    * @param bool       Whether data is preencoded or not, default = already encoded
+    * @access public
+    * @deprecated       deprecated since 1.3.0, method setBody() should be used instead
+    */
+    function addRawPostData($postdata, $preencoded = true)
+    {
+        $this->_body = $preencoded ? $postdata : urlencode($postdata);
+    }
+
+   /**
+    * Sets the request body (for POST, PUT and similar requests)
+    *
+    * @param    string  Request body
+    * @access   public
+    */
+    function setBody($body)
+    {
+        $this->_body = $body;
+    }
+
+    /**
+    * Clears any postdata that has been added (DEPRECATED). 
+    * 
+    * Useful for multiple request scenarios.
+    *
+    * @access public
+    * @deprecated deprecated since 1.2
+    */
+    function clearPostData()
+    {
+        $this->_postData = null;
+    }
+
+    /**
+    * Appends a cookie to "Cookie:" header
+    * 
+    * @param string $name cookie name
+    * @param string $value cookie value
+    * @access public
+    */
+    function addCookie($name, $value)
+    {
+        $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
+        $this->addHeader('Cookie', $cookies . $name . '=' . $value);
+    }
+    
+    /**
+    * Clears any cookies that have been added (DEPRECATED). 
+    * 
+    * Useful for multiple request scenarios
+    *
+    * @access public
+    * @deprecated deprecated since 1.2
+    */
+    function clearCookies()
+    {
+        $this->removeHeader('Cookie');
+    }
+
+    /**
+    * Sends the request
+    *
+    * @access public
+    * @param  bool   Whether to store response body in Response object property,
+    *                set this to false if downloading a LARGE file and using a Listener
+    * @return mixed  PEAR error on error, true otherwise
+    */
+    function sendRequest($saveBody = true)
+    {
+        if (!is_a($this->_url, 'Net_URL')) {
+            return PEAR::raiseError('No URL given', HTTP_REQUEST_ERROR_URL);
+        }
+
+        $host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
+        $port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
+
+        // 4.3.0 supports SSL connections using OpenSSL. The function test determines
+        // we running on at least 4.3.0
+        if (strcasecmp($this->_url->protocol, 'https') == 0 AND function_exists('file_get_contents') AND extension_loaded('openssl')) {
+            if (isset($this->_proxy_host)) {
+                return PEAR::raiseError('HTTPS proxies are not supported', HTTP_REQUEST_ERROR_PROXY);
+            }
+            $host = 'ssl://' . $host;
+        }
+
+        // magic quotes may fuck up file uploads and chunked response processing
+        $magicQuotes = ini_get('magic_quotes_runtime');
+        ini_set('magic_quotes_runtime', false);
+
+        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive 
+        // connection token to a proxy server...
+        if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
+            'Keep-Alive' == $this->_requestHeaders['connection'])
+        {
+            $this->removeHeader('connection');
+        }
+
+        $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
+                     (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
+        $sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
+        $sockKey   = $host . ':' . $port;
+        unset($this->_sock);
+
+        // There is a connected socket in the "static" property?
+        if ($keepAlive && !empty($sockets[$sockKey]) &&
+            !empty($sockets[$sockKey]->fp)) 
+        {
+            $this->_sock =& $sockets[$sockKey];
+            $err = null;
+        } else {
+            $this->_notify('connect');
+            $this->_sock =& new Net_Socket();
+            $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
+        }
+        PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
+
+        if (!PEAR::isError($err)) {
+            if (!empty($this->_readTimeout)) {
+                $this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
+            }
+
+            $this->_notify('sentRequest');
+
+            // Read the response
+            $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
+            $err = $this->_response->process(
+                $this->_saveBody && $saveBody,
+                HTTP_REQUEST_METHOD_HEAD != $this->_method
+            );
+
+            if ($keepAlive) {
+                $keepAlive = (isset($this->_response->_headers['content-length'])
+                              || (isset($this->_response->_headers['transfer-encoding'])
+                                  && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
+                if ($keepAlive) {
+                    if (isset($this->_response->_headers['connection'])) {
+                        $keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
+                    } else {
+                        $keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
+                    }
+                }
+            }
+        }
+
+        ini_set('magic_quotes_runtime', $magicQuotes);
+
+        if (PEAR::isError($err)) {
+            return $err;
+        }
+
+        if (!$keepAlive) {
+            $this->disconnect();
+        // Store the connected socket in "static" property
+        } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
+            $sockets[$sockKey] =& $this->_sock;
+        }
+
+        // Check for redirection
+        if (    $this->_allowRedirects
+            AND $this->_redirects <= $this->_maxRedirects
+            AND $this->getResponseCode() > 300
+            AND $this->getResponseCode() < 399
+            AND !empty($this->_response->_headers['location'])) {
+
+            
+            $redirect = $this->_response->_headers['location'];
+
+            // Absolute URL
+            if (preg_match('/^https?:\/\//i', $redirect)) {
+                $this->_url = &new Net_URL($redirect);
+                $this->addHeader('Host', $this->_generateHostHeader());
+            // Absolute path
+            } elseif ($redirect{0} == '/') {
+                $this->_url->path = $redirect;
+            
+            // Relative path
+            } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
+                if (substr($this->_url->path, -1) == '/') {
+                    $redirect = $this->_url->path . $redirect;
+                } else {
+                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                }
+                $redirect = Net_URL::resolvePath($redirect);
+                $this->_url->path = $redirect;
+                
+            // Filename, no path
+            } else {
+                if (substr($this->_url->path, -1) == '/') {
+                    $redirect = $this->_url->path . $redirect;
+                } else {
+                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                }
+                $this->_url->path = $redirect;
+            }
+
+            $this->_redirects++;
+            return $this->sendRequest($saveBody);
+
+        // Too many redirects
+        } elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
+            return PEAR::raiseError('Too many redirects', HTTP_REQUEST_ERROR_REDIRECTS);
+        }
+
+        return true;
+    }
+
+    /**
+     * Disconnect the socket, if connected. Only useful if using Keep-Alive.
+     *
+     * @access public
+     */
+    function disconnect()
+    {
+        if (!empty($this->_sock) && !empty($this->_sock->fp)) {
+            $this->_notify('disconnect');
+            $this->_sock->disconnect();
+        }
+    }
+
+    /**
+    * Returns the response code
+    *
+    * @access public
+    * @return mixed     Response code, false if not set
+    */
+    function getResponseCode()
+    {
+        return isset($this->_response->_code) ? $this->_response->_code : false;
+    }
+
+    /**
+    * Returns either the named header or all if no name given
+    *
+    * @access public
+    * @param string     The header name to return, do not set to get all headers
+    * @return mixed     either the value of $headername (false if header is not present)
+    *                   or an array of all headers
+    */
+    function getResponseHeader($headername = null)
+    {
+        if (!isset($headername)) {
+            return isset($this->_response->_headers)? $this->_response->_headers: array();
+        } else {
+            $headername = strtolower($headername);
+            return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
+        }
+    }
+
+    /**
+    * Returns the body of the response
+    *
+    * @access public
+    * @return mixed     response body, false if not set
+    */
+    function getResponseBody()
+    {
+        return isset($this->_response->_body) ? $this->_response->_body : false;
+    }
+
+    /**
+    * Returns cookies set in response
+    * 
+    * @access public
+    * @return mixed     array of response cookies, false if none are present
+    */
+    function getResponseCookies()
+    {
+        return isset($this->_response->_cookies) ? $this->_response->_cookies : false;
+    }
+
+    /**
+    * Builds the request string
+    *
+    * @access private
+    * @return string The request string
+    */
+    function _buildRequest()
+    {
+        $separator = ini_get('arg_separator.output');
+        ini_set('arg_separator.output', '&');
+        $querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
+        ini_set('arg_separator.output', $separator);
+
+        $host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
+        $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
+        $path = $this->_url->path . $querystring;
+        $url  = $host . $port . $path;
+
+        if (!strlen($url)) {
+            $url = '/';
+        }
+
+        $request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
+
+        if (in_array($this->_method, $this->_bodyDisallowed) ||
+            (0 == strlen($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method ||
+             (empty($this->_postData) && empty($this->_postFiles)))))
+        {
+            $this->removeHeader('Content-Type');
+        } else {
+            if (empty($this->_requestHeaders['content-type'])) {
+                // Add default content-type
+                $this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
+            } elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
+                $boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
+                $this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
+            }
+        }
+
+        // Request Headers
+        if (!empty($this->_requestHeaders)) {
+            foreach ($this->_requestHeaders as $name => $value) {
+                $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+                $request      .= $canonicalName . ': ' . $value . "\r\n";
+            }
+        }
+
+        // No post data or wrong method, so simply add a final CRLF
+        if (in_array($this->_method, $this->_bodyDisallowed) || 
+            (HTTP_REQUEST_METHOD_POST != $this->_method && 0 == strlen($this->_body))) {
+
+            $request .= "\r\n";
+
+        // Post data if it's an array
+        } elseif (HTTP_REQUEST_METHOD_POST == $this->_method && 
+                  (!empty($this->_postData) || !empty($this->_postFiles))) {
+
+            // "normal" POST request
+            if (!isset($boundary)) {
+                $postdata = implode('&', array_map(
+                    create_function('$a', 'return $a[0] . \'=\' . $a[1];'), 
+                    $this->_flattenArray('', $this->_postData)
+                ));
+
+            // multipart request, probably with file uploads
+            } else {
+                $postdata = '';
+                if (!empty($this->_postData)) {
+                    $flatData = $this->_flattenArray('', $this->_postData);
+                    foreach ($flatData as $item) {
+                        $postdata .= '--' . $boundary . "\r\n";
+                        $postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
+                        $postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
+                    }
+                }
+                foreach ($this->_postFiles as $name => $value) {
+                    if (is_array($value['name'])) {
+                        $varname       = $name . ($this->_useBrackets? '[]': '');
+                    } else {
+                        $varname       = $name;
+                        $value['name'] = array($value['name']);
+                    }
+                    foreach ($value['name'] as $key => $filename) {
+                        $fp   = fopen($filename, 'r');
+                        $data = fread($fp, filesize($filename));
+                        fclose($fp);
+                        $basename = basename($filename);
+                        $type     = is_array($value['type'])? @$value['type'][$key]: $value['type'];
+
+                        $postdata .= '--' . $boundary . "\r\n";
+                        $postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
+                        $postdata .= "\r\nContent-Type: " . $type;
+                        $postdata .= "\r\n\r\n" . $data . "\r\n";
+                    }
+                }
+                $postdata .= '--' . $boundary . "--\r\n";
+            }
+            $request .= 'Content-Length: ' .
+                        (HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
+                        "\r\n\r\n";
+            $request .= $postdata;
+
+        // Explicitly set request body
+        } elseif (0 < strlen($this->_body)) {
+
+            $request .= 'Content-Length: ' .
+                        (HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
+                        "\r\n\r\n";
+            $request .= $this->_body;
+
+        // Terminate headers with CRLF on POST request with no body, too
+        } else {
+
+            $request .= "\r\n";
+        }
+        
+        return $request;
+    }
+
+   /**
+    * Helper function to change the (probably multidimensional) associative array
+    * into the simple one.
+    *
+    * @param    string  name for item
+    * @param    mixed   item's values
+    * @return   array   array with the following items: array('item name', 'item value');
+    * @access   private
+    */
+    function _flattenArray($name, $values)
+    {
+        if (!is_array($values)) {
+            return array(array($name, $values));
+        } else {
+            $ret = array();
+            foreach ($values as $k => $v) {
+                if (empty($name)) {
+                    $newName = $k;
+                } elseif ($this->_useBrackets) {
+                    $newName = $name . '[' . $k . ']';
+                } else {
+                    $newName = $name;
+                }
+                $ret = array_merge($ret, $this->_flattenArray($newName, $v));
+            }
+            return $ret;
+        }
+    }
+
+
+   /**
+    * Adds a Listener to the list of listeners that are notified of
+    * the object's events
+    * 
+    * Events sent by HTTP_Request object
+    * - 'connect': on connection to server
+    * - 'sentRequest': after the request was sent
+    * - 'disconnect': on disconnection from server
+    *
+    * Events sent by HTTP_Response object
+    * - 'gotHeaders': after receiving response headers (headers are passed in $data)
+    * - 'tick': on receiving a part of response body (the part is passed in $data)
+    * - 'gzTick': on receiving a gzip-encoded part of response body (ditto)
+    * - 'gotBody': after receiving the response body (passes the decoded body in $data if it was gzipped)
+    *
+    * @param    HTTP_Request_Listener   listener to attach
+    * @return   boolean                 whether the listener was successfully attached
+    * @access   public
+    */
+    function attach(&$listener)
+    {
+        if (!is_a($listener, 'HTTP_Request_Listener')) {
+            return false;
+        }
+        $this->_listeners[$listener->getId()] =& $listener;
+        return true;
+    }
+
+
+   /**
+    * Removes a Listener from the list of listeners 
+    * 
+    * @param    HTTP_Request_Listener   listener to detach
+    * @return   boolean                 whether the listener was successfully detached
+    * @access   public
+    */
+    function detach(&$listener)
+    {
+        if (!is_a($listener, 'HTTP_Request_Listener') || 
+            !isset($this->_listeners[$listener->getId()])) {
+            return false;
+        }
+        unset($this->_listeners[$listener->getId()]);
+        return true;
+    }
+
+
+   /**
+    * Notifies all registered listeners of an event.
+    * 
+    * @param    string  Event name
+    * @param    mixed   Additional data
+    * @access   private
+    * @see      HTTP_Request::attach()
+    */
+    function _notify($event, $data = null)
+    {
+        foreach (array_keys($this->_listeners) as $id) {
+            $this->_listeners[$id]->update($this, $event, $data);
+        }
+    }
+}
+
+
+/**
+ * Response class to complement the Request class
+ *
+ * @category    HTTP
+ * @package     HTTP_Request
+ * @author      Richard Heyes 
+ * @author      Alexey Borzov 
+ * @version     Release: 1.4.2
+ */
+class HTTP_Response
+{
+    /**
+    * Socket object
+    * @var Net_Socket
+    */
+    var $_sock;
+
+    /**
+    * Protocol
+    * @var string
+    */
+    var $_protocol;
+    
+    /**
+    * Return code
+    * @var string
+    */
+    var $_code;
+    
+    /**
+    * Response headers
+    * @var array
+    */
+    var $_headers;
+
+    /**
+    * Cookies set in response  
+    * @var array
+    */
+    var $_cookies;
+
+    /**
+    * Response body
+    * @var string
+    */
+    var $_body = '';
+
+   /**
+    * Used by _readChunked(): remaining length of the current chunk
+    * @var string
+    */
+    var $_chunkLength = 0;
+
+   /**
+    * Attached listeners
+    * @var array
+    */
+    var $_listeners = array();
+
+   /**
+    * Bytes left to read from message-body
+    * @var null|int
+    */
+    var $_toRead;
+
+    /**
+    * Constructor
+    *
+    * @param  Net_Socket    socket to read the response from
+    * @param  array         listeners attached to request
+    */
+    function HTTP_Response(&$sock, &$listeners)
+    {
+        $this->_sock      =& $sock;
+        $this->_listeners =& $listeners;
+    }
+
+
+   /**
+    * Processes a HTTP response
+    * 
+    * This extracts response code, headers, cookies and decodes body if it 
+    * was encoded in some way
+    *
+    * @access public
+    * @param  bool      Whether to store response body in object property, set
+    *                   this to false if downloading a LARGE file and using a Listener.
+    *                   This is assumed to be true if body is gzip-encoded.
+    * @param  bool      Whether the response can actually have a message-body.
+    *                   Will be set to false for HEAD requests.
+    * @throws PEAR_Error
+    * @return mixed     true on success, PEAR_Error in case of malformed response
+    */
+    function process($saveBody = true, $canHaveBody = true)
+    {
+        do {
+            $line = $this->_sock->readLine();
+            if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
+                return PEAR::raiseError('Malformed response', HTTP_REQUEST_ERROR_RESPONSE);
+            } else {
+                $this->_protocol = 'HTTP/' . $http_version;
+                $this->_code     = intval($returncode);
+            }
+            while ('' !== ($header = $this->_sock->readLine())) {
+                $this->_processHeader($header);
+            }
+        } while (100 == $this->_code);
+
+        $this->_notify('gotHeaders', $this->_headers);
+
+        // RFC 2616, section 4.4:
+        // 1. Any response message which "MUST NOT" include a message-body ... 
+        // is always terminated by the first empty line after the header fields 
+        // 3. ... If a message is received with both a
+        // Transfer-Encoding header field and a Content-Length header field,
+        // the latter MUST be ignored.
+        $canHaveBody = $canHaveBody && $this->_code >= 200 && 
+                       $this->_code != 204 && $this->_code != 304;
+
+        // If response body is present, read it and decode
+        $chunked = isset($this->_headers['transfer-encoding']) && ('chunked' == $this->_headers['transfer-encoding']);
+        $gzipped = isset($this->_headers['content-encoding']) && ('gzip' == $this->_headers['content-encoding']);
+        $hasBody = false;
+        if ($canHaveBody && ($chunked || !isset($this->_headers['content-length']) || 
+                0 != $this->_headers['content-length']))
+        {
+            if ($chunked || !isset($this->_headers['content-length'])) {
+                $this->_toRead = null;
+            } else {
+                $this->_toRead = $this->_headers['content-length'];
+            }
+            while (!$this->_sock->eof() && (is_null($this->_toRead) || 0 < $this->_toRead)) {
+                if ($chunked) {
+                    $data = $this->_readChunked();
+                } elseif (is_null($this->_toRead)) {
+                    $data = $this->_sock->read(4096);
+                } else {
+                    $data = $this->_sock->read(min(4096, $this->_toRead));
+                    $this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
+                }
+                if ('' == $data) {
+                    break;
+                } else {
+                    $hasBody = true;
+                    if ($saveBody || $gzipped) {
+                        $this->_body .= $data;
+                    }
+                    $this->_notify($gzipped? 'gzTick': 'tick', $data);
+                }
+            }
+        }
+
+        if ($hasBody) {
+            // Uncompress the body if needed
+            if ($gzipped) {
+                $body = $this->_decodeGzip($this->_body);
+                if (PEAR::isError($body)) {
+                    return $body;
+                }
+                $this->_body = $body;
+                $this->_notify('gotBody', $this->_body);
+            } else {
+                $this->_notify('gotBody');
+            }
+        }
+        return true;
+    }
+
+
+   /**
+    * Processes the response header
+    *
+    * @access private
+    * @param  string    HTTP header
+    */
+    function _processHeader($header)
+    {
+        if (false === strpos($header, ':')) {
+            return;
+        }
+        list($headername, $headervalue) = explode(':', $header, 2);
+        $headername  = strtolower($headername);
+        $headervalue = ltrim($headervalue);
+        
+        if ('set-cookie' != $headername) {
+            if (isset($this->_headers[$headername])) {
+                $this->_headers[$headername] .= ',' . $headervalue;
+            } else {
+                $this->_headers[$headername]  = $headervalue;
+            }
+        } else {
+            $this->_parseCookie($headervalue);
+        }
+    }
+
+
+   /**
+    * Parse a Set-Cookie header to fill $_cookies array
+    *
+    * @access private
+    * @param  string    value of Set-Cookie header
+    */
+    function _parseCookie($headervalue)
+    {
+        $cookie = array(
+            'expires' => null,
+            'domain'  => null,
+            'path'    => null,
+            'secure'  => false
+        );
+
+        // Only a name=value pair
+        if (!strpos($headervalue, ';')) {
+            $pos = strpos($headervalue, '=');
+            $cookie['name']  = trim(substr($headervalue, 0, $pos));
+            $cookie['value'] = trim(substr($headervalue, $pos + 1));
+
+        // Some optional parameters are supplied
+        } else {
+            $elements = explode(';', $headervalue);
+            $pos = strpos($elements[0], '=');
+            $cookie['name']  = trim(substr($elements[0], 0, $pos));
+            $cookie['value'] = trim(substr($elements[0], $pos + 1));
+
+            for ($i = 1; $i < count($elements); $i++) {
+                if (false === strpos($elements[$i], '=')) {
+                    $elName  = trim($elements[$i]);
+                    $elValue = null;
+                } else {
+                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
+                }
+                $elName = strtolower($elName);
+                if ('secure' == $elName) {
+                    $cookie['secure'] = true;
+                } elseif ('expires' == $elName) {
+                    $cookie['expires'] = str_replace('"', '', $elValue);
+                } elseif ('path' == $elName || 'domain' == $elName) {
+                    $cookie[$elName] = urldecode($elValue);
+                } else {
+                    $cookie[$elName] = $elValue;
+                }
+            }
+        }
+        $this->_cookies[] = $cookie;
+    }
+
+
+   /**
+    * Read a part of response body encoded with chunked Transfer-Encoding
+    * 
+    * @access private
+    * @return string
+    */
+    function _readChunked()
+    {
+        // at start of the next chunk?
+        if (0 == $this->_chunkLength) {
+            $line = $this->_sock->readLine();
+            if (preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+                $this->_chunkLength = hexdec($matches[1]); 
+                // Chunk with zero length indicates the end
+                if (0 == $this->_chunkLength) {
+                    $this->_sock->readLine(); // make this an eof()
+                    return '';
+                }
+            } else {
+                return '';
+            }
+        }
+        $data = $this->_sock->read($this->_chunkLength);
+        $this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
+        if (0 == $this->_chunkLength) {
+            $this->_sock->readLine(); // Trailing CRLF
+        }
+        return $data;
+    }
+
+
+   /**
+    * Notifies all registered listeners of an event.
+    * 
+    * @param    string  Event name
+    * @param    mixed   Additional data
+    * @access   private
+    * @see HTTP_Request::_notify()
+    */
+    function _notify($event, $data = null)
+    {
+        foreach (array_keys($this->_listeners) as $id) {
+            $this->_listeners[$id]->update($this, $event, $data);
+        }
+    }
+
+
+   /**
+    * Decodes the message-body encoded by gzip
+    *
+    * The real decoding work is done by gzinflate() built-in function, this
+    * method only parses the header and checks data for compliance with
+    * RFC 1952  
+    *
+    * @access   private
+    * @param    string  gzip-encoded data
+    * @return   string  decoded data
+    */
+    function _decodeGzip($data)
+    {
+        if (HTTP_REQUEST_MBSTRING) {
+            $oldEncoding = mb_internal_encoding();
+            mb_internal_encoding('iso-8859-1');
+        }
+        $length = strlen($data);
+        // If it doesn't look like gzip-encoded data, don't bother
+        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
+            return $data;
+        }
+        $method = ord(substr($data, 2, 1));
+        if (8 != $method) {
+            return PEAR::raiseError('_decodeGzip(): unknown compression method', HTTP_REQUEST_ERROR_GZIP_METHOD);
+        }
+        $flags = ord(substr($data, 3, 1));
+        if ($flags & 224) {
+            return PEAR::raiseError('_decodeGzip(): reserved bits are set', HTTP_REQUEST_ERROR_GZIP_DATA);
+        }
+
+        // header is 10 bytes minimum. may be longer, though.
+        $headerLength = 10;
+        // extra fields, need to skip 'em
+        if ($flags & 4) {
+            if ($length - $headerLength - 2 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
+            }
+            $extraLength = unpack('v', substr($data, 10, 2));
+            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
+            }
+            $headerLength += $extraLength[1] + 2;
+        }
+        // file name, need to skip that
+        if ($flags & 8) {
+            if ($length - $headerLength - 1 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
+            }
+            $filenameLength = strpos(substr($data, $headerLength), chr(0));
+            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
+            }
+            $headerLength += $filenameLength + 1;
+        }
+        // comment, need to skip that also
+        if ($flags & 16) {
+            if ($length - $headerLength - 1 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
+            }
+            $commentLength = strpos(substr($data, $headerLength), chr(0));
+            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
+            }
+            $headerLength += $commentLength + 1;
+        }
+        // have a CRC for header. let's check
+        if ($flags & 1) {
+            if ($length - $headerLength - 2 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
+            }
+            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
+            $crcStored = unpack('v', substr($data, $headerLength, 2));
+            if ($crcReal != $crcStored[1]) {
+                return PEAR::raiseError('_decodeGzip(): header CRC check failed', HTTP_REQUEST_ERROR_GZIP_CRC);
+            }
+            $headerLength += 2;
+        }
+        // unpacked data CRC and size at the end of encoded data
+        $tmp = unpack('V2', substr($data, -8));
+        $dataCrc  = $tmp[1];
+        $dataSize = $tmp[2];
+
+        // finally, call the gzinflate() function
+        $unpacked = @gzinflate(substr($data, $headerLength, -8), $dataSize);
+        if (false === $unpacked) {
+            return PEAR::raiseError('_decodeGzip(): gzinflate() call failed', HTTP_REQUEST_ERROR_GZIP_READ);
+        } elseif ($dataSize != strlen($unpacked)) {
+            return PEAR::raiseError('_decodeGzip(): data size check failed', HTTP_REQUEST_ERROR_GZIP_READ);
+        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
+            return PEAR::raiseError('_decodeGzip(): data CRC check failed', HTTP_REQUEST_ERROR_GZIP_CRC);
+        }
+        if (HTTP_REQUEST_MBSTRING) {
+            mb_internal_encoding($oldEncoding);
+        }
+        return $unpacked;
+    }
+} // End class HTTP_Response
+?>
diff --git a/lib/phpFlickr/PEAR/HTTP/Request/Listener.php b/lib/phpFlickr/PEAR/HTTP/Request/Listener.php
new file mode 100644
index 000000000..b00514206
--- /dev/null
+++ b/lib/phpFlickr/PEAR/HTTP/Request/Listener.php
@@ -0,0 +1,106 @@
+
+ * @copyright   2002-2007 Richard Heyes
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: Listener.php 127 2008-01-17 20:21:37Z dcoulter $
+ * @link        http://pear.php.net/package/HTTP_Request/ 
+ */
+
+/**
+ * Listener for HTTP_Request and HTTP_Response objects
+ *
+ * This class implements the Observer part of a Subject-Observer
+ * design pattern.
+ *
+ * @category    HTTP
+ * @package     HTTP_Request
+ * @author      Alexey Borzov 
+ * @version     Release: 1.4.2
+ */
+class HTTP_Request_Listener 
+{
+   /**
+    * A listener's identifier
+    * @var string
+    */
+    var $_id;
+
+   /**
+    * Constructor, sets the object's identifier
+    *
+    * @access public
+    */
+    function HTTP_Request_Listener()
+    {
+        $this->_id = md5(uniqid('http_request_', 1));
+    }
+
+
+   /**
+    * Returns the listener's identifier
+    *
+    * @access public
+    * @return string
+    */
+    function getId()
+    {
+        return $this->_id;
+    }
+
+
+   /**
+    * This method is called when Listener is notified of an event
+    *
+    * @access   public
+    * @param    object  an object the listener is attached to
+    * @param    string  Event name
+    * @param    mixed   Additional data
+    * @abstract
+    */
+    function update(&$subject, $event, $data = null)
+    {
+        echo "Notified of event: '$event'\n";
+        if (null !== $data) {
+            echo "Additional data: ";
+            var_dump($data);
+        }
+    }
+}
+?>
diff --git a/lib/phpFlickr/PEAR/Net/Socket.php b/lib/phpFlickr/PEAR/Net/Socket.php
new file mode 100644
index 000000000..96f2c4bf1
--- /dev/null
+++ b/lib/phpFlickr/PEAR/Net/Socket.php
@@ -0,0 +1,528 @@
+                                   |
+// |          Chuck Hagenbuch                            |
+// +----------------------------------------------------------------------+
+//
+// $Id: Socket.php 32 2005-08-01 06:21:02Z dancoulter $
+
+require_once 'PEAR.php';
+
+define('NET_SOCKET_READ',  1);
+define('NET_SOCKET_WRITE', 2);
+define('NET_SOCKET_ERROR', 3);
+
+/**
+ * Generalized Socket class.
+ *
+ * @version 1.1
+ * @author Stig Bakken 
+ * @author Chuck Hagenbuch 
+ */
+class Net_Socket extends PEAR {
+
+    /**
+     * Socket file pointer.
+     * @var resource $fp
+     */
+    var $fp = null;
+
+    /**
+     * Whether the socket is blocking. Defaults to true.
+     * @var boolean $blocking
+     */
+    var $blocking = true;
+
+    /**
+     * Whether the socket is persistent. Defaults to false.
+     * @var boolean $persistent
+     */
+    var $persistent = false;
+
+    /**
+     * The IP address to connect to.
+     * @var string $addr
+     */
+    var $addr = '';
+
+    /**
+     * The port number to connect to.
+     * @var integer $port
+     */
+    var $port = 0;
+
+    /**
+     * Number of seconds to wait on socket connections before assuming
+     * there's no more data. Defaults to no timeout.
+     * @var integer $timeout
+     */
+    var $timeout = false;
+
+    /**
+     * Number of bytes to read at a time in readLine() and
+     * readAll(). Defaults to 2048.
+     * @var integer $lineLength
+     */
+    var $lineLength = 2048;
+
+    /**
+     * Connect to the specified port. If called when the socket is
+     * already connected, it disconnects and connects again.
+     *
+     * @param string  $addr        IP address or host name.
+     * @param integer $port        TCP port number.
+     * @param boolean $persistent  (optional) Whether the connection is
+     *                             persistent (kept open between requests
+     *                             by the web server).
+     * @param integer $timeout     (optional) How long to wait for data.
+     * @param array   $options     See options for stream_context_create.
+     *
+     * @access public
+     *
+     * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
+     */
+    function connect($addr, $port = 0, $persistent = null, $timeout = null, $options = null)
+    {
+        if (is_resource($this->fp)) {
+            @fclose($this->fp);
+            $this->fp = null;
+        }
+
+        if (!$addr) {
+            return $this->raiseError('$addr cannot be empty');
+        } elseif (strspn($addr, '.0123456789') == strlen($addr) ||
+                  strstr($addr, '/') !== false) {
+            $this->addr = $addr;
+        } else {
+            $this->addr = @gethostbyname($addr);
+        }
+
+        $this->port = $port % 65536;
+
+        if ($persistent !== null) {
+            $this->persistent = $persistent;
+        }
+
+        if ($timeout !== null) {
+            $this->timeout = $timeout;
+        }
+
+        $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
+        $errno = 0;
+        $errstr = '';
+        if ($options && function_exists('stream_context_create')) {
+            if ($this->timeout) {
+                $timeout = $this->timeout;
+            } else {
+                $timeout = 0;
+            }
+            $context = stream_context_create($options);
+            $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $timeout, $context);
+        } else {
+            if ($this->timeout) {
+                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $this->timeout);
+            } else {
+                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
+            }
+        }
+
+        if (!$fp) {
+            return $this->raiseError($errstr, $errno);
+        }
+
+        $this->fp = $fp;
+
+        return $this->setBlocking($this->blocking);
+    }
+
+    /**
+     * Disconnects from the peer, closes the socket.
+     *
+     * @access public
+     * @return mixed true on success or an error object otherwise
+     */
+    function disconnect()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        @fclose($this->fp);
+        $this->fp = null;
+        return true;
+    }
+
+    /**
+     * Find out if the socket is in blocking mode.
+     *
+     * @access public
+     * @return boolean  The current blocking mode.
+     */
+    function isBlocking()
+    {
+        return $this->blocking;
+    }
+
+    /**
+     * Sets whether the socket connection should be blocking or
+     * not. A read call to a non-blocking socket will return immediately
+     * if there is no data available, whereas it will block until there
+     * is data for blocking sockets.
+     *
+     * @param boolean $mode  True for blocking sockets, false for nonblocking.
+     * @access public
+     * @return mixed true on success or an error object otherwise
+     */
+    function setBlocking($mode)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $this->blocking = $mode;
+        socket_set_blocking($this->fp, $this->blocking);
+        return true;
+    }
+
+    /**
+     * Sets the timeout value on socket descriptor,
+     * expressed in the sum of seconds and microseconds
+     *
+     * @param integer $seconds  Seconds.
+     * @param integer $microseconds  Microseconds.
+     * @access public
+     * @return mixed true on success or an error object otherwise
+     */
+    function setTimeout($seconds, $microseconds)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return socket_set_timeout($this->fp, $seconds, $microseconds);
+    }
+
+    /**
+     * Returns information about an existing socket resource.
+     * Currently returns four entries in the result array:
+     *
+     * 
      
+     * timed_out (bool) - The socket timed out waiting for data
      
+     * blocked (bool) - The socket was blocked
      
+     * eof (bool) - Indicates EOF event
      
+     * unread_bytes (int) - Number of bytes left in the socket buffer
      
+     * 
      
+     *
+     * @access public
+     * @return mixed Array containing information about existing socket resource or an error object otherwise
+     */
+    function getStatus()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return socket_get_status($this->fp);
+    }
+
+    /**
+     * Get a specified line of data
+     *
+     * @access public
+     * @return $size bytes of data from the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function gets($size)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return @fgets($this->fp, $size);
+    }
+
+    /**
+     * Read a specified amount of data. This is guaranteed to return,
+     * and has the added benefit of getting everything in one fread()
+     * chunk; if you know the size of the data you're getting
+     * beforehand, this is definitely the way to go.
+     *
+     * @param integer $size  The number of bytes to read from the socket.
+     * @access public
+     * @return $size bytes of data from the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function read($size)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return @fread($this->fp, $size);
+    }
+
+    /**
+     * Write a specified amount of data.
+     *
+     * @param string  $data       Data to write.
+     * @param integer $blocksize  Amount of data to write at once.
+     *                            NULL means all at once.
+     *
+     * @access public
+     * @return mixed true on success or an error object otherwise
+     */
+    function write($data, $blocksize = null)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        if (is_null($blocksize) && !OS_WINDOWS) {
+            return fwrite($this->fp, $data);
+        } else {
+            if (is_null($blocksize)) {
+                $blocksize = 1024;
+            }
+
+            $pos = 0;
+            $size = strlen($data);
+            while ($pos < $size) {
+                $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
+                if ($written === false) {
+                    return false;
+                }
+                $pos += $written;
+            }
+
+            return $pos;
+        }
+    }
+
+    /**
+     * Write a line of data to the socket, followed by a trailing "\r\n".
+     *
+     * @access public
+     * @return mixed fputs result, or an error
+     */
+    function writeLine($data)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return fwrite($this->fp, $data . "\r\n");
+    }
+
+    /**
+     * Tests for end-of-file on a socket descriptor.
+     *
+     * @access public
+     * @return bool
+     */
+    function eof()
+    {
+        return (is_resource($this->fp) && feof($this->fp));
+    }
+
+    /**
+     * Reads a byte of data
+     *
+     * @access public
+     * @return 1 byte of data from the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function readByte()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        return ord(@fread($this->fp, 1));
+    }
+
+    /**
+     * Reads a word of data
+     *
+     * @access public
+     * @return 1 word of data from the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function readWord()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $buf = @fread($this->fp, 2);
+        return (ord($buf[0]) + (ord($buf[1]) << 8));
+    }
+
+    /**
+     * Reads an int of data
+     *
+     * @access public
+     * @return integer  1 int of data from the socket, or a PEAR_Error if
+     *                  not connected.
+     */
+    function readInt()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $buf = @fread($this->fp, 4);
+        return (ord($buf[0]) + (ord($buf[1]) << 8) +
+                (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
+    }
+
+    /**
+     * Reads a zero-terminated string of data
+     *
+     * @access public
+     * @return string, or a PEAR_Error if
+     *         not connected.
+     */
+    function readString()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $string = '';
+        while (($char = @fread($this->fp, 1)) != "\x00")  {
+            $string .= $char;
+        }
+        return $string;
+    }
+
+    /**
+     * Reads an IP Address and returns it in a dot formated string
+     *
+     * @access public
+     * @return Dot formated string, or a PEAR_Error if
+     *         not connected.
+     */
+    function readIPAddress()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $buf = @fread($this->fp, 4);
+        return sprintf("%s.%s.%s.%s", ord($buf[0]), ord($buf[1]),
+                       ord($buf[2]), ord($buf[3]));
+    }
+
+    /**
+     * Read until either the end of the socket or a newline, whichever
+     * comes first. Strips the trailing newline from the returned data.
+     *
+     * @access public
+     * @return All available data up to a newline, without that
+     *         newline, or until the end of the socket, or a PEAR_Error if
+     *         not connected.
+     */
+    function readLine()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $line = '';
+        $timeout = time() + $this->timeout;
+        while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
+            $line .= @fgets($this->fp, $this->lineLength);
+            if (substr($line, -1) == "\n") {
+                return rtrim($line, "\r\n");
+            }
+        }
+        return $line;
+    }
+
+    /**
+     * Read until the socket closes, or until there is no more data in
+     * the inner PHP buffer. If the inner buffer is empty, in blocking
+     * mode we wait for at least 1 byte of data. Therefore, in
+     * blocking mode, if there is no data at all to be read, this
+     * function will never exit (unless the socket is closed on the
+     * remote end).
+     *
+     * @access public
+     *
+     * @return string  All data until the socket closes, or a PEAR_Error if
+     *                 not connected.
+     */
+    function readAll()
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $data = '';
+        while (!feof($this->fp)) {
+            $data .= @fread($this->fp, $this->lineLength);
+        }
+        return $data;
+    }
+
+    /**
+     * Runs the equivalent of the select() system call on the socket
+     * with a timeout specified by tv_sec and tv_usec.
+     *
+     * @param integer $state    Which of read/write/error to check for.
+     * @param integer $tv_sec   Number of seconds for timeout.
+     * @param integer $tv_usec  Number of microseconds for timeout.
+     *
+     * @access public
+     * @return False if select fails, integer describing which of read/write/error
+     *         are ready, or PEAR_Error if not connected.
+     */
+    function select($state, $tv_sec, $tv_usec = 0)
+    {
+        if (!is_resource($this->fp)) {
+            return $this->raiseError('not connected');
+        }
+
+        $read = null;
+        $write = null;
+        $except = null;
+        if ($state & NET_SOCKET_READ) {
+            $read[] = $this->fp;
+        }
+        if ($state & NET_SOCKET_WRITE) {
+            $write[] = $this->fp;
+        }
+        if ($state & NET_SOCKET_ERROR) {
+            $except[] = $this->fp;
+        }
+        if (false === ($sr = stream_select($read, $write, $except, $tv_sec, $tv_usec))) {
+            return false;
+        }
+
+        $result = 0;
+        if (count($read)) {
+            $result |= NET_SOCKET_READ;
+        }
+        if (count($write)) {
+            $result |= NET_SOCKET_WRITE;
+        }
+        if (count($except)) {
+            $result |= NET_SOCKET_ERROR;
+        }
+        return $result;
+    }
+
+}
diff --git a/lib/phpFlickr/PEAR/Net/URL.php b/lib/phpFlickr/PEAR/Net/URL.php
new file mode 100644
index 000000000..38e26fd15
--- /dev/null
+++ b/lib/phpFlickr/PEAR/Net/URL.php
@@ -0,0 +1,410 @@
+                            |
+// +-----------------------------------------------------------------------+
+//
+// $Id: URL.php 32 2005-08-01 06:21:02Z dancoulter $
+//
+// Net_URL Class
+
+class Net_URL
+{
+    /**
+    * Full url
+    * @var string
+    */
+    var $url;
+
+    /**
+    * Protocol
+    * @var string
+    */
+    var $protocol;
+
+    /**
+    * Username
+    * @var string
+    */
+    var $username;
+
+    /**
+    * Password
+    * @var string
+    */
+    var $password;
+
+    /**
+    * Host
+    * @var string
+    */
+    var $host;
+
+    /**
+    * Port
+    * @var integer
+    */
+    var $port;
+
+    /**
+    * Path
+    * @var string
+    */
+    var $path;
+
+    /**
+    * Query string
+    * @var array
+    */
+    var $querystring;
+
+    /**
+    * Anchor
+    * @var string
+    */
+    var $anchor;
+
+    /**
+    * Whether to use []
+    * @var bool
+    */
+    var $useBrackets;
+
+    /**
+    * PHP4 Constructor
+    *
+    * @see __construct()
+    */
+    function Net_URL($url = null, $useBrackets = true)
+    {
+        $this->__construct($url, $useBrackets);
+    }
+
+    /**
+    * PHP5 Constructor
+    *
+    * Parses the given url and stores the various parts
+    * Defaults are used in certain cases
+    *
+    * @param string $url         Optional URL
+    * @param bool   $useBrackets Whether to use square brackets when
+    *                            multiple querystrings with the same name
+    *                            exist
+    */
+    function __construct($url = null, $useBrackets = true)
+    {
+        $HTTP_SERVER_VARS  = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
+
+        $this->useBrackets = $useBrackets;
+        $this->url         = $url;
+        $this->user        = '';
+        $this->pass        = '';
+        $this->host        = '';
+        $this->port        = 80;
+        $this->path        = '';
+        $this->querystring = array();
+        $this->anchor      = '';
+
+        // Only use defaults if not an absolute URL given
+        if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
+
+            $this->protocol    = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
+
+            /**
+            * Figure out host/port
+            */
+            if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) AND preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) {
+                $host = $matches[1];
+                if (!empty($matches[3])) {
+                    $port = $matches[3];
+                } else {
+                    $port = $this->getStandardPort($this->protocol);
+                }
+            }
+
+            $this->user        = '';
+            $this->pass        = '';
+            $this->host        = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
+            $this->port        = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
+            $this->path        = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
+            $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
+            $this->anchor      = '';
+        }
+
+        // Parse the url and store the various parts
+        if (!empty($url)) {
+            $urlinfo = parse_url($url);
+
+            // Default querystring
+            $this->querystring = array();
+
+            foreach ($urlinfo as $key => $value) {
+                switch ($key) {
+                    case 'scheme':
+                        $this->protocol = $value;
+                        $this->port     = $this->getStandardPort($value);
+                        break;
+
+                    case 'user':
+                    case 'pass':
+                    case 'host':
+                    case 'port':
+                        $this->$key = $value;
+                        break;
+
+                    case 'path':
+                        if ($value{0} == '/') {
+                            $this->path = $value;
+                        } else {
+                            $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
+                            $this->path = sprintf('%s/%s', $path, $value);
+                        }
+                        break;
+
+                    case 'query':
+                        $this->querystring = $this->_parseRawQueryString($value);
+                        break;
+
+                    case 'fragment':
+                        $this->anchor = $value;
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+    * Returns full url
+    *
+    * @return string Full url
+    * @access public
+    */
+    function getURL()
+    {
+        $querystring = $this->getQueryString();
+
+        $this->url = $this->protocol . '://'
+                   . $this->user . (!empty($this->pass) ? ':' : '')
+                   . $this->pass . (!empty($this->user) ? '@' : '')
+                   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
+                   . $this->path
+                   . (!empty($querystring) ? '?' . $querystring : '')
+                   . (!empty($this->anchor) ? '#' . $this->anchor : '');
+
+        return $this->url;
+    }
+
+    /**
+    * Adds a querystring item
+    *
+    * @param  string $name       Name of item
+    * @param  string $value      Value of item
+    * @param  bool   $preencoded Whether value is urlencoded or not, default = not
+    * @access public
+    */
+    function addQueryString($name, $value, $preencoded = false)
+    {
+        if ($preencoded) {
+            $this->querystring[$name] = $value;
+        } else {
+            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
+        }
+    }
+
+    /**
+    * Removes a querystring item
+    *
+    * @param  string $name Name of item
+    * @access public
+    */
+    function removeQueryString($name)
+    {
+        if (isset($this->querystring[$name])) {
+            unset($this->querystring[$name]);
+        }
+    }
+
+    /**
+    * Sets the querystring to literally what you supply
+    *
+    * @param  string $querystring The querystring data. Should be of the format foo=bar&x=y etc
+    * @access public
+    */
+    function addRawQueryString($querystring)
+    {
+        $this->querystring = $this->_parseRawQueryString($querystring);
+    }
+
+    /**
+    * Returns flat querystring
+    *
+    * @return string Querystring
+    * @access public
+    */
+    function getQueryString()
+    {
+        if (!empty($this->querystring)) {
+            foreach ($this->querystring as $name => $value) {
+                if (is_array($value)) {
+                    foreach ($value as $k => $v) {
+                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
+                    }
+                } elseif (!is_null($value)) {
+                    $querystring[] = $name . '=' . $value;
+                } else {
+                    $querystring[] = $name;
+                }
+            }
+            $querystring = implode(ini_get('arg_separator.output'), $querystring);
+        } else {
+            $querystring = '';
+        }
+
+        return $querystring;
+    }
+
+    /**
+    * Parses raw querystring and returns an array of it
+    *
+    * @param  string  $querystring The querystring to parse
+    * @return array                An array of the querystring data
+    * @access private
+    */
+    function _parseRawQuerystring($querystring)
+    {
+        $parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
+        $return = array();
+
+        foreach ($parts as $part) {
+            if (strpos($part, '=') !== false) {
+                $value = substr($part, strpos($part, '=') + 1);
+                $key   = substr($part, 0, strpos($part, '='));
+            } else {
+                $value = null;
+                $key   = $part;
+            }
+            if (substr($key, -2) == '[]') {
+                $key = substr($key, 0, -2);
+                if (@!is_array($return[$key])) {
+                    $return[$key]   = array();
+                    $return[$key][] = $value;
+                } else {
+                    $return[$key][] = $value;
+                }
+            } elseif (!$this->useBrackets AND !empty($return[$key])) {
+                $return[$key]   = (array)$return[$key];
+                $return[$key][] = $value;
+            } else {
+                $return[$key] = $value;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+    * Resolves //, ../ and ./ from a path and returns
+    * the result. Eg:
+    *
+    * /foo/bar/../boo.php    => /foo/boo.php
+    * /foo/bar/../../boo.php => /boo.php
+    * /foo/bar/.././/boo.php => /foo/boo.php
+    *
+    * This method can also be called statically.
+    *
+    * @param  string $url URL path to resolve
+    * @return string      The result
+    */
+    function resolvePath($path)
+    {
+        $path = explode('/', str_replace('//', '/', $path));
+
+        for ($i=0; $i 1 OR ($i == 1 AND $path[0] != '') ) ) {
+                unset($path[$i]);
+                unset($path[$i-1]);
+                $path = array_values($path);
+                $i -= 2;
+
+            } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
+                unset($path[$i]);
+                $path = array_values($path);
+                $i--;
+
+            } else {
+                continue;
+            }
+        }
+
+        return implode('/', $path);
+    }
+
+    /**
+    * Returns the standard port number for a protocol
+    *
+    * @param  string  $scheme The protocol to lookup
+    * @return integer         Port number or NULL if no scheme matches
+    *
+    * @author Philippe Jausions 
+    */
+    function getStandardPort($scheme)
+    {
+        switch (strtolower($scheme)) {
+            case 'http':    return 80;
+            case 'https':   return 443;
+            case 'ftp':     return 21;
+            case 'imap':    return 143;
+            case 'imaps':   return 993;
+            case 'pop3':    return 110;
+            case 'pop3s':   return 995;
+            default:        return null;
+       }
+    }
+
+    /**
+    * Forces the URL to a particular protocol
+    *
+    * @param string  $protocol Protocol to force the URL to
+    * @param integer $port     Optional port (standard port is used by default)
+    */
+    function setProtocol($protocol, $port = null)
+    {
+        $this->protocol = $protocol;
+        $this->port = is_null($port) ? $this->getStandardPort() : $port;
+    }
+
+}
+?>
diff --git a/lib/phpFlickr/PEAR/PEAR.php b/lib/phpFlickr/PEAR/PEAR.php
new file mode 100644
index 000000000..e442d8c7a
--- /dev/null
+++ b/lib/phpFlickr/PEAR/PEAR.php
@@ -0,0 +1,1108 @@
+
+ * @author     Stig Bakken 
+ * @author     Tomas V.V.Cox 
+ * @author     Greg Beaver 
+ * @copyright  1997-2006 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    CVS: $Id: PEAR.php 127 2008-01-17 20:21:37Z dcoulter $
+ * @link       http://pear.php.net/package/PEAR
+ * @since      File available since Release 0.1
+ */
+
+/**#@+
+ * ERROR constants
+ */
+define('PEAR_ERROR_RETURN',     1);
+define('PEAR_ERROR_PRINT',      2);
+define('PEAR_ERROR_TRIGGER',    4);
+define('PEAR_ERROR_DIE',        8);
+define('PEAR_ERROR_CALLBACK',  16);
+/**
+ * WARNING: obsolete
+ * @deprecated
+ */
+define('PEAR_ERROR_EXCEPTION', 32);
+/**#@-*/
+define('PEAR_ZE2', (function_exists('version_compare') &&
+                    version_compare(zend_version(), "2-dev", "ge")));
+
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    define('OS_WINDOWS', true);
+    define('OS_UNIX',    false);
+    define('PEAR_OS',    'Windows');
+} else {
+    define('OS_WINDOWS', false);
+    define('OS_UNIX',    true);
+    define('PEAR_OS',    'Unix'); // blatant assumption
+}
+
+// instant backwards compatibility
+if (!defined('PATH_SEPARATOR')) {
+    if (OS_WINDOWS) {
+        define('PATH_SEPARATOR', ';');
+    } else {
+        define('PATH_SEPARATOR', ':');
+    }
+}
+
+$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
+$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
+$GLOBALS['_PEAR_destructor_object_list'] = array();
+$GLOBALS['_PEAR_shutdown_funcs']         = array();
+$GLOBALS['_PEAR_error_handler_stack']    = array();
+
+@ini_set('track_errors', true);
+
+/**
+ * Base class for other PEAR classes.  Provides rudimentary
+ * emulation of destructors.
+ *
+ * If you want a destructor in your class, inherit PEAR and make a
+ * destructor method called _yourclassname (same name as the
+ * constructor, but with a "_" prefix).  Also, in your constructor you
+ * have to call the PEAR constructor: $this->PEAR();.
+ * The destructor method will be called without parameters.  Note that
+ * at in some SAPI implementations (such as Apache), any output during
+ * the request shutdown (in which destructors are called) seems to be
+ * discarded.  If you need to get any debug information from your
+ * destructor, use error_log(), syslog() or something similar.
+ *
+ * IMPORTANT! To use the emulated destructors you need to create the
+ * objects by reference: $obj =& new PEAR_child;
+ *
+ * @category   pear
+ * @package    PEAR
+ * @author     Stig Bakken 
+ * @author     Tomas V.V. Cox 
+ * @author     Greg Beaver 
+ * @copyright  1997-2006 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: 1.6.2
+ * @link       http://pear.php.net/package/PEAR
+ * @see        PEAR_Error
+ * @since      Class available since PHP 4.0.2
+ * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
+ */
+class PEAR
+{
+    // {{{ properties
+
+    /**
+     * Whether to enable internal debug messages.
+     *
+     * @var     bool
+     * @access  private
+     */
+    var $_debug = false;
+
+    /**
+     * Default error mode for this object.
+     *
+     * @var     int
+     * @access  private
+     */
+    var $_default_error_mode = null;
+
+    /**
+     * Default error options used for this object when error mode
+     * is PEAR_ERROR_TRIGGER.
+     *
+     * @var     int
+     * @access  private
+     */
+    var $_default_error_options = null;
+
+    /**
+     * Default error handler (callback) for this object, if error mode is
+     * PEAR_ERROR_CALLBACK.
+     *
+     * @var     string
+     * @access  private
+     */
+    var $_default_error_handler = '';
+
+    /**
+     * Which class to use for error objects.
+     *
+     * @var     string
+     * @access  private
+     */
+    var $_error_class = 'PEAR_Error';
+
+    /**
+     * An array of expected errors.
+     *
+     * @var     array
+     * @access  private
+     */
+    var $_expected_errors = array();
+
+    // }}}
+
+    // {{{ constructor
+
+    /**
+     * Constructor.  Registers this object in
+     * $_PEAR_destructor_object_list for destructor emulation if a
+     * destructor object exists.
+     *
+     * @param string $error_class  (optional) which class to use for
+     *        error objects, defaults to PEAR_Error.
+     * @access public
+     * @return void
+     */
+    function PEAR($error_class = null)
+    {
+        $classname = strtolower(get_class($this));
+        if ($this->_debug) {
+            print "PEAR constructor called, class=$classname\n";
+        }
+        if ($error_class !== null) {
+            $this->_error_class = $error_class;
+        }
+        while ($classname && strcasecmp($classname, "pear")) {
+            $destructor = "_$classname";
+            if (method_exists($this, $destructor)) {
+                global $_PEAR_destructor_object_list;
+                $_PEAR_destructor_object_list[] = &$this;
+                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+                    register_shutdown_function("_PEAR_call_destructors");
+                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+                }
+                break;
+            } else {
+                $classname = get_parent_class($classname);
+            }
+        }
+    }
+
+    // }}}
+    // {{{ destructor
+
+    /**
+     * Destructor (the emulated type of...).  Does nothing right now,
+     * but is included for forward compatibility, so subclass
+     * destructors should always call it.
+     *
+     * See the note in the class desciption about output from
+     * destructors.
+     *
+     * @access public
+     * @return void
+     */
+    function _PEAR() {
+        if ($this->_debug) {
+            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
+        }
+    }
+
+    // }}}
+    // {{{ getStaticProperty()
+
+    /**
+    * If you have a class that's mostly/entirely static, and you need static
+    * properties, you can use this method to simulate them. Eg. in your method(s)
+    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
+    * You MUST use a reference, or they will not persist!
+    *
+    * @access public
+    * @param  string $class  The calling classname, to prevent clashes
+    * @param  string $var    The variable to retrieve.
+    * @return mixed   A reference to the variable. If not set it will be
+    *                 auto initialised to NULL.
+    */
+    function &getStaticProperty($class, $var)
+    {
+        static $properties;
+        if (!isset($properties[$class])) {
+            $properties[$class] = array();
+        }
+        if (!array_key_exists($var, $properties[$class])) {
+            $properties[$class][$var] = null;
+        }
+        return $properties[$class][$var];
+    }
+
+    // }}}
+    // {{{ registerShutdownFunc()
+
+    /**
+    * Use this function to register a shutdown method for static
+    * classes.
+    *
+    * @access public
+    * @param  mixed $func  The function name (or array of class/method) to call
+    * @param  mixed $args  The arguments to pass to the function
+    * @return void
+    */
+    function registerShutdownFunc($func, $args = array())
+    {
+        // if we are called statically, there is a potential
+        // that no shutdown func is registered.  Bug #6445
+        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
+            register_shutdown_function("_PEAR_call_destructors");
+            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
+        }
+        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
+    }
+
+    // }}}
+    // {{{ isError()
+
+    /**
+     * Tell whether a value is a PEAR error.
+     *
+     * @param   mixed $data   the value to test
+     * @param   int   $code   if $data is an error object, return true
+     *                        only if $code is a string and
+     *                        $obj->getMessage() == $code or
+     *                        $code is an integer and $obj->getCode() == $code
+     * @access  public
+     * @return  bool    true if parameter is an error
+     */
+    function isError($data, $code = null)
+    {
+        if (is_a($data, 'PEAR_Error')) {
+            if (is_null($code)) {
+                return true;
+            } elseif (is_string($code)) {
+                return $data->getMessage() == $code;
+            } else {
+                return $data->getCode() == $code;
+            }
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ setErrorHandling()
+
+    /**
+     * Sets how errors generated by this object should be handled.
+     * Can be invoked both in objects and statically.  If called
+     * statically, setErrorHandling sets the default behaviour for all
+     * PEAR objects.  If called in an object, setErrorHandling sets
+     * the default behaviour for that object.
+     *
+     * @param int $mode
+     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
+     *
+     * @param mixed $options
+     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
+     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+     *
+     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
+     *        to be the callback function or method.  A callback
+     *        function is a string with the name of the function, a
+     *        callback method is an array of two elements: the element
+     *        at index 0 is the object, and the element at index 1 is
+     *        the name of the method to call in the object.
+     *
+     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
+     *        a printf format string used when printing the error
+     *        message.
+     *
+     * @access public
+     * @return void
+     * @see PEAR_ERROR_RETURN
+     * @see PEAR_ERROR_PRINT
+     * @see PEAR_ERROR_TRIGGER
+     * @see PEAR_ERROR_DIE
+     * @see PEAR_ERROR_CALLBACK
+     * @see PEAR_ERROR_EXCEPTION
+     *
+     * @since PHP 4.0.5
+     */
+
+    function setErrorHandling($mode = null, $options = null)
+    {
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $setmode     = &$this->_default_error_mode;
+            $setoptions  = &$this->_default_error_options;
+        } else {
+            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+        }
+
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $setmode = $mode;
+                $setoptions = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $setmode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $setoptions = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+    }
+
+    // }}}
+    // {{{ expectError()
+
+    /**
+     * This method is used to tell which errors you expect to get.
+     * Expected errors are always returned with error mode
+     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
+     * and this method pushes a new element onto it.  The list of
+     * expected errors are in effect until they are popped off the
+     * stack with the popExpect() method.
+     *
+     * Note that this method can not be called statically
+     *
+     * @param mixed $code a single error code or an array of error codes to expect
+     *
+     * @return int     the new depth of the "expected errors" stack
+     * @access public
+     */
+    function expectError($code = '*')
+    {
+        if (is_array($code)) {
+            array_push($this->_expected_errors, $code);
+        } else {
+            array_push($this->_expected_errors, array($code));
+        }
+        return sizeof($this->_expected_errors);
+    }
+
+    // }}}
+    // {{{ popExpect()
+
+    /**
+     * This method pops one element off the expected error codes
+     * stack.
+     *
+     * @return array   the list of error codes that were popped
+     */
+    function popExpect()
+    {
+        return array_pop($this->_expected_errors);
+    }
+
+    // }}}
+    // {{{ _checkDelExpect()
+
+    /**
+     * This method checks unsets an error code if available
+     *
+     * @param mixed error code
+     * @return bool true if the error code was unset, false otherwise
+     * @access private
+     * @since PHP 4.3.0
+     */
+    function _checkDelExpect($error_code)
+    {
+        $deleted = false;
+
+        foreach ($this->_expected_errors AS $key => $error_array) {
+            if (in_array($error_code, $error_array)) {
+                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
+                $deleted = true;
+            }
+
+            // clean up empty arrays
+            if (0 == count($this->_expected_errors[$key])) {
+                unset($this->_expected_errors[$key]);
+            }
+        }
+        return $deleted;
+    }
+
+    // }}}
+    // {{{ delExpect()
+
+    /**
+     * This method deletes all occurences of the specified element from
+     * the expected error codes stack.
+     *
+     * @param  mixed $error_code error code that should be deleted
+     * @return mixed list of error codes that were deleted or error
+     * @access public
+     * @since PHP 4.3.0
+     */
+    function delExpect($error_code)
+    {
+        $deleted = false;
+
+        if ((is_array($error_code) && (0 != count($error_code)))) {
+            // $error_code is a non-empty array here;
+            // we walk through it trying to unset all
+            // values
+            foreach($error_code as $key => $error) {
+                if ($this->_checkDelExpect($error)) {
+                    $deleted =  true;
+                } else {
+                    $deleted = false;
+                }
+            }
+            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+        } elseif (!empty($error_code)) {
+            // $error_code comes alone, trying to unset it
+            if ($this->_checkDelExpect($error_code)) {
+                return true;
+            } else {
+                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
+            }
+        } else {
+            // $error_code is empty
+            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
+        }
+    }
+
+    // }}}
+    // {{{ raiseError()
+
+    /**
+     * This method is a wrapper that returns an instance of the
+     * configured error class with this object's default error
+     * handling applied.  If the $mode and $options parameters are not
+     * specified, the object's defaults are used.
+     *
+     * @param mixed $message a text error message or a PEAR error object
+     *
+     * @param int $code      a numeric error code (it is up to your class
+     *                  to define these if you want to use codes)
+     *
+     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
+     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
+     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
+     *
+     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
+     *                  specifies the PHP-internal error level (one of
+     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
+     *                  If $mode is PEAR_ERROR_CALLBACK, this
+     *                  parameter specifies the callback function or
+     *                  method.  In other error modes this parameter
+     *                  is ignored.
+     *
+     * @param string $userinfo If you need to pass along for example debug
+     *                  information, this parameter is meant for that.
+     *
+     * @param string $error_class The returned error object will be
+     *                  instantiated from this class, if specified.
+     *
+     * @param bool $skipmsg If true, raiseError will only pass error codes,
+     *                  the error message parameter will be dropped.
+     *
+     * @access public
+     * @return object   a PEAR error object
+     * @see PEAR::setErrorHandling
+     * @since PHP 4.0.5
+     */
+    function &raiseError($message = null,
+                         $code = null,
+                         $mode = null,
+                         $options = null,
+                         $userinfo = null,
+                         $error_class = null,
+                         $skipmsg = false)
+    {
+        // The error is yet a PEAR error object
+        if (is_object($message)) {
+            $code        = $message->getCode();
+            $userinfo    = $message->getUserInfo();
+            $error_class = $message->getType();
+            $message->error_message_prefix = '';
+            $message     = $message->getMessage();
+        }
+
+        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
+            if ($exp[0] == "*" ||
+                (is_int(reset($exp)) && in_array($code, $exp)) ||
+                (is_string(reset($exp)) && in_array($message, $exp))) {
+                $mode = PEAR_ERROR_RETURN;
+            }
+        }
+        // No mode given, try global ones
+        if ($mode === null) {
+            // Class error handler
+            if (isset($this) && isset($this->_default_error_mode)) {
+                $mode    = $this->_default_error_mode;
+                $options = $this->_default_error_options;
+            // Global error handler
+            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
+                $mode    = $GLOBALS['_PEAR_default_error_mode'];
+                $options = $GLOBALS['_PEAR_default_error_options'];
+            }
+        }
+
+        if ($error_class !== null) {
+            $ec = $error_class;
+        } elseif (isset($this) && isset($this->_error_class)) {
+            $ec = $this->_error_class;
+        } else {
+            $ec = 'PEAR_Error';
+        }
+        if ($skipmsg) {
+            $a = &new $ec($code, $mode, $options, $userinfo);
+            return $a;
+        } else {
+            $a = &new $ec($message, $code, $mode, $options, $userinfo);
+            return $a;
+        }
+    }
+
+    // }}}
+    // {{{ throwError()
+
+    /**
+     * Simpler form of raiseError with fewer options.  In most cases
+     * message, code and userinfo are enough.
+     *
+     * @param string $message
+     *
+     */
+    function &throwError($message = null,
+                         $code = null,
+                         $userinfo = null)
+    {
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $a = &$this->raiseError($message, $code, null, null, $userinfo);
+            return $a;
+        } else {
+            $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
+            return $a;
+        }
+    }
+
+    // }}}
+    function staticPushErrorHandling($mode, $options = null)
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+        $def_options = &$GLOBALS['_PEAR_default_error_options'];
+        $stack[] = array($def_mode, $def_options);
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $def_mode = $mode;
+                $def_options = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $def_mode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $def_options = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+        $stack[] = array($mode, $options);
+        return true;
+    }
+
+    function staticPopErrorHandling()
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
+        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
+        array_pop($stack);
+        list($mode, $options) = $stack[sizeof($stack) - 1];
+        array_pop($stack);
+        switch ($mode) {
+            case PEAR_ERROR_EXCEPTION:
+            case PEAR_ERROR_RETURN:
+            case PEAR_ERROR_PRINT:
+            case PEAR_ERROR_TRIGGER:
+            case PEAR_ERROR_DIE:
+            case null:
+                $setmode = $mode;
+                $setoptions = $options;
+                break;
+
+            case PEAR_ERROR_CALLBACK:
+                $setmode = $mode;
+                // class/object method callback
+                if (is_callable($options)) {
+                    $setoptions = $options;
+                } else {
+                    trigger_error("invalid error callback", E_USER_WARNING);
+                }
+                break;
+
+            default:
+                trigger_error("invalid error mode", E_USER_WARNING);
+                break;
+        }
+        return true;
+    }
+
+    // {{{ pushErrorHandling()
+
+    /**
+     * Push a new error handler on top of the error handler options stack. With this
+     * you can easily override the actual error handler for some code and restore
+     * it later with popErrorHandling.
+     *
+     * @param mixed $mode (same as setErrorHandling)
+     * @param mixed $options (same as setErrorHandling)
+     *
+     * @return bool Always true
+     *
+     * @see PEAR::setErrorHandling
+     */
+    function pushErrorHandling($mode, $options = null)
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $def_mode    = &$this->_default_error_mode;
+            $def_options = &$this->_default_error_options;
+        } else {
+            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
+            $def_options = &$GLOBALS['_PEAR_default_error_options'];
+        }
+        $stack[] = array($def_mode, $def_options);
+
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $this->setErrorHandling($mode, $options);
+        } else {
+            PEAR::setErrorHandling($mode, $options);
+        }
+        $stack[] = array($mode, $options);
+        return true;
+    }
+
+    // }}}
+    // {{{ popErrorHandling()
+
+    /**
+    * Pop the last error handler used
+    *
+    * @return bool Always true
+    *
+    * @see PEAR::pushErrorHandling
+    */
+    function popErrorHandling()
+    {
+        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        array_pop($stack);
+        list($mode, $options) = $stack[sizeof($stack) - 1];
+        array_pop($stack);
+        if (isset($this) && is_a($this, 'PEAR')) {
+            $this->setErrorHandling($mode, $options);
+        } else {
+            PEAR::setErrorHandling($mode, $options);
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ loadExtension()
+
+    /**
+    * OS independant PHP extension load. Remember to take care
+    * on the correct extension name for case sensitive OSes.
+    *
+    * @param string $ext The extension name
+    * @return bool Success or not on the dl() call
+    */
+    function loadExtension($ext)
+    {
+        if (!extension_loaded($ext)) {
+            // if either returns true dl() will produce a FATAL error, stop that
+            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
+                return false;
+            }
+            if (OS_WINDOWS) {
+                $suffix = '.dll';
+            } elseif (PHP_OS == 'HP-UX') {
+                $suffix = '.sl';
+            } elseif (PHP_OS == 'AIX') {
+                $suffix = '.a';
+            } elseif (PHP_OS == 'OSX') {
+                $suffix = '.bundle';
+            } else {
+                $suffix = '.so';
+            }
+            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+        }
+        return true;
+    }
+
+    // }}}
+}
+
+// {{{ _PEAR_call_destructors()
+
+function _PEAR_call_destructors()
+{
+    global $_PEAR_destructor_object_list;
+    if (is_array($_PEAR_destructor_object_list) &&
+        sizeof($_PEAR_destructor_object_list))
+    {
+        reset($_PEAR_destructor_object_list);
+        if (PEAR::getStaticProperty('PEAR', 'destructlifo')) {
+            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
+        }
+        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
+            $classname = get_class($objref);
+            while ($classname) {
+                $destructor = "_$classname";
+                if (method_exists($objref, $destructor)) {
+                    $objref->$destructor();
+                    break;
+                } else {
+                    $classname = get_parent_class($classname);
+                }
+            }
+        }
+        // Empty the object list to ensure that destructors are
+        // not called more than once.
+        $_PEAR_destructor_object_list = array();
+    }
+
+    // Now call the shutdown functions
+    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
+        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
+            call_user_func_array($value[0], $value[1]);
+        }
+    }
+}
+
+// }}}
+/**
+ * Standard PEAR error class for PHP 4
+ *
+ * This class is supserseded by {@link PEAR_Exception} in PHP 5
+ *
+ * @category   pear
+ * @package    PEAR
+ * @author     Stig Bakken 
+ * @author     Tomas V.V. Cox 
+ * @author     Gregory Beaver 
+ * @copyright  1997-2006 The PHP Group
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version    Release: 1.6.2
+ * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
+ * @see        PEAR::raiseError(), PEAR::throwError()
+ * @since      Class available since PHP 4.0.2
+ */
+class PEAR_Error
+{
+    // {{{ properties
+
+    var $error_message_prefix = '';
+    var $mode                 = PEAR_ERROR_RETURN;
+    var $level                = E_USER_NOTICE;
+    var $code                 = -1;
+    var $message              = '';
+    var $userinfo             = '';
+    var $backtrace            = null;
+
+    // }}}
+    // {{{ constructor
+
+    /**
+     * PEAR_Error constructor
+     *
+     * @param string $message  message
+     *
+     * @param int $code     (optional) error code
+     *
+     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
+     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
+     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
+     *
+     * @param mixed $options   (optional) error level, _OR_ in the case of
+     * PEAR_ERROR_CALLBACK, the callback function or object/method
+     * tuple.
+     *
+     * @param string $userinfo (optional) additional user/debug info
+     *
+     * @access public
+     *
+     */
+    function PEAR_Error($message = 'unknown error', $code = null,
+                        $mode = null, $options = null, $userinfo = null)
+    {
+        if ($mode === null) {
+            $mode = PEAR_ERROR_RETURN;
+        }
+        $this->message   = $message;
+        $this->code      = $code;
+        $this->mode      = $mode;
+        $this->userinfo  = $userinfo;
+        if (!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
+            $this->backtrace = debug_backtrace();
+            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
+                unset($this->backtrace[0]['object']);
+            }
+        }
+        if ($mode & PEAR_ERROR_CALLBACK) {
+            $this->level = E_USER_NOTICE;
+            $this->callback = $options;
+        } else {
+            if ($options === null) {
+                $options = E_USER_NOTICE;
+            }
+            $this->level = $options;
+            $this->callback = null;
+        }
+        if ($this->mode & PEAR_ERROR_PRINT) {
+            if (is_null($options) || is_int($options)) {
+                $format = "%s";
+            } else {
+                $format = $options;
+            }
+            printf($format, $this->getMessage());
+        }
+        if ($this->mode & PEAR_ERROR_TRIGGER) {
+            trigger_error($this->getMessage(), $this->level);
+        }
+        if ($this->mode & PEAR_ERROR_DIE) {
+            $msg = $this->getMessage();
+            if (is_null($options) || is_int($options)) {
+                $format = "%s";
+                if (substr($msg, -1) != "\n") {
+                    $msg .= "\n";
+                }
+            } else {
+                $format = $options;
+            }
+            die(sprintf($format, $msg));
+        }
+        if ($this->mode & PEAR_ERROR_CALLBACK) {
+            if (is_callable($this->callback)) {
+                call_user_func($this->callback, $this);
+            }
+        }
+        if ($this->mode & PEAR_ERROR_EXCEPTION) {
+            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
+            eval('$e = new Exception($this->message, $this->code);throw($e);');
+        }
+    }
+
+    // }}}
+    // {{{ getMode()
+
+    /**
+     * Get the error mode from an error object.
+     *
+     * @return int error mode
+     * @access public
+     */
+    function getMode() {
+        return $this->mode;
+    }
+
+    // }}}
+    // {{{ getCallback()
+
+    /**
+     * Get the callback function/method from an error object.
+     *
+     * @return mixed callback function or object/method array
+     * @access public
+     */
+    function getCallback() {
+        return $this->callback;
+    }
+
+    // }}}
+    // {{{ getMessage()
+
+
+    /**
+     * Get the error message from an error object.
+     *
+     * @return  string  full error message
+     * @access public
+     */
+    function getMessage()
+    {
+        return ($this->error_message_prefix . $this->message);
+    }
+
+
+    // }}}
+    // {{{ getCode()
+
+    /**
+     * Get error code from an error object
+     *
+     * @return int error code
+     * @access public
+     */
+     function getCode()
+     {
+        return $this->code;
+     }
+
+    // }}}
+    // {{{ getType()
+
+    /**
+     * Get the name of this error/exception.
+     *
+     * @return string error/exception name (type)
+     * @access public
+     */
+    function getType()
+    {
+        return get_class($this);
+    }
+
+    // }}}
+    // {{{ getUserInfo()
+
+    /**
+     * Get additional user-supplied information.
+     *
+     * @return string user-supplied information
+     * @access public
+     */
+    function getUserInfo()
+    {
+        return $this->userinfo;
+    }
+
+    // }}}
+    // {{{ getDebugInfo()
+
+    /**
+     * Get additional debug information supplied by the application.
+     *
+     * @return string debug information
+     * @access public
+     */
+    function getDebugInfo()
+    {
+        return $this->getUserInfo();
+    }
+
+    // }}}
+    // {{{ getBacktrace()
+
+    /**
+     * Get the call backtrace from where the error was generated.
+     * Supported with PHP 4.3.0 or newer.
+     *
+     * @param int $frame (optional) what frame to fetch
+     * @return array Backtrace, or NULL if not available.
+     * @access public
+     */
+    function getBacktrace($frame = null)
+    {
+        if (defined('PEAR_IGNORE_BACKTRACE')) {
+            return null;
+        }
+        if ($frame === null) {
+            return $this->backtrace;
+        }
+        return $this->backtrace[$frame];
+    }
+
+    // }}}
+    // {{{ addUserInfo()
+
+    function addUserInfo($info)
+    {
+        if (empty($this->userinfo)) {
+            $this->userinfo = $info;
+        } else {
+            $this->userinfo .= " ** $info";
+        }
+    }
+
+    // }}}
+    // {{{ toString()
+
+    /**
+     * Make a string representation of this object.
+     *
+     * @return string a string with an object summary
+     * @access public
+     */
+    function toString() {
+        $modes = array();
+        $levels = array(E_USER_NOTICE  => 'notice',
+                        E_USER_WARNING => 'warning',
+                        E_USER_ERROR   => 'error');
+        if ($this->mode & PEAR_ERROR_CALLBACK) {
+            if (is_array($this->callback)) {
+                $callback = (is_object($this->callback[0]) ?
+                    strtolower(get_class($this->callback[0])) :
+                    $this->callback[0]) . '::' .
+                    $this->callback[1];
+            } else {
+                $callback = $this->callback;
+            }
+            return sprintf('[%s: message="%s" code=%d mode=callback '.
+                           'callback=%s prefix="%s" info="%s"]',
+                           strtolower(get_class($this)), $this->message, $this->code,
+                           $callback, $this->error_message_prefix,
+                           $this->userinfo);
+        }
+        if ($this->mode & PEAR_ERROR_PRINT) {
+            $modes[] = 'print';
+        }
+        if ($this->mode & PEAR_ERROR_TRIGGER) {
+            $modes[] = 'trigger';
+        }
+        if ($this->mode & PEAR_ERROR_DIE) {
+            $modes[] = 'die';
+        }
+        if ($this->mode & PEAR_ERROR_RETURN) {
+            $modes[] = 'return';
+        }
+        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
+                       'prefix="%s" info="%s"]',
+                       strtolower(get_class($this)), $this->message, $this->code,
+                       implode("|", $modes), $levels[$this->level],
+                       $this->error_message_prefix,
+                       $this->userinfo);
+    }
+
+    // }}}
+}
+
+/*
+ * Local Variables:
+ * mode: php
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ */
+?>
diff --git a/lib/phpFlickr/README.txt b/lib/phpFlickr/README.txt
new file mode 100644
index 000000000..df0a56d98
--- /dev/null
+++ b/lib/phpFlickr/README.txt
@@ -0,0 +1,215 @@
+phpFlickr Class 2.3.1
+Written by Dan Coulter (dancoulter@users.sourceforge.net)
+Project Homepage: http://www.phpflickr.com/
+Google Code Project Page: http://code.google.com/p/phpflickr/
+Released under GNU Lesser General Public License (http://www.gnu.org/copyleft/lgpl.html)
+For more information about the class and upcoming tools and applications using it,
+visit http://www.phpflickr.com/ or http://code.google.com/p/phpflickr/
+
+If you are interested in hiring me for a project (involving phpFlickr
+or not), feel free to email me.
+
+Installation instructions:
+1.  Copy the files from the installation package into a folder on your
+    server.  They need to be readible by your web server.  You can put 
+    them into an include folder defined in your php.ini file, if you 
+    like, though it's not required. 
+    
+2.  All you have to do now is include the file in your PHP scripts and 
+    create an instance.  For example:
+    $f = new phpFlickr();
+
+    The constructor has three arguments:
+    A.  $api_key - This is the API key given to you by flickr.com. This 
+        argument is required and you can get an API Key at:
+        http://www.flickr.com/services/api/key.gne
+        
+    B.  $secret - The "secret" is optional because is not required to 
+        make unauthenticated calls, but is absolutely required for the 
+        new authentication API (see Authentication section below).  You 
+        will get one assigned alongside your api key.
+    
+    C.  $die_on_error - This takes a boolean value and determines 
+        whether the class will die (aka cease operation) if the API 
+        returns an error statement.  It defaults to false.  Every method 
+        will return false if the API returns an error.  You can access 
+        error messages using the getErrorCode() and getErrorMsg() 
+        methods.
+        
+3.  All of the API methods have been implemented in my class.  You can 
+    see a full list and documentation here: 
+        http://www.flickr.com/services/api/
+    To call a method, remove the "flickr." part of the name and replace 
+    any periods with underscores. For example, instead of 
+    flickr.photos.search, you would call $f->photos_search() or instead 
+    of flickr.photos.licenses.getInfo, you would call 
+    $f->photos_licenses_getInfo() (yes, it is case sensitive).
+    
+    All functions have their arguments implemented in the list order on 
+    their documentation page (a link to which is included with each 
+    method in the phpFlickr clasS). The only exceptions to this are 
+    photos_search(), photos_getWithoutGeodata() and 
+    photos_getWithoutGeodata() which have so many optional arguments
+    that it's easier for everyone if you just have to pass an 
+    associative array of arguments.  See the comment in the 
+    photos_search() definition in phpFlickr.php for more information.
+    
+
+    
+Authentication:
+    As of this release of the phpFlickr class there is only one authentication method
+    available to the API.  This method is somewhat complex, but is far more secure and
+    allows your users to feel a little safer authenticating to your application.  You'll
+    no longer have to ask for their username and password.
+    
+    Authentication API - http://www.flickr.com/services/api/auth.spec.html
+        
+        I know how complicated this API looks at first glance, so I've tried to
+        make this as transparent to the coding process.  I'll go through the steps
+        you'll need to use this.  Both the auth.php and getToken.php file will
+        need your API Key and Secret entered before you can use them.
+        
+        To have end users authenticate their accounts:
+            First, setup a callback script.  I've included a callback script that 
+            is pretty flexible.  You'll find it in the package entitled "auth.php".  
+            You'll need to go to flickr and point your api key to this file as the 
+            callback script.  Once you've done this, on any page that you want to 
+            require the end user end user to authenticate their flickr account to 
+            your app, just call the phpFlickr::auth() function with whatever 
+            permission you need to use.
+            For example:
+                $f->auth("write");
+            The three permissions are "read", "write" and "delete".  The function
+            defaults to "read", if you leave it blank.  
+            
+            Calling this function will send the user's browser to Flickr's page to 
+            authenticate to your app.  Once they have logged in, it will bounce
+            them back to your callback script which will redirect back to the
+            original page that you called the auth() function from after setting
+            a session variable to save their authentication token.  If that session
+            variable exists, calling the auth() function will return the permissions
+            that the user granted your app on the Flickr page instead of redirecting
+            to an external page.
+        
+        To authenticate the app to your account to show your private pictures (for example)
+            This method will allow you to have the app authenticate to one specific
+            account, no matter who views your website.  This is useful to display
+            private photos or photosets (among other things).
+            
+            *Note*: The method below is a little hard to understand, so I've setup a tool
+            to help you through this: http://www.phpflickr.com/tools/auth/.
+                        
+            First, you'll have to setup a callback script with Flickr.  Once you've
+            done that, edit line 12 of the included getToken.php file to reflect 
+            which permissions you'll need for the app.  Then browse to the page.
+            Once you've authorized the app with Flickr, it'll send you back to that
+            page which will give you a token which will look something like this:
+                1234-567890abcdef1234
+            Go to the file where you are creating an instance of phpFlickr (I suggest
+            an include file) and after you've created it set the token to use:
+                $f->setToken("");
+            This token never expires, so you don't have to worry about having to
+            login periodically.
+            
+
+Using Caching:
+    Caching can be very important to a project.  Just a few calls to the Flickr API
+    can take long enough to bore your average web user (depending on the calls you
+    are making).  I've built in caching that will access either a database or files
+    in your filesystem.  To enable caching, use the phpFlickr::enableCache() function.
+    This function requires at least two arguments. The first will be the type of
+    cache you're using (either "db" or "fs")
+    
+    1.  If you're using database caching, you'll need to supply a PEAR::DB connection
+        string. For example: 
+        $flickr->enableCache("db", "mysql://user:password@server/database");
+        The third (optional) argument is expiration of the cache in seconds (defaults 
+        to 600).  The fourth (optional) argument is the table where you want to store
+        the cache.  This defaults to flickr_cache and will attempt to create the table
+        if it does not already exist.
+    
+    2.  If you're using filesystem caching, you'll need to supply a folder where the
+        web server has write access. For example: 
+        $flickr->enableCache("fs", "/var/www/phpFlickrCache");
+        The third (optional) argument is, the same as in the Database caching, an
+        expiration in seconds for the cache.
+        Note: filesystem caching will probably be slower than database caching. I
+        haven't done any tests of this, but if you get large amounts of calls, the
+        process of cleaning out old calls may get hard on your server.
+        
+        You may not want to allow the world to view the files that are created during
+        caching.  If you want to hide this information, either make sure that your
+        permissions are set correctly, or disable the webserver from displaying 
+        *.cache files.  In Apache, you can specify this in the configuration files
+        or in a .htaccess file with the following directives:
+        
+        
+            Deny from all
+        
+        
+        Alternatively, you can specify a directory that is outside of the web server's
+        document root.
+        
+Uploading
+    Uploading is pretty simple. Aside from being authenticated (see Authentication 
+    section) the very minimum that you'll have to pass is a path to an image file on 
+    your php server. You can do either synchronous or asynchronous uploading as follows:
+        synchronous:    sync_upload("photo.jpg");
+        asynchronous:   async_upload("photo.jpg");
+    
+    The basic difference is that synchronous uploading waits around until Flickr
+    processes the photo and returns a PhotoID.  Asynchronous just uploads the
+    picture and gets a "ticketid" that you can use to check on the status of your 
+    upload. Asynchronous is much faster, though the photoid won't be instantly
+    available for you. You can read more about asynchronous uploading here:
+        http://www.flickr.com/services/api/upload.async.html
+        
+    Both of the functions take the same arguments which are:
+        Photo: The path of the file to upload.
+        Title: The title of the photo.
+        Description: A description of the photo. May contain some limited HTML.
+        Tags: A space-separated list of tags to apply to the photo.
+        is_public: Set to 0 for no, 1 for yes.
+        is_friend: Set to 0 for no, 1 for yes.
+        is_family: Set to 0 for no, 1 for yes.
+        
+Replacing Photos
+    Flickr has released API support for uploading a replacement photo.  To use this
+    new method, just use the "replace" function in phpFlickr.  You'll be required
+    to pass the file name and Flickr's photo ID.  You need to authenticate your script
+    with "write" permissions before you can replace a photo.  The arguments are:
+        Photo: The path of the file to upload.
+        Photo ID: The numeric Flickr ID of the photo you want to replace.
+        Async (optional): Set to 0 for a synchronous call, 1 for asynchronous.
+    If you use the asynchronous call, it will return a ticketid instead
+    of photoid.
+
+Other Notes:
+    1.  Many of the methods have optional arguments.  For these, I have implemented 
+        them in the same order that the Flickr API documentation lists them. PHP
+        allows for optional arguments in function calls, but if you want to use the
+        third optional argument, you have to fill in the others to the left first.
+        You can use the "NULL" value (without quotes) in the place of an actual
+        argument.  For example:
+        $f->groups_pools_getPhotos($group_id, NULL, NULL, 10);
+        This will get the first ten photos from a specific group's pool.  If you look
+        at the documentation, you will see that there is another argument, "page". I've
+        left it off because it appears after "per_page".
+    2.  Some people will need to ues phpFlickr from behind a proxy server.  I've
+        implemented a method that will allow you to use an HTTP proxy for all of your
+        traffic.  Let's say that you have a proxy server on your local server running
+        at port 8181.  This is the code you would use:
+            $f = new phpFlickr("[api key]");
+            $f->setProxy("localhost", "8181");
+        After that, all of your calls will be automatically made through your proxy server.
+            
+
+That's it! Enjoy the class.  Check out the project page (listed above) for updates
+and news.  I plan to implement file uploads and functions to aggregate data from
+several different methods for easier use in a web application.  Thanks for your
+interest in this project!
+
+    Please email me if you have any questions or problems. You'll find my email
+	at the top of this file.
+
+ 
diff --git a/lib/phpFlickr/auth.php b/lib/phpFlickr/auth.php
new file mode 100644
index 000000000..d272d49bf
--- /dev/null
+++ b/lib/phpFlickr/auth.php
@@ -0,0 +1,37 @@
+auth($permissions, false);
+    } else {
+        $f->auth_getToken($_GET['frob']);
+	}
+    
+    if (empty($redirect)) {
+		header("Location: " . $default_redirect);
+    } else {
+		header("Location: " . $redirect);
+    }
+ 
+?>
\ No newline at end of file
diff --git a/lib/phpFlickr/example.php b/lib/phpFlickr/example.php
new file mode 100644
index 000000000..8b409b425
--- /dev/null
+++ b/lib/phpFlickr/example.php
@@ -0,0 +1,30 @@
+" with one provided 
+ * by Flickr: http://www.flickr.com/services/api/key.gne
+ */
+
+require_once("phpFlickr.php");
+$f = new phpFlickr("");
+
+$recent = $f->photos_getRecent();
+
+foreach ($recent['photo'] as $photo) {
+    $owner = $f->people_getInfo($photo['owner']);
+    echo "";
+    echo $photo['title'];
+    echo " Owner: ";
+    echo "";
+    echo $owner['username'];
+    echo "
      ";
+}
+?>
diff --git a/lib/phpFlickr/getToken.php b/lib/phpFlickr/getToken.php
new file mode 100644
index 000000000..55180ea29
--- /dev/null
+++ b/lib/phpFlickr/getToken.php
@@ -0,0 +1,19 @@
+auth("read");
+    
+    echo "Copy this token into your code: " . $_SESSION['phpFlickr_auth_token'];
+    
+?>
\ No newline at end of file
diff --git a/lib/phpFlickr/phpFlickr.php b/lib/phpFlickr/phpFlickr.php
new file mode 100644
index 000000000..8ef65c581
--- /dev/null
+++ b/lib/phpFlickr/phpFlickr.php
@@ -0,0 +1,1453 @@
+api_key = $api_key;
+		$this->secret = $secret;
+		$this->die_on_error = $die_on_error;
+		$this->service = "flickr";
+
+		//Find the PHP version and store it for future reference
+		$this->php_version = explode("-", phpversion());
+		$this->php_version = explode(".", $this->php_version[0]);
+
+		//All calls to the API are done via the POST method using the PEAR::HTTP_Request package.
+		require_once 'HTTP/Request.php';
+		$this->req =& new HTTP_Request();
+		$this->req->setMethod(HTTP_REQUEST_METHOD_POST);
+	}
+
+	function enableCache ($type, $connection, $cache_expire = 600, $table = 'flickr_cache') {
+		// Turns on caching.  $type must be either "db" (for database caching) or "fs" (for filesystem).
+		// When using db, $connection must be a PEAR::DB connection string. Example:
+		//	  "mysql://user:password@server/database"
+		// If the $table, doesn't exist, it will attempt to create it.
+		// When using file system, caching, the $connection is the folder that the web server has write
+		// access to. Use absolute paths for best results.  Relative paths may have unexpected behavior
+		// when you include this.  They'll usually work, you'll just want to test them.
+		if ($type == 'db') {
+			require_once 'DB.php';
+			$db =& DB::connect($connection);
+			if (PEAR::isError($db)) {
+				die($db->getMessage());
+			}
+
+			/*
+			 * If high performance is crucial, you can easily comment
+			 * out this query once you've created your database table.
+			 */
+
+			$db->query("
+				CREATE TABLE IF NOT EXISTS `$table` (
+					`request` CHAR( 35 ) NOT NULL ,
+					`response` MEDIUMTEXT NOT NULL ,
+					`expiration` DATETIME NOT NULL ,
+					INDEX ( `request` )
+				) TYPE = MYISAM");
+
+			if ($db->getOne("SELECT COUNT(*) FROM $table") > $this->max_cache_rows) {
+				$db->query("DELETE FROM $table WHERE expiration < DATE_SUB(NOW(), INTERVAL $cache_expire second)");
+				$db->query('OPTIMIZE TABLE ' . $this->cache_table);
+			}
+
+			$this->cache = 'db';
+			$this->cache_db = $db;
+			$this->cache_table = $table;
+		} elseif ($type == 'fs') {
+			$this->cache = 'fs';
+			$connection = realpath($connection);
+			$this->cache_dir = $connection;
+			if ($dir = opendir($this->cache_dir)) {
+				while ($file = readdir($dir)) {
+					if (substr($file, -6) == '.cache' && ((filemtime($this->cache_dir . '/' . $file) + $cache_expire) < time()) ) {
+						unlink($this->cache_dir . '/' . $file);
+					}
+				}
+			}
+		}
+		$this->cache_expire = $cache_expire;
+	}
+
+	function getCached ($request) {
+		//Checks the database or filesystem for a cached result to the request.
+		//If there is no cache result, it returns a value of false. If it finds one,
+		//it returns the unparsed XML.
+		$reqhash = md5(serialize($request));
+		if ($this->cache == 'db') {
+			$result = $this->cache_db->getOne("SELECT response FROM " . $this->cache_table . " WHERE request = ? AND DATE_SUB(NOW(), INTERVAL " . (int) $this->cache_expire . " SECOND) < expiration", $reqhash);
+			if (!empty($result)) {
+				return $result;
+			}
+		} elseif ($this->cache == 'fs') {
+			$file = $this->cache_dir . '/' . $reqhash . '.cache';
+			if (file_exists($file)) {
+				if ($this->php_version[0] > 4 || ($this->php_version[0] == 4 && $this->php_version[1] >= 3)) {
+					return file_get_contents($file);
+				} else {
+					return implode('', file($file));
+				}
+			}
+		}
+		return false;
+	}
+
+	function cache ($request, $response) {
+		//Caches the unparsed XML of a request.
+		$reqhash = md5(serialize($request));
+		if ($this->cache == 'db') {
+			//$this->cache_db->query("DELETE FROM $this->cache_table WHERE request = '$reqhash'");
+			if ($this->cache_db->getOne("SELECT COUNT(*) FROM {$this->cache_table} WHERE request = '$reqhash'")) {
+				$sql = "UPDATE " . $this->cache_table . " SET response = ?, expiration = ? WHERE request = ?";
+				$this->cache_db->query($sql, array($response, strftime("%Y-%m-%d %H:%M:%S"), $reqhash));
+			} else {
+				$sql = "INSERT INTO " . $this->cache_table . " (request, response, expiration) VALUES ('$reqhash', '" . str_replace("'", "''", $response) . "', '" . strftime("%Y-%m-%d %H:%M:%S") . "')";
+				$this->cache_db->query($sql);
+			}
+		} elseif ($this->cache == "fs") {
+			$file = $this->cache_dir . "/" . $reqhash . ".cache";
+			$fstream = fopen($file, "w");
+			$result = fwrite($fstream,$response);
+			fclose($fstream);
+			return $result;
+		}
+		return false;
+	}
+
+	function request ($command, $args = array(), $nocache = false) {
+		//Sends a request to Flickr's REST endpoint via POST.
+		$this->req->setURL($this->REST);
+		$this->req->clearPostData();
+		if (substr($command,0,7) != "flickr.") {
+			$command = "flickr." . $command;
+		}
+
+		//Process arguments, including method and login data.
+		$args = array_merge(array("method" => $command, "format" => "php_serial", "api_key" => $this->api_key), $args);
+		if (!empty($this->token)) {
+			$args = array_merge($args, array("auth_token" => $this->token));
+		} elseif (!empty($_SESSION['phpFlickr_auth_token'])) {
+			$args = array_merge($args, array("auth_token" => $_SESSION['phpFlickr_auth_token']));
+		}
+		ksort($args);
+		$auth_sig = "";
+		if (!($this->response = $this->getCached($args)) || $nocache) {
+			foreach ($args as $key => $data) {
+				$auth_sig .= $key . $data;
+				$this->req->addPostData($key, $data);
+			}
+			if (!empty($this->secret)) {
+				$api_sig = md5($this->secret . $auth_sig);
+				$this->req->addPostData("api_sig", $api_sig);
+			}
+
+			$this->req->addHeader("Connection", "Keep-Alive");
+			
+			//Send Requests
+			if ($this->req->sendRequest()) {
+				$this->response = $this->req->getResponseBody();
+				$this->cache($args, $this->response);
+			} else {
+				die("There has been a problem sending your command to the server.");
+			}
+		}
+		/*
+		 * Uncomment this line (and comment out the next one) if you're doing large queries
+		 * and you're concerned about time.  This will, however, change the structure of
+		 * the result, so be sure that you look at the results.
+		 */
+		//$this->parsed_response = unserialize($this->response);
+		$this->parsed_response = $this->clean_text_nodes(unserialize($this->response));
+		if ($this->parsed_response['stat'] == 'fail') {
+			if ($this->die_on_error) die("The Flickr API returned the following error: #{$this->parsed_response['code']} - {$this->parsed_response['message']}");
+			else {
+				$this->error_code = $this->parsed_response['code'];
+				$this->error_msg = $this->parsed_response['message'];
+				$this->parsed_response = false;
+			}
+		} else {
+			$this->error_code = false;
+			$this->error_msg = false;
+		}
+		return $this->response;
+	}
+
+	function clean_text_nodes ($arr) {
+		if (!is_array($arr)) {
+			return $arr;
+		} elseif (count($arr) == 0) {
+			return $arr;
+		} elseif (count($arr) == 1 && array_key_exists('_content', $arr)) {
+			return $arr['_content'];
+		} else {
+			foreach ($arr as $key => $element) {
+				$arr[$key] = $this->clean_text_nodes($element);
+			}
+			return($arr);
+		}
+	}
+
+	function setToken ($token) {
+		// Sets an authentication token to use instead of the session variable
+		$this->token = $token;
+	}
+
+	function setProxy ($server, $port) {
+		// Sets the proxy for all phpFlickr calls.
+		$this->req->setProxy($server, $port);
+	}
+
+	function getErrorCode () {
+		// Returns the error code of the last call.  If the last call did not
+		// return an error. This will return a false boolean.
+		return $this->error_code;
+	}
+
+	function getErrorMsg () {
+		// Returns the error message of the last call.  If the last call did not
+		// return an error. This will return a false boolean.
+		return $this->error_msg;
+	}
+
+	/* These functions are front ends for the flickr calls */
+
+	function buildPhotoURL ($photo, $size = "Medium") {
+		//receives an array (can use the individual photo data returned
+		//from an API call) and returns a URL (doesn't mean that the
+		//file size exists)
+		$sizes = array(
+			"square" => "_s",
+			"thumbnail" => "_t",
+			"small" => "_m",
+			"medium" => "",
+			"large" => "_b",
+			"original" => "_o"
+		);
+		
+		$size = strtolower($size);
+		if (!array_key_exists($size, $sizes)) {
+			$size = "medium";
+		}
+		
+		if ($size == "original") {
+			$url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['originalsecret'] . "_o" . "." . $photo['originalformat'];
+		} else {
+			$url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret'] . $sizes[$size] . ".jpg";
+		}
+		return $url;
+	}
+
+	function getFriendlyGeodata ($lat, $lon) {
+		/* I've added this method to get the friendly geodata (i.e. 'in New York, NY') that the
+		 * website provides, but isn't available in the API. I'm providing this service as long
+		 * as it doesn't flood my server with requests and crash it all the time.
+		 */
+		return unserialize(file_get_contents('http://phpflickr.com/geodata/?format=php&lat=' . $lat . '&lon=' . $lon));
+	}
+
+	function sync_upload ($photo, $title = null, $description = null, $tags = null, $is_public = null, $is_friend = null, $is_family = null) {
+		$upload_req =& new HTTP_Request();
+		$upload_req->setMethod(HTTP_REQUEST_METHOD_POST);
+
+
+		$upload_req->setURL($this->Upload);
+		$upload_req->clearPostData();
+
+		//Process arguments, including method and login data.
+		$args = array("api_key" => $this->api_key, "title" => $title, "description" => $description, "tags" => $tags, "is_public" => $is_public, "is_friend" => $is_friend, "is_family" => $is_family);
+		if (!empty($this->email)) {
+			$args = array_merge($args, array("email" => $this->email));
+		}
+		if (!empty($this->password)) {
+			$args = array_merge($args, array("password" => $this->password));
+		}
+		if (!empty($this->token)) {
+			$args = array_merge($args, array("auth_token" => $this->token));
+		} elseif (!empty($_SESSION['phpFlickr_auth_token'])) {
+			$args = array_merge($args, array("auth_token" => $_SESSION['phpFlickr_auth_token']));
+		}
+
+		ksort($args);
+		$auth_sig = "";
+		foreach ($args as $key => $data) {
+			if ($data !== null) {
+				$auth_sig .= $key . $data;
+				$upload_req->addPostData($key, $data);
+			}
+		}
+		if (!empty($this->secret)) {
+			$api_sig = md5($this->secret . $auth_sig);
+			$upload_req->addPostData("api_sig", $api_sig);
+		}
+
+		$photo = realpath($photo);
+
+		$result = $upload_req->addFile("photo", $photo);
+
+		if (PEAR::isError($result)) {
+			die($result->getMessage());
+		}
+
+		//Send Requests
+		if ($upload_req->sendRequest()) {
+			$this->response = $upload_req->getResponseBody();
+		} else {
+			die("There has been a problem sending your command to the server.");
+		}
+
+		$rsp = explode("\n", $this->response);
+		foreach ($rsp as $line) {
+			if (ereg('die_on_error)
+					die("The Flickr API returned the following error: #{$match[1]} - {$match[2]}");
+				else {
+					$this->error_code = $match[1];
+					$this->error_msg = $match[2];
+					$this->parsed_response = false;
+					return false;
+				}
+			} elseif (ereg("(.*)", $line, $match)) {
+				$this->error_code = false;
+				$this->error_msg = false;
+				return $match[1];
+			}
+		}
+	}
+
+	function async_upload ($photo, $title = null, $description = null, $tags = null, $is_public = null, $is_friend = null, $is_family = null) {
+		$upload_req =& new HTTP_Request();
+		$upload_req->setMethod(HTTP_REQUEST_METHOD_POST);
+
+		$upload_req->setURL($this->Upload);
+		$upload_req->clearPostData();
+
+		//Process arguments, including method and login data.
+		$args = array("async" => 1, "api_key" => $this->api_key, "title" => $title, "description" => $description, "tags" => $tags, "is_public" => $is_public, "is_friend" => $is_friend, "is_family" => $is_family);
+		if (!empty($this->email)) {
+			$args = array_merge($args, array("email" => $this->email));
+		}
+		if (!empty($this->password)) {
+			$args = array_merge($args, array("password" => $this->password));
+		}
+		if (!empty($this->token)) {
+			$args = array_merge($args, array("auth_token" => $this->token));
+		} elseif (!empty($_SESSION['phpFlickr_auth_token'])) {
+			$args = array_merge($args, array("auth_token" => $_SESSION['phpFlickr_auth_token']));
+		}
+
+		ksort($args);
+		$auth_sig = "";
+		foreach ($args as $key => $data) {
+			if ($data !== null) {
+				$auth_sig .= $key . $data;
+				$upload_req->addPostData($key, $data);
+			}
+		}
+		if (!empty($this->secret)) {
+			$api_sig = md5($this->secret . $auth_sig);
+			$upload_req->addPostData("api_sig", $api_sig);
+		}
+
+		$photo = realpath($photo);
+
+		$result = $upload_req->addFile("photo", $photo);
+
+		if (PEAR::isError($result)) {
+			die($result->getMessage());
+		}
+
+		//Send Requests
+		if ($upload_req->sendRequest()) {
+			$this->response = $upload_req->getResponseBody();
+		} else {
+			die("There has been a problem sending your command to the server.");
+		}
+
+		$rsp = explode("\n", $this->response);
+		foreach ($rsp as $line) {
+			if (ereg('die_on_error)
+					die("The Flickr API returned the following error: #{$match[1]} - {$match[2]}");
+				else {
+					$this->error_code = $match[1];
+					$this->error_msg = $match[2];
+					$this->parsed_response = false;
+					return false;
+				}
+			} elseif (ereg("(.*)error_code = false;
+				$this->error_msg = false;
+				return $match[1];
+			}
+		}
+	}
+
+	// Interface for new replace API method.
+	function replace ($photo, $photo_id, $async = null) {
+		$upload_req =& new HTTP_Request();
+		$upload_req->setMethod(HTTP_REQUEST_METHOD_POST);
+
+		$upload_req->setURL($this->Replace);
+		$upload_req->clearPostData();
+
+		//Process arguments, including method and login data.
+		$args = array("api_key" => $this->api_key, "photo_id" => $photo_id, "async" => $async);
+		if (!empty($this->email)) {
+			$args = array_merge($args, array("email" => $this->email));
+		}
+		if (!empty($this->password)) {
+			$args = array_merge($args, array("password" => $this->password));
+		}
+		if (!empty($this->token)) {
+			$args = array_merge($args, array("auth_token" => $this->token));
+		} elseif (!empty($_SESSION['phpFlickr_auth_token'])) {
+			$args = array_merge($args, array("auth_token" => $_SESSION['phpFlickr_auth_token']));
+		}
+
+		ksort($args);
+		$auth_sig = "";
+		foreach ($args as $key => $data) {
+			if ($data !== null) {
+				$auth_sig .= $key . $data;
+				$upload_req->addPostData($key, $data);
+			}
+		}
+		if (!empty($this->secret)) {
+			$api_sig = md5($this->secret . $auth_sig);
+			$upload_req->addPostData("api_sig", $api_sig);
+		}
+
+		$photo = realpath($photo);
+
+		$result = $upload_req->addFile("photo", $photo);
+
+		if (PEAR::isError($result)) {
+			die($result->getMessage());
+		}
+
+		//Send Requests
+		if ($upload_req->sendRequest()) {
+			$this->response = $upload_req->getResponseBody();
+		} else {
+			die("There has been a problem sending your command to the server.");
+		}
+		if ($async == 1)
+			$find = 'ticketid';
+		 else
+			$find = 'photoid';
+
+		$rsp = explode("\n", $this->response);
+		foreach ($rsp as $line) {
+			if (ereg('die_on_error)
+					die("The Flickr API returned the following error: #{$match[1]} - {$match[2]}");
+				else {
+					$this->error_code = $match[1];
+					$this->error_msg = $match[2];
+					$this->parsed_response = false;
+					return false;
+				}
+			} elseif (ereg("<" . $find . ">(.*)error_code = false;
+				$this->error_msg = false;
+				return $match[1];
+			}
+		}
+	}
+
+	function auth ($perms = "read", $remember_uri = true) {
+		// Redirects to Flickr's authentication piece if there is no valid token.
+		// If remember_uri is set to false, the callback script (included) will
+		// redirect to its default page.
+
+		if (empty($_SESSION['phpFlickr_auth_token']) && empty($this->token)) {
+			if ($remember_uri) {
+				$redirect = $_SERVER['REQUEST_URI'];
+			}
+			$api_sig = md5($this->secret . "api_key" . $this->api_key . "extra" . $redirect . "perms" . $perms);
+			if ($this->service == "23") {
+				header("Location: http://www.23hq.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
+			} else {
+				header("Location: http://www.flickr.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
+			}
+			exit;
+		} else {
+			$tmp = $this->die_on_error;
+			$this->die_on_error = false;
+			$rsp = $this->auth_checkToken();
+			if ($this->error_code !== false) {
+				unset($_SESSION['phpFlickr_auth_token']);
+				$this->auth($perms, $remember_uri);
+			}
+			$this->die_on_error = $tmp;
+			return $rsp['perms'];
+		}
+	}
+
+	/*******************************
+
+	To use the phpFlickr::call method, pass a string containing the API method you want
+	to use and an associative array of arguments.  For example:
+		$result = $f->call("flickr.photos.comments.getList", array("photo_id"=>'34952612'));
+	This method will allow you to make calls to arbitrary methods that haven't been
+	implemented in phpFlickr yet.
+
+	*******************************/
+
+	function call ($method, $arguments) {
+		foreach ( $arguments as $key => $value ) {
+			if ( is_null($value) ) unset($arguments[$key]);
+		}
+		$this->request($method, $arguments);
+		return $this->parsed_response ? $this->parsed_response : false;
+	}
+
+	/*
+		These functions are the direct implementations of flickr calls.
+		For method documentation, including arguments, visit the address
+		included in a comment in the function.
+	*/
+
+	/* Activity methods */
+	function activity_userComments ($per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.activity.userComments.html */
+		$this->request('flickr.activity.userComments', array("per_page" => $per_page, "page" => $page));
+		return $this->parsed_response ? $this->parsed_response['items']['item'] : false;
+	}
+
+	function activity_userPhotos ($timeframe = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.activity.userPhotos.html */
+		$this->request('flickr.activity.userPhotos', array("timeframe" => $timeframe, "per_page" => $per_page, "page" => $page));
+		return $this->parsed_response ? $this->parsed_response['items']['item'] : false;
+	}
+
+	/* Authentication methods */
+	function auth_checkToken () {
+		/* http://www.flickr.com/services/api/flickr.auth.checkToken.html */
+		$this->request('flickr.auth.checkToken');
+		return $this->parsed_response ? $this->parsed_response['auth'] : false;
+	}
+
+	function auth_getFrob () {
+		/* http://www.flickr.com/services/api/flickr.auth.getFrob.html */
+		$this->request('flickr.auth.getFrob');
+		return $this->parsed_response ? $this->parsed_response['frob'] : false;
+	}
+
+	function auth_getFullToken ($mini_token) {
+		/* http://www.flickr.com/services/api/flickr.auth.getFullToken.html */
+		$this->request('flickr.auth.getFullToken', array('mini_token'=>$mini_token));
+		return $this->parsed_response ? $this->parsed_response['auth'] : false;
+	}
+
+	function auth_getToken ($frob) {
+		/* http://www.flickr.com/services/api/flickr.auth.getToken.html */
+		$this->request('flickr.auth.getToken', array('frob'=>$frob));
+		session_register('phpFlickr_auth_token');
+		$_SESSION['phpFlickr_auth_token'] = $this->parsed_response['auth']['token'];
+		return $this->parsed_response ? $this->parsed_response['auth'] : false;
+	}
+
+	/* Blogs methods */
+	function blogs_getList ($service = NULL) {
+		/* http://www.flickr.com/services/api/flickr.blogs.getList.html */
+		$rsp = $this->call('flickr.blogs.getList', array('service' => $service));
+		return $rsp['blogs']['blog'];
+	}
+	
+	function blogs_getServices () {
+		/* http://www.flickr.com/services/api/flickr.blogs.getServices.html */
+		return $this->call('flickr.blogs.getServices', array());
+	}
+
+	function blogs_postPhoto ($blog_id = NULL, $photo_id, $title, $description, $blog_password = NULL, $service = NULL) {
+		/* http://www.flickr.com/services/api/flickr.blogs.postPhoto.html */
+		return $this->call('flickr.blogs.postPhoto', array('blog_id' => $blog_id, 'photo_id' => $photo_id, 'title' => $title, 'description' => $description, 'blog_password' => $blog_password, 'service' => $service));
+	}
+
+	/* Collections Methods */
+	function collections_getInfo ($collection_id) {
+		/* http://www.flickr.com/services/api/flickr.collections.getInfo.html */
+		return $this->call('flickr.collections.getInfo', array('collection_id' => $collection_id));
+	}
+
+	function collections_getTree ($collection_id = NULL, $user_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.collections.getTree.html */
+		return $this->call('flickr.collections.getTree', array('collection_id' => $collection_id, 'user_id' => $user_id));
+	}
+	
+	/* Commons Methods */
+	function commons_getInstitutions () {
+		/* http://www.flickr.com/services/api/flickr.commons.getInstitutions.html */
+		return $this->call('flickr.commons.getInstitutions', array());
+	}
+	
+	/* Contacts Methods */
+	function contacts_getList ($filter = NULL, $page = NULL, $per_page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.contacts.getList.html */
+		$this->request('flickr.contacts.getList', array('filter'=>$filter, 'page'=>$page, 'per_page'=>$per_page));
+		return $this->parsed_response ? $this->parsed_response['contacts'] : false;
+	}
+
+	function contacts_getPublicList ($user_id, $page = NULL, $per_page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.contacts.getPublicList.html */
+		$this->request('flickr.contacts.getPublicList', array('user_id'=>$user_id, 'page'=>$page, 'per_page'=>$per_page));
+		return $this->parsed_response ? $this->parsed_response['contacts'] : false;
+	}
+	
+	function contacts_getListRecentlyUploaded ($date_lastupload = NULL, $filter = NULL) {
+		/* http://www.flickr.com/services/api/flickr.contacts.getListRecentlyUploaded.html */
+		return $this->call('flickr.contacts.getListRecentlyUploaded', array('date_lastupload' => $date_lastupload, 'filter' => $filter));
+	}
+
+	/* Favorites Methods */
+	function favorites_add ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.favorites.add.html */
+		$this->request('flickr.favorites.add', array('photo_id'=>$photo_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function favorites_getList ($user_id = NULL, $min_fave_date = NULL, $max_fave_date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.favorites.getList.html */
+		return $this->call('flickr.favorites.getList', array('user_id' => $user_id, 'min_fave_date' => $min_fave_date, 'max_fave_date' => $max_fave_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	function favorites_getPublicList ($user_id, $min_fave_date = NULL, $max_fave_date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.favorites.getPublicList.html */
+		return $this->call('flickr.favorites.getPublicList', array('user_id' => $user_id, 'min_fave_date' => $min_fave_date, 'max_fave_date' => $max_fave_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	function favorites_remove ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.favorites.remove.html */
+		$this->request("flickr.favorites.remove", array("photo_id"=>$photo_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	/* Groups Methods */
+	function groups_browse ($cat_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.groups.browse.html */
+		$this->request("flickr.groups.browse", array("cat_id"=>$cat_id));
+		return $this->parsed_response ? $this->parsed_response['category'] : false;
+	}
+
+	function groups_getInfo ($group_id, $lang = NULL) {
+		/* http://www.flickr.com/services/api/flickr.groups.getInfo.html */
+		return $this->call('flickr.groups.getInfo', array('group_id' => $group_id, 'lang' => $lang));
+	}
+
+	function groups_search ($text, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.groups.search.html */
+		$this->request("flickr.groups.search", array("text"=>$text,"per_page"=>$per_page,"page"=>$page));
+		return $this->parsed_response ? $this->parsed_response['groups'] : false;
+	}
+
+	/* Groups Members Methods */
+	function groups_members_getList ($group_id, $membertypes = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.groups.members.getList.html */
+		return $this->call('flickr.groups.members.getList', array('group_id' => $group_id, 'membertypes' => $membertypes, 'per_page' => $per_page, 'page' => $page));
+	}
+	
+	/* Groups Pools Methods */
+	function groups_pools_add ($photo_id, $group_id) {
+		/* http://www.flickr.com/services/api/flickr.groups.pools.add.html */
+		$this->request("flickr.groups.pools.add", array("photo_id"=>$photo_id, "group_id"=>$group_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function groups_pools_getContext ($photo_id, $group_id) {
+		/* http://www.flickr.com/services/api/flickr.groups.pools.getContext.html */
+		$this->request("flickr.groups.pools.getContext", array("photo_id"=>$photo_id, "group_id"=>$group_id));
+		return $this->parsed_response ? $this->parsed_response : false;
+	}
+
+	function groups_pools_getGroups ($page = NULL, $per_page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.groups.pools.getGroups.html */
+		$this->request("flickr.groups.pools.getGroups", array('page'=>$page, 'per_page'=>$per_page));
+		return $this->parsed_response ? $this->parsed_response['groups'] : false;
+	}
+
+	function groups_pools_getPhotos ($group_id, $tags = NULL, $user_id = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html */
+		if (is_array($extras)) {
+			$extras = implode(",", $extras);
+		}
+		$this->request("flickr.groups.pools.getPhotos", array("group_id"=>$group_id, "tags"=>$tags, "user_id"=>$user_id, "extras"=>$extras, "per_page"=>$per_page, "page"=>$page));
+		return $this->parsed_response ? $this->parsed_response['photos'] : false;
+	}
+
+	function groups_pools_remove ($photo_id, $group_id) {
+		/* http://www.flickr.com/services/api/flickr.groups.pools.remove.html */
+		$this->request("flickr.groups.pools.remove", array("photo_id"=>$photo_id, "group_id"=>$group_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	/* Interestingness methods */
+	function interestingness_getList ($date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.interestingness.getList.html */
+		if (is_array($extras)) {
+			$extras = implode(",", $extras);
+		}
+
+		$this->request("flickr.interestingness.getList", array("date"=>$date, "extras"=>$extras, "per_page"=>$per_page, "page"=>$page));
+		return $this->parsed_response ? $this->parsed_response['photos'] : false;
+	}
+
+	/* Machine Tag methods */
+	function machinetags_getNamespaces ($predicate = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.machinetags.getNamespaces.html */
+		return $this->call('flickr.machinetags.getNamespaces', array('predicate' => $predicate, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	function machinetags_getPairs ($namespace = NULL, $predicate = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.machinetags.getPairs.html */
+		return $this->call('flickr.machinetags.getPairs', array('namespace' => $namespace, 'predicate' => $predicate, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	function machinetags_getPredicates ($namespace = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.machinetags.getPredicates.html */
+		return $this->call('flickr.machinetags.getPredicates', array('namespace' => $namespace, 'per_page' => $per_page, 'page' => $page));
+	}
+	
+	function machinetags_getRecentValues ($namespace = NULL, $predicate = NULL, $added_since = NULL) {
+		/* http://www.flickr.com/services/api/flickr.machinetags.getRecentValues.html */
+		return $this->call('flickr.machinetags.getRecentValues', array('namespace' => $namespace, 'predicate' => $predicate, 'added_since' => $added_since));
+	}
+
+	function machinetags_getValues ($namespace, $predicate, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.machinetags.getValues.html */
+		return $this->call('flickr.machinetags.getValues', array('namespace' => $namespace, 'predicate' => $predicate, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	/* Panda methods */
+	function panda_getList () {
+		/* http://www.flickr.com/services/api/flickr.panda.getList.html */
+		return $this->call('flickr.panda.getList', array());
+	}
+
+	function panda_getPhotos ($panda_name, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.panda.getPhotos.html */
+		return $this->call('flickr.panda.getPhotos', array('panda_name' => $panda_name, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	/* People methods */
+	function people_findByEmail ($find_email) {
+		/* http://www.flickr.com/services/api/flickr.people.findByEmail.html */
+		$this->request("flickr.people.findByEmail", array("find_email"=>$find_email));
+		return $this->parsed_response ? $this->parsed_response['user'] : false;
+	}
+
+	function people_findByUsername ($username) {
+		/* http://www.flickr.com/services/api/flickr.people.findByUsername.html */
+		$this->request("flickr.people.findByUsername", array("username"=>$username));
+		return $this->parsed_response ? $this->parsed_response['user'] : false;
+	}
+
+	function people_getInfo ($user_id) {
+		/* http://www.flickr.com/services/api/flickr.people.getInfo.html */
+		$this->request("flickr.people.getInfo", array("user_id"=>$user_id));
+		return $this->parsed_response ? $this->parsed_response['person'] : false;
+	}
+
+	function people_getPublicGroups ($user_id) {
+		/* http://www.flickr.com/services/api/flickr.people.getPublicGroups.html */
+		$this->request("flickr.people.getPublicGroups", array("user_id"=>$user_id));
+		return $this->parsed_response ? $this->parsed_response['groups']['group'] : false;
+	}
+
+	function people_getPublicPhotos ($user_id, $safe_search = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html */
+		return $this->call('flickr.people.getPublicPhotos', array('user_id' => $user_id, 'safe_search' => $safe_search, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	function people_getUploadStatus () {
+		/* http://www.flickr.com/services/api/flickr.people.getUploadStatus.html */
+		/* Requires Authentication */
+		$this->request("flickr.people.getUploadStatus");
+		return $this->parsed_response ? $this->parsed_response['user'] : false;
+	}
+
+
+	/* Photos Methods */
+	function photos_addTags ($photo_id, $tags) {
+		/* http://www.flickr.com/services/api/flickr.photos.addTags.html */
+		$this->request("flickr.photos.addTags", array("photo_id"=>$photo_id, "tags"=>$tags), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_delete ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.delete.html */
+		$this->request("flickr.photos.delete", array("photo_id"=>$photo_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_getAllContexts ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.getAllContexts.html */
+		$this->request("flickr.photos.getAllContexts", array("photo_id"=>$photo_id));
+		return $this->parsed_response ? $this->parsed_response : false;
+	}
+
+	function photos_getContactsPhotos ($count = NULL, $just_friends = NULL, $single_photo = NULL, $include_self = NULL, $extras = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html */
+		$this->request("flickr.photos.getContactsPhotos", array("count"=>$count, "just_friends"=>$just_friends, "single_photo"=>$single_photo, "include_self"=>$include_self, "extras"=>$extras));
+		return $this->parsed_response ? $this->parsed_response['photos']['photo'] : false;
+	}
+
+	function photos_getContactsPublicPhotos ($user_id, $count = NULL, $just_friends = NULL, $single_photo = NULL, $include_self = NULL, $extras = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.getContactsPublicPhotos.html */
+		$this->request("flickr.photos.getContactsPublicPhotos", array("user_id"=>$user_id, "count"=>$count, "just_friends"=>$just_friends, "single_photo"=>$single_photo, "include_self"=>$include_self, "extras"=>$extras));
+		return $this->parsed_response ? $this->parsed_response['photos']['photo'] : false;
+	}
+
+	function photos_getContext ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.getContext.html */
+		$this->request("flickr.photos.getContext", array("photo_id"=>$photo_id));
+		return $this->parsed_response ? $this->parsed_response : false;
+	}
+
+	function photos_getCounts ($dates = NULL, $taken_dates = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.getCounts.html */
+		$this->request("flickr.photos.getCounts", array("dates"=>$dates, "taken_dates"=>$taken_dates));
+		return $this->parsed_response ? $this->parsed_response['photocounts']['photocount'] : false;
+	}
+
+	function photos_getExif ($photo_id, $secret = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.getExif.html */
+		$this->request("flickr.photos.getExif", array("photo_id"=>$photo_id, "secret"=>$secret));
+		return $this->parsed_response ? $this->parsed_response['photo'] : false;
+	}
+	
+	function photos_getFavorites ($photo_id, $page = NULL, $per_page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.getFavorites.html */
+		$this->request("flickr.photos.getFavorites", array("photo_id"=>$photo_id, "page"=>$page, "per_page"=>$per_page));
+		return $this->parsed_response ? $this->parsed_response['photo'] : false;
+	}
+
+	function photos_getInfo ($photo_id, $secret = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.getInfo.html */
+		$this->request("flickr.photos.getInfo", array("photo_id"=>$photo_id, "secret"=>$secret));
+		return $this->parsed_response ? $this->parsed_response['photo'] : false;
+	}
+
+	function photos_getNotInSet ($min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL, $privacy_filter = NULL, $media = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.getNotInSet.html */
+		return $this->call('flickr.photos.getNotInSet', array('min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date, 'privacy_filter' => $privacy_filter, 'media' => $media, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	function photos_getPerms ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.getPerms.html */
+		$this->request("flickr.photos.getPerms", array("photo_id"=>$photo_id));
+		return $this->parsed_response ? $this->parsed_response['perms'] : false;
+	}
+
+	function photos_getRecent ($extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.getRecent.html */
+
+		if (is_array($extras)) {
+			$extras = implode(",", $extras);
+		}
+		$this->request("flickr.photos.getRecent", array("extras"=>$extras, "per_page"=>$per_page, "page"=>$page));
+		return $this->parsed_response ? $this->parsed_response['photos'] : false;
+	}
+
+	function photos_getSizes ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.getSizes.html */
+		$this->request("flickr.photos.getSizes", array("photo_id"=>$photo_id));
+		return $this->parsed_response ? $this->parsed_response['sizes']['size'] : false;
+	}
+
+	function photos_getUntagged ($min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL, $privacy_filter = NULL, $media = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.getUntagged.html */
+		return $this->call('flickr.photos.getUntagged', array('min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date, 'privacy_filter' => $privacy_filter, 'media' => $media, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	function photos_getWithGeoData ($args = array()) {
+		/* See the documentation included with the photos_search() function.
+		 * I'm using the same style of arguments for this function. The only
+		 * difference here is that this doesn't require any arguments. The
+		 * flickr.photos.search method requires at least one search parameter.
+		 */
+		/* http://www.flickr.com/services/api/flickr.photos.getWithGeoData.html */
+		$this->request("flickr.photos.getWithGeoData", $args);
+		return $this->parsed_response ? $this->parsed_response['photos'] : false;
+	}
+
+	function photos_getWithoutGeoData ($args = array()) {
+		/* See the documentation included with the photos_search() function.
+		 * I'm using the same style of arguments for this function. The only
+		 * difference here is that this doesn't require any arguments. The
+		 * flickr.photos.search method requires at least one search parameter.
+		 */
+		/* http://www.flickr.com/services/api/flickr.photos.getWithoutGeoData.html */
+		$this->request("flickr.photos.getWithoutGeoData", $args);
+		return $this->parsed_response ? $this->parsed_response['photos'] : false;
+	}
+
+	function photos_recentlyUpdated ($min_date, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.recentlyUpdated.html */
+		return $this->call('flickr.photos.recentlyUpdated', array('min_date' => $min_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	function photos_removeTag ($tag_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.removeTag.html */
+		$this->request("flickr.photos.removeTag", array("tag_id"=>$tag_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_search ($args = array()) {
+		/* This function strays from the method of arguments that I've
+		 * used in the other functions for the fact that there are just
+		 * so many arguments to this API method. What you'll need to do
+		 * is pass an associative array to the function containing the
+		 * arguments you want to pass to the API.  For example:
+		 *   $photos = $f->photos_search(array("tags"=>"brown,cow", "tag_mode"=>"any"));
+		 * This will return photos tagged with either "brown" or "cow"
+		 * or both. See the API documentation (link below) for a full
+		 * list of arguments.
+		 */
+
+		/* http://www.flickr.com/services/api/flickr.photos.search.html */
+		$this->request("flickr.photos.search", $args);
+		return $this->parsed_response ? $this->parsed_response['photos'] : false;
+	}
+
+	function photos_setContentType ($photo_id, $content_type) {
+		/* http://www.flickr.com/services/api/flickr.photos.setContentType.html */
+		return $this->call('flickr.photos.setContentType', array('photo_id' => $photo_id, 'content_type' => $content_type));
+	}
+	
+	function photos_setDates ($photo_id, $date_posted = NULL, $date_taken = NULL, $date_taken_granularity = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.setDates.html */
+		$this->request("flickr.photos.setDates", array("photo_id"=>$photo_id, "date_posted"=>$date_posted, "date_taken"=>$date_taken, "date_taken_granularity"=>$date_taken_granularity), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_setMeta ($photo_id, $title, $description) {
+		/* http://www.flickr.com/services/api/flickr.photos.setMeta.html */
+		$this->request("flickr.photos.setMeta", array("photo_id"=>$photo_id, "title"=>$title, "description"=>$description), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_setPerms ($photo_id, $is_public, $is_friend, $is_family, $perm_comment, $perm_addmeta) {
+		/* http://www.flickr.com/services/api/flickr.photos.setPerms.html */
+		$this->request("flickr.photos.setPerms", array("photo_id"=>$photo_id, "is_public"=>$is_public, "is_friend"=>$is_friend, "is_family"=>$is_family, "perm_comment"=>$perm_comment, "perm_addmeta"=>$perm_addmeta), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_setSafetyLevel ($photo_id, $safety_level = NULL, $hidden = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.setSafetyLevel.html */
+		return $this->call('flickr.photos.setSafetyLevel', array('photo_id' => $photo_id, 'safety_level' => $safety_level, 'hidden' => $hidden));
+	}
+	
+	function photos_setTags ($photo_id, $tags) {
+		/* http://www.flickr.com/services/api/flickr.photos.setTags.html */
+		$this->request("flickr.photos.setTags", array("photo_id"=>$photo_id, "tags"=>$tags), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	/* Photos - Comments Methods */
+	function photos_comments_addComment ($photo_id, $comment_text) {
+		/* http://www.flickr.com/services/api/flickr.photos.comments.addComment.html */
+		$this->request("flickr.photos.comments.addComment", array("photo_id" => $photo_id, "comment_text"=>$comment_text), TRUE);
+		return $this->parsed_response ? $this->parsed_response['comment'] : false;
+	}
+
+	function photos_comments_deleteComment ($comment_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.comments.deleteComment.html */
+		$this->request("flickr.photos.comments.deleteComment", array("comment_id" => $comment_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_comments_editComment ($comment_id, $comment_text) {
+		/* http://www.flickr.com/services/api/flickr.photos.comments.editComment.html */
+		$this->request("flickr.photos.comments.editComment", array("comment_id" => $comment_id, "comment_text"=>$comment_text), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_comments_getList ($photo_id, $min_comment_date = NULL, $max_comment_date = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.comments.getList.html */
+		return $this->call('flickr.photos.comments.getList', array('photo_id' => $photo_id, 'min_comment_date' => $min_comment_date, 'max_comment_date' => $max_comment_date));
+	}
+	
+	function photos_comments_getRecentForContacts ($date_lastcomment = NULL, $contacts_filter = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.comments.getRecentForContacts.html */
+		return $this->call('flickr.photos.comments.getRecentForContacts', array('date_lastcomment' => $date_lastcomment, 'contacts_filter' => $contacts_filter, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	/* Photos - Geo Methods */
+	function photos_geo_batchCorrectLocation ($lat, $lon, $accuracy, $place_id = NULL, $woe_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.geo.batchCorrectLocation.html */
+		return $this->call('flickr.photos.geo.batchCorrectLocation', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'place_id' => $place_id, 'woe_id' => $woe_id));
+	}
+
+	function photos_geo_correctLocation ($photo_id, $place_id = NULL, $woe_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.geo.correctLocation.html */
+		return $this->call('flickr.photos.geo.correctLocation', array('photo_id' => $photo_id, 'place_id' => $place_id, 'woe_id' => $woe_id));
+	}
+
+	function photos_geo_getLocation ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.geo.getLocation.html */
+		$this->request("flickr.photos.geo.getLocation", array("photo_id"=>$photo_id));
+		return $this->parsed_response ? $this->parsed_response['photo'] : false;
+	}
+
+	function photos_geo_getPerms ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.geo.getPerms.html */
+		$this->request("flickr.photos.geo.getPerms", array("photo_id"=>$photo_id));
+		return $this->parsed_response ? $this->parsed_response['perms'] : false;
+	}
+	
+	function photos_geo_photosForLocation ($lat, $lon, $accuracy = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.geo.photosForLocation.html */
+		return $this->call('flickr.photos.geo.photosForLocation', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
+	}
+
+	function photos_geo_removeLocation ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.geo.removeLocation.html */
+		$this->request("flickr.photos.geo.removeLocation", array("photo_id"=>$photo_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_geo_setContext ($photo_id, $context) {
+		/* http://www.flickr.com/services/api/flickr.photos.geo.setContext.html */
+		return $this->call('flickr.photos.geo.setContext', array('photo_id' => $photo_id, 'context' => $context));
+	}
+
+	function photos_geo_setLocation ($photo_id, $lat, $lon, $accuracy = NULL, $context = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photos.geo.setLocation.html */
+		return $this->call('flickr.photos.geo.setLocation', array('photo_id' => $photo_id, 'lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'context' => $context));
+	}
+
+	function photos_geo_setPerms ($is_public, $is_contact, $is_friend, $is_family, $photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.geo.setPerms.html */
+		return $this->call('flickr.photos.geo.setPerms', array('is_public' => $is_public, 'is_contact' => $is_contact, 'is_friend' => $is_friend, 'is_family' => $is_family, 'photo_id' => $photo_id));
+	}
+
+	/* Photos - Licenses Methods */
+	function photos_licenses_getInfo () {
+		/* http://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html */
+		$this->request("flickr.photos.licenses.getInfo");
+		return $this->parsed_response ? $this->parsed_response['licenses']['license'] : false;
+	}
+
+	function photos_licenses_setLicense ($photo_id, $license_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.licenses.setLicense.html */
+		/* Requires Authentication */
+		$this->request("flickr.photos.licenses.setLicense", array("photo_id"=>$photo_id, "license_id"=>$license_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	/* Photos - Notes Methods */
+	function photos_notes_add ($photo_id, $note_x, $note_y, $note_w, $note_h, $note_text) {
+		/* http://www.flickr.com/services/api/flickr.photos.notes.add.html */
+		$this->request("flickr.photos.notes.add", array("photo_id" => $photo_id, "note_x" => $note_x, "note_y" => $note_y, "note_w" => $note_w, "note_h" => $note_h, "note_text" => $note_text), TRUE);
+		return $this->parsed_response ? $this->parsed_response['note'] : false;
+	}
+
+	function photos_notes_delete ($note_id) {
+		/* http://www.flickr.com/services/api/flickr.photos.notes.delete.html */
+		$this->request("flickr.photos.notes.delete", array("note_id" => $note_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photos_notes_edit ($note_id, $note_x, $note_y, $note_w, $note_h, $note_text) {
+		/* http://www.flickr.com/services/api/flickr.photos.notes.edit.html */
+		$this->request("flickr.photos.notes.edit", array("note_id" => $note_id, "note_x" => $note_x, "note_y" => $note_y, "note_w" => $note_w, "note_h" => $note_h, "note_text" => $note_text), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	/* Photos - Transform Methods */
+	function photos_transform_rotate ($photo_id, $degrees) {
+		/* http://www.flickr.com/services/api/flickr.photos.transform.rotate.html */
+		$this->request("flickr.photos.transform.rotate", array("photo_id" => $photo_id, "degrees" => $degrees), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	/* Photos - Upload Methods */
+	function photos_upload_checkTickets ($tickets) {
+		/* http://www.flickr.com/services/api/flickr.photos.upload.checkTickets.html */
+		if (is_array($tickets)) {
+			$tickets = implode(",", $tickets);
+		}
+		$this->request("flickr.photos.upload.checkTickets", array("tickets" => $tickets), TRUE);
+		return $this->parsed_response ? $this->parsed_response['uploader']['ticket'] : false;
+	}
+
+	/* Photosets Methods */
+	function photosets_addPhoto ($photoset_id, $photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photosets.addPhoto.html */
+		$this->request("flickr.photosets.addPhoto", array("photoset_id" => $photoset_id, "photo_id" => $photo_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photosets_create ($title, $description, $primary_photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photosets.create.html */
+		$this->request("flickr.photosets.create", array("title" => $title, "primary_photo_id" => $primary_photo_id, "description" => $description), TRUE);
+		return $this->parsed_response ? $this->parsed_response['photoset'] : false;
+	}
+
+	function photosets_delete ($photoset_id) {
+		/* http://www.flickr.com/services/api/flickr.photosets.delete.html */
+		$this->request("flickr.photosets.delete", array("photoset_id" => $photoset_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photosets_editMeta ($photoset_id, $title, $description = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photosets.editMeta.html */
+		$this->request("flickr.photosets.editMeta", array("photoset_id" => $photoset_id, "title" => $title, "description" => $description), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photosets_editPhotos ($photoset_id, $primary_photo_id, $photo_ids) {
+		/* http://www.flickr.com/services/api/flickr.photosets.editPhotos.html */
+		$this->request("flickr.photosets.editPhotos", array("photoset_id" => $photoset_id, "primary_photo_id" => $primary_photo_id, "photo_ids" => $photo_ids), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photosets_getContext ($photo_id, $photoset_id) {
+		/* http://www.flickr.com/services/api/flickr.photosets.getContext.html */
+		$this->request("flickr.photosets.getContext", array("photo_id" => $photo_id, "photoset_id" => $photoset_id));
+		return $this->parsed_response ? $this->parsed_response : false;
+	}
+
+	function photosets_getInfo ($photoset_id) {
+		/* http://www.flickr.com/services/api/flickr.photosets.getInfo.html */
+		$this->request("flickr.photosets.getInfo", array("photoset_id" => $photoset_id));
+		return $this->parsed_response ? $this->parsed_response['photoset'] : false;
+	}
+
+	function photosets_getList ($user_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photosets.getList.html */
+		$this->request("flickr.photosets.getList", array("user_id" => $user_id));
+		return $this->parsed_response ? $this->parsed_response['photosets'] : false;
+	}
+
+	function photosets_getPhotos ($photoset_id, $extras = NULL, $privacy_filter = NULL, $per_page = NULL, $page = NULL, $media = NULL) {
+		/* http://www.flickr.com/services/api/flickr.photosets.getPhotos.html */
+		return $this->call('flickr.photosets.getPhotos', array('photoset_id' => $photoset_id, 'extras' => $extras, 'privacy_filter' => $privacy_filter, 'per_page' => $per_page, 'page' => $page, 'media' => $media));
+	}
+
+	function photosets_orderSets ($photoset_ids) {
+		/* http://www.flickr.com/services/api/flickr.photosets.orderSets.html */
+		if (is_array($photoset_ids)) {
+			$photoset_ids = implode(",", $photoset_ids);
+		}
+		$this->request("flickr.photosets.orderSets", array("photoset_ids" => $photoset_ids), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photosets_removePhoto ($photoset_id, $photo_id) {
+		/* http://www.flickr.com/services/api/flickr.photosets.removePhoto.html */
+		$this->request("flickr.photosets.removePhoto", array("photoset_id" => $photoset_id, "photo_id" => $photo_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	/* Photosets Comments Methods */
+	function photosets_comments_addComment ($photoset_id, $comment_text) {
+		/* http://www.flickr.com/services/api/flickr.photosets.comments.addComment.html */
+		$this->request("flickr.photosets.comments.addComment", array("photoset_id" => $photoset_id, "comment_text"=>$comment_text), TRUE);
+		return $this->parsed_response ? $this->parsed_response['comment'] : false;
+	}
+
+	function photosets_comments_deleteComment ($comment_id) {
+		/* http://www.flickr.com/services/api/flickr.photosets.comments.deleteComment.html */
+		$this->request("flickr.photosets.comments.deleteComment", array("comment_id" => $comment_id), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photosets_comments_editComment ($comment_id, $comment_text) {
+		/* http://www.flickr.com/services/api/flickr.photosets.comments.editComment.html */
+		$this->request("flickr.photosets.comments.editComment", array("comment_id" => $comment_id, "comment_text"=>$comment_text), TRUE);
+		return $this->parsed_response ? true : false;
+	}
+
+	function photosets_comments_getList ($photoset_id) {
+		/* http://www.flickr.com/services/api/flickr.photosets.comments.getList.html */
+		$this->request("flickr.photosets.comments.getList", array("photoset_id"=>$photoset_id));
+		return $this->parsed_response ? $this->parsed_response['comments'] : false;
+	}
+	
+	/* Places Methods */
+	function places_find ($query) {
+		/* http://www.flickr.com/services/api/flickr.places.find.html */
+		return $this->call('flickr.places.find', array('query' => $query));
+	}
+
+	function places_findByLatLon ($lat, $lon, $accuracy = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.findByLatLon.html */
+		return $this->call('flickr.places.findByLatLon', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy));
+	}
+
+	function places_getChildrenWithPhotosPublic ($place_id = NULL, $woe_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.getChildrenWithPhotosPublic.html */
+		return $this->call('flickr.places.getChildrenWithPhotosPublic', array('place_id' => $place_id, 'woe_id' => $woe_id));
+	}
+
+	function places_getInfo ($place_id = NULL, $woe_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.getInfo.html */
+		return $this->call('flickr.places.getInfo', array('place_id' => $place_id, 'woe_id' => $woe_id));
+	}
+
+	function places_getInfoByUrl ($url) {
+		/* http://www.flickr.com/services/api/flickr.places.getInfoByUrl.html */
+		return $this->call('flickr.places.getInfoByUrl', array('url' => $url));
+	}
+	
+	function places_getPlaceTypes () {
+		/* http://www.flickr.com/services/api/flickr.places.getPlaceTypes.html */
+		return $this->call('flickr.places.getPlaceTypes', array());
+	}
+	
+	function places_getShapeHistory ($place_id = NULL, $woe_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.getShapeHistory.html */
+		return $this->call('flickr.places.getShapeHistory', array('place_id' => $place_id, 'woe_id' => $woe_id));
+	}
+
+	function places_getTopPlacesList ($place_type_id, $date = NULL, $woe_id = NULL, $place_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.getTopPlacesList.html */
+		return $this->call('flickr.places.getTopPlacesList', array('place_type_id' => $place_type_id, 'date' => $date, 'woe_id' => $woe_id, 'place_id' => $place_id));
+	}
+	
+	function places_placesForBoundingBox ($bbox, $place_type = NULL, $place_type_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.placesForBoundingBox.html */
+		return $this->call('flickr.places.placesForBoundingBox', array('bbox' => $bbox, 'place_type' => $place_type, 'place_type_id' => $place_type_id));
+	}
+
+	function places_placesForContacts ($place_type = NULL, $place_type_id = NULL, $woe_id = NULL, $place_id = NULL, $threshold = NULL, $contacts = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.placesForContacts.html */
+		return $this->call('flickr.places.placesForContacts', array('place_type' => $place_type, 'place_type_id' => $place_type_id, 'woe_id' => $woe_id, 'place_id' => $place_id, 'threshold' => $threshold, 'contacts' => $contacts, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
+	}
+
+	function places_placesForTags ($place_type_id, $woe_id = NULL, $place_id = NULL, $threshold = NULL, $tags = NULL, $tag_mode = NULL, $machine_tags = NULL, $machine_tag_mode = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.placesForTags.html */
+		return $this->call('flickr.places.placesForTags', array('place_type_id' => $place_type_id, 'woe_id' => $woe_id, 'place_id' => $place_id, 'threshold' => $threshold, 'tags' => $tags, 'tag_mode' => $tag_mode, 'machine_tags' => $machine_tags, 'machine_tag_mode' => $machine_tag_mode, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
+	}
+
+	function places_placesForUser ($place_type_id = NULL, $place_type = NULL, $woe_id = NULL, $place_id = NULL, $threshold = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.placesForUser.html */
+		return $this->call('flickr.places.placesForUser', array('place_type_id' => $place_type_id, 'place_type' => $place_type, 'woe_id' => $woe_id, 'place_id' => $place_id, 'threshold' => $threshold, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
+	}
+	
+	function places_resolvePlaceId ($place_id) {
+		/* http://www.flickr.com/services/api/flickr.places.resolvePlaceId.html */
+		$rsp = $this->call('flickr.places.resolvePlaceId', array('place_id' => $place_id));
+		return $rsp ? $rsp['location'] : $rsp;
+	}
+	
+	function places_resolvePlaceURL ($url) {
+		/* http://www.flickr.com/services/api/flickr.places.resolvePlaceURL.html */
+		$rsp = $this->call('flickr.places.resolvePlaceURL', array('url' => $url));
+		return $rsp ? $rsp['location'] : $rsp;
+	}
+	
+	function places_tagsForPlace ($woe_id = NULL, $place_id = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
+		/* http://www.flickr.com/services/api/flickr.places.tagsForPlace.html */
+		return $this->call('flickr.places.tagsForPlace', array('woe_id' => $woe_id, 'place_id' => $place_id, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
+	}
+
+	/* Prefs Methods */
+	function prefs_getContentType () {
+		/* http://www.flickr.com/services/api/flickr.prefs.getContentType.html */
+		$rsp = $this->call('flickr.prefs.getContentType', array());
+		return $rsp ? $rsp['person'] : $rsp;
+	}
+	
+	function prefs_getGeoPerms () {
+		/* http://www.flickr.com/services/api/flickr.prefs.getGeoPerms.html */
+		return $this->call('flickr.prefs.getGeoPerms', array());
+	}
+	
+	function prefs_getHidden () {
+		/* http://www.flickr.com/services/api/flickr.prefs.getHidden.html */
+		$rsp = $this->call('flickr.prefs.getHidden', array());
+		return $rsp ? $rsp['person'] : $rsp;
+	}
+	
+	function prefs_getPrivacy () {
+		/* http://www.flickr.com/services/api/flickr.prefs.getPrivacy.html */
+		$rsp = $this->call('flickr.prefs.getPrivacy', array());
+		return $rsp ? $rsp['person'] : $rsp;
+	}
+	
+	function prefs_getSafetyLevel () {
+		/* http://www.flickr.com/services/api/flickr.prefs.getSafetyLevel.html */
+		$rsp = $this->call('flickr.prefs.getSafetyLevel', array());
+		return $rsp ? $rsp['person'] : $rsp;
+	}
+
+	/* Reflection Methods */
+	function reflection_getMethodInfo ($method_name) {
+		/* http://www.flickr.com/services/api/flickr.reflection.getMethodInfo.html */
+		$this->request("flickr.reflection.getMethodInfo", array("method_name" => $method_name));
+		return $this->parsed_response ? $this->parsed_response : false;
+	}
+
+	function reflection_getMethods () {
+		/* http://www.flickr.com/services/api/flickr.reflection.getMethods.html */
+		$this->request("flickr.reflection.getMethods");
+		return $this->parsed_response ? $this->parsed_response['methods']['method'] : false;
+	}
+
+	/* Tags Methods */
+	function tags_getClusterPhotos ($tag, $cluster_id) {
+		/* http://www.flickr.com/services/api/flickr.tags.getClusterPhotos.html */
+		return $this->call('flickr.tags.getClusterPhotos', array('tag' => $tag, 'cluster_id' => $cluster_id));
+	}
+
+	function tags_getClusters ($tag) {
+		/* http://www.flickr.com/services/api/flickr.tags.getClusters.html */
+		return $this->call('flickr.tags.getClusters', array('tag' => $tag));
+	}
+
+	function tags_getHotList ($period = NULL, $count = NULL) {
+		/* http://www.flickr.com/services/api/flickr.tags.getHotList.html */
+		$this->request("flickr.tags.getHotList", array("period" => $period, "count" => $count));
+		return $this->parsed_response ? $this->parsed_response['hottags'] : false;
+	}
+
+	function tags_getListPhoto ($photo_id) {
+		/* http://www.flickr.com/services/api/flickr.tags.getListPhoto.html */
+		$this->request("flickr.tags.getListPhoto", array("photo_id" => $photo_id));
+		return $this->parsed_response ? $this->parsed_response['photo']['tags']['tag'] : false;
+	}
+
+	function tags_getListUser ($user_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.tags.getListUser.html */
+		$this->request("flickr.tags.getListUser", array("user_id" => $user_id));
+		return $this->parsed_response ? $this->parsed_response['who']['tags']['tag'] : false;
+	}
+
+	function tags_getListUserPopular ($user_id = NULL, $count = NULL) {
+		/* http://www.flickr.com/services/api/flickr.tags.getListUserPopular.html */
+		$this->request("flickr.tags.getListUserPopular", array("user_id" => $user_id, "count" => $count));
+		return $this->parsed_response ? $this->parsed_response['who']['tags']['tag'] : false;
+	}
+
+	function tags_getListUserRaw ($tag = NULL) {
+		/* http://www.flickr.com/services/api/flickr.tags.getListUserRaw.html */
+		return $this->call('flickr.tags.getListUserRaw', array('tag' => $tag));
+	}
+	
+	function tags_getRelated ($tag) {
+		/* http://www.flickr.com/services/api/flickr.tags.getRelated.html */
+		$this->request("flickr.tags.getRelated", array("tag" => $tag));
+		return $this->parsed_response ? $this->parsed_response['tags'] : false;
+	}
+
+	function test_echo ($args = array()) {
+		/* http://www.flickr.com/services/api/flickr.test.echo.html */
+		$this->request("flickr.test.echo", $args);
+		return $this->parsed_response ? $this->parsed_response : false;
+	}
+
+	function test_login () {
+		/* http://www.flickr.com/services/api/flickr.test.login.html */
+		$this->request("flickr.test.login");
+		return $this->parsed_response ? $this->parsed_response['user'] : false;
+	}
+
+	function urls_getGroup ($group_id) {
+		/* http://www.flickr.com/services/api/flickr.urls.getGroup.html */
+		$this->request("flickr.urls.getGroup", array("group_id"=>$group_id));
+		return $this->parsed_response ? $this->parsed_response['group']['url'] : false;
+	}
+
+	function urls_getUserPhotos ($user_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.urls.getUserPhotos.html */
+		$this->request("flickr.urls.getUserPhotos", array("user_id"=>$user_id));
+		return $this->parsed_response ? $this->parsed_response['user']['url'] : false;
+	}
+
+	function urls_getUserProfile ($user_id = NULL) {
+		/* http://www.flickr.com/services/api/flickr.urls.getUserProfile.html */
+		$this->request("flickr.urls.getUserProfile", array("user_id"=>$user_id));
+		return $this->parsed_response ? $this->parsed_response['user']['url'] : false;
+	}
+
+	function urls_lookupGroup ($url) {
+		/* http://www.flickr.com/services/api/flickr.urls.lookupGroup.html */
+		$this->request("flickr.urls.lookupGroup", array("url"=>$url));
+		return $this->parsed_response ? $this->parsed_response['group'] : false;
+	}
+
+	function urls_lookupUser ($url) {
+		/* http://www.flickr.com/services/api/flickr.photos.notes.edit.html */
+		$this->request("flickr.urls.lookupUser", array("url"=>$url));
+		return $this->parsed_response ? $this->parsed_response['user'] : false;
+	}
+}
+
+
+?>
diff --git a/mostvieweddashboard.php b/mostvieweddashboard.php
index eef5a15ac..33b050ffa 100644
--- a/mostvieweddashboard.php
+++ b/mostvieweddashboard.php
@@ -28,6 +28,7 @@
 			LIMIT $max";
 	
 	$result = get_data($sql);
+	echo "
      $sql
      ";
 
 	$entities = array();
 	foreach($result as $entity) {
diff --git a/pages/flickr/error_log b/pages/flickr/error_log
new file mode 100644
index 000000000..716344052
--- /dev/null
+++ b/pages/flickr/error_log
@@ -0,0 +1,23 @@
+[06-Oct-2009 10:32:06] PHP Warning:  include_once(/home/gfroese/public_html/mod/engine/start.php) [function.include-once]: failed to open stream: No such file or directory in /home/gfroese/public_html/mod/tidypics/pages/flickr/setup.php on line 9
+[06-Oct-2009 10:32:06] PHP Warning:  include_once() [function.include]: Failed opening '/home/gfroese/public_html/mod/engine/start.php' for inclusion (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/gfroese/public_html/mod/tidypics/pages/flickr/setup.php on line 9
+[06-Oct-2009 10:32:06] PHP Fatal error:  Call to undefined function  get_loggedin_user() in /home/gfroese/public_html/mod/tidypics/pages/flickr/setup.php on line 11
+[06-Oct-2009 10:40:16] PHP Warning:  require_once(/home/gfroese/public_html/mod/lib/phpFlickr/phpFlickr.php) [function.require-once]: failed to open stream: No such file or directory in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 7
+[06-Oct-2009 10:40:16] PHP Fatal error:  require_once() [function.require]: Failed opening required '/home/gfroese/public_html/mod/lib/phpFlickr/phpFlickr.php' (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 7
+[06-Oct-2009 10:43:29] WARNING: 2009-10-06 10:43:29 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 18)
+[06-Oct-2009 10:44:07] WARNING: 2009-10-06 10:44:07 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 18)
+[06-Oct-2009 10:44:15] WARNING: 2009-10-06 10:44:15 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 18)
+[06-Oct-2009 11:08:35] WARNING: 2009-10-06 11:08:35 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 20)
+[06-Oct-2009 11:08:35] WARNING: 2009-10-06 11:08:35 (PDT): "Cannot modify header information - headers already sent by (output started at /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php:17)" in file /home/gfroese/public_html/mod/theme_simpleneutral/views/default/pageshells/pageshell.php (line 21)
+[06-Oct-2009 23:05:07] WARNING: 2009-10-06 23:05:07 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 20)
+[06-Oct-2009 23:05:08] WARNING: 2009-10-06 23:05:08 (PDT): "Cannot modify header information - headers already sent by (output started at /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php:17)" in file /home/gfroese/public_html/mod/theme_simpleneutral/views/default/pageshells/pageshell.php (line 21)
+[06-Oct-2009 23:05:16] WARNING: 2009-10-06 23:05:16 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 20)
+[06-Oct-2009 23:05:16] WARNING: 2009-10-06 23:05:16 (PDT): "Cannot modify header information - headers already sent by (output started at /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php:17)" in file /home/gfroese/public_html/mod/theme_simpleneutral/views/default/pageshells/pageshell.php (line 21)
+[06-Oct-2009 23:16:00] WARNING: 2009-10-06 23:16:00 (PDT): "Cannot modify header information - headers already sent by (output started at /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php:21)" in file /home/gfroese/public_html/mod/theme_simpleneutral/views/default/pageshells/pageshell.php (line 21)
+[06-Oct-2009 23:16:56] WARNING: 2009-10-06 23:16:56 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 18)
+[06-Oct-2009 23:29:07] WARNING: 2009-10-06 23:29:07 (PDT): "require_once(/home/gfroese/public_html/mod/lib/flickr.php) [function.require-once]: failed to open stream: No such file or directory" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 14)
+[06-Oct-2009 23:29:07] PHP Fatal error:  require_once() [function.require]: Failed opening required '/home/gfroese/public_html/mod/lib/flickr.php' (include_path='.:/usr/lib/php:/usr/local/lib/php:/home/gfroese/public_html/mod/tidypics/lib/phpFlickr/PEAR') in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 14
+[06-Oct-2009 23:29:22] PHP Warning:  include_once(/home/gfroese/public_html/mod/engine/start.php) [function.include-once]: failed to open stream: No such file or directory in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 8
+[06-Oct-2009 23:29:22] PHP Warning:  include_once() [function.include]: Failed opening '/home/gfroese/public_html/mod/engine/start.php' for inclusion (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 8
+[06-Oct-2009 23:29:22] PHP Fatal error:  Call to undefined function  elgg_view_title() in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 9
+[06-Oct-2009 23:30:08] WARNING: 2009-10-06 23:30:08 (PDT): "require_once(/home/gfroese/public_html/mod/tidypics/views/lib/flickr.php) [function.require-once]: failed to open stream: No such file or directory" in file /home/gfroese/public_html/mod/tidypics/views/default/tidypics/forms/setupFlickr.php (line 2)
+[06-Oct-2009 23:30:08] PHP Fatal error:  require_once() [function.require]: Failed opening required '/home/gfroese/public_html/mod/tidypics/views/lib/flickr.php' (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/gfroese/public_html/mod/tidypics/views/default/tidypics/forms/setupFlickr.php on line 2
diff --git a/pages/flickr/importPhotosets.php b/pages/flickr/importPhotosets.php
new file mode 100644
index 000000000..c9b4416e4
--- /dev/null
+++ b/pages/flickr/importPhotosets.php
@@ -0,0 +1,44 @@
+Click on the set you wish to import into this site.  Copies of the photos will be made and stored on this site where they can be viewed and commented on.";
+	
+	$viewer = get_loggedin_user();
+	
+	require_once dirname(dirname(dirname(__FILE__))) . "/lib/phpFlickr/phpFlickr.php";
+	require_once( dirname(dirname(dirname(__FILE__)))) . "/lib/flickr.php";
+	$f = new phpFlickr("26b2abba37182aca62fe0eb2c7782050");
+	
+	$viewer = get_loggedin_user();
+	$flickr_username = get_metadata_byname( $viewer->guid, "flickr_username" );
+	$flickr_id = get_metadata_byname( $viewer->guid, "flickr_id" );
+	
+	$photosets = $f->photosets_getList( $flickr_id->value );
+	foreach( $photosets["photoset"] as $photoset ) {
+		$body .= "
      ";
+		$body .= "$photoset[title]
      ";
+		
+		$count = 0;
+		$looper = 0;
+		//create links to import photos 10 at a time
+		while( $photoset["photos"] > $count ) {
+			$looper++;
+			$body .= " $looper";
+			$count = $count + 10;			
+		}
+		$body .= "
      $photoset[photos] images";
+		$body .= "
      ";
+//		echo "
      "; var_dump( $photoset ); echo "
      "; die;
+	}
+
+//	$body .= elgg_view("tidypics/forms/setupFlickr", array(), false, true );
+	flickr_menu();
+	page_draw( "Photoset Import", elgg_view_layout("two_column_left_sidebar", '', $body));
+	
+?>
\ No newline at end of file
diff --git a/pages/flickr/setup.php b/pages/flickr/setup.php
new file mode 100644
index 000000000..a2aa20db6
--- /dev/null
+++ b/pages/flickr/setup.php
@@ -0,0 +1,17 @@
+"; var_dump($body); echo "
      ";
+	page_draw( "Setup Flickr", elgg_view_layout("two_column_left_sidebar", '', $body));
+?>
\ No newline at end of file
diff --git a/pages/lists/flickr.php b/pages/lists/flickr.php
new file mode 100644
index 000000000..b9886042b
--- /dev/null
+++ b/pages/lists/flickr.php
@@ -0,0 +1,60 @@
+guid, "flickr_username" );
+if( empty( $flickr_username )) {
+	register_error( "No Flickr username set");
+	echo "
      No flickr username set: $temp_user->guid"; die;
+	forward( "/" );
+	die;
+}
+$flickr_user = $f->people_findByUsername( $flickr_username->value );
+
+// Get the friendly URL of the user's photos
+$photos_url = $f->urls_getUserPhotos( $flickr_user["id"] );
+
+if( !empty( $flickr_user )) {
+	$recent = $f->people_getPublicPhotos( $flickr_user['id'], NULL, NULL, 5 );
+} else {
+	echo "user not found"; die;
+}
+//echo "
      "; var_dump( $recent ); echo "
      ";
+
+//echo "
      "; var_dump( $user ); echo "
      ";
+$body = elgg_view_title( "Flickr photos for $flickr_user[username]" );
+
+$count = 0;
+foreach ($recent['photos']['photo'] as $photo) {
+	
+	$photo_info = $f->photos_getInfo( $photo["id"], $photo["secret"] );
+	$body .= "
      ";
+	$body .= "$photo_info[title]
      Views: $photo_info[views]
      ";
+	$body .= "";
+	$body .= "$photo[title]";
+	$body .= "";
+
+	$tag_count = 0;
+	$body .= "
      Tags:
      ";
+	foreach( $photo_info["tags"]["tag"] as $tag ) {
+		if( $tag_count ) $body .= ", ";
+		$body .= "$tag[_content]";
+		$tag_count++;
+	}
+	
+	$body .= "
      ";
+	$count++;
+}
+page_draw( "Flickr photos for $flickr_user[username]", elgg_view_layout("two_column_left_sidebar", '', $body));
+
+?>
\ No newline at end of file
diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 32320a5d2..615b05340 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -31,12 +31,14 @@
 	
 	// grab the html to display the images
 	$images = tp_list_entities("object", "image", $user_id, $max, false, false, true);
+//	echo "
      "; var_dump( $images ); echo "
      ";
 	$images .= '
      '; // hack until elgg fixes problem with css/list entities html
 	
 	
 	// this view takes care of the title on the main column and the content wrapper
 	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
-	
+	if( empty( $area2 )) $area2 = $images; 
+		
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	
 	page_draw($title, $body);
diff --git a/start.php b/start.php
index f0c35c62f..76daca066 100644
--- a/start.php
+++ b/start.php
@@ -185,6 +185,11 @@
 			add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
 								$CONFIG->wwwroot . 'pg/photos/recentlycommented',
 								'tidypics-z');
+			if( get_loggedin_userid() == 9 ) {
+			add_submenu_item(	'Flickr Integration',
+								$CONFIG->wwwroot . 'mod/tidypics/pages/setupFlickr.php',
+								'tidypics-z');
+			}
 
 		}
 		
@@ -315,6 +320,11 @@
 					if (isset($page[1])) set_input('guid',$page[1]);
 					include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
 				break;
+				
+				case "flickr":
+					if (isset($page[1])) set_input('username',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/lists/flickr.php");
+				break;
 			}
 		}
 		else
@@ -414,7 +424,9 @@
 		return $slideshow_link;
 	}
 	
-	
+	function tp_mostrecentimages($max = 8, $pagination = true) {
+		return list_entities("object", "image", 0, $max, false, false, $pagination);	
+	}
 	/**
 	 * Called before validating the security token on a download link
 	 * We don't need security as this is not a true action (it doesn't change any data)
@@ -446,5 +458,6 @@
 	register_action("tidypics/download", true, $CONFIG->pluginspath . "tidypics/actions/download.php");
 	register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
 	register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
+	register_action("tidypics/setupFlickr", true, $CONFIG->pluginspath . "tidypics/actions/setupFlickr.php");
 
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php
index 634c343bb..4c4a111f5 100644
--- a/views/default/tidypics/forms/edit_multi.php
+++ b/views/default/tidypics/forms/edit_multi.php
@@ -17,6 +17,7 @@
 		$entity = get_entity($file_guid);
 		$guid = $entity->guid;
 		$body = $entity->description;
+		$title = $entity->title;
 		$tags = $entity->tags;
 		$container_guid = $entity->container_guid;
 		
diff --git a/views/default/tidypics/forms/setupFlickr.php b/views/default/tidypics/forms/setupFlickr.php
new file mode 100644
index 000000000..cee94058e
--- /dev/null
+++ b/views/default/tidypics/forms/setupFlickr.php
@@ -0,0 +1,17 @@
+guid, "flickr_username" );
+
+$action = $vars['url'] . 'action/tidypics/flickrSetup';
+
+$form_body = "
      ";
+$form_body .= "Please enter your Flickr username here:

      ";
+$form_body .= "";
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
+
+flickr_menu();
+
+echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 9aa79bc38829f164bacc6b522278d0098b597933 Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Thu, 8 Oct 2009 04:55:29 +0000
Subject: removed debug and cleaned up TODO items

---
 actions/flickrImportPhotoset.php | 2 --
 mostvieweddashboard.php          | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php
index fe4041b2c..315d1009d 100644
--- a/actions/flickrImportPhotoset.php
+++ b/actions/flickrImportPhotoset.php
@@ -27,8 +27,6 @@ $photos_url = $f->urls_getUserPhotos( $flickr_id->value );
 $photos = $f->photosets_getPhotos( $set_id, null, null, 10, $page_pp );
 /* TODO:
 * 1. create album if a matching one doesn't exist
-* 2. create metadata for entity so it goes into the new album
-* 3. check for id of photo in image data to make sure we haven't downloaded it already
 */
 
 $photos_to_upload = array();
diff --git a/mostvieweddashboard.php b/mostvieweddashboard.php
index 33b050ffa..5e7dc41c2 100644
--- a/mostvieweddashboard.php
+++ b/mostvieweddashboard.php
@@ -28,7 +28,6 @@
 			LIMIT $max";
 	
 	$result = get_data($sql);
-	echo "
      $sql
      ";
 
 	$entities = array();
 	foreach($result as $entity) {
@@ -42,4 +41,4 @@
 	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3


From 71b4d8c3c3343455552a76756e5aaacd82034c4e Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Fri, 9 Oct 2009 03:23:52 +0000
Subject: flickr integration updates

---
 actions/flickrImportPhotoset.php             |  9 ++-------
 actions/flickrSetup.php                      |  6 ++++++
 lib/flickr.php                               |  2 +-
 pages/flickr/error_log                       |  1 +
 pages/flickr/importPhotosets.php             |  8 +++++++-
 start.php                                    |  2 +-
 views/default/tidypics/forms/setupFlickr.php | 27 ++++++++++++++++++++++++++-
 7 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php
index 315d1009d..d28ea8564 100644
--- a/actions/flickrImportPhotoset.php
+++ b/actions/flickrImportPhotoset.php
@@ -11,6 +11,7 @@ require_once dirname(dirname(__FILE__)) . "/lib/phpFlickr/phpFlickr.php";
 $f = new phpFlickr("26b2abba37182aca62fe0eb2c7782050");
 
 $set_id = get_input( "set_id" );
+$album_id = get_input( "album_id" );
 $page_pp = get_input( "page" );
 $return_url = get_input( "return_url" );
 $user = get_loggedin_user();
@@ -25,9 +26,6 @@ if( empty( $flickr_id )) {
 // Get the friendly URL of the user's photos
 $photos_url = $f->urls_getUserPhotos( $flickr_id->value );
 $photos = $f->photosets_getPhotos( $set_id, null, null, 10, $page_pp );
-/* TODO:
-* 1. create album if a matching one doesn't exist
-*/
 
 $photos_to_upload = array();
 foreach( $photos["photoset"]["photo"] as $photo ) {
@@ -76,10 +74,7 @@ gatekeeper();
 // Get common variables
 $access_id = (int) get_input("access_id");
 $container_guid = (int) get_input('container_guid', 0);
-$container_guid = 990; //force it to my test album for now
-
-if (!$container_guid)
-	$container_guid == $_SESSION['user']->getGUID();
+$container_guid = intval ($album_id);
 
 $album = get_entity($container_guid);
 
diff --git a/actions/flickrSetup.php b/actions/flickrSetup.php
index e272ee141..2a1f82315 100644
--- a/actions/flickrSetup.php
+++ b/actions/flickrSetup.php
@@ -6,6 +6,7 @@ require_once dirname(dirname(__FILE__)) . "/lib/phpFlickr/phpFlickr.php";
 $f = new phpFlickr("26b2abba37182aca62fe0eb2c7782050");
 
 $flickr_username = get_input( "flickr_username" );
+$album_id = get_input( "album_id" );
 $return_url = get_input( "return_url" );
 $user = get_loggedin_user();
 
@@ -18,9 +19,14 @@ if( empty( $flickr_username )) {
 	if( !empty( $flickr_user["id"] )) {
 		create_metadata( $user->guid, "flickr_username", $flickr_username, "text", $user->guid, ACCESS_PUBLIC );
 		create_metadata( $user->guid, "flickr_id", $flickr_user["id"], "text", $user->guid, ACCESS_PUBLIC );
+		if( $album_id ) {
+			create_metadata( $user->guid, "flickr_album_id", $album_id, "text", $user->guid, ACCESS_PUBLIC );
+			$album = get_entity( $album_id );
+		}
 		
 		system_message( "Successfully saved Flickr username of $flickr_username" );
 		system_message( "flickr user id: $flickr_user[id]" );
+		system_message( "Album saved - $album->title" );
 	} else {
 		register_error( "Username $flickr_username not found on Flickr" );
 	}
diff --git a/lib/flickr.php b/lib/flickr.php
index ec54e2867..48872c31f 100644
--- a/lib/flickr.php
+++ b/lib/flickr.php
@@ -1,7 +1,7 @@
 function.require-once]: failed to open stream: No such file or directory" in file /home/gfroese/public_html/mod/tidypics/views/default/tidypics/forms/setupFlickr.php (line 2)
 [06-Oct-2009 23:30:08] PHP Fatal error:  require_once() [function.require]: Failed opening required '/home/gfroese/public_html/mod/tidypics/views/lib/flickr.php' (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/gfroese/public_html/mod/tidypics/views/default/tidypics/forms/setupFlickr.php on line 2
+[08-Oct-2009 20:05:02] PHP Parse error:  syntax error, unexpected ')' in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 23
diff --git a/pages/flickr/importPhotosets.php b/pages/flickr/importPhotosets.php
index c9b4416e4..fe241439e 100644
--- a/pages/flickr/importPhotosets.php
+++ b/pages/flickr/importPhotosets.php
@@ -18,6 +18,12 @@
 	$viewer = get_loggedin_user();
 	$flickr_username = get_metadata_byname( $viewer->guid, "flickr_username" );
 	$flickr_id = get_metadata_byname( $viewer->guid, "flickr_id" );
+	$album_id = get_metadata_byname( $viewer->guid, "flickr_album_id" );
+	
+	if( intval( $album_id->value ) <= 0 ) {
+		register_error( "No album selected.  Please choose and save an album: $album_id->value" );
+		forward( "/mod/tidypics/pages/flickr/setup.php" );
+	}
 	
 	$photosets = $f->photosets_getList( $flickr_id->value );
 	foreach( $photosets["photoset"] as $photoset ) {
@@ -29,7 +35,7 @@
 		//create links to import photos 10 at a time
 		while( $photoset["photos"] > $count ) {
 			$looper++;
-			$body .= " $looper";
+			$body .= " $looper";
 			$count = $count + 10;			
 		}
 		$body .= "
      $photoset[photos] images";
diff --git a/start.php b/start.php
index 76daca066..9648915bd 100644
--- a/start.php
+++ b/start.php
@@ -458,6 +458,6 @@
 	register_action("tidypics/download", true, $CONFIG->pluginspath . "tidypics/actions/download.php");
 	register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
 	register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
-	register_action("tidypics/setupFlickr", true, $CONFIG->pluginspath . "tidypics/actions/setupFlickr.php");
+	register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");
 
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/forms/setupFlickr.php b/views/default/tidypics/forms/setupFlickr.php
index cee94058e..8ae7c27bb 100644
--- a/views/default/tidypics/forms/setupFlickr.php
+++ b/views/default/tidypics/forms/setupFlickr.php
@@ -3,12 +3,37 @@ require_once( dirname(dirname(dirname(dirname(dirname(__FILE__)))))) . "/lib/fli
 
 $user = get_loggedin_user();
 $flickr_username = get_metadata_byname( $user->guid, "flickr_username" );
+$flickr_album_id = get_metadata_byname( $user->guid, "flickr_album_id" );
 
 $action = $vars['url'] . 'action/tidypics/flickrSetup';
 
 $form_body = "
      ";
-$form_body .= "Please enter your Flickr username here:

      ";
+$form_body .= "Please enter your Flickr username here:  
      ";
 $form_body .= "";
+
+$albums = get_entities( "object", "album", $user->guid );
+$options = array( 0 => "Select album" );
+foreach( $albums as $album ) {
+	$title = $album->title;
+	switch( $album->access_id ) {
+		case ACCESS_PRIVATE:
+			$title .= " (private)";
+			break;
+		case ACCESS_PUBLIC:
+			$title .= " (public)";
+			break;
+		default:
+			$title .= " (not sure)";
+			break;
+	}
+	$options[$album->guid] = $title;
+}
+
+$form_body .= "
      Album to import photos to: ";
+$form_body .= elgg_view('input/pulldown', array('internalname' => 'album_id',
+												'options_values' => $options,
+												'value' => $flickr_album_id->value ));
+$form_body .= "
      ";
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
 
 flickr_menu();
-- 
cgit v1.2.3


From 1cb002d25005995ad2fa993fb94fceb19db8c40b Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Fri, 9 Oct 2009 03:27:30 +0000
Subject: removed error_log

---
 pages/flickr/error_log | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 pages/flickr/error_log

diff --git a/pages/flickr/error_log b/pages/flickr/error_log
deleted file mode 100644
index a55ce1ae7..000000000
--- a/pages/flickr/error_log
+++ /dev/null
@@ -1,24 +0,0 @@
-[06-Oct-2009 10:32:06] PHP Warning:  include_once(/home/gfroese/public_html/mod/engine/start.php) [function.include-once]: failed to open stream: No such file or directory in /home/gfroese/public_html/mod/tidypics/pages/flickr/setup.php on line 9
-[06-Oct-2009 10:32:06] PHP Warning:  include_once() [function.include]: Failed opening '/home/gfroese/public_html/mod/engine/start.php' for inclusion (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/gfroese/public_html/mod/tidypics/pages/flickr/setup.php on line 9
-[06-Oct-2009 10:32:06] PHP Fatal error:  Call to undefined function  get_loggedin_user() in /home/gfroese/public_html/mod/tidypics/pages/flickr/setup.php on line 11
-[06-Oct-2009 10:40:16] PHP Warning:  require_once(/home/gfroese/public_html/mod/lib/phpFlickr/phpFlickr.php) [function.require-once]: failed to open stream: No such file or directory in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 7
-[06-Oct-2009 10:40:16] PHP Fatal error:  require_once() [function.require]: Failed opening required '/home/gfroese/public_html/mod/lib/phpFlickr/phpFlickr.php' (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 7
-[06-Oct-2009 10:43:29] WARNING: 2009-10-06 10:43:29 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 18)
-[06-Oct-2009 10:44:07] WARNING: 2009-10-06 10:44:07 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 18)
-[06-Oct-2009 10:44:15] WARNING: 2009-10-06 10:44:15 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 18)
-[06-Oct-2009 11:08:35] WARNING: 2009-10-06 11:08:35 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 20)
-[06-Oct-2009 11:08:35] WARNING: 2009-10-06 11:08:35 (PDT): "Cannot modify header information - headers already sent by (output started at /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php:17)" in file /home/gfroese/public_html/mod/theme_simpleneutral/views/default/pageshells/pageshell.php (line 21)
-[06-Oct-2009 23:05:07] WARNING: 2009-10-06 23:05:07 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 20)
-[06-Oct-2009 23:05:08] WARNING: 2009-10-06 23:05:08 (PDT): "Cannot modify header information - headers already sent by (output started at /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php:17)" in file /home/gfroese/public_html/mod/theme_simpleneutral/views/default/pageshells/pageshell.php (line 21)
-[06-Oct-2009 23:05:16] WARNING: 2009-10-06 23:05:16 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 20)
-[06-Oct-2009 23:05:16] WARNING: 2009-10-06 23:05:16 (PDT): "Cannot modify header information - headers already sent by (output started at /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php:17)" in file /home/gfroese/public_html/mod/theme_simpleneutral/views/default/pageshells/pageshell.php (line 21)
-[06-Oct-2009 23:16:00] WARNING: 2009-10-06 23:16:00 (PDT): "Cannot modify header information - headers already sent by (output started at /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php:21)" in file /home/gfroese/public_html/mod/theme_simpleneutral/views/default/pageshells/pageshell.php (line 21)
-[06-Oct-2009 23:16:56] WARNING: 2009-10-06 23:16:56 (PDT): "Invalid argument supplied for foreach()" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 18)
-[06-Oct-2009 23:29:07] WARNING: 2009-10-06 23:29:07 (PDT): "require_once(/home/gfroese/public_html/mod/lib/flickr.php) [function.require-once]: failed to open stream: No such file or directory" in file /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php (line 14)
-[06-Oct-2009 23:29:07] PHP Fatal error:  require_once() [function.require]: Failed opening required '/home/gfroese/public_html/mod/lib/flickr.php' (include_path='.:/usr/lib/php:/usr/local/lib/php:/home/gfroese/public_html/mod/tidypics/lib/phpFlickr/PEAR') in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 14
-[06-Oct-2009 23:29:22] PHP Warning:  include_once(/home/gfroese/public_html/mod/engine/start.php) [function.include-once]: failed to open stream: No such file or directory in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 8
-[06-Oct-2009 23:29:22] PHP Warning:  include_once() [function.include]: Failed opening '/home/gfroese/public_html/mod/engine/start.php' for inclusion (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 8
-[06-Oct-2009 23:29:22] PHP Fatal error:  Call to undefined function  elgg_view_title() in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 9
-[06-Oct-2009 23:30:08] WARNING: 2009-10-06 23:30:08 (PDT): "require_once(/home/gfroese/public_html/mod/tidypics/views/lib/flickr.php) [function.require-once]: failed to open stream: No such file or directory" in file /home/gfroese/public_html/mod/tidypics/views/default/tidypics/forms/setupFlickr.php (line 2)
-[06-Oct-2009 23:30:08] PHP Fatal error:  require_once() [function.require]: Failed opening required '/home/gfroese/public_html/mod/tidypics/views/lib/flickr.php' (include_path='.:/usr/lib/php:/usr/local/lib/php') in /home/gfroese/public_html/mod/tidypics/views/default/tidypics/forms/setupFlickr.php on line 2
-[08-Oct-2009 20:05:02] PHP Parse error:  syntax error, unexpected ')' in /home/gfroese/public_html/mod/tidypics/pages/flickr/importPhotosets.php on line 23
-- 
cgit v1.2.3


From aef5c5a559959b3ffc1c1100752ba4a961ac432c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 13 Oct 2009 00:15:40 +0000
Subject: some browsers do not like a div tag closed right away

---
 pages/lists/mostrecentimages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 615b05340..270817178 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -32,7 +32,7 @@
 	// grab the html to display the images
 	$images = tp_list_entities("object", "image", $user_id, $max, false, false, true);
 //	echo "
      "; var_dump( $images ); echo "
      ";
-	$images .= '
      '; // hack until elgg fixes problem with css/list entities html
+	$images .= '
      '; // hack until elgg fixes problem with css/list entities html
 	
 	
 	// this view takes care of the title on the main column and the content wrapper
-- 
cgit v1.2.3


From 81b8ba32beb3151025d3b390c0621e074bceae36 Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Mon, 19 Oct 2009 05:34:47 +0000
Subject: flickr integration changes

---
 actions/flickrImportPhotoset.php             |  4 ++--
 actions/flickrSetup.php                      | 10 +++++-----
 languages/en.php                             | 21 ++++++++++++++++++++-
 lib/flickr.php                               |  4 ++--
 pages/flickr/importPhotosets.php             |  8 ++++----
 pages/flickr/setup.php                       |  4 ++--
 start.php                                    |  4 ++--
 views/default/tidypics/forms/setupFlickr.php | 14 +++++++-------
 8 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php
index d28ea8564..ec0d65b5d 100644
--- a/actions/flickrImportPhotoset.php
+++ b/actions/flickrImportPhotoset.php
@@ -18,7 +18,7 @@ $user = get_loggedin_user();
 $flickr_id = get_metadata_byname( $user->guid, "flickr_id" );
 
 if( empty( $flickr_id )) {
-	register_error( "You must enter a username" );
+	register_error( elgg_echo( 'flickr:errorusername2' ));
 	forward( $return_url );
 	die; //just in case
 }
@@ -33,7 +33,7 @@ foreach( $photos["photoset"]["photo"] as $photo ) {
 	//check if we already have this image
 	$meta = get_metadata_byname( $user->guid, $photo["id"] );
 	if( $meta->value == 1 ) { //we've downloaded this already
-		register_error( "This image has already been imported" );
+		register_error( elgg_echo( 'flickr:errorimageimport' ));
 		continue;
 	}
 	//store this so we don't download the same photo multiple times
diff --git a/actions/flickrSetup.php b/actions/flickrSetup.php
index 2a1f82315..fbc519b02 100644
--- a/actions/flickrSetup.php
+++ b/actions/flickrSetup.php
@@ -11,7 +11,7 @@ $return_url = get_input( "return_url" );
 $user = get_loggedin_user();
 
 if( empty( $flickr_username )) {
-	register_error( "You must enter a username" );
+	register_error( elgg_echo( 'flickr:enterusername' ));
 	forward( $return_url );
 	die; //just in case
 } else {
@@ -24,11 +24,11 @@ if( empty( $flickr_username )) {
 			$album = get_entity( $album_id );
 		}
 		
-		system_message( "Successfully saved Flickr username of $flickr_username" );
-		system_message( "flickr user id: $flickr_user[id]" );
-		system_message( "Album saved - $album->title" );
+		system_message( sprintf( elgg_echo( 'flickr:savedusername' ), $flickr_username ));
+		system_message( sprintf( elgg_echo( 'flickr:saveduserid' ), $flickr_user["id"] ));
+		system_message( sprintf( elgg_echo( 'flickr:savedalbum' ), $album->title ));
 	} else {
-		register_error( "Username $flickr_username not found on Flickr" );
+		register_error( sprintf( elgg_echo( 'flickr:errorusername' ), $flickr_username ));
 	}
 }
 
diff --git a/languages/en.php b/languages/en.php
index 4fc9bcd64..3d669fee8 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -49,7 +49,16 @@
 			'tidypics:viewsbyothers' => "(%s by you)",
 			'tidypics:administration' => 'Tidypics Administration',
 			'tidypics:stats' => 'Stats',
-
+			'flickr:setup' => 'Flickr Setup',
+			'flickr:usernamesetup' => 'Please enter your Flickr username here:',
+			'flickr:selectalbum' => 'Select album to import photos into',
+			'flickr:albumdesc' => 'Album to import photos to:',
+			'flickr:importmanager' => 'Photoset Import Manager',
+			'flickr:desc' => 'Click on the set you wish to import into this site.
      Copies of the photos will be made and stored on this site where they can be viewed and commented on.',
+			'flickr:intro' => 'Flickr Integration allows you to import photos from your flickr account into this Elgg site. By entering your username and choosing an album to import into, you can begin the process. 
      When you have saved your username and album selection, click on the ' . elgg_echo( 'flickr:menuimport' ) . ' link to the left to select which Flickr set you would like to import photos from.',
+			'flickr:menusetup' => 'Flickr Setup',
+			'flickr:menuimport' => 'Import Flickr Photos',
+			
 		//settings
 			'tidypics:settings' => 'Settings',
 			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
@@ -171,6 +180,11 @@ The photo can be viewed here: %s",
 			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
 
 			'tidypics:upgrade:success' => 'Upgrade of Tidypics a success',
+			
+			'flickr:enterusername' => 'You must enter a username',
+			'flickr:savedusername' => 'Successfully saved username of %s',
+			'flickr:saveduserid' => 'Successfully saved userid of %s',
+			'flickr:savedalbum' => 'Album saved - %s',
 
 		//Error messages
 
@@ -195,6 +209,11 @@ The photo can be viewed here: %s",
 			'album:blank' => "Please give this album a title and description.",
 
 			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed",
+			
+			'flickr:errorusername' => 'Username %s not found on Flickr',
+			'flickr:errorusername2' => 'You must enter a username',
+			'flickr:errorimageimport' => 'This image has already been imported',
+			'flickr:errornoalbum' => "No album selected.  Please choose and save an album: %s" 
 	);
 
 	add_translation("en",$english);
diff --git a/lib/flickr.php b/lib/flickr.php
index 48872c31f..effd186c4 100644
--- a/lib/flickr.php
+++ b/lib/flickr.php
@@ -1,8 +1,8 @@
 
\ No newline at end of file
diff --git a/pages/flickr/importPhotosets.php b/pages/flickr/importPhotosets.php
index fe241439e..a807a0782 100644
--- a/pages/flickr/importPhotosets.php
+++ b/pages/flickr/importPhotosets.php
@@ -6,8 +6,8 @@
 
 	// Load Elgg engine
 	include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
-	$body = elgg_view_title( "Photoset Import Manager" );
-	$body .= "
      Click on the set you wish to import into this site.  Copies of the photos will be made and stored on this site where they can be viewed and commented on.
      ";
+	$body = elgg_view_title( elgg_echo( 'flickr:importmanager' ));
+	$body .= "
      " . elgg_echo( 'flickr:desc' ) . "
      ";
 	
 	$viewer = get_loggedin_user();
 	
@@ -21,7 +21,7 @@
 	$album_id = get_metadata_byname( $viewer->guid, "flickr_album_id" );
 	
 	if( intval( $album_id->value ) <= 0 ) {
-		register_error( "No album selected.  Please choose and save an album: $album_id->value" );
+		register_error( sprintf( elgg_echo( 'flickr:errornoalbum' ), $album_id->value ));
 		forward( "/mod/tidypics/pages/flickr/setup.php" );
 	}
 	
@@ -45,6 +45,6 @@
 
 //	$body .= elgg_view("tidypics/forms/setupFlickr", array(), false, true );
 	flickr_menu();
-	page_draw( "Photoset Import", elgg_view_layout("two_column_left_sidebar", '', $body));
+	page_draw( elgg_echo( 'flickr:importmanager' ), elgg_view_layout("two_column_left_sidebar", '', $body));
 	
 ?>
\ No newline at end of file
diff --git a/pages/flickr/setup.php b/pages/flickr/setup.php
index a2aa20db6..1de8c29c2 100644
--- a/pages/flickr/setup.php
+++ b/pages/flickr/setup.php
@@ -10,8 +10,8 @@
 	
 	$viewer = get_loggedin_user();
 	
-	$body = elgg_view_title( "Setup Flickr" );
+	$body = elgg_view_title( elgg_echo( 'flickr:setup') );
 	$body .= elgg_view("tidypics/forms/setupFlickr", array(), false, true );
 //	echo "
      "; var_dump($body); echo "
      ";
-	page_draw( "Setup Flickr", elgg_view_layout("two_column_left_sidebar", '', $body));
+	page_draw( elgg_echo( 'flickr:setup'), elgg_view_layout("two_column_left_sidebar", '', $body));
 ?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 9648915bd..466c14be8 100644
--- a/start.php
+++ b/start.php
@@ -187,7 +187,7 @@
 								'tidypics-z');
 			if( get_loggedin_userid() == 9 ) {
 			add_submenu_item(	'Flickr Integration',
-								$CONFIG->wwwroot . 'mod/tidypics/pages/setupFlickr.php',
+								$CONFIG->wwwroot . 'mod/tidypics/pages/flickr/setup.php',
 								'tidypics-z');
 			}
 
@@ -323,7 +323,7 @@
 				
 				case "flickr":
 					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/lists/flickr.php");
+					include($CONFIG->pluginspath . "tidypics/pages/flickr/setup.php");
 				break;
 			}
 		}
diff --git a/views/default/tidypics/forms/setupFlickr.php b/views/default/tidypics/forms/setupFlickr.php
index 8ae7c27bb..8c31d0883 100644
--- a/views/default/tidypics/forms/setupFlickr.php
+++ b/views/default/tidypics/forms/setupFlickr.php
@@ -7,29 +7,29 @@ $flickr_album_id = get_metadata_byname( $user->guid, "flickr_album_id" );
 
 $action = $vars['url'] . 'action/tidypics/flickrSetup';
 
-$form_body = "
      ";
-$form_body .= "Please enter your Flickr username here:  
      ";
+$form_body = "
      ". elgg_echo( 'flickr:intro' ) . "
      ";
+$form_body .= elgg_echo( 'flickr:usernamesetup') . "  
      ";
 $form_body .= "";
 
 $albums = get_entities( "object", "album", $user->guid );
-$options = array( 0 => "Select album" );
+$options = array( 0 => elgg_echo( 'flickr:selectalbum' ));
 foreach( $albums as $album ) {
 	$title = $album->title;
 	switch( $album->access_id ) {
 		case ACCESS_PRIVATE:
-			$title .= " (private)";
+			$title .= " (" . elgg_echo( 'private' ) . ")";
 			break;
 		case ACCESS_PUBLIC:
-			$title .= " (public)";
+			$title .= " (" . elgg_echo( 'public' ) . ")";
 			break;
 		default:
-			$title .= " (not sure)";
+			$title .= " (no known permission set)";
 			break;
 	}
 	$options[$album->guid] = $title;
 }
 
-$form_body .= "
      Album to import photos to: ";
+$form_body .= "
      " . elgg_echo( 'flickr:albumdesc' );
 $form_body .= elgg_view('input/pulldown', array('internalname' => 'album_id',
 												'options_values' => $options,
 												'value' => $flickr_album_id->value ));
-- 
cgit v1.2.3


From 719004142b57009e34dd5c75aa9ea73287189fe1 Mon Sep 17 00:00:00 2001
From: Greg Froese 
Date: Mon, 19 Oct 2009 05:36:57 +0000
Subject: flickr integration changes

---
 start.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/start.php b/start.php
index 466c14be8..54322d8c9 100644
--- a/start.php
+++ b/start.php
@@ -185,11 +185,9 @@
 			add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
 								$CONFIG->wwwroot . 'pg/photos/recentlycommented',
 								'tidypics-z');
-			if( get_loggedin_userid() == 9 ) {
 			add_submenu_item(	'Flickr Integration',
 								$CONFIG->wwwroot . 'mod/tidypics/pages/flickr/setup.php',
 								'tidypics-z');
-			}
 
 		}
 		
-- 
cgit v1.2.3


From e9c3929aa22606f4974a3f721c2156ec4efcf36b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 1 Nov 2009 22:20:36 +0000
Subject: fixed the 2 short tags in the image menu

---
 views/default/tidypics/image_menu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 299f4b026..5e6053a94 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -30,14 +30,14 @@
 		// only owner and friends of owner can tag
 		if ($can_tag) {
 ?>
-
      24. 
+
      25. 
 guid == $owner->guid) {
 ?>
-
      26. 
+
      27. 
 
Date: Sun, 1 Nov 2009 23:25:25 +0000
Subject: fixed some display issues with the common lists

---
 lib/tidypics.php                   | 20 +++++++++++-
 pages/lists/mostrecentimages.php   |  2 --
 pages/lists/mostviewedimages.php   |  9 +++++-
 pages/lists/recentlycommented.php  |  9 +++++-
 pages/lists/recentlyviewed.php     |  9 +++++-
 pages/lists/yourmostviewed.php     |  9 +++++-
 views/default/tidypics/gallery.php | 64 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 115 insertions(+), 7 deletions(-)
 create mode 100644 views/default/tidypics/gallery.php

diff --git a/lib/tidypics.php b/lib/tidypics.php
index 38afc27f2..a5b713ee4 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -169,8 +169,26 @@
 		$count = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true);
 		$entities = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset);
 
-		return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
+		return tp_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
+	}
+	
+	function tp_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = false, $pagination = true) {
+		$context = get_context();
+
+		$html = elgg_view('tidypics/gallery',array(
+			'entities' => $entities,
+			'count' => $count,
+			'offset' => $offset,
+			'limit' => $limit,
+			'baseurl' => $_SERVER['REQUEST_URI'],
+			'fullview' => $fullview,
+			'context' => $context,
+			'viewtypetoggle' => $viewtypetoggle,
+			'viewtype' => get_input('search_viewtype','list'),
+			'pagination' => $pagination
+		));
 		
+		return $html;
 	}
 	
 	/**
diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 270817178..5f5116513 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -31,8 +31,6 @@
 	
 	// grab the html to display the images
 	$images = tp_list_entities("object", "image", $user_id, $max, false, false, true);
-//	echo "
      "; var_dump( $images ); echo "
      ";
-	$images .= '
      '; // hack until elgg fixes problem with css/list entities html
 	
 	
 	// this view takes care of the title on the main column and the content wrapper
diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index da8a20b5f..b8cc67b51 100644
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -35,7 +35,14 @@
 	}
 	$title = elgg_echo("tidypics:mostviewed");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+	
+	// grab the html to display the images
+	$images = tp_view_entity_list($entities, $max, 0, $max, false);
+	
+	// this view takes care of the title on the main column and the content wrapper
+	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+	if( empty( $area2 )) $area2 = $images;	
+	
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index fd1a24454..962732dba 100644
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -46,7 +46,14 @@
 	}
 	$title = elgg_echo("tidypics:recentlycommented");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+	
+	// grab the html to display the images
+	$images = tp_view_entity_list($entities, $max, 0, $max, false);
+	
+	// this view takes care of the title on the main column and the content wrapper
+	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+	if( empty( $area2 )) $area2 = $images;
+		
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/recentlyviewed.php b/pages/lists/recentlyviewed.php
index 6189b07de..1fa1be0ea 100644
--- a/pages/lists/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -39,7 +39,14 @@
 	
 	$title = elgg_echo("tidypics:recentlyviewed");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+	
+	// grab the html to display the images
+	$images = tp_view_entity_list($entities, $max, 0, $max, false);
+	
+	// this view takes care of the title on the main column and the content wrapper
+	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+	if( empty( $area2 )) $area2 = $images;
+	
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/lists/yourmostviewed.php b/pages/lists/yourmostviewed.php
index b00ddafa1..9155c4454 100644
--- a/pages/lists/yourmostviewed.php
+++ b/pages/lists/yourmostviewed.php
@@ -36,7 +36,14 @@
 	
 	$title = elgg_echo("tidypics:yourmostviewed");
 	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+	
+	// grab the html to display the images
+	$images = tp_view_entity_list($entities, $max, 0, $max, false);
+	
+	// this view takes care of the title on the main column and the content wrapper
+	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+	if( empty( $area2 )) $area2 = $images;
+		
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/gallery.php b/views/default/tidypics/gallery.php
new file mode 100644
index 000000000..29c706bb1
--- /dev/null
+++ b/views/default/tidypics/gallery.php
@@ -0,0 +1,64 @@
+ 0 && $viewtypetoggle) {
+	$nav .= elgg_view('navigation/viewtype', array(
+		'baseurl' => $baseurl,
+		'offset' => $offset,
+		'count' => $count,
+		'viewtype' => $viewtype,
+	));
+}
+
+if ($pagination) {
+	$nav .= elgg_view('navigation/pagination',array(
+		'baseurl' => $baseurl,
+		'offset' => $offset,
+		'count' => $count,
+		'limit' => $limit,
+	));
+}
+
+$html .= $nav;
+if ($viewtype == 'list') {
+	if (is_array($entities) && sizeof($entities) > 0) {
+		foreach($entities as $entity) {
+			$html .= elgg_view_entity($entity, $fullview);
+		}
+	}
+} else {
+	if (is_array($entities) && sizeof($entities) > 0) {
+		$html .= elgg_view('entities/gallery', array('entities' => $entities));
+	}
+}
+
+$html .= '
      ';
+
+if ($count) {
+	$html .= $nav;
+}
+
+echo $html;
\ No newline at end of file
-- 
cgit v1.2.3


From 44bb46bc39a0a6c47858c98837a1a39758edac08 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 3 Nov 2009 12:27:55 +0000
Subject: added lytebox since PicLensLite falls back on it if flash is not
 installed

---
 vendors/lytebox/images/blank.gif       | Bin 0 -> 43 bytes
 vendors/lytebox/images/close_blue.png  | Bin 0 -> 1788 bytes
 vendors/lytebox/images/close_gold.png  | Bin 0 -> 1652 bytes
 vendors/lytebox/images/close_green.png | Bin 0 -> 1525 bytes
 vendors/lytebox/images/close_grey.png  | Bin 0 -> 1715 bytes
 vendors/lytebox/images/close_red.png   | Bin 0 -> 1525 bytes
 vendors/lytebox/images/loading.gif     | Bin 0 -> 2767 bytes
 vendors/lytebox/images/next_blue.gif   | Bin 0 -> 733 bytes
 vendors/lytebox/images/next_gold.gif   | Bin 0 -> 732 bytes
 vendors/lytebox/images/next_green.gif  | Bin 0 -> 732 bytes
 vendors/lytebox/images/next_grey.gif   | Bin 0 -> 731 bytes
 vendors/lytebox/images/next_red.gif    | Bin 0 -> 732 bytes
 vendors/lytebox/images/pause_blue.png  | Bin 0 -> 1357 bytes
 vendors/lytebox/images/pause_gold.png  | Bin 0 -> 1207 bytes
 vendors/lytebox/images/pause_green.png | Bin 0 -> 1149 bytes
 vendors/lytebox/images/pause_grey.png  | Bin 0 -> 1282 bytes
 vendors/lytebox/images/pause_red.png   | Bin 0 -> 1133 bytes
 vendors/lytebox/images/play_blue.png   | Bin 0 -> 1231 bytes
 vendors/lytebox/images/play_gold.png   | Bin 0 -> 1141 bytes
 vendors/lytebox/images/play_green.png  | Bin 0 -> 1097 bytes
 vendors/lytebox/images/play_grey.png   | Bin 0 -> 1178 bytes
 vendors/lytebox/images/play_red.png    | Bin 0 -> 1079 bytes
 vendors/lytebox/images/prev_blue.gif   | Bin 0 -> 748 bytes
 vendors/lytebox/images/prev_gold.gif   | Bin 0 -> 748 bytes
 vendors/lytebox/images/prev_green.gif  | Bin 0 -> 748 bytes
 vendors/lytebox/images/prev_grey.gif   | Bin 0 -> 748 bytes
 vendors/lytebox/images/prev_red.gif    | Bin 0 -> 748 bytes
 vendors/lytebox/lytebox.css            |  93 ++++
 vendors/lytebox/lytebox.js             | 843 +++++++++++++++++++++++++++++++++
 29 files changed, 936 insertions(+)
 create mode 100644 vendors/lytebox/images/blank.gif
 create mode 100644 vendors/lytebox/images/close_blue.png
 create mode 100644 vendors/lytebox/images/close_gold.png
 create mode 100644 vendors/lytebox/images/close_green.png
 create mode 100644 vendors/lytebox/images/close_grey.png
 create mode 100644 vendors/lytebox/images/close_red.png
 create mode 100644 vendors/lytebox/images/loading.gif
 create mode 100644 vendors/lytebox/images/next_blue.gif
 create mode 100644 vendors/lytebox/images/next_gold.gif
 create mode 100644 vendors/lytebox/images/next_green.gif
 create mode 100644 vendors/lytebox/images/next_grey.gif
 create mode 100644 vendors/lytebox/images/next_red.gif
 create mode 100644 vendors/lytebox/images/pause_blue.png
 create mode 100644 vendors/lytebox/images/pause_gold.png
 create mode 100644 vendors/lytebox/images/pause_green.png
 create mode 100644 vendors/lytebox/images/pause_grey.png
 create mode 100644 vendors/lytebox/images/pause_red.png
 create mode 100644 vendors/lytebox/images/play_blue.png
 create mode 100644 vendors/lytebox/images/play_gold.png
 create mode 100644 vendors/lytebox/images/play_green.png
 create mode 100644 vendors/lytebox/images/play_grey.png
 create mode 100644 vendors/lytebox/images/play_red.png
 create mode 100644 vendors/lytebox/images/prev_blue.gif
 create mode 100644 vendors/lytebox/images/prev_gold.gif
 create mode 100644 vendors/lytebox/images/prev_green.gif
 create mode 100644 vendors/lytebox/images/prev_grey.gif
 create mode 100644 vendors/lytebox/images/prev_red.gif
 create mode 100644 vendors/lytebox/lytebox.css
 create mode 100644 vendors/lytebox/lytebox.js

diff --git a/vendors/lytebox/images/blank.gif b/vendors/lytebox/images/blank.gif
new file mode 100644
index 000000000..1d11fa9ad
Binary files /dev/null and b/vendors/lytebox/images/blank.gif differ
diff --git a/vendors/lytebox/images/close_blue.png b/vendors/lytebox/images/close_blue.png
new file mode 100644
index 000000000..297368c82
Binary files /dev/null and b/vendors/lytebox/images/close_blue.png differ
diff --git a/vendors/lytebox/images/close_gold.png b/vendors/lytebox/images/close_gold.png
new file mode 100644
index 000000000..d1b847694
Binary files /dev/null and b/vendors/lytebox/images/close_gold.png differ
diff --git a/vendors/lytebox/images/close_green.png b/vendors/lytebox/images/close_green.png
new file mode 100644
index 000000000..83909e2d7
Binary files /dev/null and b/vendors/lytebox/images/close_green.png differ
diff --git a/vendors/lytebox/images/close_grey.png b/vendors/lytebox/images/close_grey.png
new file mode 100644
index 000000000..bc83ac55e
Binary files /dev/null and b/vendors/lytebox/images/close_grey.png differ
diff --git a/vendors/lytebox/images/close_red.png b/vendors/lytebox/images/close_red.png
new file mode 100644
index 000000000..3d835bb30
Binary files /dev/null and b/vendors/lytebox/images/close_red.png differ
diff --git a/vendors/lytebox/images/loading.gif b/vendors/lytebox/images/loading.gif
new file mode 100644
index 000000000..f864d5fd3
Binary files /dev/null and b/vendors/lytebox/images/loading.gif differ
diff --git a/vendors/lytebox/images/next_blue.gif b/vendors/lytebox/images/next_blue.gif
new file mode 100644
index 000000000..4666e44d3
Binary files /dev/null and b/vendors/lytebox/images/next_blue.gif differ
diff --git a/vendors/lytebox/images/next_gold.gif b/vendors/lytebox/images/next_gold.gif
new file mode 100644
index 000000000..c5ba21f5c
Binary files /dev/null and b/vendors/lytebox/images/next_gold.gif differ
diff --git a/vendors/lytebox/images/next_green.gif b/vendors/lytebox/images/next_green.gif
new file mode 100644
index 000000000..85a1433b8
Binary files /dev/null and b/vendors/lytebox/images/next_green.gif differ
diff --git a/vendors/lytebox/images/next_grey.gif b/vendors/lytebox/images/next_grey.gif
new file mode 100644
index 000000000..f1773cd19
Binary files /dev/null and b/vendors/lytebox/images/next_grey.gif differ
diff --git a/vendors/lytebox/images/next_red.gif b/vendors/lytebox/images/next_red.gif
new file mode 100644
index 000000000..4ddff3dae
Binary files /dev/null and b/vendors/lytebox/images/next_red.gif differ
diff --git a/vendors/lytebox/images/pause_blue.png b/vendors/lytebox/images/pause_blue.png
new file mode 100644
index 000000000..3d4e34f68
Binary files /dev/null and b/vendors/lytebox/images/pause_blue.png differ
diff --git a/vendors/lytebox/images/pause_gold.png b/vendors/lytebox/images/pause_gold.png
new file mode 100644
index 000000000..ee529699c
Binary files /dev/null and b/vendors/lytebox/images/pause_gold.png differ
diff --git a/vendors/lytebox/images/pause_green.png b/vendors/lytebox/images/pause_green.png
new file mode 100644
index 000000000..c52f28c1c
Binary files /dev/null and b/vendors/lytebox/images/pause_green.png differ
diff --git a/vendors/lytebox/images/pause_grey.png b/vendors/lytebox/images/pause_grey.png
new file mode 100644
index 000000000..1c2e9e0b2
Binary files /dev/null and b/vendors/lytebox/images/pause_grey.png differ
diff --git a/vendors/lytebox/images/pause_red.png b/vendors/lytebox/images/pause_red.png
new file mode 100644
index 000000000..5ee4dcf5c
Binary files /dev/null and b/vendors/lytebox/images/pause_red.png differ
diff --git a/vendors/lytebox/images/play_blue.png b/vendors/lytebox/images/play_blue.png
new file mode 100644
index 000000000..c8cd259c4
Binary files /dev/null and b/vendors/lytebox/images/play_blue.png differ
diff --git a/vendors/lytebox/images/play_gold.png b/vendors/lytebox/images/play_gold.png
new file mode 100644
index 000000000..766d6513c
Binary files /dev/null and b/vendors/lytebox/images/play_gold.png differ
diff --git a/vendors/lytebox/images/play_green.png b/vendors/lytebox/images/play_green.png
new file mode 100644
index 000000000..6e832a438
Binary files /dev/null and b/vendors/lytebox/images/play_green.png differ
diff --git a/vendors/lytebox/images/play_grey.png b/vendors/lytebox/images/play_grey.png
new file mode 100644
index 000000000..8e18760be
Binary files /dev/null and b/vendors/lytebox/images/play_grey.png differ
diff --git a/vendors/lytebox/images/play_red.png b/vendors/lytebox/images/play_red.png
new file mode 100644
index 000000000..887d64496
Binary files /dev/null and b/vendors/lytebox/images/play_red.png differ
diff --git a/vendors/lytebox/images/prev_blue.gif b/vendors/lytebox/images/prev_blue.gif
new file mode 100644
index 000000000..beba13ef5
Binary files /dev/null and b/vendors/lytebox/images/prev_blue.gif differ
diff --git a/vendors/lytebox/images/prev_gold.gif b/vendors/lytebox/images/prev_gold.gif
new file mode 100644
index 000000000..b48193258
Binary files /dev/null and b/vendors/lytebox/images/prev_gold.gif differ
diff --git a/vendors/lytebox/images/prev_green.gif b/vendors/lytebox/images/prev_green.gif
new file mode 100644
index 000000000..2d4e14e52
Binary files /dev/null and b/vendors/lytebox/images/prev_green.gif differ
diff --git a/vendors/lytebox/images/prev_grey.gif b/vendors/lytebox/images/prev_grey.gif
new file mode 100644
index 000000000..a7f2260a5
Binary files /dev/null and b/vendors/lytebox/images/prev_grey.gif differ
diff --git a/vendors/lytebox/images/prev_red.gif b/vendors/lytebox/images/prev_red.gif
new file mode 100644
index 000000000..f702e6333
Binary files /dev/null and b/vendors/lytebox/images/prev_red.gif differ
diff --git a/vendors/lytebox/lytebox.css b/vendors/lytebox/lytebox.css
new file mode 100644
index 000000000..5303fac1b
--- /dev/null
+++ b/vendors/lytebox/lytebox.css
@@ -0,0 +1,93 @@
+#lbOverlay { position: fixed; top: 0; left: 0; z-index: 99998; width: 100%; height: 500px; }
+	#lbOverlay.grey { background-color: #000000; }
+	#lbOverlay.red { background-color: #330000; }
+	#lbOverlay.green { background-color: #003300; }
+	#lbOverlay.blue { background-color: #011D50; }
+	#lbOverlay.gold { background-color: #666600; }
+
+#lbMain { position: absolute; left: 0; width: 100%; z-index: 99999; text-align: center; line-height: 0; }
+#lbMain a img { border: none; }
+
+#lbOuterContainer { position: relative; background-color: #fff; width: 200px; height: 200px; margin: 0 auto; }
+	#lbOuterContainer.grey { border: 3px solid #888888; }
+	#lbOuterContainer.red { border: 3px solid #DD0000; }
+	#lbOuterContainer.green { border: 3px solid #00B000; }
+	#lbOuterContainer.blue { border: 3px solid #5F89D8; }
+	#lbOuterContainer.gold { border: 3px solid #B0B000; }
+
+#lbDetailsContainer {	font: 10px Verdana, Helvetica, sans-serif; background-color: #fff; width: 100%; line-height: 1.4em;	overflow: auto; margin: 0 auto; }
+	#lbDetailsContainer.grey { border: 3px solid #888888; border-top: none; }
+	#lbDetailsContainer.red { border: 3px solid #DD0000; border-top: none; }
+	#lbDetailsContainer.green { border: 3px solid #00B000; border-top: none; }
+	#lbDetailsContainer.blue { border: 3px solid #5F89D8; border-top: none; }
+	#lbDetailsContainer.gold { border: 3px solid #B0B000; border-top: none; }
+
+#lbImageContainer, #lbIframeContainer { padding: 10px; }
+#lbLoading {
+	position: absolute; top: 45%; left: 0%; height: 32px; width: 100%; text-align: center; line-height: 0; background: url(images/loading.gif) center no-repeat;
+}
+
+#lbHoverNav { position: absolute; top: 0; left: 0; height: 100%; width: 100%; z-index: 10; }
+#lbImageContainer>#lbHoverNav { left: 0; }
+#lbHoverNav a { outline: none; }
+
+#lbPrev { width: 49%; height: 100%; background: transparent url(images/blank.gif) no-repeat; display: block; left: 0; float: left; }
+	#lbPrev.grey:hover, #lbPrev.grey:visited:hover { background: url(images/prev_grey.gif) left 15% no-repeat; }
+	#lbPrev.red:hover, #lbPrev.red:visited:hover { background: url(images/prev_red.gif) left 15% no-repeat; }
+	#lbPrev.green:hover, #lbPrev.green:visited:hover { background: url(images/prev_green.gif) left 15% no-repeat; }
+	#lbPrev.blue:hover, #lbPrev.blue:visited:hover { background: url(images/prev_blue.gif) left 15% no-repeat; }
+	#lbPrev.gold:hover, #lbPrev.gold:visited:hover { background: url(images/prev_gold.gif) left 15% no-repeat; }
+	
+#lbNext { width: 49%; height: 100%; background: transparent url(images/blank.gif) no-repeat; display: block; right: 0; float: right; }
+	#lbNext.grey:hover, #lbNext.grey:visited:hover { background: url(images/next_grey.gif) right 15% no-repeat; }
+	#lbNext.red:hover, #lbNext.red:visited:hover { background: url(images/next_red.gif) right 15% no-repeat; }
+	#lbNext.green:hover, #lbNext.green:visited:hover { background: url(images/next_green.gif) right 15% no-repeat; }
+	#lbNext.blue:hover, #lbNext.blue:visited:hover { background: url(images/next_blue.gif) right 15% no-repeat; }
+	#lbNext.gold:hover, #lbNext.gold:visited:hover { background: url(images/next_gold.gif) right 15% no-repeat; }
+
+#lbPrev2, #lbNext2 { text-decoration: none; font-weight: bold; }
+	#lbPrev2.grey, #lbNext2.grey, #lbSpacer.grey { color: #333333; }
+	#lbPrev2.red, #lbNext2.red, #lbSpacer.red { color: #620000; }
+	#lbPrev2.green, #lbNext2.green, #lbSpacer.green { color: #003300; }
+	#lbPrev2.blue, #lbNext2.blue, #lbSpacer.blue { color: #01379E; }
+	#lbPrev2.gold, #lbNext2.gold, #lbSpacer.gold { color: #666600; }
+	
+#lbPrev2_Off, #lbNext2_Off { font-weight: bold; }
+	#lbPrev2_Off.grey, #lbNext2_Off.grey { color: #CCCCCC; }
+	#lbPrev2_Off.red, #lbNext2_Off.red { color: #FFCCCC; }
+	#lbPrev2_Off.green, #lbNext2_Off.green { color: #82FF82; }
+	#lbPrev2_Off.blue, #lbNext2_Off.blue { color: #B7CAEE; }
+	#lbPrev2_Off.gold, #lbNext2_Off.gold { color: #E1E100; }
+	
+#lbDetailsData { padding: 0 10px; }
+	#lbDetailsData.grey { color: #333333; }
+	#lbDetailsData.red { color: #620000; }
+	#lbDetailsData.green { color: #003300; }
+	#lbDetailsData.blue { color: #01379E; }
+	#lbDetailsData.gold { color: #666600; }
+
+#lbDetails { width: 60%; float: left; text-align: left; }
+#lbCaption { display: block; font-weight: bold; }
+#lbNumberDisplay { float: left; display: block; padding-bottom: 1.0em; }
+#lbNavDisplay { float: left; display: block; padding-bottom: 1.0em; }
+
+#lbClose { width: 64px; height: 28px; float: right; margin-bottom: 1px; }
+	#lbClose.grey { background: url(images/close_grey.png) no-repeat; }
+	#lbClose.red { background: url(images/close_red.png) no-repeat; }
+	#lbClose.green { background: url(images/close_green.png) no-repeat; }
+	#lbClose.blue { background: url(images/close_blue.png) no-repeat; }
+	#lbClose.gold { background: url(images/close_gold.png) no-repeat; }
+
+#lbPlay { width: 64px; height: 28px; float: right; margin-bottom: 1px; }
+	#lbPlay.grey { background: url(images/play_grey.png) no-repeat; }
+	#lbPlay.red { background: url(images/play_red.png) no-repeat; }
+	#lbPlay.green { background: url(images/play_green.png) no-repeat; }
+	#lbPlay.blue { background: url(images/play_blue.png) no-repeat; }
+	#lbPlay.gold { background: url(images/play_gold.png) no-repeat; }
+	
+#lbPause { width: 64px; height: 28px; float: right; margin-bottom: 1px; }
+	#lbPause.grey { background: url(images/pause_grey.png) no-repeat; }
+	#lbPause.red { background: url(images/pause_red.png) no-repeat; }
+	#lbPause.green { background: url(images/pause_green.png) no-repeat; }
+	#lbPause.blue { background: url(images/pause_blue.png) no-repeat; }
+	#lbPause.gold { background: url(images/pause_gold.png) no-repeat; }
\ No newline at end of file
diff --git a/vendors/lytebox/lytebox.js b/vendors/lytebox/lytebox.js
new file mode 100644
index 000000000..1cf7210d0
--- /dev/null
+++ b/vendors/lytebox/lytebox.js
@@ -0,0 +1,843 @@
+//***********************************************************************************************************************************/
+//	LyteBox v3.22
+//
+//	 Author: Markus F. Hay
+//  Website: http://www.dolem.com/lytebox
+//	   Date: October 2, 2007
+//	License: Creative Commons Attribution 3.0 License (http://creativecommons.org/licenses/by/3.0/)
+// Browsers: Tested successfully on WinXP with the following browsers (using no DOCTYPE and Strict/Transitional/Loose DOCTYPES):
+//				* Firefox: 2.0.0.7, 1.5.0.12
+//				* Internet Explorer: 7.0, 6.0 SP2, 5.5 SP2
+//				* Opera: 9.23
+//
+// Releases: For up-to-date and complete release information, visit http://www.dolem.com/forum/showthread.php?tid=62
+//				* v3.22 (10/02/07)
+//				* v3.21 (09/30/07)
+//				* v3.20 (07/12/07)
+//				* v3.10 (05/28/07)
+//				* v3.00 (05/15/07)
+//				* v2.02 (11/13/06)
+//
+//   Credit: LyteBox was originally derived from the Lightbox class (v2.02) that was written by Lokesh Dhakar. For more
+//			 information please visit http://huddletogether.com/projects/lightbox2/
+//***********************************************************************************************************************************/
+Array.prototype.removeDuplicates = function () { for (var i = 1; i < this.length; i++) { if (this[i][0] == this[i-1][0]) { this.splice(i,1); } } }
+Array.prototype.empty = function () { for (var i = 0; i <= this.length; i++) { this.shift(); } }
+String.prototype.trim = function () { return this.replace(/^\s+|\s+$/g, ''); }
+
+function LyteBox() {
+	/*** Start Global Configuration ***/
+		this.theme				= 'grey';	// themes: grey (default), red, green, blue, gold
+		this.hideFlash			= true;		// controls whether or not Flash objects should be hidden
+		this.outerBorder		= true;		// controls whether to show the outer grey (or theme) border
+		this.resizeSpeed		= 8;		// controls the speed of the image resizing (1=slowest and 10=fastest)
+		this.maxOpacity			= 80;		// higher opacity = darker overlay, lower opacity = lighter overlay
+		this.navType			= 1;		// 1 = "Prev/Next" buttons on top left and left (default), 2 = "<< prev | next >>" links next to image number
+		this.autoResize			= true;		// controls whether or not images should be resized if larger than the browser window dimensions
+		this.doAnimations		= true;		// controls whether or not "animate" Lytebox, i.e. resize transition between images, fade in/out effects, etc.
+		
+		this.borderSize			= 12;		// if you adjust the padding in the CSS, you will need to update this variable -- otherwise, leave this alone...
+	/*** End Global Configuration ***/
+	
+	/*** Configure Slideshow Options ***/
+		this.slideInterval		= 4000;		// Change value (milliseconds) to increase/decrease the time between "slides" (10000 = 10 seconds)
+		this.showNavigation		= true;		// true to display Next/Prev buttons/text during slideshow, false to hide
+		this.showClose			= true;		// true to display the Close button, false to hide
+		this.showDetails		= true;		// true to display image details (caption, count), false to hide
+		this.showPlayPause		= true;		// true to display pause/play buttons next to close button, false to hide
+		this.autoEnd			= true;		// true to automatically close Lytebox after the last image is reached, false to keep open
+		this.pauseOnNextClick	= false;	// true to pause the slideshow when the "Next" button is clicked
+        this.pauseOnPrevClick 	= true;		// true to pause the slideshow when the "Prev" button is clicked
+	/*** End Slideshow Configuration ***/
+	
+	if(this.resizeSpeed > 10) { this.resizeSpeed = 10; }
+	if(this.resizeSpeed < 1) { resizeSpeed = 1; }
+	this.resizeDuration = (11 - this.resizeSpeed) * 0.15;
+	this.resizeWTimerArray		= new Array();
+	this.resizeWTimerCount		= 0;
+	this.resizeHTimerArray		= new Array();
+	this.resizeHTimerCount		= 0;
+	this.showContentTimerArray	= new Array();
+	this.showContentTimerCount	= 0;
+	this.overlayTimerArray		= new Array();
+	this.overlayTimerCount		= 0;
+	this.imageTimerArray		= new Array();
+	this.imageTimerCount		= 0;
+	this.timerIDArray			= new Array();
+	this.timerIDCount			= 0;
+	this.slideshowIDArray		= new Array();
+	this.slideshowIDCount		= 0;
+	this.imageArray	 = new Array();
+	this.activeImage = null;
+	this.slideArray	 = new Array();
+	this.activeSlide = null;
+	this.frameArray	 = new Array();
+	this.activeFrame = null;
+	this.checkFrame();
+	this.isSlideshow = false;
+	this.isLyteframe = false;
+	/*@cc_on
+		/*@if (@_jscript)
+			this.ie = (document.all && !window.opera) ? true : false;
+		/*@else @*/
+			this.ie = false;
+		/*@end
+	@*/
+	this.ie7 = (this.ie && window.XMLHttpRequest);	
+	this.initialize();
+}
+LyteBox.prototype.initialize = function() {
+	this.updateLyteboxItems();
+	var objBody = this.doc.getElementsByTagName("body").item(0);	
+	if (this.doc.getElementById('lbOverlay')) {
+		objBody.removeChild(this.doc.getElementById("lbOverlay"));
+		objBody.removeChild(this.doc.getElementById("lbMain"));
+	}
+	var objOverlay = this.doc.createElement("div");
+		objOverlay.setAttribute('id','lbOverlay');
+		objOverlay.setAttribute((this.ie ? 'className' : 'class'), this.theme);
+		if ((this.ie && !this.ie7) || (this.ie7 && this.doc.compatMode == 'BackCompat')) {
+			objOverlay.style.position = 'absolute';
+		}
+		objOverlay.style.display = 'none';
+		objBody.appendChild(objOverlay);
+	var objLytebox = this.doc.createElement("div");
+		objLytebox.setAttribute('id','lbMain');
+		objLytebox.style.display = 'none';
+		objBody.appendChild(objLytebox);
+	var objOuterContainer = this.doc.createElement("div");
+		objOuterContainer.setAttribute('id','lbOuterContainer');
+		objOuterContainer.setAttribute((this.ie ? 'className' : 'class'), this.theme);
+		objLytebox.appendChild(objOuterContainer);
+	var objIframeContainer = this.doc.createElement("div");
+		objIframeContainer.setAttribute('id','lbIframeContainer');
+		objIframeContainer.style.display = 'none';
+		objOuterContainer.appendChild(objIframeContainer);
+	var objIframe = this.doc.createElement("iframe");
+		objIframe.setAttribute('id','lbIframe');
+		objIframe.setAttribute('name','lbIframe');
+		objIframe.style.display = 'none';
+		objIframeContainer.appendChild(objIframe);
+	var objImageContainer = this.doc.createElement("div");
+		objImageContainer.setAttribute('id','lbImageContainer');
+		objOuterContainer.appendChild(objImageContainer);
+	var objLyteboxImage = this.doc.createElement("img");
+		objLyteboxImage.setAttribute('id','lbImage');
+		objImageContainer.appendChild(objLyteboxImage);
+	var objLoading = this.doc.createElement("div");
+		objLoading.setAttribute('id','lbLoading');
+		objOuterContainer.appendChild(objLoading);
+	var objDetailsContainer = this.doc.createElement("div");
+		objDetailsContainer.setAttribute('id','lbDetailsContainer');
+		objDetailsContainer.setAttribute((this.ie ? 'className' : 'class'), this.theme);
+		objLytebox.appendChild(objDetailsContainer);
+	var objDetailsData =this.doc.createElement("div");
+		objDetailsData.setAttribute('id','lbDetailsData');
+		objDetailsData.setAttribute((this.ie ? 'className' : 'class'), this.theme);
+		objDetailsContainer.appendChild(objDetailsData);
+	var objDetails = this.doc.createElement("div");
+		objDetails.setAttribute('id','lbDetails');
+		objDetailsData.appendChild(objDetails);
+	var objCaption = this.doc.createElement("span");
+		objCaption.setAttribute('id','lbCaption');
+		objDetails.appendChild(objCaption);
+	var objHoverNav = this.doc.createElement("div");
+		objHoverNav.setAttribute('id','lbHoverNav');
+		objImageContainer.appendChild(objHoverNav);
+	var objBottomNav = this.doc.createElement("div");
+		objBottomNav.setAttribute('id','lbBottomNav');
+		objDetailsData.appendChild(objBottomNav);
+	var objPrev = this.doc.createElement("a");
+		objPrev.setAttribute('id','lbPrev');
+		objPrev.setAttribute((this.ie ? 'className' : 'class'), this.theme);
+		objPrev.setAttribute('href','#');
+		objHoverNav.appendChild(objPrev);
+	var objNext = this.doc.createElement("a");
+		objNext.setAttribute('id','lbNext');
+		objNext.setAttribute((this.ie ? 'className' : 'class'), this.theme);
+		objNext.setAttribute('href','#');
+		objHoverNav.appendChild(objNext);
+	var objNumberDisplay = this.doc.createElement("span");
+		objNumberDisplay.setAttribute('id','lbNumberDisplay');
+		objDetails.appendChild(objNumberDisplay);
+	var objNavDisplay = this.doc.createElement("span");
+		objNavDisplay.setAttribute('id','lbNavDisplay');
+		objNavDisplay.style.display = 'none';
+		objDetails.appendChild(objNavDisplay);
+	var objClose = this.doc.createElement("a");
+		objClose.setAttribute('id','lbClose');
+		objClose.setAttribute((this.ie ? 'className' : 'class'), this.theme);
+		objClose.setAttribute('href','#');
+		objBottomNav.appendChild(objClose);
+	var objPause = this.doc.createElement("a");
+		objPause.setAttribute('id','lbPause');
+		objPause.setAttribute((this.ie ? 'className' : 'class'), this.theme);
+		objPause.setAttribute('href','#');
+		objPause.style.display = 'none';
+		objBottomNav.appendChild(objPause);
+	var objPlay = this.doc.createElement("a");
+		objPlay.setAttribute('id','lbPlay');
+		objPlay.setAttribute((this.ie ? 'className' : 'class'), this.theme);
+		objPlay.setAttribute('href','#');
+		objPlay.style.display = 'none';
+		objBottomNav.appendChild(objPlay);
+};
+LyteBox.prototype.updateLyteboxItems = function() {	
+	var anchors = (this.isFrame) ? window.parent.frames[window.name].document.getElementsByTagName('a') : document.getElementsByTagName('a');
+	for (var i = 0; i < anchors.length; i++) {
+		var anchor = anchors[i];
+		var relAttribute = String(anchor.getAttribute('rel'));
+		if (anchor.getAttribute('href')) {
+			if (relAttribute.toLowerCase().match('lytebox')) {
+				anchor.onclick = function () { myLytebox.start(this, false, false); return false; }
+			} else if (relAttribute.toLowerCase().match('lyteshow')) {
+				anchor.onclick = function () { myLytebox.start(this, true, false); return false; }
+			} else if (relAttribute.toLowerCase().match('lyteframe')) {
+				anchor.onclick = function () { myLytebox.start(this, false, true); return false; }
+			}
+		}
+	}
+};
+LyteBox.prototype.start = function(imageLink, doSlide, doFrame) {
+	if (this.ie && !this.ie7) {	this.toggleSelects('hide');	}
+	if (this.hideFlash) { this.toggleFlash('hide'); }
+	this.isLyteframe = (doFrame ? true : false);
+	var pageSize	= this.getPageSize();
+	var objOverlay	= this.doc.getElementById('lbOverlay');
+	var objBody		= this.doc.getElementsByTagName("body").item(0);
+	objOverlay.style.height = pageSize[1] + "px";
+	objOverlay.style.display = '';
+	this.appear('lbOverlay', (this.doAnimations ? 0 : this.maxOpacity));
+	var anchors = (this.isFrame) ? window.parent.frames[window.name].document.getElementsByTagName('a') : document.getElementsByTagName('a');
+	if (this.isLyteframe) {
+		this.frameArray = [];
+		this.frameNum = 0;
+		if ((imageLink.getAttribute('rel') == 'lyteframe')) {
+			var rev = imageLink.getAttribute('rev');
+			this.frameArray.push(new Array(imageLink.getAttribute('href'), imageLink.getAttribute('title'), (rev == null || rev == '' ? 'width: 400px; height: 400px; scrolling: auto;' : rev)));
+		} else {
+			if (imageLink.getAttribute('rel').indexOf('lyteframe') != -1) {
+				for (var i = 0; i < anchors.length; i++) {
+					var anchor = anchors[i];
+					if (anchor.getAttribute('href') && (anchor.getAttribute('rel') == imageLink.getAttribute('rel'))) {
+						var rev = anchor.getAttribute('rev');
+						this.frameArray.push(new Array(anchor.getAttribute('href'), anchor.getAttribute('title'), (rev == null || rev == '' ? 'width: 400px; height: 400px; scrolling: auto;' : rev)));
+					}
+				}
+				this.frameArray.removeDuplicates();
+				while(this.frameArray[this.frameNum][0] != imageLink.getAttribute('href')) { this.frameNum++; }
+			}
+		}
+	} else {
+		this.imageArray = [];
+		this.imageNum = 0;
+		this.slideArray = [];
+		this.slideNum = 0;
+		if ((imageLink.getAttribute('rel') == 'lytebox')) {
+			this.imageArray.push(new Array(imageLink.getAttribute('href'), imageLink.getAttribute('title')));
+		} else {
+			if (imageLink.getAttribute('rel').indexOf('lytebox') != -1) {
+				for (var i = 0; i < anchors.length; i++) {
+					var anchor = anchors[i];
+					if (anchor.getAttribute('href') && (anchor.getAttribute('rel') == imageLink.getAttribute('rel'))) {
+						this.imageArray.push(new Array(anchor.getAttribute('href'), anchor.getAttribute('title')));
+					}
+				}
+				this.imageArray.removeDuplicates();
+				while(this.imageArray[this.imageNum][0] != imageLink.getAttribute('href')) { this.imageNum++; }
+			}
+			if (imageLink.getAttribute('rel').indexOf('lyteshow') != -1) {
+				for (var i = 0; i < anchors.length; i++) {
+					var anchor = anchors[i];
+					if (anchor.getAttribute('href') && (anchor.getAttribute('rel') == imageLink.getAttribute('rel'))) {
+						this.slideArray.push(new Array(anchor.getAttribute('href'), anchor.getAttribute('title')));
+					}
+				}
+				this.slideArray.removeDuplicates();
+				while(this.slideArray[this.slideNum][0] != imageLink.getAttribute('href')) { this.slideNum++; }
+			}
+		}
+	}
+	var object = this.doc.getElementById('lbMain');
+		object.style.top = (this.getPageScroll() + (pageSize[3] / 15)) + "px";
+		object.style.display = '';
+	if (!this.outerBorder) {
+		this.doc.getElementById('lbOuterContainer').style.border = 'none';
+		this.doc.getElementById('lbDetailsContainer').style.border = 'none';
+	} else {
+		this.doc.getElementById('lbOuterContainer').style.borderBottom = '';
+		this.doc.getElementById('lbOuterContainer').setAttribute((this.ie ? 'className' : 'class'), this.theme);
+	}
+	this.doc.getElementById('lbOverlay').onclick = function() { myLytebox.end(); return false; }
+	this.doc.getElementById('lbMain').onclick = function(e) {
+		var e = e;
+		if (!e) {
+			if (window.parent.frames[window.name] && (parent.document.getElementsByTagName('frameset').length <= 0)) {
+				e = window.parent.window.event;
+			} else {
+				e = window.event;
+			}
+		}
+		var id = (e.target ? e.target.id : e.srcElement.id);
+		if (id == 'lbMain') { myLytebox.end(); return false; }
+	}
+	this.doc.getElementById('lbClose').onclick = function() { myLytebox.end(); return false; }
+	this.doc.getElementById('lbPause').onclick = function() { myLytebox.togglePlayPause("lbPause", "lbPlay"); return false; }
+	this.doc.getElementById('lbPlay').onclick = function() { myLytebox.togglePlayPause("lbPlay", "lbPause"); return false; }	
+	this.isSlideshow = doSlide;
+	this.isPaused = (this.slideNum != 0 ? true : false);
+	if (this.isSlideshow && this.showPlayPause && this.isPaused) {
+		this.doc.getElementById('lbPlay').style.display = '';
+		this.doc.getElementById('lbPause').style.display = 'none';
+	}
+	if (this.isLyteframe) {
+		this.changeContent(this.frameNum);
+	} else {
+		if (this.isSlideshow) {
+			this.changeContent(this.slideNum);
+		} else {
+			this.changeContent(this.imageNum);
+		}
+	}
+};
+LyteBox.prototype.changeContent = function(imageNum) {
+	if (this.isSlideshow) {
+		for (var i = 0; i < this.slideshowIDCount; i++) { window.clearTimeout(this.slideshowIDArray[i]); }
+	}
+	this.activeImage = this.activeSlide = this.activeFrame = imageNum;
+	if (!this.outerBorder) {
+		this.doc.getElementById('lbOuterContainer').style.border = 'none';
+		this.doc.getElementById('lbDetailsContainer').style.border = 'none';
+	} else {
+		this.doc.getElementById('lbOuterContainer').style.borderBottom = '';
+		this.doc.getElementById('lbOuterContainer').setAttribute((this.ie ? 'className' : 'class'), this.theme);
+	}
+	this.doc.getElementById('lbLoading').style.display = '';
+	this.doc.getElementById('lbImage').style.display = 'none';
+	this.doc.getElementById('lbIframe').style.display = 'none';
+	this.doc.getElementById('lbPrev').style.display = 'none';
+	this.doc.getElementById('lbNext').style.display = 'none';
+	this.doc.getElementById('lbIframeContainer').style.display = 'none';
+	this.doc.getElementById('lbDetailsContainer').style.display = 'none';
+	this.doc.getElementById('lbNumberDisplay').style.display = 'none';
+	if (this.navType == 2 || this.isLyteframe) {
+		object = this.doc.getElementById('lbNavDisplay');
+		object.innerHTML = '    || ';
+		object.style.display = 'none';
+	}
+	if (this.isLyteframe) {
+		var iframe = myLytebox.doc.getElementById('lbIframe');
+		var styles = this.frameArray[this.activeFrame][2];
+		var aStyles = styles.split(';');
+		for (var i = 0; i < aStyles.length; i++) {
+			if (aStyles[i].indexOf('width:') >= 0) {
+				var w = aStyles[i].replace('width:', '');
+				iframe.width = w.trim();
+			} else if (aStyles[i].indexOf('height:') >= 0) {
+				var h = aStyles[i].replace('height:', '');
+				iframe.height = h.trim();
+			} else if (aStyles[i].indexOf('scrolling:') >= 0) {
+				var s = aStyles[i].replace('scrolling:', '');
+				iframe.scrolling = s.trim();
+			} else if (aStyles[i].indexOf('border:') >= 0) {
+				// Not implemented yet, as there are cross-platform issues with setting the border (from a GUI standpoint)
+				//var b = aStyles[i].replace('border:', '');
+				//iframe.style.border = b.trim();
+			}
+		}
+		this.resizeContainer(parseInt(iframe.width), parseInt(iframe.height));
+	} else {
+		imgPreloader = new Image();
+		imgPreloader.onload = function() {
+			var imageWidth = imgPreloader.width;
+			var imageHeight = imgPreloader.height;
+			if (myLytebox.autoResize) {
+				var pagesize = myLytebox.getPageSize();
+				var x = pagesize[2] - 150;
+				var y = pagesize[3] - 150;
+				if (imageWidth > x) {
+					imageHeight = Math.round(imageHeight * (x / imageWidth));
+					imageWidth = x; 
+					if (imageHeight > y) { 
+						imageWidth = Math.round(imageWidth * (y / imageHeight));
+						imageHeight = y; 
+					}
+				} else if (imageHeight > y) { 
+					imageWidth = Math.round(imageWidth * (y / imageHeight));
+					imageHeight = y; 
+					if (imageWidth > x) {
+						imageHeight = Math.round(imageHeight * (x / imageWidth));
+						imageWidth = x;
+					}
+				}
+			}
+			var lbImage = myLytebox.doc.getElementById('lbImage')
+			lbImage.src = (myLytebox.isSlideshow ? myLytebox.slideArray[myLytebox.activeSlide][0] : myLytebox.imageArray[myLytebox.activeImage][0]);
+			lbImage.width = imageWidth;
+			lbImage.height = imageHeight;
+			myLytebox.resizeContainer(imageWidth, imageHeight);
+			imgPreloader.onload = function() {};
+		}
+		imgPreloader.src = (this.isSlideshow ? this.slideArray[this.activeSlide][0] : this.imageArray[this.activeImage][0]);
+	}
+};
+LyteBox.prototype.resizeContainer = function(imgWidth, imgHeight) {
+	this.wCur = this.doc.getElementById('lbOuterContainer').offsetWidth;
+	this.hCur = this.doc.getElementById('lbOuterContainer').offsetHeight;
+	this.xScale = ((imgWidth  + (this.borderSize * 2)) / this.wCur) * 100;
+	this.yScale = ((imgHeight  + (this.borderSize * 2)) / this.hCur) * 100;
+	var wDiff = (this.wCur - this.borderSize * 2) - imgWidth;
+	var hDiff = (this.hCur - this.borderSize * 2) - imgHeight;
+	if (!(hDiff == 0)) {
+		this.hDone = false;
+		this.resizeH('lbOuterContainer', this.hCur, imgHeight + this.borderSize*2, this.getPixelRate(this.hCur, imgHeight));
+	} else {
+		this.hDone = true;
+	}
+	if (!(wDiff == 0)) {
+		this.wDone = false;
+		this.resizeW('lbOuterContainer', this.wCur, imgWidth + this.borderSize*2, this.getPixelRate(this.wCur, imgWidth));
+	} else {
+		this.wDone = true;
+	}
+	if ((hDiff == 0) && (wDiff == 0)) {
+		if (this.ie){ this.pause(250); } else { this.pause(100); } 
+	}
+	this.doc.getElementById('lbPrev').style.height = imgHeight + "px";
+	this.doc.getElementById('lbNext').style.height = imgHeight + "px";
+	this.doc.getElementById('lbDetailsContainer').style.width = (imgWidth + (this.borderSize * 2) + (this.ie && this.doc.compatMode == "BackCompat" && this.outerBorder ? 2 : 0)) + "px";
+	this.showContent();
+};
+LyteBox.prototype.showContent = function() {
+	if (this.wDone && this.hDone) {
+		for (var i = 0; i < this.showContentTimerCount; i++) { window.clearTimeout(this.showContentTimerArray[i]); }
+		if (this.outerBorder) {
+			this.doc.getElementById('lbOuterContainer').style.borderBottom = 'none';
+		}
+		this.doc.getElementById('lbLoading').style.display = 'none';
+		if (this.isLyteframe) {
+			this.doc.getElementById('lbIframe').style.display = '';
+			this.appear('lbIframe', (this.doAnimations ? 0 : 100));
+		} else {
+			this.doc.getElementById('lbImage').style.display = '';
+			this.appear('lbImage', (this.doAnimations ? 0 : 100));
+			this.preloadNeighborImages();
+		}
+		if (this.isSlideshow) {
+			if(this.activeSlide == (this.slideArray.length - 1)) {
+				if (this.autoEnd) {
+					this.slideshowIDArray[this.slideshowIDCount++] = setTimeout("myLytebox.end('slideshow')", this.slideInterval);
+				}
+			} else {
+				if (!this.isPaused) {
+					this.slideshowIDArray[this.slideshowIDCount++] = setTimeout("myLytebox.changeContent("+(this.activeSlide+1)+")", this.slideInterval);
+				}
+			}
+			this.doc.getElementById('lbHoverNav').style.display = (this.showNavigation && this.navType == 1 ? '' : 'none');
+			this.doc.getElementById('lbClose').style.display = (this.showClose ? '' : 'none');
+			this.doc.getElementById('lbDetails').style.display = (this.showDetails ? '' : 'none');
+			this.doc.getElementById('lbPause').style.display = (this.showPlayPause && !this.isPaused ? '' : 'none');
+			this.doc.getElementById('lbPlay').style.display = (this.showPlayPause && !this.isPaused ? 'none' : '');
+			this.doc.getElementById('lbNavDisplay').style.display = (this.showNavigation && this.navType == 2 ? '' : 'none');
+		} else {
+			this.doc.getElementById('lbHoverNav').style.display = (this.navType == 1 && !this.isLyteframe ? '' : 'none');
+			if ((this.navType == 2 && !this.isLyteframe && this.imageArray.length > 1) || (this.frameArray.length > 1 && this.isLyteframe)) {
+				this.doc.getElementById('lbNavDisplay').style.display = '';
+			} else {
+				this.doc.getElementById('lbNavDisplay').style.display = 'none';
+			}
+			this.doc.getElementById('lbClose').style.display = '';
+			this.doc.getElementById('lbDetails').style.display = '';
+			this.doc.getElementById('lbPause').style.display = 'none';
+			this.doc.getElementById('lbPlay').style.display = 'none';
+		}
+		this.doc.getElementById('lbImageContainer').style.display = (this.isLyteframe ? 'none' : '');
+		this.doc.getElementById('lbIframeContainer').style.display = (this.isLyteframe ? '' : 'none');
+		try {
+			this.doc.getElementById('lbIframe').src = this.frameArray[this.activeFrame][0];
+		} catch(e) { }
+	} else {
+		this.showContentTimerArray[this.showContentTimerCount++] = setTimeout("myLytebox.showContent()", 200);
+	}
+};
+LyteBox.prototype.updateDetails = function() {
+	var object = this.doc.getElementById('lbCaption');
+	var sTitle = (this.isSlideshow ? this.slideArray[this.activeSlide][1] : (this.isLyteframe ? this.frameArray[this.activeFrame][1] : this.imageArray[this.activeImage][1]));
+	object.style.display = '';
+	object.innerHTML = (sTitle == null ? '' : sTitle);
+	this.updateNav();
+	this.doc.getElementById('lbDetailsContainer').style.display = '';
+	object = this.doc.getElementById('lbNumberDisplay');
+	if (this.isSlideshow && this.slideArray.length > 1) {
+		object.style.display = '';
+		object.innerHTML = "Image " + eval(this.activeSlide + 1) + " of " + this.slideArray.length;
+		this.doc.getElementById('lbNavDisplay').style.display = (this.navType == 2 && this.showNavigation ? '' : 'none');
+	} else if (this.imageArray.length > 1 && !this.isLyteframe) {
+		object.style.display = '';
+		object.innerHTML = "Image " + eval(this.activeImage + 1) + " of " + this.imageArray.length;
+		this.doc.getElementById('lbNavDisplay').style.display = (this.navType == 2 ? '' : 'none');
+	} else if (this.frameArray.length > 1 && this.isLyteframe) {
+		object.style.display = '';
+		object.innerHTML = "Page " + eval(this.activeFrame + 1) + " of " + this.frameArray.length;
+		this.doc.getElementById('lbNavDisplay').style.display = '';
+	} else {
+		this.doc.getElementById('lbNavDisplay').style.display = 'none';
+	}
+	this.appear('lbDetailsContainer', (this.doAnimations ? 0 : 100));
+};
+LyteBox.prototype.updateNav = function() {
+	if (this.isSlideshow) {
+		if (this.activeSlide != 0) {
+			var object = (this.navType == 2 ? this.doc.getElementById('lbPrev2') : this.doc.getElementById('lbPrev'));
+				object.style.display = '';
+				object.onclick = function() {
+					if (myLytebox.pauseOnPrevClick) { myLytebox.togglePlayPause("lbPause", "lbPlay"); }
+					myLytebox.changeContent(myLytebox.activeSlide - 1); return false;
+				}
+		} else {
+			if (this.navType == 2) { this.doc.getElementById('lbPrev2_Off').style.display = ''; }
+		}
+		if (this.activeSlide != (this.slideArray.length - 1)) {
+			var object = (this.navType == 2 ? this.doc.getElementById('lbNext2') : this.doc.getElementById('lbNext'));
+				object.style.display = '';
+				object.onclick = function() {
+					if (myLytebox.pauseOnNextClick) { myLytebox.togglePlayPause("lbPause", "lbPlay"); }
+					myLytebox.changeContent(myLytebox.activeSlide + 1); return false;
+				}
+		} else {
+			if (this.navType == 2) { this.doc.getElementById('lbNext2_Off').style.display = ''; }
+		}
+	} else if (this.isLyteframe) {
+		if(this.activeFrame != 0) {
+			var object = this.doc.getElementById('lbPrev2');
+				object.style.display = '';
+				object.onclick = function() {
+					myLytebox.changeContent(myLytebox.activeFrame - 1); return false;
+				}
+		} else {
+			this.doc.getElementById('lbPrev2_Off').style.display = '';
+		}
+		if(this.activeFrame != (this.frameArray.length - 1)) {
+			var object = this.doc.getElementById('lbNext2');
+				object.style.display = '';
+				object.onclick = function() {
+					myLytebox.changeContent(myLytebox.activeFrame + 1); return false;
+				}
+		} else {
+			this.doc.getElementById('lbNext2_Off').style.display = '';
+		}		
+	} else {
+		if(this.activeImage != 0) {
+			var object = (this.navType == 2 ? this.doc.getElementById('lbPrev2') : this.doc.getElementById('lbPrev'));
+				object.style.display = '';
+				object.onclick = function() {
+					myLytebox.changeContent(myLytebox.activeImage - 1); return false;
+				}
+		} else {
+			if (this.navType == 2) { this.doc.getElementById('lbPrev2_Off').style.display = ''; }
+		}
+		if(this.activeImage != (this.imageArray.length - 1)) {
+			var object = (this.navType == 2 ? this.doc.getElementById('lbNext2') : this.doc.getElementById('lbNext'));
+				object.style.display = '';
+				object.onclick = function() {
+					myLytebox.changeContent(myLytebox.activeImage + 1); return false;
+				}
+		} else {
+			if (this.navType == 2) { this.doc.getElementById('lbNext2_Off').style.display = ''; }
+		}
+	}
+	this.enableKeyboardNav();
+};
+LyteBox.prototype.enableKeyboardNav = function() { document.onkeydown = this.keyboardAction; };
+LyteBox.prototype.disableKeyboardNav = function() { document.onkeydown = ''; };
+LyteBox.prototype.keyboardAction = function(e) {
+	var keycode = key = escape = null;
+	keycode	= (e == null) ? event.keyCode : e.which;
+	key		= String.fromCharCode(keycode).toLowerCase();
+	escape  = (e == null) ? 27 : e.DOM_VK_ESCAPE;
+	if ((key == 'x') || (key == 'c') || (keycode == escape)) {
+		myLytebox.end();
+	} else if ((key == 'p') || (keycode == 37)) {
+		if (myLytebox.isSlideshow) {
+			if(myLytebox.activeSlide != 0) {
+				myLytebox.disableKeyboardNav();
+				myLytebox.changeContent(myLytebox.activeSlide - 1);
+			}
+		} else if (myLytebox.isLyteframe) {
+			if(myLytebox.activeFrame != 0) {
+				myLytebox.disableKeyboardNav();
+				myLytebox.changeContent(myLytebox.activeFrame - 1);
+			}
+		} else {
+			if(myLytebox.activeImage != 0) {
+				myLytebox.disableKeyboardNav();
+				myLytebox.changeContent(myLytebox.activeImage - 1);
+			}
+		}
+	} else if ((key == 'n') || (keycode == 39)) {
+		if (myLytebox.isSlideshow) {
+			if(myLytebox.activeSlide != (myLytebox.slideArray.length - 1)) {
+				myLytebox.disableKeyboardNav();
+				myLytebox.changeContent(myLytebox.activeSlide + 1);
+			}
+		} else if (myLytebox.isLyteframe) {
+			if(myLytebox.activeFrame != (myLytebox.frameArray.length - 1)) {
+				myLytebox.disableKeyboardNav();
+				myLytebox.changeContent(myLytebox.activeFrame + 1);
+			}
+		} else {
+			if(myLytebox.activeImage != (myLytebox.imageArray.length - 1)) {
+				myLytebox.disableKeyboardNav();
+				myLytebox.changeContent(myLytebox.activeImage + 1);
+			}
+		}
+	}
+};
+LyteBox.prototype.preloadNeighborImages = function() {
+	if (this.isSlideshow) {
+		if ((this.slideArray.length - 1) > this.activeSlide) {
+			preloadNextImage = new Image();
+			preloadNextImage.src = this.slideArray[this.activeSlide + 1][0];
+		}
+		if(this.activeSlide > 0) {
+			preloadPrevImage = new Image();
+			preloadPrevImage.src = this.slideArray[this.activeSlide - 1][0];
+		}
+	} else {
+		if ((this.imageArray.length - 1) > this.activeImage) {
+			preloadNextImage = new Image();
+			preloadNextImage.src = this.imageArray[this.activeImage + 1][0];
+		}
+		if(this.activeImage > 0) {
+			preloadPrevImage = new Image();
+			preloadPrevImage.src = this.imageArray[this.activeImage - 1][0];
+		}
+	}
+};
+LyteBox.prototype.togglePlayPause = function(hideID, showID) {
+	if (this.isSlideshow && hideID == "lbPause") {
+		for (var i = 0; i < this.slideshowIDCount; i++) { window.clearTimeout(this.slideshowIDArray[i]); }
+	}
+	this.doc.getElementById(hideID).style.display = 'none';
+	this.doc.getElementById(showID).style.display = '';
+	if (hideID == "lbPlay") {
+		this.isPaused = false;
+		if (this.activeSlide == (this.slideArray.length - 1)) {
+			this.end();
+		} else {
+			this.changeContent(this.activeSlide + 1);
+		}
+	} else {
+		this.isPaused = true;
+	}
+};
+LyteBox.prototype.end = function(caller) {
+	var closeClick = (caller == 'slideshow' ? false : true);
+	if (this.isSlideshow && this.isPaused && !closeClick) { return; }
+	this.disableKeyboardNav();
+	this.doc.getElementById('lbMain').style.display = 'none';
+	this.fade('lbOverlay', (this.doAnimations ? this.maxOpacity : 0));
+	this.toggleSelects('visible');
+	if (this.hideFlash) { this.toggleFlash('visible'); }
+	if (this.isSlideshow) {
+		for (var i = 0; i < this.slideshowIDCount; i++) { window.clearTimeout(this.slideshowIDArray[i]); }
+	}
+	if (this.isLyteframe) {
+		 this.initialize();
+	}
+};
+LyteBox.prototype.checkFrame = function() {
+	if (window.parent.frames[window.name] && (parent.document.getElementsByTagName('frameset').length <= 0)) {
+		this.isFrame = true;
+		this.lytebox = "window.parent." + window.name + ".myLytebox";
+		this.doc = parent.document;
+	} else {
+		this.isFrame = false;
+		this.lytebox = "myLytebox";
+		this.doc = document;
+	}
+};
+LyteBox.prototype.getPixelRate = function(cur, img) {
+	var diff = (img > cur) ? img - cur : cur - img;
+	if (diff >= 0 && diff <= 100) { return 10; }
+	if (diff > 100 && diff <= 200) { return 15; }
+	if (diff > 200 && diff <= 300) { return 20; }
+	if (diff > 300 && diff <= 400) { return 25; }
+	if (diff > 400 && diff <= 500) { return 30; }
+	if (diff > 500 && diff <= 600) { return 35; }
+	if (diff > 600 && diff <= 700) { return 40; }
+	if (diff > 700) { return 45; }
+};
+LyteBox.prototype.appear = function(id, opacity) {
+	var object = this.doc.getElementById(id).style;
+	object.opacity = (opacity / 100);
+	object.MozOpacity = (opacity / 100);
+	object.KhtmlOpacity = (opacity / 100);
+	object.filter = "alpha(opacity=" + (opacity + 10) + ")";
+	if (opacity == 100 && (id == 'lbImage' || id == 'lbIframe')) {
+		try { object.removeAttribute("filter"); } catch(e) {}	/* Fix added for IE Alpha Opacity Filter bug. */
+		this.updateDetails();
+	} else if (opacity >= this.maxOpacity && id == 'lbOverlay') {
+		for (var i = 0; i < this.overlayTimerCount; i++) { window.clearTimeout(this.overlayTimerArray[i]); }
+		return;
+	} else if (opacity >= 100 && id == 'lbDetailsContainer') {
+		try { object.removeAttribute("filter"); } catch(e) {}	/* Fix added for IE Alpha Opacity Filter bug. */
+		for (var i = 0; i < this.imageTimerCount; i++) { window.clearTimeout(this.imageTimerArray[i]); }
+		this.doc.getElementById('lbOverlay').style.height = this.getPageSize()[1] + "px";
+	} else {
+		if (id == 'lbOverlay') {
+			this.overlayTimerArray[this.overlayTimerCount++] = setTimeout("myLytebox.appear('" + id + "', " + (opacity+20) + ")", 1);
+		} else {
+			this.imageTimerArray[this.imageTimerCount++] = setTimeout("myLytebox.appear('" + id + "', " + (opacity+10) + ")", 1);
+		}
+	}
+};
+LyteBox.prototype.fade = function(id, opacity) {
+	var object = this.doc.getElementById(id).style;
+	object.opacity = (opacity / 100);
+	object.MozOpacity = (opacity / 100);
+	object.KhtmlOpacity = (opacity / 100);
+	object.filter = "alpha(opacity=" + opacity + ")";
+	if (opacity <= 0) {
+		try {
+			object.display = 'none';
+		} catch(err) { }
+	} else if (id == 'lbOverlay') {
+		this.overlayTimerArray[this.overlayTimerCount++] = setTimeout("myLytebox.fade('" + id + "', " + (opacity-20) + ")", 1);
+	} else {
+		this.timerIDArray[this.timerIDCount++] = setTimeout("myLytebox.fade('" + id + "', " + (opacity-10) + ")", 1);
+	}
+};
+LyteBox.prototype.resizeW = function(id, curW, maxW, pixelrate, speed) {
+	if (!this.hDone) {
+		this.resizeWTimerArray[this.resizeWTimerCount++] = setTimeout("myLytebox.resizeW('" + id + "', " + curW + ", " + maxW + ", " + pixelrate + ")", 100);
+		return;
+	}
+	var object = this.doc.getElementById(id);
+	var timer = speed ? speed : (this.resizeDuration/2);
+	var newW = (this.doAnimations ? curW : maxW);
+	object.style.width = (newW) + "px";
+	if (newW < maxW) {
+		newW += (newW + pixelrate >= maxW) ? (maxW - newW) : pixelrate;
+	} else if (newW > maxW) {
+		newW -= (newW - pixelrate <= maxW) ? (newW - maxW) : pixelrate;
+	}
+	this.resizeWTimerArray[this.resizeWTimerCount++] = setTimeout("myLytebox.resizeW('" + id + "', " + newW + ", " + maxW + ", " + pixelrate + ", " + (timer+0.02) + ")", timer+0.02);
+	if (parseInt(object.style.width) == maxW) {
+		this.wDone = true;
+		for (var i = 0; i < this.resizeWTimerCount; i++) { window.clearTimeout(this.resizeWTimerArray[i]); }
+	}
+};
+LyteBox.prototype.resizeH = function(id, curH, maxH, pixelrate, speed) {
+	var timer = speed ? speed : (this.resizeDuration/2);
+	var object = this.doc.getElementById(id);
+	var newH = (this.doAnimations ? curH : maxH);
+	object.style.height = (newH) + "px";
+	if (newH < maxH) {
+		newH += (newH + pixelrate >= maxH) ? (maxH - newH) : pixelrate;
+	} else if (newH > maxH) {
+		newH -= (newH - pixelrate <= maxH) ? (newH - maxH) : pixelrate;
+	}
+	this.resizeHTimerArray[this.resizeHTimerCount++] = setTimeout("myLytebox.resizeH('" + id + "', " + newH + ", " + maxH + ", " + pixelrate + ", " + (timer+.02) + ")", timer+.02);
+	if (parseInt(object.style.height) == maxH) {
+		this.hDone = true;
+		for (var i = 0; i < this.resizeHTimerCount; i++) { window.clearTimeout(this.resizeHTimerArray[i]); }
+	}
+};
+LyteBox.prototype.getPageScroll = function() {
+	if (self.pageYOffset) {
+		return this.isFrame ? parent.pageYOffset : self.pageYOffset;
+	} else if (this.doc.documentElement && this.doc.documentElement.scrollTop){
+		return this.doc.documentElement.scrollTop;
+	} else if (document.body) {
+		return this.doc.body.scrollTop;
+	}
+};
+LyteBox.prototype.getPageSize = function() {	
+	var xScroll, yScroll, windowWidth, windowHeight;
+	if (window.innerHeight && window.scrollMaxY) {
+		xScroll = this.doc.scrollWidth;
+		yScroll = (this.isFrame ? parent.innerHeight : self.innerHeight) + (this.isFrame ? parent.scrollMaxY : self.scrollMaxY);
+	} else if (this.doc.body.scrollHeight > this.doc.body.offsetHeight){
+		xScroll = this.doc.body.scrollWidth;
+		yScroll = this.doc.body.scrollHeight;
+	} else {
+		xScroll = this.doc.getElementsByTagName("html").item(0).offsetWidth;
+		yScroll = this.doc.getElementsByTagName("html").item(0).offsetHeight;
+		xScroll = (xScroll < this.doc.body.offsetWidth) ? this.doc.body.offsetWidth : xScroll;
+		yScroll = (yScroll < this.doc.body.offsetHeight) ? this.doc.body.offsetHeight : yScroll;
+	}
+	if (self.innerHeight) {
+		windowWidth = (this.isFrame) ? parent.innerWidth : self.innerWidth;
+		windowHeight = (this.isFrame) ? parent.innerHeight : self.innerHeight;
+	} else if (document.documentElement && document.documentElement.clientHeight) {
+		windowWidth = this.doc.documentElement.clientWidth;
+		windowHeight = this.doc.documentElement.clientHeight;
+	} else if (document.body) {
+		windowWidth = this.doc.getElementsByTagName("html").item(0).clientWidth;
+		windowHeight = this.doc.getElementsByTagName("html").item(0).clientHeight;
+		windowWidth = (windowWidth == 0) ? this.doc.body.clientWidth : windowWidth;
+		windowHeight = (windowHeight == 0) ? this.doc.body.clientHeight : windowHeight;
+	}
+	var pageHeight = (yScroll < windowHeight) ? windowHeight : yScroll;
+	var pageWidth = (xScroll < windowWidth) ? windowWidth : xScroll;
+	return new Array(pageWidth, pageHeight, windowWidth, windowHeight);
+};
+LyteBox.prototype.toggleFlash = function(state) {
+	var objects = this.doc.getElementsByTagName("object");
+	for (var i = 0; i < objects.length; i++) {
+		objects[i].style.visibility = (state == "hide") ? 'hidden' : 'visible';
+	}
+	var embeds = this.doc.getElementsByTagName("embed");
+	for (var i = 0; i < embeds.length; i++) {
+		embeds[i].style.visibility = (state == "hide") ? 'hidden' : 'visible';
+	}
+	if (this.isFrame) {
+		for (var i = 0; i < parent.frames.length; i++) {
+			try {
+				objects = parent.frames[i].window.document.getElementsByTagName("object");
+				for (var j = 0; j < objects.length; j++) {
+					objects[j].style.visibility = (state == "hide") ? 'hidden' : 'visible';
+				}
+			} catch(e) { }
+			try {
+				embeds = parent.frames[i].window.document.getElementsByTagName("embed");
+				for (var j = 0; j < embeds.length; j++) {
+					embeds[j].style.visibility = (state == "hide") ? 'hidden' : 'visible';
+				}
+			} catch(e) { }
+		}
+	}
+};
+LyteBox.prototype.toggleSelects = function(state) {
+	var selects = this.doc.getElementsByTagName("select");
+	for (var i = 0; i < selects.length; i++ ) {
+		selects[i].style.visibility = (state == "hide") ? 'hidden' : 'visible';
+	}
+	if (this.isFrame) {
+		for (var i = 0; i < parent.frames.length; i++) {
+			try {
+				selects = parent.frames[i].window.document.getElementsByTagName("select");
+				for (var j = 0; j < selects.length; j++) {
+					selects[j].style.visibility = (state == "hide") ? 'hidden' : 'visible';
+				}
+			} catch(e) { }
+		}
+	}
+};
+LyteBox.prototype.pause = function(numberMillis) {
+	var now = new Date();
+	var exitTime = now.getTime() + numberMillis;
+	while (true) {
+		now = new Date();
+		if (now.getTime() > exitTime) { return; }
+	}
+};
+if (window.addEventListener) {
+	window.addEventListener("load",initLytebox,false);
+} else if (window.attachEvent) {
+	window.attachEvent("onload",initLytebox);
+} else {
+	window.onload = function() {initLytebox();}
+}
+function initLytebox() { myLytebox = new LyteBox(); }
\ No newline at end of file
-- 
cgit v1.2.3


From 622dca92b2a8eb399e7b2b44a682d7dd682dc68c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Tue, 3 Nov 2009 12:46:10 +0000
Subject: fixed bug where admins couldn't redo thumbnails for other users

---
 lib/resize.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/resize.php b/lib/resize.php
index 9f4ecd4bc..7885a52df 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -28,6 +28,8 @@
 		$image_sizes = unserialize($image_sizes);
 
 		$thumb = new ElggFile();
+		$thumb->owner_guid = $file->owner_guid;
+		$thumb->container_guid = $file->container_guid;
 
 		// tiny thumbail
 		$thumb->setFilename($prefix."thumb".$filestorename);
@@ -221,7 +223,8 @@
 		$image_sizes = unserialize($image_sizes);
 
 		$thumb = new ElggFile();
-
+		$thumb->owner_guid = $file->owner_guid;
+		$thumb->container_guid = $file->container_guid;
 
 		// tiny thumbnail
 		$thumb->setFilename($prefix."thumb".$filestorename);
@@ -392,7 +395,8 @@
 		$image_sizes = unserialize($image_sizes);
 
 		$thumb = new ElggFile();
-
+		$thumb->owner_guid = $file->owner_guid;
+		$thumb->container_guid = $file->container_guid;
 
 		// tiny thumbnail
 		$thumb->setFilename($prefix."thumb".$filestorename);
-- 
cgit v1.2.3


From 3bd5e571364385cb93a93b8526e1e90e56db7b49 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 11 Dec 2009 12:30:23 +0000
Subject: moved download action to download page

---
 actions/download.php                  | 52 -----------------------------------
 start.php                             | 26 +++++-------------
 views/default/object/image.php        |  2 +-
 views/default/tidypics/image_menu.php |  2 +-
 views/rss/object/album.php            |  4 +--
 views/rss/object/file.php             |  2 +-
 6 files changed, 12 insertions(+), 76 deletions(-)
 delete mode 100644 actions/download.php

diff --git a/actions/download.php b/actions/download.php
deleted file mode 100644
index b382c56bc..000000000
--- a/actions/download.php
+++ /dev/null
@@ -1,52 +0,0 @@
-originalfilename;
-		$mime = $file->mimetype;
-		
-		header("Content-Type: $mime");
-		if ($view == "inline")
-			header("Content-Disposition: inline; filename=\"$filename\"");
-		else
-			header("Content-Disposition: attachment; filename=\"$filename\"");
-
-		
-		$readfile = new ElggFile($file_guid);
-		$readfile->owner_guid = $file->owner_guid;
-		
-		$contents = $readfile->grabFile();
-		
-		if (empty($contents)) {
-			echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );
-		} else {
-			
-			// expires every 60 days
-			$expires = 60 * 60*60*24;
-			
-			header("Content-Length: " . strlen($contents));
-			header("Cache-Control: public", true);
-			header("Pragma: public", true);
-			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
-			
-			
-			echo $contents;
-		}
-		
-		exit;
-	}
-	else
-		register_error(elgg_echo("image:downloadfailed"));
-
-?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 54322d8c9..6a1b95723 100644
--- a/start.php
+++ b/start.php
@@ -72,10 +72,7 @@
 		}
 		
 		// slideshow plugin hook
-		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
-		
-		// no checking security token for download
-		register_plugin_hook('action', 'tidypics/download', 'tidypics_download_override');
+		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');		
 	}
 	
 	/**
@@ -273,6 +270,12 @@
 					include($CONFIG->pluginspath . "tidypics/pages/world.php");
 				break;
 				
+				case "download": // download an image
+					if (isset($page[1])) set_input('file_guid', $page[1]);
+					if (isset($page[2])) set_input('type', $page[2]);
+					include($CONFIG->pluginspath . "tidypics/pages/download.php");
+				break;
+				
 				case "tagged": // all photos tagged with user 
 					if (isset($page[1])) set_input('guid',$page[1]);
 					include($CONFIG->pluginspath . "tidypics/pages/tagged.php");
@@ -425,20 +428,6 @@
 	function tp_mostrecentimages($max = 8, $pagination = true) {
 		return list_entities("object", "image", 0, $max, false, false, $pagination);	
 	}
-	/**
-	 * Called before validating the security token on a download link
-	 * We don't need security as this is not a true action (it doesn't change any data)
-	 * 
-	 * @return false (shouldn't return though since the action exits
-	 */
-	function tidypics_download_override($hook, $action)
-	{
-		global $CONFIG;
-		
-		include $CONFIG->actions[$action]['file'];
-		
-		return false;
-	}
 	
 
 	// Make sure tidypics_init is called on initialisation
@@ -453,7 +442,6 @@
 	register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
 	register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
 	register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
-	register_action("tidypics/download", true, $CONFIG->pluginspath . "tidypics/actions/download.php");
 	register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
 	register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
 	register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");
diff --git a/views/default/object/image.php b/views/default/object/image.php
index dd52f872e..fb7a72ff8 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -150,7 +150,7 @@
 				$image_link = false;
 				if (get_plugin_setting('download_link', 'tidypics') != "disabled") {
 					// admin allows downloads so default to inline download link
-					$image_link = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&view=inline";
+					$image_link = $vars['url'] . "pg/photos/download/{$image_guid}/inline/";
 				}
 				// does any plugin want to override the link
 				$image_link = trigger_plugin_hook('tp_image_link', 'image', $image, $image_link); 				
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 5e6053a94..9e7a53969 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -43,7 +43,7 @@
 	}
 	
 	if (get_plugin_setting('download_link', 'tidypics') != "disabled") {
-		$download_url = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid; 
+		$download_url = $vars['url'] . "pg/photos/download/{$image_guid}/"; 
 ?>
 
      28. 
 cover) {
@@ -52,7 +52,7 @@
 		
 		time_created); ?>
 		getURL(); ?>
-		
+		
 		title; ?>
 		description); ?>
 		
diff --git a/views/rss/object/file.php b/views/rss/object/file.php
index ace3e28e6..e40da4f69 100644
--- a/views/rss/object/file.php
+++ b/views/rss/object/file.php
@@ -19,5 +19,5 @@
 	  getURL(); ?>
 	  <![CDATA[<?php echo $title; ?>]]>
 	  description)); ?>]]>
-	  
+	  
 	
-- 
cgit v1.2.3


From 58fd575a7b28936455baea2856b1d5613d29b477 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 11 Dec 2009 12:54:14 +0000
Subject: working on adding rss feeds for all listing pages

---
 pages/download.php             | 52 ++++++++++++++++++++++++++++++++++++++++++
 views/rss/object/image.php     | 19 +++++++++++++++
 views/rss/tidypics/gallery.php | 18 +++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 pages/download.php
 create mode 100644 views/rss/object/image.php
 create mode 100644 views/rss/tidypics/gallery.php

diff --git a/pages/download.php b/pages/download.php
new file mode 100644
index 000000000..f5530cebc
--- /dev/null
+++ b/pages/download.php
@@ -0,0 +1,52 @@
+originalfilename;
+		$mime = $file->mimetype;
+		
+		header("Content-Type: $mime");
+		if ($type == "inline")
+			header("Content-Disposition: inline; filename=\"$filename\"");
+		else
+			header("Content-Disposition: attachment; filename=\"$filename\"");
+
+		
+		$readfile = new ElggFile($file_guid);
+		$readfile->owner_guid = $file->owner_guid;
+		
+		$contents = $readfile->grabFile();
+		
+		if (empty($contents)) {
+			echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );
+		} else {
+			
+			// expires every 60 days
+			$expires = 60 * 60*60*24;
+			
+			header("Content-Length: " . strlen($contents));
+			header("Cache-Control: public", true);
+			header("Pragma: public", true);
+			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+			
+			
+			echo $contents;
+		}
+		
+		exit;
+	}
+	else
+		register_error(elgg_echo("image:downloadfailed"));
+
+?>
\ No newline at end of file
diff --git a/views/rss/object/image.php b/views/rss/object/image.php
new file mode 100644
index 000000000..dafc05f45
--- /dev/null
+++ b/views/rss/object/image.php
@@ -0,0 +1,19 @@
+title;
+$descr = $vars['entity']->description;
+$download = $vars['url'] . 'pg/photos/download/' . $vars['entity']->guid . '/inline/';
+$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
+?>
+
+	
+		<?php echo $title; ?>
+		guid . '&size=large'; ?>
+		
+		time_created); ?>
+		getURL(); ?>
+		
+		
+		
+		
+	
\ No newline at end of file
diff --git a/views/rss/tidypics/gallery.php b/views/rss/tidypics/gallery.php
new file mode 100644
index 000000000..2fcf2ac76
--- /dev/null
+++ b/views/rss/tidypics/gallery.php
@@ -0,0 +1,18 @@
+ 0) {
+	foreach($entities as $entity) {
+		echo elgg_view_entity($entity);
+	}
+}
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 1738eb457318068194571f337cff52f9a2bbb29b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 12 Dec 2009 02:41:16 +0000
Subject: using image rss view for album display and condensed most viewed
 pages

---
 lib/tidypics.php                 |  69 +++++++++++++++++++++++++
 pages/lists/friendmostviewed.php |  59 ---------------------
 pages/lists/mostviewedimages.php |  39 +++++++++++---
 pages/lists/yourmostviewed.php   |  49 ------------------
 start.php                        | 108 +++++++++++++++++----------------------
 views/rss/object/album.php       |  32 +++---------
 6 files changed, 155 insertions(+), 201 deletions(-)
 delete mode 100644 pages/lists/friendmostviewed.php
 delete mode 100644 pages/lists/yourmostviewed.php

diff --git a/lib/tidypics.php b/lib/tidypics.php
index a5b713ee4..e24e4d77e 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -191,6 +191,75 @@
 		return $html;
 	}
 	
+	function tp_get_entities_from_annotations_calculate_x($sum = "sum", $entity_type = "", $entity_subtype = "", $name = "", $mdname = '', $mdvalue = '', $owner_guid = 0, $limit = 10, $offset = 0, $orderdir = 'desc', $count = false)
+	{
+		global $CONFIG;
+		
+		$sum = sanitise_string($sum);
+		$entity_type = sanitise_string($entity_type);
+		$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
+		$name = get_metastring_id($name);
+		$limit = (int) $limit;
+		$offset = (int) $offset;
+		$owner_guid = (int) $owner_guid;
+		if (!empty($mdname) && !empty($mdvalue)) {
+			$meta_n = get_metastring_id($mdname);
+			$meta_v = get_metastring_id($mdvalue);
+		}
+		
+		if (empty($name)) return 0;
+		
+		$where = array();
+		
+		if ($entity_type!="")
+			$where[] = "e.type='$entity_type'";
+		if ($owner_guid > 0)
+			$where[] = "e.owner_guid = $owner_guid";
+		if ($entity_subtype)
+			$where[] = "e.subtype=$entity_subtype";
+		if ($name!="")
+			$where[] = "a.name_id='$name'";
+			
+		if (!empty($mdname) && !empty($mdvalue)) {
+			if ($mdname!="")
+				$where[] = "m.name_id='$meta_n'";
+			if ($mdvalue!="")
+				$where[] = "m.value_id='$meta_v'";
+		}
+			
+		if ($sum != "count")
+			$where[] = "a.value_type='integer'"; // Limit on integer types
+
+		if (!$count) {
+			$query = "SELECT distinct e.*, $sum(ms.string) as sum ";
+		} else {
+			$query = "SELECT count(distinct e.guid) as num, $sum(ms.string) as sum ";
+		}
+		$query .= " from {$CONFIG->dbprefix}entities e JOIN {$CONFIG->dbprefix}annotations a on a.entity_guid = e.guid JOIN {$CONFIG->dbprefix}metastrings ms on a.value_id=ms.id ";
+		
+		if (!empty($mdname) && !empty($mdvalue)) {
+			$query .= " JOIN {$CONFIG->dbprefix}metadata m on m.entity_guid = e.guid "; 
+		}
+		
+		$query .= " WHERE ";
+		foreach ($where as $w)
+			$query .= " $w and ";
+		$query .= get_access_sql_suffix("a"); // now add access
+		$query .= ' and ' . get_access_sql_suffix("e"); // now add access
+		if (!$count) $query .= ' group by e.guid';
+		
+		if (!$count) {
+			$query .= ' order by sum ' . $orderdir;
+			$query .= ' limit ' . $offset . ' , ' . $limit;
+			return get_data($query, "entity_row_to_elggstar");
+		} else {
+			if ($row = get_data_row($query)) {
+				return $row->num;
+			}
+		}
+		return false;
+	}
+	
 	/**
 	 * Is page owner a group - convenience function
 	 * 
diff --git a/pages/lists/friendmostviewed.php b/pages/lists/friendmostviewed.php
deleted file mode 100644
index 07fcd39b5..000000000
--- a/pages/lists/friendmostviewed.php
+++ /dev/null
@@ -1,59 +0,0 @@
-username);
-		}
-	}*/
-
-	if (is_null(page_owner_entity()->name) || page_owner_entity()->name == '') {
-		$friendname = get_input('username');
-	} else {
-		$friendname = page_owner_entity()->name;
-	};
-	
-	//there has to be a better way to do this
-	if(!$friendname) {
-		$page = get_input("page");
-		list($pagename, $friendname) = split("/", $page);
-	}
-	$user = get_user_by_username($friendname);
-	global $CONFIG;
-	$prefix = $CONFIG->dbprefix;
-	$max = 24;
-	
-	$sql = "SELECT ent.guid, count( * ) AS views
-			FROM " . $prefix . "entities ent
-			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
-			AND sub.subtype = 'image'
-			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
-			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
-			AND ms.string = 'tp_view'
-			WHERE ent.owner_guid = " . $user->guid . "
-			GROUP BY ent.guid
-			ORDER BY views DESC
-			LIMIT $max";
-	
-	$result = get_data($sql);
-
-	$entities = array();
-	foreach($result as $entity) {
-		$entities[] = get_entity($entity->guid);
-	}
-	
-	$title = sprintf(elgg_echo("tidypics:friendmostviewed"), $friendname);
-	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-
-?>
\ No newline at end of file
diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index b8cc67b51..16b9d7295 100644
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -1,8 +1,7 @@
 dbprefix;
 	$max = 24;
 	
+	$owner_guid = page_owner();
+	
+	//$start = microtime(true);
+	$photos = tp_get_entities_from_annotations_calculate_x(	
+													'count',
+													'object', 
+													'image', 
+													'tp_view', 
+													'', 
+													'', 
+													$owner_guid, 
+													$max);
+	//error_log("elgg query is " . (float)(microtime(true) - $start));
+		
 	//this works but is wildly inefficient
 	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
-	
+/*
+	$start = microtime(true);
 	$sql = "SELECT ent.guid, count( * ) AS views
 			FROM " . $prefix . "entities ent
 			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
@@ -33,15 +47,26 @@
 	foreach($result as $entity) {
 		$entities[] = get_entity($entity->guid);
 	}
-	$title = elgg_echo("tidypics:mostviewed");
+*/
+	//error_log("custom query is " . (float)(microtime(true) - $start));
+
+	if ($owner_guid) {
+		if ($owner_guid == get_loggedin_userid()) {
+			$title = elgg_echo("tidypics:yourmostviewed");	
+		} else {
+			$title = sprintf(elgg_echo("tidypics:friendmostviewed"), page_owner_entity()->name);
+		}
+	} else {
+		$title = elgg_echo("tidypics:mostviewed");
+	}
 	$area2 = elgg_view_title($title);
 	
 	// grab the html to display the images
-	$images = tp_view_entity_list($entities, $max, 0, $max, false);
+	$content = tp_view_entity_list($photos, $max, 0, $max, false);
 	
 	// this view takes care of the title on the main column and the content wrapper
-	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
-	if( empty( $area2 )) $area2 = $images;	
+	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
+	if( empty( $area2 )) $area2 = $content;	
 	
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	page_draw($title, $body);
diff --git a/pages/lists/yourmostviewed.php b/pages/lists/yourmostviewed.php
deleted file mode 100644
index 9155c4454..000000000
--- a/pages/lists/yourmostviewed.php
+++ /dev/null
@@ -1,49 +0,0 @@
-dbprefix;
-	$max = 24;
-
-	$sql = "SELECT ent.guid, count( * ) AS views
-			FROM " . $prefix . "entities ent
-			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
-			AND sub.subtype = 'image'
-			INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid
-			INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id
-			AND ms.string = 'tp_view'
-			WHERE ent.owner_guid = " . $viewer->guid . "
-			GROUP BY ent.guid
-			ORDER BY views DESC
-			LIMIT $max";
-		
-	$result = get_data($sql);
-
-	$entities = array();
-	foreach($result as $entity) {
-		$entities[] = get_entity($entity->guid);
-	}
-	
-	$title = elgg_echo("tidypics:yourmostviewed");
-	$area2 = elgg_view_title($title);
-	
-	// grab the html to display the images
-	$images = tp_view_entity_list($entities, $max, 0, $max, false);
-	
-	// this view takes care of the title on the main column and the content wrapper
-	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
-	if( empty( $area2 )) $area2 = $images;
-		
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 6a1b95723..f56669c1f 100644
--- a/start.php
+++ b/start.php
@@ -76,7 +76,7 @@
 	}
 	
 	/**
-	 * Sets up submenus for tidypics.  Triggered on pagesetup.
+	 * Sets up sidebar menus for tidypics.  Triggered on pagesetup.
 	 */
 	function tidypics_submenus() {
 		
@@ -98,89 +98,95 @@
 			$view_count = get_plugin_setting('view_count', 'tidypics');
 			
 			// owner gets "your albumn", "your friends albums", "your most viewed", "your most recent"
-			if (get_loggedin_userid() == $page_owner->guid && get_loggedin_userid()) {
+			if (get_loggedin_userid() && get_loggedin_userid() == $page_owner->guid) {
+								
 				add_submenu_item(	elgg_echo('album:create'), 
-									$CONFIG->wwwroot . "pg/photos/new/". $page_owner->username, 
+									$CONFIG->wwwroot . "pg/photos/new/{$page_owner->username}/", 
 									'tidypics-a' );
 
 				add_submenu_item(	elgg_echo("album:yours"), 
-									$CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, 
+									$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
 									'tidypics-a' );
 
 				add_submenu_item( 	elgg_echo('album:yours:friends'), 
-									$CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, 
+									$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
 									'tidypics-a');
 				
 				if ($view_count != 'disabled') {
 					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
-										$CONFIG->wwwroot . 'pg/photos/yourmostviewed',
+										$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/",
 										'tidypics-a');
 				}
 				
 				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
-									$CONFIG->wwwroot . 'pg/photos/mostrecent/' . $_SESSION['user']->username,
+									$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/",
 									'tidypics-a');
 			} else if (isloggedin()) {
-				// logged in not owner gets "your albums", "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent"
+				
+				$user = get_loggedin_user();
+				
+				// logged in not owner gets "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent"
+				// and then "your albums", "your most viewed", "your most recent"
 				add_submenu_item(	elgg_echo("album:yours"), 
-									$CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, 
+									$CONFIG->wwwroot . "pg/photos/owned/{$user->username}/", 
 									'tidypics-b' );
 				
 				if ($view_count != 'disabled') {
 					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
-										$CONFIG->wwwroot . 'pg/photos/yourmostviewed',
+										$CONFIG->wwwroot . "pg/photos/mostviewed/{$user->username}/",
 										'tidypics-b');
 				}
 				
 				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
-									$CONFIG->wwwroot . 'pg/photos/mostrecent/' . $_SESSION['user']->username,
+									$CONFIG->wwwroot . "pg/photos/mostrecent/{$user->username}/",
 									'tidypics-b');
 									
 				if($page_owner->name) { // check to make sure the owner set their display name
 					add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, 
+										$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
 										'tidypics-a' );
 					add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, 
+										$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
 										'tidypics-a');
 					
 					if ($view_count != 'disabled') {
 						add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), 
-											$CONFIG->wwwroot . "pg/photos/friendmostviewed/". $page_owner->username, 
+											$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/", 
 											'tidypics-a');
 					}
 					
 					add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/mostrecent/". $page_owner->username, 
+										$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/", 
 										'tidypics-a');
 				}
 			} else if ($page_owner->guid) {
 				// non logged in user gets "page owners albums", "page owner's friends albums" 
 				add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name), 
-									$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username, 
-									'tidypics' );
+									$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
+									'tidypics-a' );
 				add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name), 
-									$CONFIG->wwwroot . "pg/photos/friends/". $page_owner->username, 
-									'tidypics');
+									$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
+									'tidypics-a');
 			}
 			
+			// everyone gets world albums, most recent, most viewed, most recently viewed, recently commented 
 			add_submenu_item(	elgg_echo('album:all'), 
 								$CONFIG->wwwroot . "pg/photos/world/", 
 								'tidypics-z');
 			add_submenu_item(	elgg_echo('tidypics:mostrecent'),
-								$CONFIG->wwwroot . 'pg/photos/mostrecent',
+								$CONFIG->wwwroot . 'pg/photos/mostrecent/',
 								'tidypics-z');
 			
 			if ($view_count != 'disabled') {
 				add_submenu_item(	elgg_echo('tidypics:mostviewed'),
-									$CONFIG->wwwroot . 'pg/photos/mostviewed',
+									$CONFIG->wwwroot . 'pg/photos/mostviewed/',
 									'tidypics-z');
 				add_submenu_item(	elgg_echo('tidypics:recentlyviewed'),
-									$CONFIG->wwwroot . 'pg/photos/recentlyviewed',
+									$CONFIG->wwwroot . 'pg/photos/recentlyviewed/',
 									'tidypics-z');
 			}
 			add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
-								$CONFIG->wwwroot . 'pg/photos/recentlycommented',
+								$CONFIG->wwwroot . 'pg/photos/recentlycommented/',
 								'tidypics-z');
 			add_submenu_item(	'Flickr Integration',
 								$CONFIG->wwwroot . 'mod/tidypics/pages/flickr/setup.php',
@@ -190,6 +196,17 @@
 		
 	}
 	
+	/**
+	 * Sets up tidypics admin menu. Triggered on pagesetup.
+	 */
+	function tidypics_adminmenu()
+	{
+		global $CONFIG;
+		if (get_context() == 'admin' && isadminloggedin()) {
+			add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "mod/tidypics/pages/admin.php");
+		}
+	}
+
 	/**
 	 * Sets up submenus for tidypics most viewed pages
 	 */
@@ -205,17 +222,7 @@
 		add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimages.php");
 		add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagesthismonth.php");
 		add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagestoday.php");
-		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented');
-	}
-	/**
-	 * Sets up tidypics admin menu. Triggered on pagesetup.
-	 */
-	function tidypics_adminmenu()
-	{
-		global $CONFIG;
-		if (get_context() == 'admin' && isadminloggedin()) {
-			add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "mod/tidypics/pages/admin.php");
-		}
+		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented/');
 	}
 
 	/**
@@ -281,44 +288,25 @@
 					include($CONFIG->pluginspath . "tidypics/pages/tagged.php");
 				break;
 
-				case "rate": //rate image
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/actions/rate.php");
-				break;
-
-
-				case "mostviewed":
-					if (isset($page[1])) set_input('guid',$page[1]);
+				case "mostviewed": // images with the most views
+					if (isset($page[1])) set_input('username',$page[1]);
 					include($CONFIG->pluginspath . "tidypics/pages/lists/mostviewedimages.php");
 				break;
 				
-				case "mostrecent":
+				case "mostrecent": // images uploaded most recently
 					if (isset($page[1])) set_input('username',$page[1]);
 					include($CONFIG->pluginspath . "tidypics/pages/lists/mostrecentimages.php");
 				break;
-				
-				case "yourmostviewed":
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/lists/yourmostviewed.php");
-				break;
-				
-				case "friendmostviewed":
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/lists/friendmostviewed.php");
-				break;
-				
-				case "recentlyviewed":
-					if (isset($page[1])) set_input('guid',$page[1]);
+								
+				case "recentlyviewed": // images most recently viewed
 					include($CONFIG->pluginspath . "tidypics/pages/lists/recentlyviewed.php");
 				break;
 				
-				case "recentlycommented":
-					if (isset($page[1])) set_input('guid',$page[1]);
+				case "recentlycommented": // images with the most recent comments
 					include($CONFIG->pluginspath . "tidypics/pages/lists/recentlycommented.php");
 				break;
 				
-				case "highestrated":
-					if (isset($page[1])) set_input('guid',$page[1]);
+				case "highestrated": // images with the highest average rating
 					include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
 				break;
 				
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index c59f0e2d3..990322baf 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -3,13 +3,12 @@
 	 * Tidypics Album RSS View
 	 */
 
-	// for now catch the albums view and ignore it
-	if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
-	} else {
+// for now catch the albums view and ignore it
+if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
 
-	$album = $vars['entity'];
+} else {
 
-	$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
+	$album = $vars['entity'];
 
 	// use fullsize image
 	$base_url_fullsize = $vars['url'] . 'pg/photos/download/';
@@ -30,7 +29,6 @@
 			
 			<![CDATA[<?php echo $title; ?>]]>
 			getURL() . '?view=rss'; ?>
-
 		
 ' . get_entity($image->owner_guid)->name;
-		$descr .= ' ' . elgg_echo('tidypics:posted') . '
      ';
-		$descr .= "
      guid}&size=small\" />
      ";
-		$descr .= "
      {$image->description}
      ";
-
-?>
-	
-		<?php echo $image->title; ?>
-		guid . '&size=large'; ?>
-		
-		time_created); ?>
-		getURL(); ?>
-		
-		title; ?>
-		description); ?>
-		
-	
-
-
\ No newline at end of file
-- 
cgit v1.2.3


From 07dd486f8ebd7c029fd25f72d02244477f1f0adc Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 12 Dec 2009 02:51:02 +0000
Subject: Danish translation - big thanks to erikernstm

---
 languages/da.php | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100644 languages/da.php

diff --git a/languages/da.php b/languages/da.php
new file mode 100644
index 000000000..b27639772
--- /dev/null
+++ b/languages/da.php
@@ -0,0 +1,195 @@
+ "Billede",
+			'images' => "Billeder",
+			'caption' => "Beskrivelse",
+			'photos' => "Fotos",
+			'images:upload' => "Upload fotos",
+			'images:multiupload' => "Flash Multi-Upload værktøj",
+			'images:multiupload:todo' => "Vælg et eller flere billeder til upload!",
+			'album' => "Fotoalbum",
+			'albums' => "Fotoalbums",
+			'album:slideshow' => "Se slideshow",
+			'album:yours' => "Dine Fotoalbums",
+			'album:yours:friends' => "Dine venners fotoalbums",
+			'album:user' => "%s's Fotoalbums",
+			'album:friends' => "%s's venners fotoalbum",
+			'album:all' => "Alle Fotoalbums",
+			'album:group' => "Gruppe-Fotoalbum",
+			'item:object:image' => "Fotos",
+			'item:object:album' => "Album",
+			'tidypics:uploading:images' => "Billederne er uploadet",
+			'tidypics:enablephotos' => 'Skift gruppealbum',
+			'tidypics:editprops' => 'Rediger billede',
+			'tidypics:mostcommented' => 'Mest kommenterede',
+			'tidypics:mostcommentedthismonth' => 'Mest kommenterede i denne måned',
+			'tidypics:mostcommentedtoday' => 'Mest kommenterede i dag',
+			'tidypics:mostviewed' => 'Mest besøgte billeder',
+			'tidypics:mostvieweddashboard' => 'Mest besøgte instrumentpanel',
+			'tidypics:mostviewedthisyear' => 'Mest besøgte i år',
+			'tidypics:mostviewedthismonth' => 'Mest besøgte i denne måned',
+			'tidypics:mostviewedlastmonth' => 'Mest besøgte sidste måned',
+			'tidypics:mostviewedtoday' => 'Set flest gange i dag',
+			'tidypics:recentlyviewed' => 'Senest viste billeder',
+            'tidypics:recentlycommented' => 'Senest kommenterede billeder',
+			'tidypics:mostrecent' => 'Nyeste billeder ifællesskabet',
+			'tidypics:yourmostviewed' => 'Dine mest sete',
+			'tidypics:yourmostrecent' => 'Sidst uploaded',
+			'tidypics:friendmostviewed' => "%s's mest sete",
+			'tidypics:friendmostrecent' => "%s's seneste billeder ",
+			'tidypics:highestrated' => "Højest bedømte billeder",
+			'tidypics:viewsbyowner' => "Visninger: %s af %s medlemmer (ikke inklusive dig selv)",
+			'tidypics:viewsbyothers' => "Visninger: %s (%s af dig)",
+			'tidypics:administration' => 'Tidypics administration',
+			'tidypics:stats' => 'Statistik',
+
+		//settings
+			'tidypics:settings' => 'Indstillinger',
+			'tidypics:admin:instructions' => 'Dette er de centrale Tidypics indstillinger. Tilpas dem til din opsætning og klik derefter på Gem.',
+			'tidypics:settings:image_lib' => "Foto arkiv: ",
+			'tidypics:settings:download_link' => "Vis download-link",
+			'tidypics:settings:tagging' => "Tillad fotolinks",
+			'tidypics:settings:photo_ratings' => "Tillad karakterergivning af foto (kræver plugin af Miguel Montes eller andet kompatibelt plugin)",
+			'tidypics:settings:exif' => "Vis EXIF data",
+			'tidypics:settings:view_count' => "Vis tæller",
+			'tidypics:settings:grp_perm_override' => "Giv gruppens medlemmer fuld adgang til gruppe-album",
+			'tidypics:settings:maxfilesize' => "Maksimal billedstørrelse i megabytes (MB):",
+			'tidypics:settings:quota' => "Tildelt plads til brugere / grupper (MB) (0 = Ingen plads)",
+			'tidypics:settings:watermark' => "Indtast teksten for vandmærke - ImageMagick cmdline skal vælges for billedbiblioteket",
+			'tidypics:settings:im_path' => "Angiv stien til ImageMagick kommandoer (som slutter med et Slash/)",
+			'tidypics:settings:img_river_view' => "Hvor mange poster i aktivitetslisten for hvert parti af uploadede billeder",
+			'tidypics:settings:album_river_view' => "Vis albumcover eller et sæt af fotos til nye album",
+			'tidypics:settings:largesize' => "Størrelse på billede",
+			'tidypics:settings:smallsize' => "Tumbnailstørrelse på album",
+			'tidypics:settings:thumbsize' => "Thumbnailstørrelse på billede",
+
+
+		//actions
+
+			'album:create' => "Skab album",
+			'album:add' => "Tilføj nyt album",
+			'album:addpix' => "Tilføj fotos",
+			'album:edit' => "Rediger album",
+			'album:delete' => "Slet album",
+
+			'image:edit' => "Rediger billede",
+			'image:delete' => "Slet billede",
+			'image:download' => "Download billede",
+
+		//forms
+
+			'album:title' => "Titel",
+			'album:desc' => "Beskrivelse",
+			'album:tags' => "Nøgleord",
+			'album:cover' => "Billedet skal bruges som albumcover",
+			'tidypics:quota' => "Plads:",
+
+		//views
+
+			'image:total' => "Billeder i album:",
+			'image:by' => "Billede tilføjet af",
+			'album:by' => "Album oprettet af:",
+			'album:created:on' => "Oprettet",
+			'image:none' => "Ingen billeder tilføjet.",
+			'image:back' => "Forrige",
+			'image:next' => "Næste",
+
+		// tagging
+			'tidypics:taginstruct' => 'Vælg et område på billedet, som du ønsker at linke',
+			'tidypics:deltag_title' => 'Vælg at slette links',
+			'tidypics:finish_tagging' => 'Annuller',
+			'tidypics:tagthisphoto' => 'Tilføj link til foto',
+			'tidypics:deletetag' => 'Slet foto link',
+			'tidypics:actiontag' => 'Link',
+			'tidypics:actiondelete' => 'Slet',
+			'tidypics:actioncancel' => 'Annuller',
+			'tidypics:inthisphoto' => 'Links i billedet',
+			'tidypics:usertag' => "Foto links til medlem %s",
+			'tidypics:phototagging:success' => 'Foto link tilføjet',
+			'tidypics:phototagging:error' => 'Uventet fejl ved linket',
+			'tidypics:deletetag:success' => 'Udvalgte links er blevet fjernet',
+
+
+		//rss
+			'tidypics:posted' => 'Billedet indstilles individuelt:',
+
+		//widgets
+
+			'tidypics:widget:albums' => "Fotoalbum",
+			'tidypics:widget:album_descr' => "Viser seneste album",
+			'tidypics:widget:num_albums' => "Antal albums",
+			'tidypics:widget:latest' => "Nyeste billeder",
+			'tidypics:widget:latest_descr' => "Vis seneste billeder",
+			'tidypics:widget:num_latest' => "Antal billeder",
+			'album:more' => "Vis alle albums",
+
+		//river
+
+			//images
+			'image:river:created' => "%s har tilføjet et billede %s i album %s",
+			'image:river:item' => "et billede",
+			'image:river:annotate' => "en kommentar til billedet",
+
+			//albums
+			'album:river:created' => "%s har tilføjet et nyt album",
+			'album:river:group' => "i gruppen",
+			'album:river:item' => "et album",
+			'album:river:annotate' => "en kommentar til albummet",
+
+		//notifications
+			'tidypics:newalbum' => 'Nye Fotoalbum',
+
+
+		//  Status messages
+			'tidypics:upl_success' => "Billedet er uploadet med succes",
+			'image:saved' => "Billedet blev gemt",
+			'images:saved' => "Alle billeder er gemt",
+			'image:deleted' => "Billedet blev slettet",
+			'image:delete:confirm' => "Ønsker du at slette dette billede?",
+
+			'images:edited' => "Billedet er blevet opdateret",
+			'album:edited' => "Albummet er blevet opdateret",
+			'album:saved' => "Albummet blev gemt",
+			'album:deleted' => "Albummet er blevet slettet",
+			'album:delete:confirm' => "Ønsker du at slette dette album?",
+			'album:created' => "Deres nye album er skabt",
+			'tidypics:settings:save:ok' => 'Tidypics Indstillingerne er gemt',
+			'tidypics:upgrade:success' => 'Tidypics blev opgraderet med succes',
+
+		//Error messages
+
+			'tidypics:partialuploadfailure' => "Der opstod en fejl under uploadingen af billeder (%s af %s billeder)",
+			'tidypics:completeuploadfailure' => "Upload af billede mislykkedes",
+			'tidypics:exceedpostlimit' => "Alt for mange store billeder på én gang - forsøg evt. at overføre færre eller mindre billeder",
+			'tidypics:noimages' => "Ingen billeder udvalgt til upload",
+			'tidypics:image_mem' => "Billedet er for stort",
+			'tidypics:image_pixels' => "Billedet har for mange pixels",
+			'tidypics:unk_error' => "Ukendt fejl opstod under upload",
+			'tidypics:save_error' => "Ukendt fejl opstod, da billedet skulle gemmes på serveren",
+			'tidypics:not_image' => "Type af billede kan ikke genkendes",
+			'image:deletefailed' => "Dit billede kunne ikke slettes",
+			'image:downloadfailed' => "Fejl: Billedet er ikke tilgængeligt i øjeblikket",
+			'tidypics:nosettings' => "Administratoren af webstedet, har ikke foretaget justeringer for fotoalbum",
+			'tidypics:exceed_quota' => "Din tildelte plads er opbrugt!",
+			'images:notedited' => "Ikke alle billeder er blevet opdateret",
+
+			'album:none' => "Ingen albums skabt endnu",
+			'album:uploadfailed' => "Dit album kunne ikke gemmes",
+			'album:deletefailed' => "Dit album kunne ikke slettes",
+			'album:blank' => "Giv venligst dette album en titel samt beskrivelse",
+
+			'tidypics:upgrade:failed' => "Opgraderingen af Tidypics mislykkedes",
+	);
+
+	add_translation("da",$danish);
+?>
-- 
cgit v1.2.3


From 60afb9fcf78831c7ae7bd1a885fc8d818051c6fd Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 12 Dec 2009 02:53:55 +0000
Subject: French translation - big thanks to Fx Nion

---
 languages/fr.php | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 languages/fr.php

diff --git a/languages/fr.php b/languages/fr.php
new file mode 100644
index 000000000..ceca62807
--- /dev/null
+++ b/languages/fr.php
@@ -0,0 +1,159 @@
+  "Sans titre" , 
+	 'image'  =>  "Image" , 
+	 'images'  =>  "Images" , 
+	 'caption'  =>  "Légende" , 
+	 'photos'  =>  "Photos" , 
+	 'images:upload'  =>  "Charger des images" , 
+	 'images:multiupload'  =>  "Outil Flash de chargement multi fichiers" , 
+	 'images:multiupload:todo'  =>  "Sélectionnez un ou plusieurs fichiers à charger." , 
+	 'album'  =>  "Album photo" , 
+	 'albums'  =>  "Albums photo" , 
+	 'album:slideshow'  =>  "Voir diaporama" , 
+	 'album:yours'  =>  "Vos albums photo" , 
+	 'album:yours:friends'  =>  "Les albums photo de vos amis" , 
+	 'album:user'  =>  "Albums photo de %s" , 
+	 'album:friends'  =>  "Albums photo des amis de %s" , 
+	 'album:all'  =>  "Tout les albums photo" , 
+	 'album:group'  =>  "Albums de groupe" , 
+	 'item:object:image'  =>  "Photos" , 
+	 'item:object:album'  =>  "Albums" , 
+	 'tidypics:uploading:images'  =>  "Veuillez patientez, nous chargeons les fichiers." , 
+	 'tidypics:enablephotos'  =>  "Activer les albums photo pour les groupes" , 
+	 'tidypics:editprops'  =>  "Modifier les propriétés des images" , 
+	 'tidypics:mostcommented'  =>  "Images les plus commentées." , 
+	 'tidypics:mostcommentedthismonth'  =>  "Les plus commentés ce mois-ci" , 
+	 'tidypics:mostcommentedtoday'  =>  "Les plus commentés ce jour-ci" , 
+	 'tidypics:mostviewed'  =>  "Images les plus vues" , 
+	 'tidypics:mostvieweddashboard'  =>  "Tableaux de bord les plus vus" , 
+	 'tidypics:mostviewedthisyear'  =>  "Les plus vus cette année." , 
+	 'tidypics:mostviewedthismonth'  =>  "Les plus vus ce mois-ci" , 
+	 'tidypics:mostviewedlastmonth'  =>  "Les plus vus le mois dernier" , 
+	 'tidypics:mostviewedtoday'  =>  "Les plus vus aujourd'hui" , 
+	 'tidypics:recentlyviewed'  =>  "Images récemment vues" , 
+	 'tidypics:recentlycommented'  =>  "Image récemment commentées" , 
+	 'tidypics:mostrecent'  =>  "Images les plus récentes" , 
+	 'tidypics:yourmostviewed'  =>  "Vos images les plus vues" , 
+	 'tidypics:yourmostrecent'  =>  "Vos images les plus récentes" , 
+	 'tidypics:friendmostviewed'  =>  "Les images les plus vues de %s" , 
+	 'tidypics:friendmostrecent'  =>  "Les images les plus récentes de %s" , 
+	 'tidypics:highestrated'  =>  "Les images les mieux notées" , 
+	 'tidypics:views'  =>  "Vues: %s" , 
+	 'tidypics:viewsbyowner'  =>  "par % membres (vous exclus)" , 
+	 'tidypics:viewsbyothers'  =>  "(%s par vous)" , 
+	 'tidypics:administration'  =>  "Administration Tydipics" , 
+	 'tidypics:stats'  =>  "Stats" , 
+	 'tidypics:settings'  =>  "Paramétrages" , 
+	 'tidypics:admin:instructions'  =>  "Réglages principaux de Tydipics. Modifiez les pour votre usage et cliquez sur Sauvegarder" , 
+	 'tidypics:settings:image_lib'  =>  "Librairie graphique" , 
+	 'tidypics:settings:thumbnail'  =>  "Création des vignettes" , 
+	 'tidypics:settings:download_link'  =>  "Voir le lien de download" , 
+	 'tidypics:settings:tagging'  =>  "Activer les tags sur les photos" , 
+	 'tidypics:settings:photo_ratings'  =>  "Activer les notations des photos (nécessite le rate plugin de Miguel Montes ou compatible)" , 
+	 'tidypics:settings:exif'  =>  "Voir les données EXIF" , 
+	 'tidypics:settings:view_count'  =>  "Voir le compteur" , 
+	 'tidypics:settings:grp_perm_override'  =>  "Autoriser l'acés total aux membres du groupe" , 
+	 'tidypics:settings:maxfilesize'  =>  "Taille maximum des images  en Mb:" , 
+	 'tidypics:settings:quota'  =>  "Quota Utilisateur/Groupe (Mb) - O égal pas de quota" , 
+	 'tidypics:settings:watermark'  =>  "Entrez le texte qui doit figure sur le WaterMark - fonction non vraiment sure." , 
+	 'tidypics:settings:im_path'  =>  "Chemin de l'exécutable ImageMagick, terminé par un slash" , 
+	 'tidypics:settings:img_river_view'  =>  "Combien d'entrées dans le river pour chaque lot de traitement des fichiers chargés" , 
+	 'tidypics:settings:album_river_view'  =>  "Montrer la couverture de l'album ou un ensemble de photos pour tout nouvel album" , 
+	 'tidypics:settings:largesize'  =>  "Taille initiale de l'image" , 
+	 'tidypics:settings:smallsize'  =>  "Taille de la vue de l'album" , 
+	 'tidypics:settings:thumbsize'  =>  "Taille des vignettes" , 
+	 'tidypics:settings:im_id'  =>  "Identifiant de l'image" , 
+	 'album:create'  =>  "Créer un nouvel album" , 
+	 'album:add'  =>  "Ajouter un Album photo" , 
+	 'album:addpix'  =>  "Ajouter des photos à l'album" , 
+	 'album:edit'  =>  "Modifier l'album" , 
+	 'album:delete'  =>  "Supprimer l'album" , 
+	 'image:edit'  =>  "Modifier l'image" , 
+	 'image:delete'  =>  "Supprimer l'image" , 
+	 'image:download'  =>  "Télécharger l'image" , 
+	 'album:title'  =>  "Titre" , 
+	 'album:desc'  =>  "Description" , 
+	 'album:tags'  =>  "Tags" , 
+	 'album:cover'  =>  "Faire de cette image la couverture de l'album" , 
+	 'tidypics:quota'  =>  "Quota utilisé:" , 
+	 'image:total'  =>  "Images dans l'album:" , 
+	 'image:by'  =>  "Image ajoutée par" , 
+	 'album:by'  =>  "Album créé par" , 
+	 'album:created:on'  =>  "Création" , 
+	 'image:none'  =>  "Aucune image n'a encore été ajoutée" , 
+	 'image:back'  =>  "Précédent" , 
+	 'image:next'  =>  "Suivant" , 
+	 'tidypics:taginstruct'  =>  "Sélectionnez la zone que vous souhaitez tagger" , 
+	 'tidypics:deltag_title'  =>  "Sélectionnez le tag à supprimer" , 
+	 'tidypics:finish_tagging'  =>  "Arrêter de tagger" , 
+	 'tidypics:tagthisphoto'  =>  "Tagger cette photo" , 
+	 'tidypics:deletetag'  =>  "Supprimer le tag d'une photo" , 
+	 'tidypics:actiontag'  =>  "Tag" , 
+	 'tidypics:actiondelete'  =>  "Supprimer" , 
+	 'tidypics:actioncancel'  =>  "Annuler" , 
+	 'tidypics:inthisphoto'  =>  "Dans cette photo" , 
+	 'tidypics:usertag'  =>  "Photo taggée par %s" , 
+	 'tidypics:phototagging:success'  =>  "La photo a été correctement taggée." , 
+	 'tidypics:phototagging:error'  =>  "Erreur innatendue durant le taggage" , 
+	 'tidypics:deletetag:success'  =>  "Les tags sélectionnés ont correctement été supprimés" , 
+	 'tidypics:tag:subject'  =>  "Vous avez été taggé dans une photo !!!" , 
+	 'tidypics:tag:body'  =>  "Vous avez été taggé dans la photo %s par %s !!!
+La photo peut être consultée ici: %s" , 
+	 'tidypics:posted'  =>  "a posté une photo" , 
+	 'tidypics:widget:albums'  =>  "Albums photo" , 
+	 'tidypics:widget:album_descr'  =>  "Échantillon de vos albums photo" , 
+	 'tidypics:widget:num_albums'  =>  "Nombre de photos à montrer" , 
+	 'tidypics:widget:latest'  =>  "Dernières photos" , 
+	 'tidypics:widget:latest_descr'  =>  "Montrer les dernières photos" , 
+	 'tidypics:widget:num_latest'  =>  "Nombre d'images à montrer" , 
+	 'album:more'  =>  "Voir tout les albums" , 
+	 'image:river:created'  =>  "%s a ajouté la photo %s à l'album %s" , 
+	 'image:river:item'  =>  "une photo" , 
+	 'image:river:annotate'  =>  "commentaire sur la photo" , 
+	 'image:river:tagged'  =>  "a été taggé sur la photo" , 
+	 'album:river:created'  =>  "%s a créé un nouvel album photo" , 
+	 'album:river:group'  =>  "dans le groupe" , 
+	 'album:river:item'  =>  "un album" , 
+	 'album:river:annotate'  =>  "un commentaire sur l'album photo" , 
+	 'tidypics:newalbum'  =>  "Nouvel album photo" , 
+	 'tidypics:upl_success'  =>  "Vos images ont été correctement chargées." , 
+	 'image:saved'  =>  "Votre image a été correctement enregistrée" , 
+	 'images:saved'  =>  "Toutes les images ont été correctement enregistrées" , 
+	 'image:deleted'  =>  "Votre image a correctement été supprimée" , 
+	 'image:delete:confirm'  =>  "Confirmez-vous la suppression de cette image" , 
+	 'images:edited'  =>  "Vos images ont été correctement mises à jour" , 
+	 'album:edited'  =>  "Votre album a correctement été mis à jour" , 
+	 'album:saved'  =>  "Votre album a correctement été enregistré" , 
+	 'album:deleted'  =>  "Votre album a correctement été supprimé" , 
+	 'album:delete:confirm'  =>  "Confirmez-vous la suppression de cet album" , 
+	 'album:created'  =>  "Votre nouvel album a été créé" , 
+	 'tidypics:settings:save:ok'  =>  "Réglages du plugin Tydipics enregistrés" , 
+	 'tidypics:upgrade:success'  =>  "Mise à jour de Tydipics effectuée" , 
+	 'tidypics:partialuploadfailure'  =>  "Des erreurs sont survenues durant le chargement des images (%s sur %s images)" , 
+	 'tidypics:completeuploadfailure'  =>  "Echec du chargement des images " , 
+	 'tidypics:exceedpostlimit'  =>  "Trop d'images trop lourdes - essayez de charges des images plus petites" , 
+	 'tidypics:noimages'  =>  "Aucune image sélectionnée" , 
+	 'tidypics:image_mem'  =>  "Image trop large - taille trop grosse" , 
+	 'tidypics:image_pixels'  =>  "L'image a trop de pixels" , 
+	 'tidypics:unk_error'  =>  "Erreur inconnue de chargement" , 
+	 'tidypics:save_error'  =>  "Erreur inconnue lors de l'enregistrement de l'image sur le serveur" , 
+	 'tidypics:not_image'  =>  "Type d'image non reconnu" , 
+	 'image:deletefailed'  =>  "Votre image n'a pu être supprimée" , 
+	 'image:downloadfailed'  =>  "Désolé, image indisponible pour le moment" , 
+	 'tidypics:nosettings'  =>  "L'administrateur n'a pas effectué les reglages minimaux des albums" , 
+	 'tidypics:exceed_quota'  =>  "Quota fixé par l'administrateur dépassé" , 
+	 'images:notedited'  =>  "Toutes les images n'ont pas été correctement mises à jour" , 
+	 'album:none'  =>  "Aucun album encore créé" , 
+	 'album:uploadfailed'  =>  "Désolé, nous ne pouvons pas enregistrer l'album" , 
+	 'album:deletefailed'  =>  "Votre album ne peut pas être supprimé pour le moment" , 
+	 'album:blank'  =>  "Donnez un titre et une description à cet album" , 
+	 'tidypics:upgrade:failed'  =>  "Mise à jour de Tydipics infructueuse"
+); 
+
+add_translation('fr', $french); 
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From f3261b03dfe5ee472f8048b85a1f4b9aa776026d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 12 Dec 2009 03:16:52 +0000
Subject: setting page owner for some pages

---
 pages/lists/mostrecentimages.php  | 7 ++++++-
 pages/lists/mostviewedimages.php  | 5 +++++
 pages/lists/recentlycommented.php | 8 ++++++--
 pages/lists/recentlyviewed.php    | 8 ++++++--
 pages/world.php                   | 5 +++++
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 5f5116513..8a9f8dbdb 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -1,7 +1,7 @@
 name);
 		}
+	} else {
+		// world view - set page owner to logged in user
+		if (isloggedin()) {
+			set_page_owner(get_loggedin_userid());
+		}
 	}
 
 	// how many do we display
diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index 16b9d7295..1e856edc6 100644
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -57,6 +57,11 @@
 			$title = sprintf(elgg_echo("tidypics:friendmostviewed"), page_owner_entity()->name);
 		}
 	} else {
+		// world view - set page owner to logged in user
+		if (isloggedin()) {
+			set_page_owner(get_loggedin_userid());
+		}
+		
 		$title = elgg_echo("tidypics:mostviewed");
 	}
 	$area2 = elgg_view_title($title);
diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index 962732dba..a39caf6ae 100644
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -1,14 +1,18 @@
 dbprefix;
 	$max_limit = 200; //get extra because you'll have multiple views per image in the result set
diff --git a/pages/lists/recentlyviewed.php b/pages/lists/recentlyviewed.php
index 1fa1be0ea..b61107fc4 100644
--- a/pages/lists/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -1,14 +1,18 @@
 dbprefix;
 	$max_limit = 200; //get extra because you'll have multiple views per image in the result set
diff --git a/pages/world.php b/pages/world.php
index 514fd058c..2683abc1d 100644
--- a/pages/world.php
+++ b/pages/world.php
@@ -6,6 +6,11 @@
 
 	include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
 	
+	// set page owner to logged in user
+	if (isloggedin()) {
+		set_page_owner(get_loggedin_userid());
+	}
+	
 	$num_albums = 16;
 	
 	$title = elgg_echo('album:all');
-- 
cgit v1.2.3


From ee56a5b4bdb933c61786481e000aaff626fd59d5 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 12 Dec 2009 03:48:17 +0000
Subject: increased number of image views possible

---
 lib/image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/image.php b/lib/image.php
index 34b054898..0c4049183 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -95,7 +95,7 @@
 		 */
 		public function getViews($viewer_guid)
 		{
-			$views = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 9999);
+			$views = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 99999);
 			if ($views) 
 			{
 				$total_views = count($views);
-- 
cgit v1.2.3


From edd03acb340891ffa8ca973ca2ab24f87aa32158 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 12 Dec 2009 03:50:17 +0000
Subject: added a help page for common problems

---
 languages/en.php                          |  1 +
 views/default/tidypics/admin/help.php     | 25 +++++++++++++++++++++++++
 views/default/tidypics/admin/tidypics.php |  8 ++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 views/default/tidypics/admin/help.php

diff --git a/languages/en.php b/languages/en.php
index 3d669fee8..87c431f75 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -64,6 +64,7 @@
 			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
 			'tidypics:settings:image_lib' => "Image Library",
 			'tidypics:settings:thumbnail' => "Thumbnail Creation",
+			'tidypics:settings:help' => "Help",
 			'tidypics:settings:download_link' => "Show download link",
 			'tidypics:settings:tagging' => "Enable photo tagging",
 			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
diff --git a/views/default/tidypics/admin/help.php b/views/default/tidypics/admin/help.php
new file mode 100644
index 000000000..4014be9ce
--- /dev/null
+++ b/views/default/tidypics/admin/help.php
@@ -0,0 +1,25 @@
+
      
+
      White screen when uploading images
      
+
      
+Tidypics tries to calculate the maximum size of an image that your server will support. If it
+guesses incorrectly and someone uploads a photo that is too large, the script may crash when
+resizing the image if you are using GD. The easiest way to test this is to set display_errors
+to 1 in your .htaccess file and upload large images. If this causes a problem, a php memory error
+should display on the screen. You can increased your php memory limit (see the docs directory).
+A better option is to use ImageMagick if your server supports it (again see the docs directory).
+
      
+If it is not a memory issue, you should see some other error appear. Once you have fixed the error,
+change display_error back to 0.  
+
      
+
      Question mark images appear
      
+
      
+If you see question mark images when you look at your albums, this means the resizing of the images
+failed. This could be due to the memory limits as described above. There are other causes. Tidypics
+tries to detect these problems and write the cause to the error log. You should check your server
+error log right after an upload that results in a question mark for these error messages. The messages
+will begin with "Tidypics warning:". It is possible if you have turned off php warnings that you will 
+not see these warnings.
+
      
+Another possible cause is using ImageMagick when your server does not support it or specifying
+the wrong path to the ImageMagick executables.
+
      
\ No newline at end of file
diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
index 7aeb3a195..fa518156c 100644
--- a/views/default/tidypics/admin/tidypics.php
+++ b/views/default/tidypics/admin/tidypics.php
@@ -8,6 +8,7 @@
 	$statsselect = '';
 	$imagelibselect = '';
 	$thumbnailselect = '';
+	$helpselect = '';
 	switch($tab) {
 		case 'settings':
 			$settingsselect = 'class="selected"';
@@ -21,6 +22,9 @@
 		case 'thumbnail':
 			$thumbnailselect = 'class="selected"';
 			break;
+		case 'help':
+			$helpselect = 'class="selected"';
+			break;
 	}
 	
 ?>
@@ -31,6 +35,7 @@
 			
    28. >
      29. 
 			
    29. >
      30. 
 			
    30. >
      31. 
+			
    31. >
      32. 
 		
 	
      
 
 
      
-- 
cgit v1.2.3


From 515dbe6886987ef2399b532ce1816805a7ace0c0 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 12 Dec 2009 03:59:20 +0000
Subject: added plugin hook for lightbox

---
 views/default/object/image.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index fb7a72ff8..9436c53b5 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -60,13 +60,27 @@
 
 /********************************************************************
  *
- *  simple gallery view - when is this called?
+ *  listing of photos in an album
  *
  *********************************************************************/
 		if (!$vars['full']) {
+error_log('hello world!');			
 ?>
 	
      
+
 		thumbnail
+
 	
      
 
Date: Sat, 12 Dec 2009 04:18:04 +0000
Subject: removed error_log call

---
 views/default/object/image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 9436c53b5..72b245d17 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -64,7 +64,7 @@
  *
  *********************************************************************/
 		if (!$vars['full']) {
-error_log('hello world!');			
+			
 ?>
 	
      
 
Date: Sat, 12 Dec 2009 19:51:49 +0000
Subject: convert line endings to Unix

---
 actions/addalbum.php                           |  146 ++--
 actions/addtag.php                             |  208 ++---
 actions/create_thumbnails.php                  |  122 +--
 actions/delete.php                             |  240 +++---
 actions/deletetag.php                          |  114 +--
 actions/edit.php                               |  162 ++--
 actions/edit_multi.php                         |  130 +--
 actions/imtest.php                             |   38 +-
 actions/settings.php                           |  140 +--
 actions/upload.php                             |  510 +++++------
 languages/en.php                               |  440 +++++-----
 lib/resize.php                                 | 1092 ++++++++++++------------
 lib/tidypics.php                               |  596 ++++++-------
 pages/admin.php                                |   46 +-
 pages/download.php                             |  102 +--
 pages/edit.php                                 |  100 +--
 pages/edit_multiple.php                        |   94 +-
 pages/friends.php                              |   74 +-
 pages/newalbum.php                             |   62 +-
 pages/ownedalbums.php                          |  100 +--
 pages/tagged.php                               |   98 +--
 pages/upload.php                               |   82 +-
 pages/viewalbum.php                            |  134 +--
 pages/viewimage.php                            |  114 +--
 pages/world.php                                |   60 +-
 start.php                                      |  872 +++++++++----------
 thumbnail.php                                  |  156 ++--
 views/default/annotation/annotate.php          |   40 +-
 views/default/js/tagging.php                   |  604 ++++++-------
 views/default/river/object/album/create.php    |   84 +-
 views/default/river/object/image/create.php    |   56 +-
 views/default/river/object/image/tag.php       |   44 +-
 views/default/tidypics/admin/help.php          |   48 +-
 views/default/tidypics/admin/imagelib.php      |  122 +--
 views/default/tidypics/admin/settings.php      |   48 +-
 views/default/tidypics/admin/stats.php         |   68 +-
 views/default/tidypics/admin/thumbnails.php    |   64 +-
 views/default/tidypics/albums.php              |  100 +--
 views/default/tidypics/breadcrumbs.php         |   44 +-
 views/default/tidypics/exif.php                |   26 +-
 views/default/tidypics/forms/edit.php          |  234 ++---
 views/default/tidypics/forms/edit_multi.php    |  114 +--
 views/default/tidypics/forms/settings.php      |  288 +++----
 views/default/tidypics/gallery.php             |  126 +--
 views/default/tidypics/groupprofile_albums.php |   28 +-
 views/default/tidypics/hover_menu.php          |   22 +-
 views/default/tidypics/image_menu.php          |  100 +--
 views/default/tidypics/tagging.php             |  172 ++--
 views/default/widgets/album_view/edit.php      |   46 +-
 views/default/widgets/latest_photos/edit.php   |   28 +-
 views/rss/object/album.php                     |   88 +-
 views/rss/object/file.php                      |   46 +-
 views/rss/object/image.php                     |   36 +-
 views/rss/tidypics/gallery.php                 |   34 +-
 54 files changed, 4371 insertions(+), 4371 deletions(-)

diff --git a/actions/addalbum.php b/actions/addalbum.php
index ffc7ec9c7..8df488a92 100644
--- a/actions/addalbum.php
+++ b/actions/addalbum.php
@@ -1,74 +1,74 @@
-getGUID());
-
-	// Cache to the session
-	$_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
-		}
-		
-		// Now let's add tags
-		if (is_array($tagarray)) {
-			$album->tags = $tagarray;
-		}
-		
-		
-		
-		// Success message
-		system_message(elgg_echo("album:created"));
-		
-		// 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);
-
-		forward("pg/photos/upload/" . $album->guid);
-	}
-
+getGUID());
+
+	// Cache to the session
+	$_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
+		}
+		
+		// Now let's add tags
+		if (is_array($tagarray)) {
+			$album->tags = $tagarray;
+		}
+		
+		
+		
+		// Success message
+		system_message(elgg_echo("album:created"));
+		
+		// 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);
+
+		forward("pg/photos/upload/" . $album->guid);
+	}
+
 ?>
\ No newline at end of file
diff --git a/actions/addtag.php b/actions/addtag.php
index 2c258db84..56268783e 100644
--- a/actions/addtag.php
+++ b/actions/addtag.php
@@ -1,104 +1,104 @@
-tags)) {
-			if ($image->tags != $word) {
-				$new_word_tag = true;
-				$tagarray = $image->tags . ',' . $word;
-				$tagarray = string_to_tag_array($tagarray);
-			}
-		} else {
-			if (!in_array($word, $image->tags)) {
-				$new_word_tag = true;
-				$tagarray = $image->tags;
-				$tagarray[] = $word;
-			}
-		}
-	}
-	
-	// add new tag now so it is available in search
-	if ($new_word_tag) {
-		$image->clearMetadata('tags');
-		$image->tags = $tagarray;
-	}
-
-	// create string for javascript tag object
-	$tag->coords = $coordinates_str;
-	$tag->type   = $relationships_type;
-	$tag->value  = $value;
-
-	$access_id = $image->getAccessID();
-	$owner_id = get_loggedin_userid();
-	$tagger = get_loggedin_user();
-
-	//Save annotation
-	if ($image->annotate('phototag', serialize($tag), $access_id, $owner_id)) {
-		// if tag is a user id, add relationship for searching (find all images with user x)
-		if ($relationships_type === 'user') {
-			if (!check_entity_relationship($user_id, 'phototag', $image_guid)) {
-				add_entity_relationship($user_id, 'phototag', $image_guid);
-				
-				// also add this to the river - subject is image, object is the tagged user
-				if (function_exists('add_to_river'))
-					add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id, $access_id);
-				
-				// notify user of tagging as long as not self
-				if ($owner_id != $user_id)
-					notify_user($user_id, $owner_id, elgg_echo('tidypics:tag:subject'), 
-						sprintf(
-									elgg_echo('tidypics:tag:body'),
-									$image->title,
-									$tagger->name,
-									$image->getURL()
-								)
-					);
-			}
-		}
-	
-		system_message(elgg_echo("tidypics:phototagging:success"));
-	}
-
-
-	forward($_SERVER['HTTP_REFERER']);
-
-?>
+tags)) {
+			if ($image->tags != $word) {
+				$new_word_tag = true;
+				$tagarray = $image->tags . ',' . $word;
+				$tagarray = string_to_tag_array($tagarray);
+			}
+		} else {
+			if (!in_array($word, $image->tags)) {
+				$new_word_tag = true;
+				$tagarray = $image->tags;
+				$tagarray[] = $word;
+			}
+		}
+	}
+	
+	// add new tag now so it is available in search
+	if ($new_word_tag) {
+		$image->clearMetadata('tags');
+		$image->tags = $tagarray;
+	}
+
+	// create string for javascript tag object
+	$tag->coords = $coordinates_str;
+	$tag->type   = $relationships_type;
+	$tag->value  = $value;
+
+	$access_id = $image->getAccessID();
+	$owner_id = get_loggedin_userid();
+	$tagger = get_loggedin_user();
+
+	//Save annotation
+	if ($image->annotate('phototag', serialize($tag), $access_id, $owner_id)) {
+		// if tag is a user id, add relationship for searching (find all images with user x)
+		if ($relationships_type === 'user') {
+			if (!check_entity_relationship($user_id, 'phototag', $image_guid)) {
+				add_entity_relationship($user_id, 'phototag', $image_guid);
+				
+				// also add this to the river - subject is image, object is the tagged user
+				if (function_exists('add_to_river'))
+					add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id, $access_id);
+				
+				// notify user of tagging as long as not self
+				if ($owner_id != $user_id)
+					notify_user($user_id, $owner_id, elgg_echo('tidypics:tag:subject'), 
+						sprintf(
+									elgg_echo('tidypics:tag:body'),
+									$image->title,
+									$tagger->name,
+									$image->getURL()
+								)
+					);
+			}
+		}
+	
+		system_message(elgg_echo("tidypics:phototagging:success"));
+	}
+
+
+	forward($_SERVER['HTTP_REFERER']);
+
+?>
diff --git a/actions/create_thumbnails.php b/actions/create_thumbnails.php
index 3869e2dcf..09743eef6 100644
--- a/actions/create_thumbnails.php
+++ b/actions/create_thumbnails.php
@@ -1,61 +1,61 @@
-getFilename();
-	$container_guid = $image->container_guid;
-	if (!$filename || !$container_guid) {
-		echo "Error retrieving information about the image";
-		return;
-	}
-	
-	$title = $image->title;
-	$prefix = "image/" . $container_guid . "/";
-	$filestorename = substr($filename, strlen($prefix));
-	
-	$image_lib = get_plugin_setting('image_lib', 'tidypics');
-	if (!$image_lib)
-		$image_lib = "GD";
-	
-	if ($image_lib == 'ImageMagick') { // ImageMagick command line
-		
-		if (tp_create_im_cmdline_thumbnails($image, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
-			echo "Failed to create thumbnails";
-		}
-		
-	} else if ($image_lib == 'ImageMagickPHP') {  // imagick PHP extension 
-		
-		if (tp_create_imagick_thumbnails($image, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
-			echo "Failed to create thumbnails";
-		}
-	
-	} else { 
-		
-		if (tp_create_gd_thumbnails($image, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
-			echo "Failed to create thumbnails";
-		}
-		
-	} // end of image library selector
-	
-	echo "wwwroot}mod/tidypics/thumbnail.php?file_guid={$guid}&size=large\" alt=\"{$title}\" />";
-				
-?>
+getFilename();
+	$container_guid = $image->container_guid;
+	if (!$filename || !$container_guid) {
+		echo "Error retrieving information about the image";
+		return;
+	}
+	
+	$title = $image->title;
+	$prefix = "image/" . $container_guid . "/";
+	$filestorename = substr($filename, strlen($prefix));
+	
+	$image_lib = get_plugin_setting('image_lib', 'tidypics');
+	if (!$image_lib)
+		$image_lib = "GD";
+	
+	if ($image_lib == 'ImageMagick') { // ImageMagick command line
+		
+		if (tp_create_im_cmdline_thumbnails($image, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
+			echo "Failed to create thumbnails";
+		}
+		
+	} else if ($image_lib == 'ImageMagickPHP') {  // imagick PHP extension 
+		
+		if (tp_create_imagick_thumbnails($image, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
+			echo "Failed to create thumbnails";
+		}
+	
+	} else { 
+		
+		if (tp_create_gd_thumbnails($image, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
+			echo "Failed to create thumbnails";
+		}
+		
+	} // end of image library selector
+	
+	echo "wwwroot}mod/tidypics/thumbnail.php?file_guid={$guid}&size=large\" alt=\"{$title}\" />";
+				
+?>
diff --git a/actions/delete.php b/actions/delete.php
index 1a518af9e..5506c2303 100644
--- a/actions/delete.php
+++ b/actions/delete.php
@@ -1,121 +1,121 @@
-canEdit()) { // user doesn't have permissions
-		register_error(elgg_echo("file:deletefailed"));
-		forward($forward_url);
-	}
-
-	$subtype = $entity->getSubtype();
-	$container = get_entity($entity->container_guid);
-	
-	if ($subtype != 'image' && $subtype != 'album') { // how did we even get here?
-		register_error(elgg_echo("file:deletefailed"));
-		forward($forward_url);
-	}
-
-	$owner_guid = 0; // group or user
-	if ($subtype == 'image') { //deleting an image
-		$album = get_entity($entity->container_guid);
-		$owner_guid = $album->container_guid;
-		$forward_url = $container->getURL(); //forward back to album after deleting pictures
-		$images = array($entity);
-		// plugins can register to be told when a Tidypics image has been deleted
-		trigger_elgg_event('delete', 'tp_image', $entity);
-	} else { //deleting an album
-		$owner_guid = $entity->container_guid;
-		$forward_url = 'pg/photos/owned/' . $container->username;
-		//get all the images from this album as long as less than 999 images
-		$images = get_entities("object", "image", $guid, '', 999); 
-		// plugins can register to be told when a Tidypics album has been deleted
-		trigger_elgg_event('delete', 'tp_album', $entity);
-	}
-
-	// make sure we decrease the repo size for the size quota
-	$image_repo_size_md = get_metadata_byname($owner_guid, "image_repo_size");
-	$image_repo_size = (int)$image_repo_size_md->value;
-
-	//loop through all images and delete them
-	foreach($images as $im) {
-		$thumbnail = $im->thumbnail;
-		$smallthumb = $im->smallthumb;
-		$largethumb = $im->largethumb;
-
-		if ($thumbnail) { //delete standard thumbnail image
-			$delfile = new ElggFile();
-			$delfile->owner_guid = $im->getOwner();
-			$delfile->setFilename($thumbnail);
-			$delfile->delete();
-		}
-		if ($smallthumb) { //delete small thumbnail image
-			$delfile = new ElggFile();
-			$delfile->owner_guid = $im->getOwner();
-			$delfile->setFilename($smallthumb);
-			$delfile->delete();
-		}
-		if ($largethumb) { //delete large thumbnail image
-			$delfile = new ElggFile();
-			$delfile->owner_guid = $im->getOwner();
-			$delfile->setFilename($largethumb);
-			$delfile->delete();
-		}
-		if ($im) { //delete actual image file
-			$delfile = new ElggFile($im->getGUID());
-			$delfile->owner_guid = $im->getOwner();
-			//$delfile->setFilename($im->originalfilename);
-			$image_repo_size -= $delfile->size();
-			
-			if (!$delfile->delete()) {
-				if ($subtype=='image') register_error(elgg_echo("file:deletefailed")); //unable to delete object
-			} else {
-				if ($subtype=='image') system_message(elgg_echo("file:deleted")); //successfully deleted object
-			}
-		} //end delete actual image file
-	} //end looping through each image to delete it
-	
-	//now that all images have been deleted, delete the album
-	if ($subtype == 'album') {
-		//delete the album's directory manually; first create a temp file to get the directory path
-		$tmpfile = new ElggFile();
-		$tmpfile->setFilename('image/' . $guid . '/._tmp_del_tidypics_album_');
-		$tmpfile->subtype = 'image';
-		$tmpfile->container_guid = $guid;
-		$tmpfile->open("write");
-		$tmpfile->write('');
-		$tmpfile->close();
-		$tmpfile->save();
-		$albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore());
-		$tmpfile->delete();
-		if (is_dir($albumdir))
-			rmdir($albumdir);
-		
-		//delete object from database
-		if (!$entity->delete()) {
-			register_error(elgg_echo("file:deletefailed")); //unable to delete object
-		} else {
-			system_message(elgg_echo("file:deleted")); //successfully deleted object
-		}
-	} //end of delete album
-
-	create_metadata($owner_guid, "image_repo_size", $image_repo_size, 'integer', $owner_guid);
-
-	forward($forward_url);
-
+canEdit()) { // user doesn't have permissions
+		register_error(elgg_echo("file:deletefailed"));
+		forward($forward_url);
+	}
+
+	$subtype = $entity->getSubtype();
+	$container = get_entity($entity->container_guid);
+	
+	if ($subtype != 'image' && $subtype != 'album') { // how did we even get here?
+		register_error(elgg_echo("file:deletefailed"));
+		forward($forward_url);
+	}
+
+	$owner_guid = 0; // group or user
+	if ($subtype == 'image') { //deleting an image
+		$album = get_entity($entity->container_guid);
+		$owner_guid = $album->container_guid;
+		$forward_url = $container->getURL(); //forward back to album after deleting pictures
+		$images = array($entity);
+		// plugins can register to be told when a Tidypics image has been deleted
+		trigger_elgg_event('delete', 'tp_image', $entity);
+	} else { //deleting an album
+		$owner_guid = $entity->container_guid;
+		$forward_url = 'pg/photos/owned/' . $container->username;
+		//get all the images from this album as long as less than 999 images
+		$images = get_entities("object", "image", $guid, '', 999); 
+		// plugins can register to be told when a Tidypics album has been deleted
+		trigger_elgg_event('delete', 'tp_album', $entity);
+	}
+
+	// make sure we decrease the repo size for the size quota
+	$image_repo_size_md = get_metadata_byname($owner_guid, "image_repo_size");
+	$image_repo_size = (int)$image_repo_size_md->value;
+
+	//loop through all images and delete them
+	foreach($images as $im) {
+		$thumbnail = $im->thumbnail;
+		$smallthumb = $im->smallthumb;
+		$largethumb = $im->largethumb;
+
+		if ($thumbnail) { //delete standard thumbnail image
+			$delfile = new ElggFile();
+			$delfile->owner_guid = $im->getOwner();
+			$delfile->setFilename($thumbnail);
+			$delfile->delete();
+		}
+		if ($smallthumb) { //delete small thumbnail image
+			$delfile = new ElggFile();
+			$delfile->owner_guid = $im->getOwner();
+			$delfile->setFilename($smallthumb);
+			$delfile->delete();
+		}
+		if ($largethumb) { //delete large thumbnail image
+			$delfile = new ElggFile();
+			$delfile->owner_guid = $im->getOwner();
+			$delfile->setFilename($largethumb);
+			$delfile->delete();
+		}
+		if ($im) { //delete actual image file
+			$delfile = new ElggFile($im->getGUID());
+			$delfile->owner_guid = $im->getOwner();
+			//$delfile->setFilename($im->originalfilename);
+			$image_repo_size -= $delfile->size();
+			
+			if (!$delfile->delete()) {
+				if ($subtype=='image') register_error(elgg_echo("file:deletefailed")); //unable to delete object
+			} else {
+				if ($subtype=='image') system_message(elgg_echo("file:deleted")); //successfully deleted object
+			}
+		} //end delete actual image file
+	} //end looping through each image to delete it
+	
+	//now that all images have been deleted, delete the album
+	if ($subtype == 'album') {
+		//delete the album's directory manually; first create a temp file to get the directory path
+		$tmpfile = new ElggFile();
+		$tmpfile->setFilename('image/' . $guid . '/._tmp_del_tidypics_album_');
+		$tmpfile->subtype = 'image';
+		$tmpfile->container_guid = $guid;
+		$tmpfile->open("write");
+		$tmpfile->write('');
+		$tmpfile->close();
+		$tmpfile->save();
+		$albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore());
+		$tmpfile->delete();
+		if (is_dir($albumdir))
+			rmdir($albumdir);
+		
+		//delete object from database
+		if (!$entity->delete()) {
+			register_error(elgg_echo("file:deletefailed")); //unable to delete object
+		} else {
+			system_message(elgg_echo("file:deleted")); //successfully deleted object
+		}
+	} //end of delete album
+
+	create_metadata($owner_guid, "image_repo_size", $image_repo_size, 'integer', $owner_guid);
+
+	forward($forward_url);
+
 ?>
\ No newline at end of file
diff --git a/actions/deletetag.php b/actions/deletetag.php
index 3a76f6e99..becf1fedb 100644
--- a/actions/deletetag.php
+++ b/actions/deletetag.php
@@ -1,57 +1,57 @@
- $value) {		
-		// delete normal tag if it exists
-		if (is_array($image->tags)) {
-			$index = array_search($value, $image->tags);
-			if ($index !== false) {
-				$tagarray = $image->tags;
-				unset($tagarray[$index]);
-				$image->clearMetadata('tags');
-				$image->tags = $tagarray;
-			}
-		} else {
-			if ($value === $image->tags) {
-				$image->clearMetadata('tags');
-			}
-		}
-		
-		// delete relationship if this tag is a user
-		$annotation = get_annotation($id);
-		$photo_tag = unserialize($annotation->value);
-		if ($photo_tag->type == 'user') {
-			remove_entity_relationship($photo_tag->value, 'phototag', $image_guid);
-		}
-		
-		// delete the photo tag annotation
-		delete_annotation($id);
-	}
-	
-	system_message(elgg_echo("tidypics:deletetag:success"));
-
-	forward($_SERVER['HTTP_REFERER']);
-
-?>
+ $value) {		
+		// delete normal tag if it exists
+		if (is_array($image->tags)) {
+			$index = array_search($value, $image->tags);
+			if ($index !== false) {
+				$tagarray = $image->tags;
+				unset($tagarray[$index]);
+				$image->clearMetadata('tags');
+				$image->tags = $tagarray;
+			}
+		} else {
+			if ($value === $image->tags) {
+				$image->clearMetadata('tags');
+			}
+		}
+		
+		// delete relationship if this tag is a user
+		$annotation = get_annotation($id);
+		$photo_tag = unserialize($annotation->value);
+		if ($photo_tag->type == 'user') {
+			remove_entity_relationship($photo_tag->value, 'phototag', $image_guid);
+		}
+		
+		// delete the photo tag annotation
+		delete_annotation($id);
+	}
+	
+	system_message(elgg_echo("tidypics:deletetag:success"));
+
+	forward($_SERVER['HTTP_REFERER']);
+
+?>
diff --git a/actions/edit.php b/actions/edit.php
index 91c465828..cdf9420b2 100644
--- a/actions/edit.php
+++ b/actions/edit.php
@@ -1,81 +1,81 @@
-canEdit()) {
-		forward();
-	}
-
-	// Get owning user/group
-	$owner = get_entity($entity->getOwner());
-
-	// change access only if access is different from current
-	if ($subtype == 'album' && $entity->access_id != $access) {
-		$entity->access_id = $access;
-	
-		//get images from album and update access on image entities
-		$images = get_entities("object","image", $guid, '', 999, '', false);
-		foreach ($images as $im) {
-			$im->access_id = $access;
-			$im->save();
-		}
-	}
-
-
-	// Set its title and description appropriately
-	$entity->title = $title;
-	$entity->description = $body;
-
-	// Before we can set metadata, we need to save the entity
-	if (!$entity->save()) {
-		register_error(elgg_echo("album:error"));
-		$entity->delete();
-		forward($_SERVER['HTTP_REFERER']); //failed, so forward to previous page
-	}
-
-	// Now let's add tags
-	$tagarray = string_to_tag_array($tags);
-	$entity->clearMetadata('tags');
-	if (is_array($tagarray)) {
-		$entity->tags = $tagarray;
-	}
-
-	//if cover meta is sent from image save as metadata
-	if ($subtype == 'image' && $cover == elgg_echo('album:cover')) {
-		$album = get_entity($container_guid); 
-		$album->cover = $entity->guid;
-	}
-
-	// Success message
-	if ($subtype == 'album') {
-		system_message(elgg_echo("album:edited"));
-		// plugins can register to be told when a Tidypics album has been updated
-		trigger_elgg_event('update', 'tp_album', $entity);
-	} else {
-		system_message(elgg_echo('images:edited'));
-		// plugins can register to be told when a Tidypics image has been updated
-		trigger_elgg_event('update', 'tp_image', $entity);
-	}
-
-	forward($entity->getURL());
-?>
+canEdit()) {
+		forward();
+	}
+
+	// Get owning user/group
+	$owner = get_entity($entity->getOwner());
+
+	// change access only if access is different from current
+	if ($subtype == 'album' && $entity->access_id != $access) {
+		$entity->access_id = $access;
+	
+		//get images from album and update access on image entities
+		$images = get_entities("object","image", $guid, '', 999, '', false);
+		foreach ($images as $im) {
+			$im->access_id = $access;
+			$im->save();
+		}
+	}
+
+
+	// Set its title and description appropriately
+	$entity->title = $title;
+	$entity->description = $body;
+
+	// Before we can set metadata, we need to save the entity
+	if (!$entity->save()) {
+		register_error(elgg_echo("album:error"));
+		$entity->delete();
+		forward($_SERVER['HTTP_REFERER']); //failed, so forward to previous page
+	}
+
+	// Now let's add tags
+	$tagarray = string_to_tag_array($tags);
+	$entity->clearMetadata('tags');
+	if (is_array($tagarray)) {
+		$entity->tags = $tagarray;
+	}
+
+	//if cover meta is sent from image save as metadata
+	if ($subtype == 'image' && $cover == elgg_echo('album:cover')) {
+		$album = get_entity($container_guid); 
+		$album->cover = $entity->guid;
+	}
+
+	// Success message
+	if ($subtype == 'album') {
+		system_message(elgg_echo("album:edited"));
+		// plugins can register to be told when a Tidypics album has been updated
+		trigger_elgg_event('update', 'tp_album', $entity);
+	} else {
+		system_message(elgg_echo('images:edited'));
+		// plugins can register to be told when a Tidypics image has been updated
+		trigger_elgg_event('update', 'tp_image', $entity);
+	}
+
+	forward($entity->getURL());
+?>
diff --git a/actions/edit_multi.php b/actions/edit_multi.php
index 92252b6dd..c7099e6db 100644
--- a/actions/edit_multi.php
+++ b/actions/edit_multi.php
@@ -1,66 +1,66 @@
- $im) {
-		$image = get_entity($im);
-		
-		if ($image->canEdit()) {
-			
-			// Convert string of tags into a preformatted array
-			$tagarray = string_to_tag_array($tags_array[$key]);
-
-			//set title appropriately
-			if ($title_array[$key])
-				$image->title = $title_array[$key];
-			else
-				$image->title = substr($image->originalfilename, 0, strrpos($image->originalfilename, '.'));
-			
-			//set description appropriately
-			$image->description = $caption_array[$key];
-
-			// Before we can set metadata, we need to save the image
-			if (!$image->save()) {
-				array_push($not_updated, $image->guid);
-			}
-
-			// Now let's add tags. We can pass an array directly to the object property! Easy.
-			$image->clearMetadata('tags');
-			if (is_array($tagarray)) {
-				$image->tags = $tagarray;
-			}
-				
-			//if cover meta is sent from image save as metadata
-			if ($cover == $im) {
-				$album_entity->cover = $im;
-			}
-		}
-	}
-	
-	// Success message
-	if (count($not_updated) > 0) {
-		register_error(elgg_echo("images:notedited"));
-	} else {
-		system_message(elgg_echo("images:edited"));
-	}
-			
-	// Forward to the main album page
-	forward($album_entity->getURL());
-
+ $im) {
+		$image = get_entity($im);
+		
+		if ($image->canEdit()) {
+			
+			// Convert string of tags into a preformatted array
+			$tagarray = string_to_tag_array($tags_array[$key]);
+
+			//set title appropriately
+			if ($title_array[$key])
+				$image->title = $title_array[$key];
+			else
+				$image->title = substr($image->originalfilename, 0, strrpos($image->originalfilename, '.'));
+			
+			//set description appropriately
+			$image->description = $caption_array[$key];
+
+			// Before we can set metadata, we need to save the image
+			if (!$image->save()) {
+				array_push($not_updated, $image->guid);
+			}
+
+			// Now let's add tags. We can pass an array directly to the object property! Easy.
+			$image->clearMetadata('tags');
+			if (is_array($tagarray)) {
+				$image->tags = $tagarray;
+			}
+				
+			//if cover meta is sent from image save as metadata
+			if ($cover == $im) {
+				$album_entity->cover = $im;
+			}
+		}
+	}
+	
+	// Success message
+	if (count($not_updated) > 0) {
+		register_error(elgg_echo("images:notedited"));
+	} else {
+		system_message(elgg_echo("images:edited"));
+	}
+			
+	// Forward to the main album page
+	forward($album_entity->getURL());
+
 ?>
\ No newline at end of file
diff --git a/actions/imtest.php b/actions/imtest.php
index 8d5171785..cbe15a1c1 100644
--- a/actions/imtest.php
+++ b/actions/imtest.php
@@ -1,19 +1,19 @@
-
+
diff --git a/actions/settings.php b/actions/settings.php
index 6b115b049..e16e7960e 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -1,70 +1,70 @@
- $v) {
-		if (!set_plugin_setting($k, $v, 'tidypics')) {
-			register_error(sprintf(elgg_echo('plugins:settings:save:fail'), 'tidypics'));
-			forward($_SERVER['HTTP_REFERER']);
-		}
-	}
-
-	// check boxes
-	if (is_array(get_input('download_link'))) // this can be done due to way Elgg uses checkboxes
-		set_plugin_setting('download_link', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('download_link', 'disabled', 'tidypics');
-
-	if (is_array(get_input('tagging')))
-		set_plugin_setting('tagging', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('tagging', 'disabled', 'tidypics');
-
-	if (is_array(get_input('photo_ratings')))
-		set_plugin_setting('photo_ratings', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('photo_ratings', 'disabled', 'tidypics');
-
-	if (is_array(get_input('exif')))
-		set_plugin_setting('exif', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('exif', 'disabled', 'tidypics');
-
-	if (is_array(get_input('view_count')))
-		set_plugin_setting('view_count', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('view_count', 'disabled', 'tidypics');
-
-	if (is_array(get_input('grp_perm_override')))
-		set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('grp_perm_override', 'disabled', 'tidypics');
-
-
-	// image sizes
-	$image_sizes = array();
-	$image_sizes['large_image_width'] = get_input('large_thumb_width');
-	$image_sizes['large_image_height'] = get_input('large_thumb_height');
-	$image_sizes['small_image_width'] = get_input('small_thumb_width');
-	$image_sizes['small_image_height'] = get_input('small_thumb_height');
-	$image_sizes['thumb_image_width'] = get_input('thumb_width');
-	$image_sizes['thumb_image_height'] = get_input('thumb_height');
-	set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics');
-
-
-	
-	system_message(elgg_echo('tidypics:settings:save:ok'));
-	
-	forward($_SERVER['HTTP_REFERER']);
-?>
+ $v) {
+		if (!set_plugin_setting($k, $v, 'tidypics')) {
+			register_error(sprintf(elgg_echo('plugins:settings:save:fail'), 'tidypics'));
+			forward($_SERVER['HTTP_REFERER']);
+		}
+	}
+
+	// check boxes
+	if (is_array(get_input('download_link'))) // this can be done due to way Elgg uses checkboxes
+		set_plugin_setting('download_link', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('download_link', 'disabled', 'tidypics');
+
+	if (is_array(get_input('tagging')))
+		set_plugin_setting('tagging', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('tagging', 'disabled', 'tidypics');
+
+	if (is_array(get_input('photo_ratings')))
+		set_plugin_setting('photo_ratings', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('photo_ratings', 'disabled', 'tidypics');
+
+	if (is_array(get_input('exif')))
+		set_plugin_setting('exif', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('exif', 'disabled', 'tidypics');
+
+	if (is_array(get_input('view_count')))
+		set_plugin_setting('view_count', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('view_count', 'disabled', 'tidypics');
+
+	if (is_array(get_input('grp_perm_override')))
+		set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
+	else
+		set_plugin_setting('grp_perm_override', 'disabled', 'tidypics');
+
+
+	// image sizes
+	$image_sizes = array();
+	$image_sizes['large_image_width'] = get_input('large_thumb_width');
+	$image_sizes['large_image_height'] = get_input('large_thumb_height');
+	$image_sizes['small_image_width'] = get_input('small_thumb_width');
+	$image_sizes['small_image_height'] = get_input('small_thumb_height');
+	$image_sizes['thumb_image_width'] = get_input('thumb_width');
+	$image_sizes['thumb_image_height'] = get_input('thumb_height');
+	set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics');
+
+
+	
+	system_message(elgg_echo('tidypics:settings:save:ok'));
+	
+	forward($_SERVER['HTTP_REFERER']);
+?>
diff --git a/actions/upload.php b/actions/upload.php
index 3aa739414..0913ed937 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -1,255 +1,255 @@
-getGUID();
-
-	$album = get_entity($container_guid);
-
-	$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); 
-	if (!$maxfilesize)
-		$maxfilesize = 5; // default to 5 MB if not set 
-	$maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs
-
-	$quota = get_plugin_setting('quota','tidypics');
-	$quota = 1024 * 1024 * $quota;
-	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
-	$image_repo_size = (int)$image_repo_size_md->value;
-
-	$image_lib = get_plugin_setting('image_lib', 'tidypics');
-	if (!$image_lib)
-		$image_lib = "GD";
-
-	// post limit exceeded
-	if (count($_FILES) == 0) {
-		trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
-		register_error(elgg_echo('tidypics:exceedpostlimit'));
-		forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
-	}
-
-	// test to make sure at least 1 image was selected by user
-	$num_images = 0;
-	foreach($_FILES as $key => $sent_file) {
-		if (!empty($sent_file['name']))
-			$num_images++;
-	}
-	if ($num_images == 0) {
-		// have user try again
-		register_error(elgg_echo('tidypics:noimages'));
-		forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
-	}
-
-	$uploaded_images = array();
-	$not_uploaded = array();
-	$error_msgs = array();
-	
-	$img_river_view = get_plugin_setting('img_river_view', 'tidypics');
-	
-	$accepted_formats = array(
-								'image/jpeg',
-								'image/png',
-								'image/gif',
-								'image/pjpeg',
-								'image/x-png',
-								);
-
-
-	foreach($_FILES as $key => $sent_file) {
-		
-		// skip empty entries 
-		if (empty($sent_file['name']))
-			continue;
-		
-		$name = $sent_file['name'];
-		$mime = $sent_file['type'];
-
-		if ($sent_file['error']) {
-			array_push($not_uploaded, $sent_file['name']);
-			if ($sent_file['error'] == 1) {
-				trigger_error('Tidypics warning: image exceed server php upload limit', E_USER_WARNING);
-				array_push($error_msgs, elgg_echo('tidypics:image_mem'));
-			}
-			else {
-				array_push($error_msgs, elgg_echo('tidypics:unk_error'));
-			}
-			continue;
-		}
-		
-		//make sure file is an image
-		if (!in_array($mime, $accepted_formats)) {
-			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:not_image'));
-			continue;
-		}
-
-		// check quota
-		if ($quota) {
-			if ($image_repo_size + $sent_file['size'] > $quota) {
-				array_push($not_uploaded, $sent_file['name']);
-				array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
-				continue;
-			}
-		}
-		
-		// make sure file does not exceed memory limit
-		if ($sent_file['size'] > $maxfilesize) {
-			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:image_mem'));
-			continue;
-		}
-		
-		// make sure the in memory image size does not exceed memory available - GD only
-		$imginfo = getimagesize($sent_file['tmp_name']);
-		$mem_avail = ini_get('memory_limit');
-		$mem_avail = rtrim($mem_avail, 'M');
-		$mem_avail = $mem_avail * 1024 * 1024;
-		if ($image_lib == 'GD') {
-			$mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);
-			
-			$mem_used = memory_get_usage();
-				
-			$mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer
-			if ($mem_required > $mem_avail) {
-				array_push($not_uploaded, $sent_file['name']);
-				array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
-				trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
-				continue;
-			}
-		} else if ($image_lib == 'ImageMagickPHP') {
-			// haven't been able to determine a limit like there is for GD
-		}
-
-		//this will save to users folder in /image/ and organize by photo album
-		$prefix = "image/" . $container_guid . "/";
-		$file = new ElggFile();
-		$filestorename = strtolower(time().$name);
-		$file->setFilename($prefix.$filestorename);
-		$file->setMimeType($mime);
-		$file->originalfilename = $name;
-		$file->subtype="image";
-		$file->simpletype="image";
-		$file->access_id = $access_id;
-		if ($container_guid) {
-			$file->container_guid = $container_guid;
-		}
-		$file->open("write");
-		$file->write(get_uploaded_file($key));
-		$file->close();
-		$result = $file->save();
-
-		if (!$result) {
-			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:save_error'));
-			continue;
-		}
-		
-		//get and store the exif data
-		td_get_exif($file);
-		
-		
-		// resize photos to create thumbnails
-		if ($image_lib == 'ImageMagick') { // ImageMagick command line
-			
-			if (tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
-			}
-			
-		} else if ($image_lib == 'ImageMagickPHP') {  // imagick php extension 
-			
-			if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
-			}
-		
-		} else { 
-			
-			if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
-			}
-			
-		} // end of image library selector
-
-		//keep one file handy so we can add a notice to the river if single image option selected
-		if(!$file_for_river) {
-			$file_for_river = $file;
-		}
-
-		array_push($uploaded_images, $file->guid);
-
-		// update user/group size for checking quota
-		$image_repo_size += $sent_file['size'];
-
-		// plugins can register to be told when a new image has been uploaded
-		trigger_elgg_event('upload', 'tp_image', $file);
-		
-		// successful upload so check if this is a new album and throw river event/notification if so
-		if ($album->new_album == TP_NEW_ALBUM) {
-			$album->new_album = TP_OLD_ALBUM;
-
-			// we throw the notification manually here so users are not told about the new album until there
-			// is at least a few photos in it
-			object_notifications('create', 'object', $album);
-			
-			if (function_exists('add_to_river'))
-				add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
-		}
-	
-		if ($img_river_view == "all") {
-			add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
-		}
-		unset($file);  // may not be needed but there seems to be a memory leak
-
-	} //end of for loop
-				
-	if (count($not_uploaded) > 0) {
-		if (count($uploaded_images) > 0)
-			$error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images))  . '
      ';
-		else
-			$error = elgg_echo("tidypics:completeuploadfailure") . '
      ';
-
-		$num_failures = count($not_uploaded);
-		for ($i = 0; $i < $num_failures; $i++) {
-			$error .= "{$not_uploaded[$i]}: {$error_msgs[$i]} 
      ";
-		}
-		register_error($error);
-		
-		if (count($uploaded_images) == 0)
-			forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page
-		else {
-			// some images did upload so we fall through
-		}
-	} else {
-			system_message(elgg_echo('tidypics:upl_success'));
-	}
-
-	
-	if (count($uploaded_images) && $img_river_view == "1") {
-		if (function_exists('add_to_river')) {
-			add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
-		}
-	}
-	
-	// update image repo size
-	create_metadata($album->container_guid, "image_repo_size", $image_repo_size, 'integer', $album->container_guid);
-	
-	// plugins can register to be told when a Tidypics album has had images added
-	trigger_elgg_event('upload', 'tp_album', $album);
-	
-	
-	//forward to multi-image edit page
-	forward($CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images)); 
-
-?>
+getGUID();
+
+	$album = get_entity($container_guid);
+
+	$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); 
+	if (!$maxfilesize)
+		$maxfilesize = 5; // default to 5 MB if not set 
+	$maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs
+
+	$quota = get_plugin_setting('quota','tidypics');
+	$quota = 1024 * 1024 * $quota;
+	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
+	$image_repo_size = (int)$image_repo_size_md->value;
+
+	$image_lib = get_plugin_setting('image_lib', 'tidypics');
+	if (!$image_lib)
+		$image_lib = "GD";
+
+	// post limit exceeded
+	if (count($_FILES) == 0) {
+		trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
+		register_error(elgg_echo('tidypics:exceedpostlimit'));
+		forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
+	}
+
+	// test to make sure at least 1 image was selected by user
+	$num_images = 0;
+	foreach($_FILES as $key => $sent_file) {
+		if (!empty($sent_file['name']))
+			$num_images++;
+	}
+	if ($num_images == 0) {
+		// have user try again
+		register_error(elgg_echo('tidypics:noimages'));
+		forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
+	}
+
+	$uploaded_images = array();
+	$not_uploaded = array();
+	$error_msgs = array();
+	
+	$img_river_view = get_plugin_setting('img_river_view', 'tidypics');
+	
+	$accepted_formats = array(
+								'image/jpeg',
+								'image/png',
+								'image/gif',
+								'image/pjpeg',
+								'image/x-png',
+								);
+
+
+	foreach($_FILES as $key => $sent_file) {
+		
+		// skip empty entries 
+		if (empty($sent_file['name']))
+			continue;
+		
+		$name = $sent_file['name'];
+		$mime = $sent_file['type'];
+
+		if ($sent_file['error']) {
+			array_push($not_uploaded, $sent_file['name']);
+			if ($sent_file['error'] == 1) {
+				trigger_error('Tidypics warning: image exceed server php upload limit', E_USER_WARNING);
+				array_push($error_msgs, elgg_echo('tidypics:image_mem'));
+			}
+			else {
+				array_push($error_msgs, elgg_echo('tidypics:unk_error'));
+			}
+			continue;
+		}
+		
+		//make sure file is an image
+		if (!in_array($mime, $accepted_formats)) {
+			array_push($not_uploaded, $sent_file['name']);
+			array_push($error_msgs, elgg_echo('tidypics:not_image'));
+			continue;
+		}
+
+		// check quota
+		if ($quota) {
+			if ($image_repo_size + $sent_file['size'] > $quota) {
+				array_push($not_uploaded, $sent_file['name']);
+				array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
+				continue;
+			}
+		}
+		
+		// make sure file does not exceed memory limit
+		if ($sent_file['size'] > $maxfilesize) {
+			array_push($not_uploaded, $sent_file['name']);
+			array_push($error_msgs, elgg_echo('tidypics:image_mem'));
+			continue;
+		}
+		
+		// make sure the in memory image size does not exceed memory available - GD only
+		$imginfo = getimagesize($sent_file['tmp_name']);
+		$mem_avail = ini_get('memory_limit');
+		$mem_avail = rtrim($mem_avail, 'M');
+		$mem_avail = $mem_avail * 1024 * 1024;
+		if ($image_lib == 'GD') {
+			$mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);
+			
+			$mem_used = memory_get_usage();
+				
+			$mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer
+			if ($mem_required > $mem_avail) {
+				array_push($not_uploaded, $sent_file['name']);
+				array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
+				trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
+				continue;
+			}
+		} else if ($image_lib == 'ImageMagickPHP') {
+			// haven't been able to determine a limit like there is for GD
+		}
+
+		//this will save to users folder in /image/ and organize by photo album
+		$prefix = "image/" . $container_guid . "/";
+		$file = new ElggFile();
+		$filestorename = strtolower(time().$name);
+		$file->setFilename($prefix.$filestorename);
+		$file->setMimeType($mime);
+		$file->originalfilename = $name;
+		$file->subtype="image";
+		$file->simpletype="image";
+		$file->access_id = $access_id;
+		if ($container_guid) {
+			$file->container_guid = $container_guid;
+		}
+		$file->open("write");
+		$file->write(get_uploaded_file($key));
+		$file->close();
+		$result = $file->save();
+
+		if (!$result) {
+			array_push($not_uploaded, $sent_file['name']);
+			array_push($error_msgs, elgg_echo('tidypics:save_error'));
+			continue;
+		}
+		
+		//get and store the exif data
+		td_get_exif($file);
+		
+		
+		// resize photos to create thumbnails
+		if ($image_lib == 'ImageMagick') { // ImageMagick command line
+			
+			if (tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
+			}
+			
+		} else if ($image_lib == 'ImageMagickPHP') {  // imagick php extension 
+			
+			if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
+			}
+		
+		} else { 
+			
+			if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
+			}
+			
+		} // end of image library selector
+
+		//keep one file handy so we can add a notice to the river if single image option selected
+		if(!$file_for_river) {
+			$file_for_river = $file;
+		}
+
+		array_push($uploaded_images, $file->guid);
+
+		// update user/group size for checking quota
+		$image_repo_size += $sent_file['size'];
+
+		// plugins can register to be told when a new image has been uploaded
+		trigger_elgg_event('upload', 'tp_image', $file);
+		
+		// successful upload so check if this is a new album and throw river event/notification if so
+		if ($album->new_album == TP_NEW_ALBUM) {
+			$album->new_album = TP_OLD_ALBUM;
+
+			// we throw the notification manually here so users are not told about the new album until there
+			// is at least a few photos in it
+			object_notifications('create', 'object', $album);
+			
+			if (function_exists('add_to_river'))
+				add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
+		}
+	
+		if ($img_river_view == "all") {
+			add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
+		}
+		unset($file);  // may not be needed but there seems to be a memory leak
+
+	} //end of for loop
+				
+	if (count($not_uploaded) > 0) {
+		if (count($uploaded_images) > 0)
+			$error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images))  . '
      ';
+		else
+			$error = elgg_echo("tidypics:completeuploadfailure") . '
      ';
+
+		$num_failures = count($not_uploaded);
+		for ($i = 0; $i < $num_failures; $i++) {
+			$error .= "{$not_uploaded[$i]}: {$error_msgs[$i]} 
      ";
+		}
+		register_error($error);
+		
+		if (count($uploaded_images) == 0)
+			forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page
+		else {
+			// some images did upload so we fall through
+		}
+	} else {
+			system_message(elgg_echo('tidypics:upl_success'));
+	}
+
+	
+	if (count($uploaded_images) && $img_river_view == "1") {
+		if (function_exists('add_to_river')) {
+			add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
+		}
+	}
+	
+	// update image repo size
+	create_metadata($album->container_guid, "image_repo_size", $image_repo_size, 'integer', $album->container_guid);
+	
+	// plugins can register to be told when a Tidypics album has had images added
+	trigger_elgg_event('upload', 'tp_album', $album);
+	
+	
+	//forward to multi-image edit page
+	forward($CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images)); 
+
+?>
diff --git a/languages/en.php b/languages/en.php
index 87c431f75..7fa5f2e73 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1,221 +1,221 @@
- "untitled",
-
-		// Menu items and titles
-
-			'image' => "Image",
-			'images' => "Images",
-			'caption' => "Caption",
-			'photos' => "Photos",
-			'images:upload' => "Upload Images",
-			'images:multiupload' => "Flash Multi Upload Tool",
-			'images:multiupload:todo' => "Choose one or more files for upload.",
-			'album' => "Photo Album",
-			'albums' => "Photo Albums",
-			'album:slideshow' => "View slideshow",
-			'album:yours' => "Your photo albums",
-			'album:yours:friends' => "Your friends' photo albums",
-			'album:user' => "%s's photo albums",
-			'album:friends' => "%s's friends' photo albums",
-			'album:all' => "All site photo albums",
-			'album:group' => "Group albums",
-			'item:object:image' => "Photos",
-			'item:object:album' => "Albums",
-			'tidypics:uploading:images' => "Please wait. Uploading images.",
-			'tidypics:enablephotos' => 'Enable group photo albums',
-			'tidypics:editprops' => 'Edit Image Properties',
-			'tidypics:mostcommented' => 'Most commented images',
-			'tidypics:mostcommentedthismonth' => 'Most commented this month',
-			'tidypics:mostcommentedtoday' => 'Most commented today',
-			'tidypics:mostviewed' => 'Most viewed images',
-			'tidypics:mostvieweddashboard' => 'Most viewed dashboard',
-			'tidypics:mostviewedthisyear' => 'Most viewed this year',
-			'tidypics:mostviewedthismonth' => 'Most viewed this month',
-			'tidypics:mostviewedlastmonth' => 'Most viewed last month',
-			'tidypics:mostviewedtoday' => 'Most viewed today',
-			'tidypics:recentlyviewed' => 'Recently viewed images',
-			'tidypics:recentlycommented' => 'Recently commented images',
-			'tidypics:mostrecent' => 'Most recent images',
-			'tidypics:yourmostviewed' => 'Your most viewed images',
-			'tidypics:yourmostrecent' => 'Your most recent images',
-			'tidypics:friendmostviewed' => "%s's most viewed images",
-			'tidypics:friendmostrecent' => "%s's most recent images",
-			'tidypics:highestrated' => "Highest rated images",
-			'tidypics:views' => "Views: %s",
-			'tidypics:viewsbyowner' => "by %s users (not including you)",
-			'tidypics:viewsbyothers' => "(%s by you)",
-			'tidypics:administration' => 'Tidypics Administration',
-			'tidypics:stats' => 'Stats',
-			'flickr:setup' => 'Flickr Setup',
-			'flickr:usernamesetup' => 'Please enter your Flickr username here:',
-			'flickr:selectalbum' => 'Select album to import photos into',
-			'flickr:albumdesc' => 'Album to import photos to:',
-			'flickr:importmanager' => 'Photoset Import Manager',
-			'flickr:desc' => 'Click on the set you wish to import into this site.
      Copies of the photos will be made and stored on this site where they can be viewed and commented on.',
-			'flickr:intro' => 'Flickr Integration allows you to import photos from your flickr account into this Elgg site. By entering your username and choosing an album to import into, you can begin the process. 
      When you have saved your username and album selection, click on the ' . elgg_echo( 'flickr:menuimport' ) . ' link to the left to select which Flickr set you would like to import photos from.',
-			'flickr:menusetup' => 'Flickr Setup',
-			'flickr:menuimport' => 'Import Flickr Photos',
-			
-		//settings
-			'tidypics:settings' => 'Settings',
-			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
-			'tidypics:settings:image_lib' => "Image Library",
-			'tidypics:settings:thumbnail' => "Thumbnail Creation",
-			'tidypics:settings:help' => "Help",
-			'tidypics:settings:download_link' => "Show download link",
-			'tidypics:settings:tagging' => "Enable photo tagging",
-			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
-			'tidypics:settings:exif' => "Show EXIF data",
-			'tidypics:settings:view_count' => "View counter",
-			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
-			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
-			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
-			'tidypics:settings:watermark' => "Enter text to appear in the watermark - not for production sites yet",
-			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands (with trailing slash)",
-			'tidypics:settings:img_river_view' => "How many entries in river for each batch of uploaded images",
-			'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",
-			'tidypics:settings:largesize' => "Primary image size",
-			'tidypics:settings:smallsize' => "Album view image size",
-			'tidypics:settings:thumbsize' => "Thumbnail image size",
-			'tidypics:settings:im_id' => "Image ID",
-	
-		//actions
-
-			'album:create' => "Create new album",
-			'album:add' => "Add Photo Album",
-			'album:addpix' => "Add photos to album",
-			'album:edit' => "Edit album",
-			'album:delete' => "Delete album",
-
-			'image:edit' => "Edit image",
-			'image:delete' => "Delete image",
-			'image:download' => "Download image",
-
-		//forms
-
-			'album:title' => "Title",
-			'album:desc' => "Description",
-			'album:tags' => "Tags",
-			'album:cover' => "Make image album cover?",
-			'tidypics:quota' => "Quota usage:",
-
-		//views
-
-			'image:total' => "Images in album:",
-			'image:by' => "Image added by",
-			'album:by' => "Album created by",
-			'album:created:on' => "Created",
-			'image:none' => "No images have been added yet.",
-			'image:back' => "Previous",
-			'image:next' => "Next",
-
-		// tagging
-			'tidypics:taginstruct' => 'Select area that you want to tag',
-			'tidypics:deltag_title' => 'Select tags to delete',
-			'tidypics:finish_tagging' => 'Stop tagging',
-			'tidypics:tagthisphoto' => 'Tag this photo',
-			'tidypics:deletetag' => 'Delete a photo tag',
-			'tidypics:actiontag' => 'Tag',
-			'tidypics:actiondelete' => 'Delete',
-			'tidypics:actioncancel' => 'Cancel',
-			'tidypics:inthisphoto' => 'In this photo',
-			'tidypics:usertag' => "Photos tagged with user %s",
-			'tidypics:phototagging:success' => 'Photo tag was successfully added',
-			'tidypics:phototagging:error' => 'Unexpected error occurred during tagging',
-			'tidypics:deletetag:success' => 'Selected tags were successfully deleted',
-			
-			'tidypics:tag:subject' => "You have been tagged in a photo",
-			'tidypics:tag:body' => "You have been tagged in the photo %s by %s.			
-			
-The photo can be viewed here: %s",
-
-
-		//rss
-			'tidypics:posted' => 'posted a photo:',
-
-		//widgets
-
-			'tidypics:widget:albums' => "Photo Albums",
-			'tidypics:widget:album_descr' => "Showcase your photo albums",
-			'tidypics:widget:num_albums' => "Number of albums to display",
-			'tidypics:widget:latest' => "Latest Photos",
-			'tidypics:widget:latest_descr' => "Display your latest photos",
-			'tidypics:widget:num_latest' => "Number of images to display",
-			'album:more' => "View all albums",
-
-		//  river
-
-			//images
-			'image:river:created' => "%s added the photo %s to album %s",
-			'image:river:item' => "an photo",
-			'image:river:annotate' => "a comment on the photo",
-			'image:river:tagged' => "was tagged in the photo",
-
-			//albums
-			'album:river:created' => "%s created a new photo album",
-			'album:river:group' => "in the group",
-			'album:river:item' => "an album",
-			'album:river:annotate' => "a comment on the photo album",
-
-		// notifications
-			'tidypics:newalbum' => 'New photo album',
-
-
-		//  Status messages
-
-			'tidypics:upl_success' => "Your images uploaded successfully.",
-			'image:saved' => "Your image was successfully saved.",
-			'images:saved' => "All images were successfully saved.",
-			'image:deleted' => "Your image was successfully deleted.",
-			'image:delete:confirm' => "Are you sure you want to delete this image?",
-
-			'images:edited' => "Your images were successfully updated.",
-			'album:edited' => "Your album was successfully updated.",
-			'album:saved' => "Your album was successfully saved.",
-			'album:deleted' => "Your album was successfully deleted.",
-			'album:delete:confirm' => "Are you sure you want to delete this album?",
-			'album:created' => "Your new album has been created.",
-			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
-
-			'tidypics:upgrade:success' => 'Upgrade of Tidypics a success',
-			
-			'flickr:enterusername' => 'You must enter a username',
-			'flickr:savedusername' => 'Successfully saved username of %s',
-			'flickr:saveduserid' => 'Successfully saved userid of %s',
-			'flickr:savedalbum' => 'Album saved - %s',
-
-		//Error messages
-
-			'tidypics:partialuploadfailure' => "There were errors uploading some of the images (%s of %s images).",
-			'tidypics:completeuploadfailure' => "Upload of images failed.",
-			'tidypics:exceedpostlimit' => "Too many large images - try to upload fewer or smaller images.",
-			'tidypics:noimages' => "No images were selected.",
-			'tidypics:image_mem' => "Image is too large - too many bytes",
-			'tidypics:image_pixels' => "Image has too many pixels",
-			'tidypics:unk_error' => "Unknown upload error",
-			'tidypics:save_error' => "Unknown error saving the image on server",
-			'tidypics:not_image' => "This is not a recognized image type",
-			'image:deletefailed' => "Your image could not be deleted at this time.",
-			'image:downloadfailed' => "Sorry; this image is not available at this time.",
-			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
-			'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator",
-			'images:notedited' => "Not all images were successfully updated",
-
-			'album:none' => "No albums have been created yet.",
-			'album:uploadfailed' => "Sorry; we could not save your album.",
-			'album:deletefailed' => "Your album could not be deleted at this time.",
-			'album:blank' => "Please give this album a title and description.",
-
-			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed",
-			
-			'flickr:errorusername' => 'Username %s not found on Flickr',
-			'flickr:errorusername2' => 'You must enter a username',
-			'flickr:errorimageimport' => 'This image has already been imported',
-			'flickr:errornoalbum' => "No album selected.  Please choose and save an album: %s" 
-	);
-
-	add_translation("en",$english);
+ "untitled",
+
+		// Menu items and titles
+
+			'image' => "Image",
+			'images' => "Images",
+			'caption' => "Caption",
+			'photos' => "Photos",
+			'images:upload' => "Upload Images",
+			'images:multiupload' => "Flash Multi Upload Tool",
+			'images:multiupload:todo' => "Choose one or more files for upload.",
+			'album' => "Photo Album",
+			'albums' => "Photo Albums",
+			'album:slideshow' => "View slideshow",
+			'album:yours' => "Your photo albums",
+			'album:yours:friends' => "Your friends' photo albums",
+			'album:user' => "%s's photo albums",
+			'album:friends' => "%s's friends' photo albums",
+			'album:all' => "All site photo albums",
+			'album:group' => "Group albums",
+			'item:object:image' => "Photos",
+			'item:object:album' => "Albums",
+			'tidypics:uploading:images' => "Please wait. Uploading images.",
+			'tidypics:enablephotos' => 'Enable group photo albums',
+			'tidypics:editprops' => 'Edit Image Properties',
+			'tidypics:mostcommented' => 'Most commented images',
+			'tidypics:mostcommentedthismonth' => 'Most commented this month',
+			'tidypics:mostcommentedtoday' => 'Most commented today',
+			'tidypics:mostviewed' => 'Most viewed images',
+			'tidypics:mostvieweddashboard' => 'Most viewed dashboard',
+			'tidypics:mostviewedthisyear' => 'Most viewed this year',
+			'tidypics:mostviewedthismonth' => 'Most viewed this month',
+			'tidypics:mostviewedlastmonth' => 'Most viewed last month',
+			'tidypics:mostviewedtoday' => 'Most viewed today',
+			'tidypics:recentlyviewed' => 'Recently viewed images',
+			'tidypics:recentlycommented' => 'Recently commented images',
+			'tidypics:mostrecent' => 'Most recent images',
+			'tidypics:yourmostviewed' => 'Your most viewed images',
+			'tidypics:yourmostrecent' => 'Your most recent images',
+			'tidypics:friendmostviewed' => "%s's most viewed images",
+			'tidypics:friendmostrecent' => "%s's most recent images",
+			'tidypics:highestrated' => "Highest rated images",
+			'tidypics:views' => "Views: %s",
+			'tidypics:viewsbyowner' => "by %s users (not including you)",
+			'tidypics:viewsbyothers' => "(%s by you)",
+			'tidypics:administration' => 'Tidypics Administration',
+			'tidypics:stats' => 'Stats',
+			'flickr:setup' => 'Flickr Setup',
+			'flickr:usernamesetup' => 'Please enter your Flickr username here:',
+			'flickr:selectalbum' => 'Select album to import photos into',
+			'flickr:albumdesc' => 'Album to import photos to:',
+			'flickr:importmanager' => 'Photoset Import Manager',
+			'flickr:desc' => 'Click on the set you wish to import into this site.
      Copies of the photos will be made and stored on this site where they can be viewed and commented on.',
+			'flickr:intro' => 'Flickr Integration allows you to import photos from your flickr account into this Elgg site. By entering your username and choosing an album to import into, you can begin the process. 
      When you have saved your username and album selection, click on the ' . elgg_echo( 'flickr:menuimport' ) . ' link to the left to select which Flickr set you would like to import photos from.',
+			'flickr:menusetup' => 'Flickr Setup',
+			'flickr:menuimport' => 'Import Flickr Photos',
+			
+		//settings
+			'tidypics:settings' => 'Settings',
+			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
+			'tidypics:settings:image_lib' => "Image Library",
+			'tidypics:settings:thumbnail' => "Thumbnail Creation",
+			'tidypics:settings:help' => "Help",
+			'tidypics:settings:download_link' => "Show download link",
+			'tidypics:settings:tagging' => "Enable photo tagging",
+			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
+			'tidypics:settings:exif' => "Show EXIF data",
+			'tidypics:settings:view_count' => "View counter",
+			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
+			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
+			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
+			'tidypics:settings:watermark' => "Enter text to appear in the watermark - not for production sites yet",
+			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands (with trailing slash)",
+			'tidypics:settings:img_river_view' => "How many entries in river for each batch of uploaded images",
+			'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",
+			'tidypics:settings:largesize' => "Primary image size",
+			'tidypics:settings:smallsize' => "Album view image size",
+			'tidypics:settings:thumbsize' => "Thumbnail image size",
+			'tidypics:settings:im_id' => "Image ID",
+	
+		//actions
+
+			'album:create' => "Create new album",
+			'album:add' => "Add Photo Album",
+			'album:addpix' => "Add photos to album",
+			'album:edit' => "Edit album",
+			'album:delete' => "Delete album",
+
+			'image:edit' => "Edit image",
+			'image:delete' => "Delete image",
+			'image:download' => "Download image",
+
+		//forms
+
+			'album:title' => "Title",
+			'album:desc' => "Description",
+			'album:tags' => "Tags",
+			'album:cover' => "Make image album cover?",
+			'tidypics:quota' => "Quota usage:",
+
+		//views
+
+			'image:total' => "Images in album:",
+			'image:by' => "Image added by",
+			'album:by' => "Album created by",
+			'album:created:on' => "Created",
+			'image:none' => "No images have been added yet.",
+			'image:back' => "Previous",
+			'image:next' => "Next",
+
+		// tagging
+			'tidypics:taginstruct' => 'Select area that you want to tag',
+			'tidypics:deltag_title' => 'Select tags to delete',
+			'tidypics:finish_tagging' => 'Stop tagging',
+			'tidypics:tagthisphoto' => 'Tag this photo',
+			'tidypics:deletetag' => 'Delete a photo tag',
+			'tidypics:actiontag' => 'Tag',
+			'tidypics:actiondelete' => 'Delete',
+			'tidypics:actioncancel' => 'Cancel',
+			'tidypics:inthisphoto' => 'In this photo',
+			'tidypics:usertag' => "Photos tagged with user %s",
+			'tidypics:phototagging:success' => 'Photo tag was successfully added',
+			'tidypics:phototagging:error' => 'Unexpected error occurred during tagging',
+			'tidypics:deletetag:success' => 'Selected tags were successfully deleted',
+			
+			'tidypics:tag:subject' => "You have been tagged in a photo",
+			'tidypics:tag:body' => "You have been tagged in the photo %s by %s.			
+			
+The photo can be viewed here: %s",
+
+
+		//rss
+			'tidypics:posted' => 'posted a photo:',
+
+		//widgets
+
+			'tidypics:widget:albums' => "Photo Albums",
+			'tidypics:widget:album_descr' => "Showcase your photo albums",
+			'tidypics:widget:num_albums' => "Number of albums to display",
+			'tidypics:widget:latest' => "Latest Photos",
+			'tidypics:widget:latest_descr' => "Display your latest photos",
+			'tidypics:widget:num_latest' => "Number of images to display",
+			'album:more' => "View all albums",
+
+		//  river
+
+			//images
+			'image:river:created' => "%s added the photo %s to album %s",
+			'image:river:item' => "an photo",
+			'image:river:annotate' => "a comment on the photo",
+			'image:river:tagged' => "was tagged in the photo",
+
+			//albums
+			'album:river:created' => "%s created a new photo album",
+			'album:river:group' => "in the group",
+			'album:river:item' => "an album",
+			'album:river:annotate' => "a comment on the photo album",
+
+		// notifications
+			'tidypics:newalbum' => 'New photo album',
+
+
+		//  Status messages
+
+			'tidypics:upl_success' => "Your images uploaded successfully.",
+			'image:saved' => "Your image was successfully saved.",
+			'images:saved' => "All images were successfully saved.",
+			'image:deleted' => "Your image was successfully deleted.",
+			'image:delete:confirm' => "Are you sure you want to delete this image?",
+
+			'images:edited' => "Your images were successfully updated.",
+			'album:edited' => "Your album was successfully updated.",
+			'album:saved' => "Your album was successfully saved.",
+			'album:deleted' => "Your album was successfully deleted.",
+			'album:delete:confirm' => "Are you sure you want to delete this album?",
+			'album:created' => "Your new album has been created.",
+			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
+
+			'tidypics:upgrade:success' => 'Upgrade of Tidypics a success',
+			
+			'flickr:enterusername' => 'You must enter a username',
+			'flickr:savedusername' => 'Successfully saved username of %s',
+			'flickr:saveduserid' => 'Successfully saved userid of %s',
+			'flickr:savedalbum' => 'Album saved - %s',
+
+		//Error messages
+
+			'tidypics:partialuploadfailure' => "There were errors uploading some of the images (%s of %s images).",
+			'tidypics:completeuploadfailure' => "Upload of images failed.",
+			'tidypics:exceedpostlimit' => "Too many large images - try to upload fewer or smaller images.",
+			'tidypics:noimages' => "No images were selected.",
+			'tidypics:image_mem' => "Image is too large - too many bytes",
+			'tidypics:image_pixels' => "Image has too many pixels",
+			'tidypics:unk_error' => "Unknown upload error",
+			'tidypics:save_error' => "Unknown error saving the image on server",
+			'tidypics:not_image' => "This is not a recognized image type",
+			'image:deletefailed' => "Your image could not be deleted at this time.",
+			'image:downloadfailed' => "Sorry; this image is not available at this time.",
+			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
+			'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator",
+			'images:notedited' => "Not all images were successfully updated",
+
+			'album:none' => "No albums have been created yet.",
+			'album:uploadfailed' => "Sorry; we could not save your album.",
+			'album:deletefailed' => "Your album could not be deleted at this time.",
+			'album:blank' => "Please give this album a title and description.",
+
+			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed",
+			
+			'flickr:errorusername' => 'Username %s not found on Flickr',
+			'flickr:errorusername2' => 'You must enter a username',
+			'flickr:errorimageimport' => 'This image has already been imported',
+			'flickr:errornoalbum' => "No album selected.  Please choose and save an album: %s" 
+	);
+
+	add_translation("en",$english);
 ?>
\ No newline at end of file
diff --git a/lib/resize.php b/lib/resize.php
index 7885a52df..c35eb09ea 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -1,547 +1,547 @@
-owner_guid = $file->owner_guid;
-		$thumb->container_guid = $file->container_guid;
-
-		// tiny thumbail
-		$thumb->setFilename($prefix."thumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
-									$thumbname,
-									false,
-									$image_sizes['thumb_image_width'],
-									$image_sizes['thumb_image_height'], 
-									true);
-		if (!$rtn_code)
-			return false;
-		$file->thumbnail = $prefix."thumb".$filestorename;
-
-
-		// album thumbnail
-		$thumb->setFilename($prefix."smallthumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
-									$thumbname,
-									false,
-									$image_sizes['small_image_width'],
-									$image_sizes['small_image_height'], 
-									true); 
-		if (!$rtn_code)
-			return false;
-		$file->smallthumb = $prefix."smallthumb".$filestorename;
-
-
-		// main image
-		$thumb->setFilename($prefix."largethumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
-									$thumbname,
-									true,
-									$image_sizes['large_image_width'],
-									$image_sizes['large_image_height'], 
-									false); 
-		if (!$rtn_code)
-			return false;
-		$file->largethumb = $prefix."largethumb".$filestorename;
-		
-
-		unset($thumb);
-
-		return true;
-	}
-
-	/**
-	 * Writes resized version of an already uploaded image - original from Elgg filestore.php 
-	 * Saves it in the same format as uploaded
-	 *
-	 * @param string $input_name The name of the file on the disk
-	 * @param string $output_name The name of the file to be written
-	 * @param bool - watermark this image? 
-	 * @param int $maxwidth The maximum width of the resized image
-	 * @param int $maxheight The maximum height of the resized image
-	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
-	 * @return bool true on success or false on failure
-	 */
-	function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
-		
-		// Get the size information from the image
-		$imgsizearray = getimagesize($input_name);
-		if (!imgsizearray)
-			return false;
-		
-		// Get width and height
-		$width = $imgsizearray[0];
-		$height = $imgsizearray[1];
-		$newwidth = $width;
-		$newheight = $height;
-		
-		// Square the image dimensions if we're wanting a square image
-		if ($square) {
-			if ($width < $height) {
-				$height = $width;
-			} else {
-				$width = $height;
-			}
-			
-			$newwidth = $width;
-			$newheight = $height;
-			
-		}
-		
-		if ($width > $maxwidth) {
-			$newheight = floor($height * ($maxwidth / $width));
-			$newwidth = $maxwidth;
-		}
-		if ($newheight > $maxheight) {
-			$newwidth = floor($newwidth * ($maxheight / $newheight));
-			$newheight = $maxheight; 
-		}
-		
-		$accepted_formats = array(
-										'image/jpeg' => 'jpeg',
-										'image/pjpeg' => 'jpeg',
-										'image/png' => 'png',
-										'image/x-png' => 'png',
-										'image/gif' => 'gif'
-								);
-
-		// make sure the function is available
-		$function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']];
-		if (!is_callable($function))
-			return false;
-		
-		
-		// load old image
-		$oldimage = $function($input_name);
-		if (!$oldimage)
-			return false;
-		
-		// allocate the new image
-		$newimage = imagecreatetruecolor($newwidth, $newheight);
-		if (!$newimage)
-			return false;
-		
-		// Crop the image if we need a square
-		if ($square) {
-			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-				$widthoffset = floor(($imgsizearray[0] - $width) / 2);
-				$heightoffset = floor(($imgsizearray[1] - $height) / 2);
-			} else {
-				$widthoffset = $x1;
-				$heightoffset = $y1;
-				$width = ($x2 - $x1);
-				$height = $width;
-			}
-		} else {
-			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-				$widthoffset = 0;
-				$heightoffset = 0;
-			} else {
-				$widthoffset = $x1;
-				$heightoffset = $y1;
-				$width = ($x2 - $x1);
-				$height = ($y2 - $y1);
-			}
-		}
-		
-		if ($square) {
-			$newheight = $maxheight;
-			$newwidth = $maxwidth;
-		}
-		
-		$rtn_code = imagecopyresampled($newimage, $oldimage, 0,0,$widthoffset,$heightoffset,$newwidth,$newheight,$width,$height);
-		if (!rtn_code)
-			return $rtn_code;
-		
-		if ($watermark)
-			tp_gd_watermark($newimage);
-		
-		switch ($imgsizearray['mime']) {
-			case 'image/jpeg':
-			case 'image/pjpeg':
-				$rtn_code = imagejpeg($newimage, $output_name, 85); 
-				break;
-			case 'image/png':
-			case 'image/x-png':
-				$rtn_code = imagepng($newimage, $output_name);
-				break;
-			case 'image/gif':
-				$rtn_code = imagegif($newimage, $output_name);
-				break;
-		}
-		
-		imagedestroy($newimage);
-		imagedestroy($oldimage);
-		
-		return $rtn_code;
-	}
-
-
-	/**
-	 * Create thumbnails using PHP imagick extension
-	 *
-	 * @param ElggFile holds the image that was uploaded
-	 * @param string   folder to store thumbnail in
-	 * @param string   name of the thumbnail
-	 * @return bool    true on success 
-	 */
-	function tp_create_imagick_thumbnails($file, $prefix, $filestorename)
-	{
-		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
-		if (!$image_sizes) {
-			register_error(elgg_echo('tidypics:nosettings'));
-			return false;
-		}
-		$image_sizes = unserialize($image_sizes);
-
-		$thumb = new ElggFile();
-		$thumb->owner_guid = $file->owner_guid;
-		$thumb->container_guid = $file->container_guid;
-
-		// tiny thumbnail
-		$thumb->setFilename($prefix."thumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
-										$thumbname,
-										$image_sizes['thumb_image_width'],
-										$image_sizes['thumb_image_height'], 
-										true);
-		if (!$rtn_code)
-			return false;
-		$file->thumbnail = $prefix."thumb".$filestorename;
-
-
-		// album thumbnail
-		$thumb->setFilename($prefix."smallthumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
-										$thumbname,
-										$image_sizes['small_image_width'],
-										$image_sizes['small_image_height'], 
-										true); 
-		if (!$rtn_code)
-			return false;
-		$file->smallthumb = $prefix."smallthumb".$filestorename;
-
-
-		// main image
-		$thumb->setFilename($prefix."largethumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
-										$thumbname,
-										$image_sizes['large_image_width'],
-										$image_sizes['large_image_height'], 
-										false); 
-		if (!$rtn_code)
-			return false;
-		$file->largethumb = $prefix."largethumb".$filestorename;
-		
-		tp_imagick_watermark($thumbname);
-
-		unset($thumb);
-
-		return true;
-	}
-
-	
-	/**
-	 * Resize using PHP imagick extension
-	 *
-	 * Writes resized version of an already uploaded image
-	 * 
-	 *
-	 * @param string $input_name The name of the file input field on the submission form
-	 * @param string $output_name The name of the file to be written
-	 * @param int $maxwidth The maximum width of the resized image
-	 * @param int $maxheight The maximum height of the resized image
-	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
-	 * @return bool true on success
-	 */
-	function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
-		
-		// Get the size information from the image
-		$imgsizearray = getimagesize($input_name);
-		if (!$imgsizearray)
-			return false;
-		
-
-		// Get width and height
-		$width = $imgsizearray[0];
-		$height = $imgsizearray[1];
-		$newwidth = $width;
-		$newheight = $height;
-		
-		// initial guess at final dimensions for new image (doesn't check for squareness yet
-		if ($newwidth > $maxwidth) {
-			$newheight = floor($newheight * ($maxwidth / $newwidth));
-			$newwidth = $maxwidth;
-		}
-		if ($newheight > $maxheight) {
-			$newwidth = floor($newwidth * ($maxheight / $newheight));
-			$newheight = $maxheight; 
-		}
-		
-		// Handle squareness for both original and new image
-		if ($square) {
-			if ($width < $height) {
-				$height = $width;
-			} else {
-				$width = $height;
-			}
-			
-			if ($maxheight == $maxwidth) {
-				// if input arguments = square, no need to use above calculations (which can have round-off errors)
-				$newwidth = $maxwidth;
-				$newheight = $maxheight;
-			} else {
-				if ($newwidth < $newheight) {
-					$newheight = $newwidth;
-				} else {
-					$newwidth = $newheight;
-				}
-			}
-		}
-		
-		
-		// Crop the original image - this needs to be checked over
-		if ($square) {
-			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-				$xoffset = floor(($imgsizearray[0] - $width) / 2);
-				$yoffset = floor(($imgsizearray[1] - $height) / 2);
-			} else { // assume we're being passed good croping coordinates
-				$xoffset = $x1;
-				$yoffset = $y1;
-				$width = ($x2 - $x1);
-				$height = $width;
-			}
-		} else {
-			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-				$xoffset = 0;
-				$yoffset = 0;
-			} else {
-				$xoffset = $x1;
-				$yoffset = $y1;
-				$width = ($x2 - $x1);
-				$height = ($y2 - $y1);
-			}
-		}
-
-
-		try {
-			$img = new Imagick($input_name);
-		} catch (ImagickException $e) {
-			return false;
-		}
-		
-		$img->cropImage($width, $height, $xoffset, $yoffset);
-		
-		// use the default IM filter (windowing filter), I think 1 means default blurring or number of lobes
-		$img->resizeImage($newwidth, $newheight, imagick::FILTER_LANCZOS, 1);
-		$img->setImagePage($newwidth, $newheight, 0, 0);
-		
-		if ($img->writeImage($output_name) != true) {
-			$img->destroy();
-			return false;
-		}
-		
-		$img->destroy();
-		
-		return true;
-	}
-
-	/**
-	 * Create thumbnails using ImageMagick executables
-	 *
-	 * @param ElggFile holds the image that was uploaded
-	 * @param string   folder to store thumbnail in
-	 * @param string   name of the thumbnail
-	 * @return bool    true on success 
-	 */
-	function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename)
-	{
-		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
-		if (!$image_sizes) {
-			register_error(elgg_echo('tidypics:nosettings'));
-			return false;
-		}
-		$image_sizes = unserialize($image_sizes);
-
-		$thumb = new ElggFile();
-		$thumb->owner_guid = $file->owner_guid;
-		$thumb->container_guid = $file->container_guid;
-
-		// tiny thumbnail
-		$thumb->setFilename($prefix."thumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
-											$thumbname,
-											$image_sizes['thumb_image_width'],
-											$image_sizes['thumb_image_height'], 
-											true);
-		if (!$rtn_code)
-			return false;
-		$file->thumbnail = $prefix."thumb".$filestorename;
-
-
-		// album thumbnail
-		$thumb->setFilename($prefix."smallthumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
-											$thumbname,
-											$image_sizes['small_image_width'],
-											$image_sizes['small_image_height'], 
-											true); 
-		if (!$rtn_code)
-			return false;
-		$file->smallthumb = $prefix."smallthumb".$filestorename;
-
-
-		// main image
-		$thumb->setFilename($prefix."largethumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
-											$thumbname,
-											$image_sizes['large_image_width'],
-											$image_sizes['large_image_height'], 
-											false); 
-		if (!$rtn_code)
-			return false;
-		$file->largethumb = $prefix."largethumb".$filestorename;
-		
-		
-		tp_im_cmdline_watermark($thumbname);
-		
-
-
-		unset($thumb);
-
-		return true;
-	}
-
-	/*
-	 * Gets the jpeg contents of the resized version of an already uploaded image
-	 * (Returns false if the uploaded file was not an image)
-	 *
-	 * @param string $input_name The name of the file input field on the submission form
-	 * @param string $output_name The name of the file to be written
-	 * @param int $maxwidth The maximum width of the resized image
-	 * @param int $maxheight The maximum height of the resized image
-	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
-	 * @return bool
-	 */
-	function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
-		
-		
-		// Get the size information from the image
-		if ($imgsizearray = getimagesize($input_name)) {
-
-			// Get width and height
-			$width = $imgsizearray[0];
-			$height = $imgsizearray[1];
-			$newwidth = $width;
-			$newheight = $height;
-			
-			// Square the image dimensions if we're wanting a square image
-			if ($square) {
-				if ($width < $height) {
-					$height = $width;
-				} else {
-					$width = $height;
-				}
-				
-				$newwidth = $width;
-				$newheight = $height;
-				
-			}
-
-			if ($width > $maxwidth) {
-				$newheight = floor($height * ($maxwidth / $width));
-				$newwidth = $maxwidth;
-			}
-			if ($newheight > $maxheight) {
-				$newwidth = floor($newwidth * ($maxheight / $newheight));
-				$newheight = $maxheight;
-			}
-
-			$accepted_formats = array(
-										'image/jpeg' => 'jpeg',
-										'image/pjpeg' => 'jpeg',
-										'image/png' => 'png',
-										'image/x-png' => 'png',
-										'image/gif' => 'gif'
-								);
-			// If it's a file we can manipulate ...
-			if (array_key_exists($imgsizearray['mime'],$accepted_formats)) {
-
-				// Crop the image if we need a square
-				if ($square) {
-					if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-						$widthoffset = floor(($imgsizearray[0] - $width) / 2);
-						$heightoffset = floor(($imgsizearray[1] - $height) / 2);
-					} else {
-						$widthoffset = $x1;
-						$heightoffset = $y1;
-						$width = ($x2 - $x1);
-						$height = $width;
-					}
-				} else {
-					if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-						$widthoffset = 0;
-						$heightoffset = 0;
-					} else {
-						$widthoffset = $x1;
-						$heightoffset = $y1;
-						$width = ($x2 - $x1);
-						$height = ($y2 - $y1);
-					}
-				}
-				
-				// Resize and return the image contents!
-				if ($square) {
-					$newheight = $maxheight;
-					$newwidth = $maxwidth;
-				}
-				$im_path = get_plugin_setting('im_path', 'tidypics');
-				if(!$im_path) {
-					$im_path = "/usr/bin/";
-				}
-				if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/";
-				$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
-				exec($command);
-				return true;
-
-			}
-		}
-
-		return false;
-	}
-
+owner_guid = $file->owner_guid;
+		$thumb->container_guid = $file->container_guid;
+
+		// tiny thumbail
+		$thumb->setFilename($prefix."thumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+									$thumbname,
+									false,
+									$image_sizes['thumb_image_width'],
+									$image_sizes['thumb_image_height'], 
+									true);
+		if (!$rtn_code)
+			return false;
+		$file->thumbnail = $prefix."thumb".$filestorename;
+
+
+		// album thumbnail
+		$thumb->setFilename($prefix."smallthumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+									$thumbname,
+									false,
+									$image_sizes['small_image_width'],
+									$image_sizes['small_image_height'], 
+									true); 
+		if (!$rtn_code)
+			return false;
+		$file->smallthumb = $prefix."smallthumb".$filestorename;
+
+
+		// main image
+		$thumb->setFilename($prefix."largethumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+									$thumbname,
+									true,
+									$image_sizes['large_image_width'],
+									$image_sizes['large_image_height'], 
+									false); 
+		if (!$rtn_code)
+			return false;
+		$file->largethumb = $prefix."largethumb".$filestorename;
+		
+
+		unset($thumb);
+
+		return true;
+	}
+
+	/**
+	 * Writes resized version of an already uploaded image - original from Elgg filestore.php 
+	 * Saves it in the same format as uploaded
+	 *
+	 * @param string $input_name The name of the file on the disk
+	 * @param string $output_name The name of the file to be written
+	 * @param bool - watermark this image? 
+	 * @param int $maxwidth The maximum width of the resized image
+	 * @param int $maxheight The maximum height of the resized image
+	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+	 * @return bool true on success or false on failure
+	 */
+	function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+		
+		// Get the size information from the image
+		$imgsizearray = getimagesize($input_name);
+		if (!imgsizearray)
+			return false;
+		
+		// Get width and height
+		$width = $imgsizearray[0];
+		$height = $imgsizearray[1];
+		$newwidth = $width;
+		$newheight = $height;
+		
+		// Square the image dimensions if we're wanting a square image
+		if ($square) {
+			if ($width < $height) {
+				$height = $width;
+			} else {
+				$width = $height;
+			}
+			
+			$newwidth = $width;
+			$newheight = $height;
+			
+		}
+		
+		if ($width > $maxwidth) {
+			$newheight = floor($height * ($maxwidth / $width));
+			$newwidth = $maxwidth;
+		}
+		if ($newheight > $maxheight) {
+			$newwidth = floor($newwidth * ($maxheight / $newheight));
+			$newheight = $maxheight; 
+		}
+		
+		$accepted_formats = array(
+										'image/jpeg' => 'jpeg',
+										'image/pjpeg' => 'jpeg',
+										'image/png' => 'png',
+										'image/x-png' => 'png',
+										'image/gif' => 'gif'
+								);
+
+		// make sure the function is available
+		$function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']];
+		if (!is_callable($function))
+			return false;
+		
+		
+		// load old image
+		$oldimage = $function($input_name);
+		if (!$oldimage)
+			return false;
+		
+		// allocate the new image
+		$newimage = imagecreatetruecolor($newwidth, $newheight);
+		if (!$newimage)
+			return false;
+		
+		// Crop the image if we need a square
+		if ($square) {
+			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+				$widthoffset = floor(($imgsizearray[0] - $width) / 2);
+				$heightoffset = floor(($imgsizearray[1] - $height) / 2);
+			} else {
+				$widthoffset = $x1;
+				$heightoffset = $y1;
+				$width = ($x2 - $x1);
+				$height = $width;
+			}
+		} else {
+			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+				$widthoffset = 0;
+				$heightoffset = 0;
+			} else {
+				$widthoffset = $x1;
+				$heightoffset = $y1;
+				$width = ($x2 - $x1);
+				$height = ($y2 - $y1);
+			}
+		}
+		
+		if ($square) {
+			$newheight = $maxheight;
+			$newwidth = $maxwidth;
+		}
+		
+		$rtn_code = imagecopyresampled($newimage, $oldimage, 0,0,$widthoffset,$heightoffset,$newwidth,$newheight,$width,$height);
+		if (!rtn_code)
+			return $rtn_code;
+		
+		if ($watermark)
+			tp_gd_watermark($newimage);
+		
+		switch ($imgsizearray['mime']) {
+			case 'image/jpeg':
+			case 'image/pjpeg':
+				$rtn_code = imagejpeg($newimage, $output_name, 85); 
+				break;
+			case 'image/png':
+			case 'image/x-png':
+				$rtn_code = imagepng($newimage, $output_name);
+				break;
+			case 'image/gif':
+				$rtn_code = imagegif($newimage, $output_name);
+				break;
+		}
+		
+		imagedestroy($newimage);
+		imagedestroy($oldimage);
+		
+		return $rtn_code;
+	}
+
+
+	/**
+	 * Create thumbnails using PHP imagick extension
+	 *
+	 * @param ElggFile holds the image that was uploaded
+	 * @param string   folder to store thumbnail in
+	 * @param string   name of the thumbnail
+	 * @return bool    true on success 
+	 */
+	function tp_create_imagick_thumbnails($file, $prefix, $filestorename)
+	{
+		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
+		if (!$image_sizes) {
+			register_error(elgg_echo('tidypics:nosettings'));
+			return false;
+		}
+		$image_sizes = unserialize($image_sizes);
+
+		$thumb = new ElggFile();
+		$thumb->owner_guid = $file->owner_guid;
+		$thumb->container_guid = $file->container_guid;
+
+		// tiny thumbnail
+		$thumb->setFilename($prefix."thumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
+										$thumbname,
+										$image_sizes['thumb_image_width'],
+										$image_sizes['thumb_image_height'], 
+										true);
+		if (!$rtn_code)
+			return false;
+		$file->thumbnail = $prefix."thumb".$filestorename;
+
+
+		// album thumbnail
+		$thumb->setFilename($prefix."smallthumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
+										$thumbname,
+										$image_sizes['small_image_width'],
+										$image_sizes['small_image_height'], 
+										true); 
+		if (!$rtn_code)
+			return false;
+		$file->smallthumb = $prefix."smallthumb".$filestorename;
+
+
+		// main image
+		$thumb->setFilename($prefix."largethumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
+										$thumbname,
+										$image_sizes['large_image_width'],
+										$image_sizes['large_image_height'], 
+										false); 
+		if (!$rtn_code)
+			return false;
+		$file->largethumb = $prefix."largethumb".$filestorename;
+		
+		tp_imagick_watermark($thumbname);
+
+		unset($thumb);
+
+		return true;
+	}
+
+	
+	/**
+	 * Resize using PHP imagick extension
+	 *
+	 * Writes resized version of an already uploaded image
+	 * 
+	 *
+	 * @param string $input_name The name of the file input field on the submission form
+	 * @param string $output_name The name of the file to be written
+	 * @param int $maxwidth The maximum width of the resized image
+	 * @param int $maxheight The maximum height of the resized image
+	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+	 * @return bool true on success
+	 */
+	function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+		
+		// Get the size information from the image
+		$imgsizearray = getimagesize($input_name);
+		if (!$imgsizearray)
+			return false;
+		
+
+		// Get width and height
+		$width = $imgsizearray[0];
+		$height = $imgsizearray[1];
+		$newwidth = $width;
+		$newheight = $height;
+		
+		// initial guess at final dimensions for new image (doesn't check for squareness yet
+		if ($newwidth > $maxwidth) {
+			$newheight = floor($newheight * ($maxwidth / $newwidth));
+			$newwidth = $maxwidth;
+		}
+		if ($newheight > $maxheight) {
+			$newwidth = floor($newwidth * ($maxheight / $newheight));
+			$newheight = $maxheight; 
+		}
+		
+		// Handle squareness for both original and new image
+		if ($square) {
+			if ($width < $height) {
+				$height = $width;
+			} else {
+				$width = $height;
+			}
+			
+			if ($maxheight == $maxwidth) {
+				// if input arguments = square, no need to use above calculations (which can have round-off errors)
+				$newwidth = $maxwidth;
+				$newheight = $maxheight;
+			} else {
+				if ($newwidth < $newheight) {
+					$newheight = $newwidth;
+				} else {
+					$newwidth = $newheight;
+				}
+			}
+		}
+		
+		
+		// Crop the original image - this needs to be checked over
+		if ($square) {
+			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+				$xoffset = floor(($imgsizearray[0] - $width) / 2);
+				$yoffset = floor(($imgsizearray[1] - $height) / 2);
+			} else { // assume we're being passed good croping coordinates
+				$xoffset = $x1;
+				$yoffset = $y1;
+				$width = ($x2 - $x1);
+				$height = $width;
+			}
+		} else {
+			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+				$xoffset = 0;
+				$yoffset = 0;
+			} else {
+				$xoffset = $x1;
+				$yoffset = $y1;
+				$width = ($x2 - $x1);
+				$height = ($y2 - $y1);
+			}
+		}
+
+
+		try {
+			$img = new Imagick($input_name);
+		} catch (ImagickException $e) {
+			return false;
+		}
+		
+		$img->cropImage($width, $height, $xoffset, $yoffset);
+		
+		// use the default IM filter (windowing filter), I think 1 means default blurring or number of lobes
+		$img->resizeImage($newwidth, $newheight, imagick::FILTER_LANCZOS, 1);
+		$img->setImagePage($newwidth, $newheight, 0, 0);
+		
+		if ($img->writeImage($output_name) != true) {
+			$img->destroy();
+			return false;
+		}
+		
+		$img->destroy();
+		
+		return true;
+	}
+
+	/**
+	 * Create thumbnails using ImageMagick executables
+	 *
+	 * @param ElggFile holds the image that was uploaded
+	 * @param string   folder to store thumbnail in
+	 * @param string   name of the thumbnail
+	 * @return bool    true on success 
+	 */
+	function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename)
+	{
+		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
+		if (!$image_sizes) {
+			register_error(elgg_echo('tidypics:nosettings'));
+			return false;
+		}
+		$image_sizes = unserialize($image_sizes);
+
+		$thumb = new ElggFile();
+		$thumb->owner_guid = $file->owner_guid;
+		$thumb->container_guid = $file->container_guid;
+
+		// tiny thumbnail
+		$thumb->setFilename($prefix."thumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
+											$thumbname,
+											$image_sizes['thumb_image_width'],
+											$image_sizes['thumb_image_height'], 
+											true);
+		if (!$rtn_code)
+			return false;
+		$file->thumbnail = $prefix."thumb".$filestorename;
+
+
+		// album thumbnail
+		$thumb->setFilename($prefix."smallthumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
+											$thumbname,
+											$image_sizes['small_image_width'],
+											$image_sizes['small_image_height'], 
+											true); 
+		if (!$rtn_code)
+			return false;
+		$file->smallthumb = $prefix."smallthumb".$filestorename;
+
+
+		// main image
+		$thumb->setFilename($prefix."largethumb".$filestorename);
+		$thumbname = $thumb->getFilenameOnFilestore();
+		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
+											$thumbname,
+											$image_sizes['large_image_width'],
+											$image_sizes['large_image_height'], 
+											false); 
+		if (!$rtn_code)
+			return false;
+		$file->largethumb = $prefix."largethumb".$filestorename;
+		
+		
+		tp_im_cmdline_watermark($thumbname);
+		
+
+
+		unset($thumb);
+
+		return true;
+	}
+
+	/*
+	 * Gets the jpeg contents of the resized version of an already uploaded image
+	 * (Returns false if the uploaded file was not an image)
+	 *
+	 * @param string $input_name The name of the file input field on the submission form
+	 * @param string $output_name The name of the file to be written
+	 * @param int $maxwidth The maximum width of the resized image
+	 * @param int $maxheight The maximum height of the resized image
+	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+	 * @return bool
+	 */
+	function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+		
+		
+		// Get the size information from the image
+		if ($imgsizearray = getimagesize($input_name)) {
+
+			// Get width and height
+			$width = $imgsizearray[0];
+			$height = $imgsizearray[1];
+			$newwidth = $width;
+			$newheight = $height;
+			
+			// Square the image dimensions if we're wanting a square image
+			if ($square) {
+				if ($width < $height) {
+					$height = $width;
+				} else {
+					$width = $height;
+				}
+				
+				$newwidth = $width;
+				$newheight = $height;
+				
+			}
+
+			if ($width > $maxwidth) {
+				$newheight = floor($height * ($maxwidth / $width));
+				$newwidth = $maxwidth;
+			}
+			if ($newheight > $maxheight) {
+				$newwidth = floor($newwidth * ($maxheight / $newheight));
+				$newheight = $maxheight;
+			}
+
+			$accepted_formats = array(
+										'image/jpeg' => 'jpeg',
+										'image/pjpeg' => 'jpeg',
+										'image/png' => 'png',
+										'image/x-png' => 'png',
+										'image/gif' => 'gif'
+								);
+			// If it's a file we can manipulate ...
+			if (array_key_exists($imgsizearray['mime'],$accepted_formats)) {
+
+				// Crop the image if we need a square
+				if ($square) {
+					if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+						$widthoffset = floor(($imgsizearray[0] - $width) / 2);
+						$heightoffset = floor(($imgsizearray[1] - $height) / 2);
+					} else {
+						$widthoffset = $x1;
+						$heightoffset = $y1;
+						$width = ($x2 - $x1);
+						$height = $width;
+					}
+				} else {
+					if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+						$widthoffset = 0;
+						$heightoffset = 0;
+					} else {
+						$widthoffset = $x1;
+						$heightoffset = $y1;
+						$width = ($x2 - $x1);
+						$height = ($y2 - $y1);
+					}
+				}
+				
+				// Resize and return the image contents!
+				if ($square) {
+					$newheight = $maxheight;
+					$newwidth = $maxwidth;
+				}
+				$im_path = get_plugin_setting('im_path', 'tidypics');
+				if(!$im_path) {
+					$im_path = "/usr/bin/";
+				}
+				if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/";
+				$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
+				exec($command);
+				return true;
+
+			}
+		}
+
+		return false;
+	}
+
 ?>
\ No newline at end of file
diff --git a/lib/tidypics.php b/lib/tidypics.php
index e24e4d77e..b0a8a70d2 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -1,299 +1,299 @@
-
-	
-		
      
-			
      
-			
      
-			
-			
      
-		
      
-
-
-	 * Good luck
-	 */
-	function tp_get_latest_photos($num_images, $owner_guid = 0)
-	{
-		$prev_context = set_context('front');
-		$image_html = tp_list_entities('object', 'image', $owner_guid, $num_images, false, false, false);  
-		set_context($prev_context);
-		return $image_html;
-	}
-	
-	
-	/**
-	 * Get image directory path
-	 *
-	 * Each album gets a subdirectory based on its container id
-	 *
-	 * @return string	path to image directory
-	 */
-	function tp_get_img_dir()
-	{
-		$file = new ElggFile();
-		return $file->getFilenameOnFilestore() . 'image/';
-	}
-	
-	
-	
-	/*********************************************************************
-	 * the functions below replace broken core functions or add functions 
-	 * that could/should exist in the core
-	 */
-	 
-	/**
-	 *
-	 */
-	function tp_get_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null, $timelower = 0, $timeupper = 0)
-	{
-		global $CONFIG;
-		
-		if ($subtype === false || $subtype === null || $subtype === 0)
-			return false;
-		
-		if ($order_by == "") $order_by = "time_created desc";
-		$order_by = sanitise_string($order_by);
-		$limit = (int)$limit;
-		$offset = (int)$offset;
-		$site_guid = (int) $site_guid;
-		$timelower = (int) $timelower;
-		$timeupper = (int) $timeupper;
-		if ($site_guid == 0)
-			$site_guid = $CONFIG->site_guid;
-				
-		$where = array();
-		
-		if (is_array($subtype)) {
-			$tempwhere = "";
-			if (sizeof($subtype))
-			foreach($subtype as $typekey => $subtypearray) {
-				foreach($subtypearray as $subtypeval) {
-					$typekey = sanitise_string($typekey);
-					if (!empty($subtypeval)) {
-						if (!$subtypeval = (int) get_subtype_id($typekey, $subtypeval))
-							return false;
-					} else {
-						// @todo: Setting subtype to 0 when $subtype = '' returns entities with
-						// no subtype.  This is different to the non-array behavior
-						// but may be required in some cases.
-						$subtypeval = 0;
-					}
-					if (!empty($tempwhere)) $tempwhere .= " or ";
-					$tempwhere .= "(type = '{$typekey}' and subtype = {$subtypeval})";
-				}
-			}
-			if (!empty($tempwhere)) $where[] = "({$tempwhere})";
-			
-		} else {
-		
-			$type = sanitise_string($type);
-			if ($subtype !== "" AND !$subtype = get_subtype_id($type, $subtype))
-				return false;
-			
-			if ($type != "")
-				$where[] = "type='$type'";
-			if ($subtype!=="")
-				$where[] = "subtype=$subtype";
-		}
-
-		if ($owner_guid != "") {
-			if (!is_array($owner_guid)) {
-				$owner_array = array($owner_guid);
-				$owner_guid = (int) $owner_guid;
-				$where[] = "owner_guid = '$owner_guid'";
-			} else if (sizeof($owner_guid) > 0) {
-				$owner_array = array_map('sanitise_int', $owner_guid);
-				// Cast every element to the owner_guid array to int
-				$owner_guid = array_map("sanitise_int", $owner_guid);
-				$owner_guid = implode(",",$owner_guid);
-				$where[] = "owner_guid in ({$owner_guid})";
-			}
-		}
-		if ($site_guid > 0)
-			$where[] = "site_guid = {$site_guid}";
-
-		if (!is_null($container_guid)) {
-			if (is_array($container_guid)) {
-				foreach($container_guid as $key => $val) $container_guid[$key] = (int) $val;
-				$where[] = "container_guid in (" . implode(",",$container_guid) . ")";
-			} else {
-				$container_guid = (int) $container_guid;
-				$where[] = "container_guid = {$container_guid}";
-			}
-		}
-		if ($timelower)
-			$where[] = "time_created >= {$timelower}";
-		if ($timeupper)
-			$where[] = "time_created <= {$timeupper}";
-			
-		if (!$count) {
-			$query = "SELECT * from {$CONFIG->dbprefix}entities where ";
-		} else {
-			$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where ";
-		}
-		foreach ($where as $w)
-			$query .= " $w and ";
-		$query .= get_access_sql_suffix(); // Add access controls
-		if (!$count) {
-			$query .= " order by $order_by";
-			if ($limit) $query .= " limit $offset, $limit"; // Add order and limit
-			$dt = get_data($query, "entity_row_to_elggstar");
-			return $dt;
-		} else {
-			$total = get_data_row($query);
-			return $total->total;
-		}
-	}
-
-	function tp_list_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = false, $pagination = true) {
-		
-		$offset = (int) get_input('offset');
-		$count = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true);
-		$entities = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset);
-
-		return tp_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
-	}
-	
-	function tp_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = false, $pagination = true) {
-		$context = get_context();
-
-		$html = elgg_view('tidypics/gallery',array(
-			'entities' => $entities,
-			'count' => $count,
-			'offset' => $offset,
-			'limit' => $limit,
-			'baseurl' => $_SERVER['REQUEST_URI'],
-			'fullview' => $fullview,
-			'context' => $context,
-			'viewtypetoggle' => $viewtypetoggle,
-			'viewtype' => get_input('search_viewtype','list'),
-			'pagination' => $pagination
-		));
-		
-		return $html;
-	}
-	
-	function tp_get_entities_from_annotations_calculate_x($sum = "sum", $entity_type = "", $entity_subtype = "", $name = "", $mdname = '', $mdvalue = '', $owner_guid = 0, $limit = 10, $offset = 0, $orderdir = 'desc', $count = false)
-	{
-		global $CONFIG;
-		
-		$sum = sanitise_string($sum);
-		$entity_type = sanitise_string($entity_type);
-		$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
-		$name = get_metastring_id($name);
-		$limit = (int) $limit;
-		$offset = (int) $offset;
-		$owner_guid = (int) $owner_guid;
-		if (!empty($mdname) && !empty($mdvalue)) {
-			$meta_n = get_metastring_id($mdname);
-			$meta_v = get_metastring_id($mdvalue);
-		}
-		
-		if (empty($name)) return 0;
-		
-		$where = array();
-		
-		if ($entity_type!="")
-			$where[] = "e.type='$entity_type'";
-		if ($owner_guid > 0)
-			$where[] = "e.owner_guid = $owner_guid";
-		if ($entity_subtype)
-			$where[] = "e.subtype=$entity_subtype";
-		if ($name!="")
-			$where[] = "a.name_id='$name'";
-			
-		if (!empty($mdname) && !empty($mdvalue)) {
-			if ($mdname!="")
-				$where[] = "m.name_id='$meta_n'";
-			if ($mdvalue!="")
-				$where[] = "m.value_id='$meta_v'";
-		}
-			
-		if ($sum != "count")
-			$where[] = "a.value_type='integer'"; // Limit on integer types
-
-		if (!$count) {
-			$query = "SELECT distinct e.*, $sum(ms.string) as sum ";
-		} else {
-			$query = "SELECT count(distinct e.guid) as num, $sum(ms.string) as sum ";
-		}
-		$query .= " from {$CONFIG->dbprefix}entities e JOIN {$CONFIG->dbprefix}annotations a on a.entity_guid = e.guid JOIN {$CONFIG->dbprefix}metastrings ms on a.value_id=ms.id ";
-		
-		if (!empty($mdname) && !empty($mdvalue)) {
-			$query .= " JOIN {$CONFIG->dbprefix}metadata m on m.entity_guid = e.guid "; 
-		}
-		
-		$query .= " WHERE ";
-		foreach ($where as $w)
-			$query .= " $w and ";
-		$query .= get_access_sql_suffix("a"); // now add access
-		$query .= ' and ' . get_access_sql_suffix("e"); // now add access
-		if (!$count) $query .= ' group by e.guid';
-		
-		if (!$count) {
-			$query .= ' order by sum ' . $orderdir;
-			$query .= ' limit ' . $offset . ' , ' . $limit;
-			return get_data($query, "entity_row_to_elggstar");
-		} else {
-			if ($row = get_data_row($query)) {
-				return $row->num;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Is page owner a group - convenience function
-	 * 
-	 * @return true/false
-	 */
-	function tp_is_group_page() {
-		
-		if ($group = page_owner_entity()) {
-			if ($group instanceof ElggGroup)
-				return true;
-		}
-		
-		return false;
-	}
-	
-	
-	/**
-	 * Is the request from a known browser
-	 * 
-	 * @return true/false
-	 */
-	function tp_is_person()
-	{
-		$known = array('msie', 'mozilla', 'firefox', 'safari', 'webkit', 'opera', 'netscape', 'konqueror', 'gecko');
-		
-		$agent = strtolower($_SERVER['HTTP_USER_AGENT']);
-		
-		foreach ($known as $browser)
-		{
-			if (strpos($agent, $browser) !== false) {
-				return true;
-			}
-		}
-		
-		return false;
-	}
+
+	
+		
      
+			
      
+			
      
+			
+			
      
+		
      
+
+
+	 * Good luck
+	 */
+	function tp_get_latest_photos($num_images, $owner_guid = 0)
+	{
+		$prev_context = set_context('front');
+		$image_html = tp_list_entities('object', 'image', $owner_guid, $num_images, false, false, false);  
+		set_context($prev_context);
+		return $image_html;
+	}
+	
+	
+	/**
+	 * Get image directory path
+	 *
+	 * Each album gets a subdirectory based on its container id
+	 *
+	 * @return string	path to image directory
+	 */
+	function tp_get_img_dir()
+	{
+		$file = new ElggFile();
+		return $file->getFilenameOnFilestore() . 'image/';
+	}
+	
+	
+	
+	/*********************************************************************
+	 * the functions below replace broken core functions or add functions 
+	 * that could/should exist in the core
+	 */
+	 
+	/**
+	 *
+	 */
+	function tp_get_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null, $timelower = 0, $timeupper = 0)
+	{
+		global $CONFIG;
+		
+		if ($subtype === false || $subtype === null || $subtype === 0)
+			return false;
+		
+		if ($order_by == "") $order_by = "time_created desc";
+		$order_by = sanitise_string($order_by);
+		$limit = (int)$limit;
+		$offset = (int)$offset;
+		$site_guid = (int) $site_guid;
+		$timelower = (int) $timelower;
+		$timeupper = (int) $timeupper;
+		if ($site_guid == 0)
+			$site_guid = $CONFIG->site_guid;
+				
+		$where = array();
+		
+		if (is_array($subtype)) {
+			$tempwhere = "";
+			if (sizeof($subtype))
+			foreach($subtype as $typekey => $subtypearray) {
+				foreach($subtypearray as $subtypeval) {
+					$typekey = sanitise_string($typekey);
+					if (!empty($subtypeval)) {
+						if (!$subtypeval = (int) get_subtype_id($typekey, $subtypeval))
+							return false;
+					} else {
+						// @todo: Setting subtype to 0 when $subtype = '' returns entities with
+						// no subtype.  This is different to the non-array behavior
+						// but may be required in some cases.
+						$subtypeval = 0;
+					}
+					if (!empty($tempwhere)) $tempwhere .= " or ";
+					$tempwhere .= "(type = '{$typekey}' and subtype = {$subtypeval})";
+				}
+			}
+			if (!empty($tempwhere)) $where[] = "({$tempwhere})";
+			
+		} else {
+		
+			$type = sanitise_string($type);
+			if ($subtype !== "" AND !$subtype = get_subtype_id($type, $subtype))
+				return false;
+			
+			if ($type != "")
+				$where[] = "type='$type'";
+			if ($subtype!=="")
+				$where[] = "subtype=$subtype";
+		}
+
+		if ($owner_guid != "") {
+			if (!is_array($owner_guid)) {
+				$owner_array = array($owner_guid);
+				$owner_guid = (int) $owner_guid;
+				$where[] = "owner_guid = '$owner_guid'";
+			} else if (sizeof($owner_guid) > 0) {
+				$owner_array = array_map('sanitise_int', $owner_guid);
+				// Cast every element to the owner_guid array to int
+				$owner_guid = array_map("sanitise_int", $owner_guid);
+				$owner_guid = implode(",",$owner_guid);
+				$where[] = "owner_guid in ({$owner_guid})";
+			}
+		}
+		if ($site_guid > 0)
+			$where[] = "site_guid = {$site_guid}";
+
+		if (!is_null($container_guid)) {
+			if (is_array($container_guid)) {
+				foreach($container_guid as $key => $val) $container_guid[$key] = (int) $val;
+				$where[] = "container_guid in (" . implode(",",$container_guid) . ")";
+			} else {
+				$container_guid = (int) $container_guid;
+				$where[] = "container_guid = {$container_guid}";
+			}
+		}
+		if ($timelower)
+			$where[] = "time_created >= {$timelower}";
+		if ($timeupper)
+			$where[] = "time_created <= {$timeupper}";
+			
+		if (!$count) {
+			$query = "SELECT * from {$CONFIG->dbprefix}entities where ";
+		} else {
+			$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where ";
+		}
+		foreach ($where as $w)
+			$query .= " $w and ";
+		$query .= get_access_sql_suffix(); // Add access controls
+		if (!$count) {
+			$query .= " order by $order_by";
+			if ($limit) $query .= " limit $offset, $limit"; // Add order and limit
+			$dt = get_data($query, "entity_row_to_elggstar");
+			return $dt;
+		} else {
+			$total = get_data_row($query);
+			return $total->total;
+		}
+	}
+
+	function tp_list_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = false, $pagination = true) {
+		
+		$offset = (int) get_input('offset');
+		$count = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true);
+		$entities = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset);
+
+		return tp_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
+	}
+	
+	function tp_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = false, $pagination = true) {
+		$context = get_context();
+
+		$html = elgg_view('tidypics/gallery',array(
+			'entities' => $entities,
+			'count' => $count,
+			'offset' => $offset,
+			'limit' => $limit,
+			'baseurl' => $_SERVER['REQUEST_URI'],
+			'fullview' => $fullview,
+			'context' => $context,
+			'viewtypetoggle' => $viewtypetoggle,
+			'viewtype' => get_input('search_viewtype','list'),
+			'pagination' => $pagination
+		));
+		
+		return $html;
+	}
+	
+	function tp_get_entities_from_annotations_calculate_x($sum = "sum", $entity_type = "", $entity_subtype = "", $name = "", $mdname = '', $mdvalue = '', $owner_guid = 0, $limit = 10, $offset = 0, $orderdir = 'desc', $count = false)
+	{
+		global $CONFIG;
+		
+		$sum = sanitise_string($sum);
+		$entity_type = sanitise_string($entity_type);
+		$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
+		$name = get_metastring_id($name);
+		$limit = (int) $limit;
+		$offset = (int) $offset;
+		$owner_guid = (int) $owner_guid;
+		if (!empty($mdname) && !empty($mdvalue)) {
+			$meta_n = get_metastring_id($mdname);
+			$meta_v = get_metastring_id($mdvalue);
+		}
+		
+		if (empty($name)) return 0;
+		
+		$where = array();
+		
+		if ($entity_type!="")
+			$where[] = "e.type='$entity_type'";
+		if ($owner_guid > 0)
+			$where[] = "e.owner_guid = $owner_guid";
+		if ($entity_subtype)
+			$where[] = "e.subtype=$entity_subtype";
+		if ($name!="")
+			$where[] = "a.name_id='$name'";
+			
+		if (!empty($mdname) && !empty($mdvalue)) {
+			if ($mdname!="")
+				$where[] = "m.name_id='$meta_n'";
+			if ($mdvalue!="")
+				$where[] = "m.value_id='$meta_v'";
+		}
+			
+		if ($sum != "count")
+			$where[] = "a.value_type='integer'"; // Limit on integer types
+
+		if (!$count) {
+			$query = "SELECT distinct e.*, $sum(ms.string) as sum ";
+		} else {
+			$query = "SELECT count(distinct e.guid) as num, $sum(ms.string) as sum ";
+		}
+		$query .= " from {$CONFIG->dbprefix}entities e JOIN {$CONFIG->dbprefix}annotations a on a.entity_guid = e.guid JOIN {$CONFIG->dbprefix}metastrings ms on a.value_id=ms.id ";
+		
+		if (!empty($mdname) && !empty($mdvalue)) {
+			$query .= " JOIN {$CONFIG->dbprefix}metadata m on m.entity_guid = e.guid "; 
+		}
+		
+		$query .= " WHERE ";
+		foreach ($where as $w)
+			$query .= " $w and ";
+		$query .= get_access_sql_suffix("a"); // now add access
+		$query .= ' and ' . get_access_sql_suffix("e"); // now add access
+		if (!$count) $query .= ' group by e.guid';
+		
+		if (!$count) {
+			$query .= ' order by sum ' . $orderdir;
+			$query .= ' limit ' . $offset . ' , ' . $limit;
+			return get_data($query, "entity_row_to_elggstar");
+		} else {
+			if ($row = get_data_row($query)) {
+				return $row->num;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Is page owner a group - convenience function
+	 * 
+	 * @return true/false
+	 */
+	function tp_is_group_page() {
+		
+		if ($group = page_owner_entity()) {
+			if ($group instanceof ElggGroup)
+				return true;
+		}
+		
+		return false;
+	}
+	
+	
+	/**
+	 * Is the request from a known browser
+	 * 
+	 * @return true/false
+	 */
+	function tp_is_person()
+	{
+		$known = array('msie', 'mozilla', 'firefox', 'safari', 'webkit', 'opera', 'netscape', 'konqueror', 'gecko');
+		
+		$agent = strtolower($_SERVER['HTTP_USER_AGENT']);
+		
+		foreach ($known as $browser)
+		{
+			if (strpos($agent, $browser) !== false) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
 ?>
\ No newline at end of file
diff --git a/pages/admin.php b/pages/admin.php
index 0668ac324..33d44b6c4 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -1,24 +1,24 @@
- $tab));
-	
-	page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));
-
+ $tab));
+	
+	page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));
+
 ?>
\ No newline at end of file
diff --git a/pages/download.php b/pages/download.php
index f5530cebc..e4ad2e855 100644
--- a/pages/download.php
+++ b/pages/download.php
@@ -1,52 +1,52 @@
-originalfilename;
-		$mime = $file->mimetype;
-		
-		header("Content-Type: $mime");
-		if ($type == "inline")
-			header("Content-Disposition: inline; filename=\"$filename\"");
-		else
-			header("Content-Disposition: attachment; filename=\"$filename\"");
-
-		
-		$readfile = new ElggFile($file_guid);
-		$readfile->owner_guid = $file->owner_guid;
-		
-		$contents = $readfile->grabFile();
-		
-		if (empty($contents)) {
-			echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );
-		} else {
-			
-			// expires every 60 days
-			$expires = 60 * 60*60*24;
-			
-			header("Content-Length: " . strlen($contents));
-			header("Cache-Control: public", true);
-			header("Pragma: public", true);
-			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
-			
-			
-			echo $contents;
-		}
-		
-		exit;
-	}
-	else
-		register_error(elgg_echo("image:downloadfailed"));
-
+originalfilename;
+		$mime = $file->mimetype;
+		
+		header("Content-Type: $mime");
+		if ($type == "inline")
+			header("Content-Disposition: inline; filename=\"$filename\"");
+		else
+			header("Content-Disposition: attachment; filename=\"$filename\"");
+
+		
+		$readfile = new ElggFile($file_guid);
+		$readfile->owner_guid = $file->owner_guid;
+		
+		$contents = $readfile->grabFile();
+		
+		if (empty($contents)) {
+			echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );
+		} else {
+			
+			// expires every 60 days
+			$expires = 60 * 60*60*24;
+			
+			header("Content-Length: " . strlen($contents));
+			header("Cache-Control: public", true);
+			header("Pragma: public", true);
+			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+			
+			
+			echo $contents;
+		}
+		
+		exit;
+	}
+	else
+		register_error(elgg_echo("image:downloadfailed"));
+
 ?>
\ No newline at end of file
diff --git a/pages/edit.php b/pages/edit.php
index 3f13abae9..abf1a0fdd 100644
--- a/pages/edit.php
+++ b/pages/edit.php
@@ -1,51 +1,51 @@
-canEdit()) 
-		forward();
-
-	$subtype = $entity->getSubtype();
-		
-	if ($subtype == 'album') {
-		$title = elgg_echo('album:edit');
-
-		if ($container = $entity->container_guid)
-			set_page_owner($container);
-
-	} else if ($subtype == 'image') {
-		$title = elgg_echo('image:edit');
-
-		if ($container = get_entity($entity->container_guid)->container_guid)
-			set_page_owner($container);	
-
-	} else {
-		forward();
-	}
-	
-	$page_owner = page_owner_entity();
-	if ($page_owner instanceof ElggGroup) {
-		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-	}
-
-	
-	$area2 .= elgg_view_title($title);
-	$area2 .= elgg_view('tidypics/forms/edit', array('entity' => $entity, 'subtype' => $subtype));
-	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-
-	page_draw($title, $body);
+canEdit()) 
+		forward();
+
+	$subtype = $entity->getSubtype();
+		
+	if ($subtype == 'album') {
+		$title = elgg_echo('album:edit');
+
+		if ($container = $entity->container_guid)
+			set_page_owner($container);
+
+	} else if ($subtype == 'image') {
+		$title = elgg_echo('image:edit');
+
+		if ($container = get_entity($entity->container_guid)->container_guid)
+			set_page_owner($container);	
+
+	} else {
+		forward();
+	}
+	
+	$page_owner = page_owner_entity();
+	if ($page_owner instanceof ElggGroup) {
+		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
+							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+	}
+
+	
+	$area2 .= elgg_view_title($title);
+	$area2 .= elgg_view('tidypics/forms/edit', array('entity' => $entity, 'subtype' => $subtype));
+	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/edit_multiple.php b/pages/edit_multiple.php
index 0c9295054..49b7dd6f3 100644
--- a/pages/edit_multiple.php
+++ b/pages/edit_multiple.php
@@ -1,47 +1,47 @@
-owner_guid);
-	$album = get_entity($photo->container_guid);
-	if ($album) {
-		$owner_guid = $album->container_guid;
-		if ($owner_guid)
-			set_page_owner($owner_guid);
-	}
-
-	foreach ($file_array_sent as $file_guid) {
-		if ($entity = get_entity($file_guid)) {
-			if ($entity->canEdit()){
-				array_push($new_file_array, $file_guid);
-			}
-			if (!$album_guid) 
-				$album_guid = $entity->container_guid;
-			
-		}
-	}
-
-	$title = elgg_echo('tidypics:editprops');
-	$area2 .= elgg_view_title($title);
-	$area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid));
-	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-	page_draw($title, $body);
-?>
+owner_guid);
+	$album = get_entity($photo->container_guid);
+	if ($album) {
+		$owner_guid = $album->container_guid;
+		if ($owner_guid)
+			set_page_owner($owner_guid);
+	}
+
+	foreach ($file_array_sent as $file_guid) {
+		if ($entity = get_entity($file_guid)) {
+			if ($entity->canEdit()){
+				array_push($new_file_array, $file_guid);
+			}
+			if (!$album_guid) 
+				$album_guid = $entity->container_guid;
+			
+		}
+	}
+
+	$title = elgg_echo('tidypics:editprops');
+	$area2 .= elgg_view_title($title);
+	$area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid));
+	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+	page_draw($title, $body);
+?>
diff --git a/pages/friends.php b/pages/friends.php
index 8ac1e21d0..e35adce04 100644
--- a/pages/friends.php
+++ b/pages/friends.php
@@ -1,38 +1,38 @@
-guid == get_loggedin_userid())
-		$title = elgg_echo('album:yours:friends');
-	else
-		$title = sprintf(elgg_echo('album:friends'), $user->name);
-	
-	$area2 = elgg_view_title($title);
-	
-	// get html for viewing list of photo albums
-	set_context('search');
-	set_input('search_viewtype', 'gallery'); // need to force gallery view
-	$area2 .= list_user_friends_objects($user->guid, 'album', 10, true, false);
-	
-	
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	
-	page_draw($title, $body);
+guid == get_loggedin_userid())
+		$title = elgg_echo('album:yours:friends');
+	else
+		$title = sprintf(elgg_echo('album:friends'), $user->name);
+	
+	$area2 = elgg_view_title($title);
+	
+	// get html for viewing list of photo albums
+	set_context('search');
+	set_input('search_viewtype', 'gallery'); // need to force gallery view
+	$area2 .= list_user_friends_objects($user->guid, 'album', 10, true, false);
+	
+	
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/newalbum.php b/pages/newalbum.php
index 006c61b54..fda886d52 100644
--- a/pages/newalbum.php
+++ b/pages/newalbum.php
@@ -1,32 +1,32 @@
-name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-	}
-	
-	$area2 = elgg_view_title(elgg_echo('album:add'));
-	$area2 .= elgg_view("tidypics/forms/edit");
-	
-	// Display page
-	page_draw(elgg_echo('album:add'),elgg_view_layout("two_column_left_sidebar", $area1, $area2, $area3 ));
-
+name), 
+							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+	}
+	
+	$area2 = elgg_view_title(elgg_echo('album:add'));
+	$area2 .= elgg_view("tidypics/forms/edit");
+	
+	// Display page
+	page_draw(elgg_echo('album:add'),elgg_view_layout("two_column_left_sidebar", $area1, $area2, $area3 ));
+
 ?>
\ No newline at end of file
diff --git a/pages/ownedalbums.php b/pages/ownedalbums.php
index c3dc54d24..f43c2c5eb 100644
--- a/pages/ownedalbums.php
+++ b/pages/ownedalbums.php
@@ -1,51 +1,51 @@
-username) || empty($owner->username))  {
-		forward('pg/photos/world');
-	}
-
-	
-	// setup group menu for album index
-	if ($owner instanceof ElggGroup) {
-				add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name), 
-									$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
-		if (can_write_to_container(0, $owner->guid)) {
-				add_submenu_item(	elgg_echo('album:create'),
-									$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
-									'tidypics');
-		}
-	}
-	
-	//set the title
-	$title = sprintf(elgg_echo('album:user'), $owner->name);
-	$area2 = elgg_view_title($title);
-		
-	// Get objects
-	set_context('search');
-	set_input('search_viewtype', 'gallery');
-	if ($owner instanceof ElggGroup)
-		$area2 .= list_entities("object", "album", $owner->guid, 12, false);
-	else
-		$area2 .= list_entities("object", "album", $owner->guid, 12, false);
-	
-	set_context('photos');
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	
-	// Finally draw the page
-	page_draw($title, $body);
+username) || empty($owner->username))  {
+		forward('pg/photos/world');
+	}
+
+	
+	// setup group menu for album index
+	if ($owner instanceof ElggGroup) {
+				add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name), 
+									$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
+		if (can_write_to_container(0, $owner->guid)) {
+				add_submenu_item(	elgg_echo('album:create'),
+									$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
+									'tidypics');
+		}
+	}
+	
+	//set the title
+	$title = sprintf(elgg_echo('album:user'), $owner->name);
+	$area2 = elgg_view_title($title);
+		
+	// Get objects
+	set_context('search');
+	set_input('search_viewtype', 'gallery');
+	if ($owner instanceof ElggGroup)
+		$area2 .= list_entities("object", "album", $owner->guid, 12, false);
+	else
+		$area2 .= list_entities("object", "album", $owner->guid, 12, false);
+	
+	set_context('photos');
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	
+	// Finally draw the page
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/tagged.php b/pages/tagged.php
index fb07b392c..b5a879809 100644
--- a/pages/tagged.php
+++ b/pages/tagged.php
@@ -1,50 +1,50 @@
-name);
-	else
-		$title = "User does not exist";
-		
-	
-	
-	// create main column
-	$body = elgg_view_title($title);
-	
-	set_context('search');
-	set_input('search_viewtype', 'gallery'); // need to force gallery view
-	$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); 
-
-	// Set up submenus
-	if (isloggedin()) {
-		add_submenu_item(	elgg_echo("album:yours"), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, 
-							'tidypics-b' );
-	}
-	add_submenu_item(	elgg_echo('album:all'), 
-						$CONFIG->wwwroot . "pg/photos/world/", 
-						'tidypics-z');
-	add_submenu_item(	elgg_echo('tidypics:mostrecent'),
-						$CONFIG->wwwroot . 'pg/photos/mostrecent',
-						'tidypics-z');
-
-	
-	
-	$body = elgg_view_layout('two_column_left_sidebar','',$body);
-	
-
-	page_draw($title,$body);
-
+name);
+	else
+		$title = "User does not exist";
+		
+	
+	
+	// create main column
+	$body = elgg_view_title($title);
+	
+	set_context('search');
+	set_input('search_viewtype', 'gallery'); // need to force gallery view
+	$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); 
+
+	// Set up submenus
+	if (isloggedin()) {
+		add_submenu_item(	elgg_echo("album:yours"), 
+							$CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, 
+							'tidypics-b' );
+	}
+	add_submenu_item(	elgg_echo('album:all'), 
+						$CONFIG->wwwroot . "pg/photos/world/", 
+						'tidypics-z');
+	add_submenu_item(	elgg_echo('tidypics:mostrecent'),
+						$CONFIG->wwwroot . 'pg/photos/mostrecent',
+						'tidypics-z');
+
+	
+	
+	$body = elgg_view_layout('two_column_left_sidebar','',$body);
+	
+
+	page_draw($title,$body);
+
 ?>
\ No newline at end of file
diff --git a/pages/upload.php b/pages/upload.php
index 3550d5620..84d237287 100644
--- a/pages/upload.php
+++ b/pages/upload.php
@@ -1,42 +1,42 @@
-canEdit()) {
-		// throw warning and forward to previous page
-		forward($_SERVER['HTTP_REFERER']);
-	}
-
-	// set page owner based on container (user or group) 
-	$container = $album->container_guid;
-	set_page_owner($container);
-
-	$page_owner = page_owner_entity();
-	if ($page_owner instanceof ElggGroup) {
-		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-	}
-
-	set_context('photos');
-	$title = elgg_echo('album:addpix') . ': ' . $album->title;
-	$area2 .= elgg_view_title($title);
-	
-	$area2 .= elgg_view("tidypics/forms/upload", array('album' => $album_guid ) );
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	
-	page_draw($title, $body);
+canEdit()) {
+		// throw warning and forward to previous page
+		forward($_SERVER['HTTP_REFERER']);
+	}
+
+	// set page owner based on container (user or group) 
+	$container = $album->container_guid;
+	set_page_owner($container);
+
+	$page_owner = page_owner_entity();
+	if ($page_owner instanceof ElggGroup) {
+		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
+							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+	}
+
+	set_context('photos');
+	$title = elgg_echo('album:addpix') . ': ' . $album->title;
+	$area2 .= elgg_view_title($title);
+	
+	$area2 .= elgg_view("tidypics/forms/upload", array('album' => $album_guid ) );
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+	
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/viewalbum.php b/pages/viewalbum.php
index 402c2d7e6..9ebc31fae 100644
--- a/pages/viewalbum.php
+++ b/pages/viewalbum.php
@@ -1,68 +1,68 @@
-container_guid)
-		set_page_owner($album->container_guid);
-	else
-		set_page_owner($album->owner_guid);
-
-	$owner = page_owner_entity();
-
-	// setup group menu
-	if ($owner instanceof ElggGroup) {
-		add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
-	}
-	
-	// allow other plugins to override the slideshow
-	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', $album, null);
-	if ($slideshow_link) {
-		add_submenu_item(elgg_echo('album:slideshow'),
-						$slideshow_link,
-						'photos' );
-	}
-
-	if (can_write_to_container(0, $album->container_guid)) {
-		if ($owner instanceof ElggGroup) {
-			add_submenu_item(	elgg_echo('album:create'),
-								$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
-								'photos');
-		}
-		add_submenu_item(	elgg_echo('album:addpix'),
-							$CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid,
-							'photos');
-		add_submenu_item(	elgg_echo('album:edit'),
-							$CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid,
-							'photos');
-		$ts = time();
-		$token = generate_action_token($ts);
-		add_submenu_item(	elgg_echo('album:delete'),
-							$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $album_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
-							'photos',
-							true);
-	}
-
-	// create body
-	$area2 = elgg_view_entity($album, true);
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
-	page_draw($album->title, $body);
+container_guid)
+		set_page_owner($album->container_guid);
+	else
+		set_page_owner($album->owner_guid);
+
+	$owner = page_owner_entity();
+
+	// setup group menu
+	if ($owner instanceof ElggGroup) {
+		add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name), 
+							$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
+	}
+	
+	// allow other plugins to override the slideshow
+	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', $album, null);
+	if ($slideshow_link) {
+		add_submenu_item(elgg_echo('album:slideshow'),
+						$slideshow_link,
+						'photos' );
+	}
+
+	if (can_write_to_container(0, $album->container_guid)) {
+		if ($owner instanceof ElggGroup) {
+			add_submenu_item(	elgg_echo('album:create'),
+								$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
+								'photos');
+		}
+		add_submenu_item(	elgg_echo('album:addpix'),
+							$CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid,
+							'photos');
+		add_submenu_item(	elgg_echo('album:edit'),
+							$CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid,
+							'photos');
+		$ts = time();
+		$token = generate_action_token($ts);
+		add_submenu_item(	elgg_echo('album:delete'),
+							$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $album_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
+							'photos',
+							true);
+	}
+
+	// create body
+	$area2 = elgg_view_entity($album, true);
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+
+	page_draw($album->title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/viewimage.php b/pages/viewimage.php
index 5f23fc685..025c1ad3b 100644
--- a/pages/viewimage.php
+++ b/pages/viewimage.php
@@ -1,58 +1,58 @@
-owner_guid);
-	$album = get_entity($photo->container_guid);
-	if ($album) {
-		$owner_guid = $album->container_guid;
-		if ($owner_guid)
-			set_page_owner($owner_guid);
-	}
-
-	
-	$page_owner = page_owner_entity();
-	if ($page_owner instanceof ElggGroup) {
-		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-	}
-
-	if (can_write_to_container(0, $album->container_guid)) {
-		add_submenu_item(	elgg_echo('image:edit'),
-							$CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid,
-							'photos');
-		$ts = time();
-		$token = generate_action_token($ts);
-		add_submenu_item(	elgg_echo('image:delete'),
-							$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $photo_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
-							'photos',
-							true);
-	}
-
-	
-	$title = $photo->title;
-	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity($photo, true);
-
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
-	page_draw($title, $body);
+owner_guid);
+	$album = get_entity($photo->container_guid);
+	if ($album) {
+		$owner_guid = $album->container_guid;
+		if ($owner_guid)
+			set_page_owner($owner_guid);
+	}
+
+	
+	$page_owner = page_owner_entity();
+	if ($page_owner instanceof ElggGroup) {
+		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
+							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+	}
+
+	if (can_write_to_container(0, $album->container_guid)) {
+		add_submenu_item(	elgg_echo('image:edit'),
+							$CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid,
+							'photos');
+		$ts = time();
+		$token = generate_action_token($ts);
+		add_submenu_item(	elgg_echo('image:delete'),
+							$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $photo_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
+							'photos',
+							true);
+	}
+
+	
+	$title = $photo->title;
+	$area2 = elgg_view_title($title);
+	$area2 .= elgg_view_entity($photo, true);
+
+	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+
+	page_draw($title, $body);
 ?>
\ No newline at end of file
diff --git a/pages/world.php b/pages/world.php
index 2683abc1d..9488f2620 100644
--- a/pages/world.php
+++ b/pages/world.php
@@ -1,31 +1,31 @@
-
\ No newline at end of file
diff --git a/start.php b/start.php
index f56669c1f..472bf4881 100644
--- a/start.php
+++ b/start.php
@@ -1,437 +1,437 @@
-wwwroot . "pg/photos/owned/" . $_SESSION['user']->username);
-		}
-				
-		// Extend CSS
-		extend_view('css', 'tidypics/css');
-		
-		// Extend hover-over and profile menu
-		extend_view('profile/menu/links','tidypics/hover_menu');
-		
-		//group view  ** psuedo widget view for group pages**
-		extend_view('groups/right_column','tidypics/groupprofile_albums');
-		
-		// rss extensions
-		extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
-		extend_view('extensions/channel', 'extensions/tidypics/channel');
-		
-		// Register a page handler, so we can have nice URLs
-		register_page_handler('photos','tidypics_page_handler');
-		
-		// Add a new tidypics widget
-		add_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile');
-		add_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile');
-		
-		// Register a URL handler for files
-		register_entity_url_handler('tidypics_image_url', 'object', 'image');
-		register_entity_url_handler('tidypics_album_url', 'object', 'album');
-
-		// add the class files for image and album
-		add_subtype("object", "image", "TidypicsImage");
-		add_subtype("object", "album", "TidypicsAlbum");
-
-		// Register entity type
-		register_entity_type('object','image');
-		register_entity_type('object','album');
-		
-		if (function_exists('add_group_tool_option'))
-			add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true);
-		
-		if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled")
-			register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');
-		
-		// Register for notifications 
-		if (is_callable('register_notification_object')) {
-			register_notification_object('object', 'album', elgg_echo('tidypics:newalbum'));
-			
-			register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message');
-		}
-		
-		// slideshow plugin hook
-		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');		
-	}
-	
-	/**
-	 * Sets up sidebar menus for tidypics.  Triggered on pagesetup.
-	 */
-	function tidypics_submenus() {
-		
-		global $CONFIG;
-		
-		$page_owner = page_owner_entity();
-		
-		if ($page_owner instanceof ElggGroup) {
-			if (get_context() == "groups") {
-				if ($page_owner->photos_enable != "no") {
-					add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-				}
-			}
-		}
-		// context is only set to photos on individual pages, not on group pages
-		else if (get_context() == "photos") {
-			
-			$view_count = get_plugin_setting('view_count', 'tidypics');
-			
-			// owner gets "your albumn", "your friends albums", "your most viewed", "your most recent"
-			if (get_loggedin_userid() && get_loggedin_userid() == $page_owner->guid) {
-								
-				add_submenu_item(	elgg_echo('album:create'), 
-									$CONFIG->wwwroot . "pg/photos/new/{$page_owner->username}/", 
-									'tidypics-a' );
-
-				add_submenu_item(	elgg_echo("album:yours"), 
-									$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
-									'tidypics-a' );
-
-				add_submenu_item( 	elgg_echo('album:yours:friends'), 
-									$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
-									'tidypics-a');
-				
-				if ($view_count != 'disabled') {
-					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
-										$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/",
-										'tidypics-a');
-				}
-				
-				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
-									$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/",
-									'tidypics-a');
-			} else if (isloggedin()) {
-				
-				$user = get_loggedin_user();
-				
-				// logged in not owner gets "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent"
-				// and then "your albums", "your most viewed", "your most recent"
-				add_submenu_item(	elgg_echo("album:yours"), 
-									$CONFIG->wwwroot . "pg/photos/owned/{$user->username}/", 
-									'tidypics-b' );
-				
-				if ($view_count != 'disabled') {
-					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
-										$CONFIG->wwwroot . "pg/photos/mostviewed/{$user->username}/",
-										'tidypics-b');
-				}
-				
-				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
-									$CONFIG->wwwroot . "pg/photos/mostrecent/{$user->username}/",
-									'tidypics-b');
-									
-				if($page_owner->name) { // check to make sure the owner set their display name
-					add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
-										'tidypics-a' );
-					add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
-										'tidypics-a');
-					
-					if ($view_count != 'disabled') {
-						add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), 
-											$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/", 
-											'tidypics-a');
-					}
-					
-					add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/", 
-										'tidypics-a');
-				}
-			} else if ($page_owner->guid) {
-				// non logged in user gets "page owners albums", "page owner's friends albums" 
-				add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name), 
-									$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
-									'tidypics-a' );
-				add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name), 
-									$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
-									'tidypics-a');
-			}
-			
-			// everyone gets world albums, most recent, most viewed, most recently viewed, recently commented 
-			add_submenu_item(	elgg_echo('album:all'), 
-								$CONFIG->wwwroot . "pg/photos/world/", 
-								'tidypics-z');
-			add_submenu_item(	elgg_echo('tidypics:mostrecent'),
-								$CONFIG->wwwroot . 'pg/photos/mostrecent/',
-								'tidypics-z');
-			
-			if ($view_count != 'disabled') {
-				add_submenu_item(	elgg_echo('tidypics:mostviewed'),
-									$CONFIG->wwwroot . 'pg/photos/mostviewed/',
-									'tidypics-z');
-				add_submenu_item(	elgg_echo('tidypics:recentlyviewed'),
-									$CONFIG->wwwroot . 'pg/photos/recentlyviewed/',
-									'tidypics-z');
-			}
-			add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
-								$CONFIG->wwwroot . 'pg/photos/recentlycommented/',
-								'tidypics-z');
-			add_submenu_item(	'Flickr Integration',
-								$CONFIG->wwwroot . 'mod/tidypics/pages/flickr/setup.php',
-								'tidypics-z');
-
-		}
-		
-	}
-	
-	/**
-	 * Sets up tidypics admin menu. Triggered on pagesetup.
-	 */
-	function tidypics_adminmenu()
-	{
-		global $CONFIG;
-		if (get_context() == 'admin' && isadminloggedin()) {
-			add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "mod/tidypics/pages/admin.php");
-		}
-	}
-
-	/**
-	 * Sets up submenus for tidypics most viewed pages
-	 */
-	function tidypics_mostviewed_submenus() {
-		
-		global $CONFIG;
-		
-		add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostvieweddashboard.php");
-		add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthisyear.php");
-		add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthismonth.php");
-		add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimageslastmonth.php");
-		add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagestoday.php");
-		add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimages.php");
-		add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagesthismonth.php");
-		add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagestoday.php");
-		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented/');
-	}
-
-	/**
-	 * tidypics page handler
-	 *
-	 * @param array $page Array of page elements, forwarded by the page handling mechanism
-	 */
-	function tidypics_page_handler($page) {
-		
-		global $CONFIG;
-		
-		if (isset($page[0])) 
-		{
-			switch($page[0]) 
-			{
-				case "owned":  //view list of albums owned by container
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/ownedalbums.php");
-				break;
-
-				case "view": //view an image individually
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");
-				break;
-
-				case "album": //view an album individually
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/viewalbum.php");
-				break;
-
-				case "new":  //create new album
-					if (isset($page[1])) set_input('username',$page[1]); 
-					include($CONFIG->pluginspath . "tidypics/pages/newalbum.php");
-				break;
-
-				case "upload": //upload images to album
-					if (isset($page[1])) set_input('container_guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/upload.php");
-				break;
-
-				case "edit": //edit image or album
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/edit.php");
-				break;
-
-				case "friends": // albums of friends
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/friends.php");
-				break;
-
-				case "world": // all site albums
-					include($CONFIG->pluginspath . "tidypics/pages/world.php");
-				break;
-				
-				case "download": // download an image
-					if (isset($page[1])) set_input('file_guid', $page[1]);
-					if (isset($page[2])) set_input('type', $page[2]);
-					include($CONFIG->pluginspath . "tidypics/pages/download.php");
-				break;
-				
-				case "tagged": // all photos tagged with user 
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/tagged.php");
-				break;
-
-				case "mostviewed": // images with the most views
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/lists/mostviewedimages.php");
-				break;
-				
-				case "mostrecent": // images uploaded most recently
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/lists/mostrecentimages.php");
-				break;
-								
-				case "recentlyviewed": // images most recently viewed
-					include($CONFIG->pluginspath . "tidypics/pages/lists/recentlyviewed.php");
-				break;
-				
-				case "recentlycommented": // images with the most recent comments
-					include($CONFIG->pluginspath . "tidypics/pages/lists/recentlycommented.php");
-				break;
-				
-				case "highestrated": // images with the highest average rating
-					include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
-				break;
-				
-				case "flickr":
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/flickr/setup.php");
-				break;
-			}
-		}
-		else
-		{
-			// going to all site albums if something goes wrong with the page handler 
-			include($CONFIG->pluginspath . "tidypics/pages/world.php");
-		}
-		
-	}
-
-	/**
-	 * Override permissions for group albums and images
-	 *
-	 */
-	function tidypics_permission_override($hook, $entity_type, $returnvalue, $params)
-	{
-		$entity = $params['entity'];
-		$user   = $params['user'];
-		
-		if ($entity->subtype == get_subtype_id('object', 'album')) {
-			// test that the user can edit the container
-			return can_write_to_container(0, $entity->container_guid);
-		}
-
-		if ($entity->subtype == get_subtype_id('object', 'image')) {
-			// test that the user can edit the container
-			return can_write_to_container(0, $entity->container_guid);
-		}
-	}
-	
-	
-	/**
-	 * Notification message handler
-	 */
-	function tidypics_notify_message($hook, $entity_type, $returnvalue, $params)
-	{
-		$entity = $params['entity'];
-		$to_entity = $params['to_entity'];
-		$method = $params['method'];
-		if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'album'))
-		{
-			// block notification message when the album doesn't have any photos
-			if ($entity->new_album == TP_NEW_ALBUM)
-				return false;
-				
-			$descr = $entity->description;
-			$title = $entity->title;
-			$owner = $entity->getOwnerEntity();
-			return sprintf(elgg_echo('album:river:created'), $owner->name) . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
-		}
-		return null;
-	}
-	
-	/**
-	 * Populates the ->getUrl() method for file objects
-	 * Registered in the init function
-	 *
-	 * @param ElggEntity $entity album/image entity
-	 * @return string File URL
-	 */
-	function tidypics_image_url($entity) {
-		global $CONFIG;
-		$title = $entity->title;
-		$title = friendly_title($title);
-		return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title;
-	}
-
-	function tidypics_album_url($entity) {
-		global $CONFIG;
-		$title = $entity->title;
-		$title = friendly_title($title);
-		return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title;
-	}
-	
-	
-	/**
-	 * Catch the plugin hook and add the default album slideshow
-	 * 
-	 * @param $hook - 'tidypics:slideshow'
-	 * @param $entity_type - 'album'
-	 * @param $returnvalue - if set, return because another plugin has used the hook
-	 * @param $params - album entity
-	 * @return unknown_type
-	 */
-	function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
-		
-		if ($returnvalue !== null) {
-			// someone has already added a slideshow or requested that the slideshow is not used
-			return $returnvalue;
-		}
-		
-		$slideshow_link = 'javascript:PicLensLite.start({maxScale:0,feedUrl:PicLensLite.indexFeeds()[0].url})';
-		
-		// add the slideshow javascript to the header
-		extend_view('metatags', 'js/slideshow');
-		
-		return $slideshow_link;
-	}
-	
-	function tp_mostrecentimages($max = 8, $pagination = true) {
-		return list_entities("object", "image", 0, $max, false, false, $pagination);	
-	}
-	
-
-	// Make sure tidypics_init is called on initialisation
-	register_elgg_event_handler('init','system','tidypics_init');
-	register_elgg_event_handler('pagesetup','system','tidypics_submenus');
-	register_elgg_event_handler('pagesetup','system','tidypics_adminmenu');
-	
-	// Register actions
-	register_action("tidypics/settings", false, $CONFIG->pluginspath . "tidypics/actions/settings.php");
-	register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
-	register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
-	register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
-	register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
-	register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
-	register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
-	register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
-	register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");
-
+wwwroot . "pg/photos/owned/" . $_SESSION['user']->username);
+		}
+				
+		// Extend CSS
+		extend_view('css', 'tidypics/css');
+		
+		// Extend hover-over and profile menu
+		extend_view('profile/menu/links','tidypics/hover_menu');
+		
+		//group view  ** psuedo widget view for group pages**
+		extend_view('groups/right_column','tidypics/groupprofile_albums');
+		
+		// rss extensions
+		extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
+		extend_view('extensions/channel', 'extensions/tidypics/channel');
+		
+		// Register a page handler, so we can have nice URLs
+		register_page_handler('photos','tidypics_page_handler');
+		
+		// Add a new tidypics widget
+		add_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile');
+		add_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile');
+		
+		// Register a URL handler for files
+		register_entity_url_handler('tidypics_image_url', 'object', 'image');
+		register_entity_url_handler('tidypics_album_url', 'object', 'album');
+
+		// add the class files for image and album
+		add_subtype("object", "image", "TidypicsImage");
+		add_subtype("object", "album", "TidypicsAlbum");
+
+		// Register entity type
+		register_entity_type('object','image');
+		register_entity_type('object','album');
+		
+		if (function_exists('add_group_tool_option'))
+			add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true);
+		
+		if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled")
+			register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');
+		
+		// Register for notifications 
+		if (is_callable('register_notification_object')) {
+			register_notification_object('object', 'album', elgg_echo('tidypics:newalbum'));
+			
+			register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message');
+		}
+		
+		// slideshow plugin hook
+		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');		
+	}
+	
+	/**
+	 * Sets up sidebar menus for tidypics.  Triggered on pagesetup.
+	 */
+	function tidypics_submenus() {
+		
+		global $CONFIG;
+		
+		$page_owner = page_owner_entity();
+		
+		if ($page_owner instanceof ElggGroup) {
+			if (get_context() == "groups") {
+				if ($page_owner->photos_enable != "no") {
+					add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
+										$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+				}
+			}
+		}
+		// context is only set to photos on individual pages, not on group pages
+		else if (get_context() == "photos") {
+			
+			$view_count = get_plugin_setting('view_count', 'tidypics');
+			
+			// owner gets "your albumn", "your friends albums", "your most viewed", "your most recent"
+			if (get_loggedin_userid() && get_loggedin_userid() == $page_owner->guid) {
+								
+				add_submenu_item(	elgg_echo('album:create'), 
+									$CONFIG->wwwroot . "pg/photos/new/{$page_owner->username}/", 
+									'tidypics-a' );
+
+				add_submenu_item(	elgg_echo("album:yours"), 
+									$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
+									'tidypics-a' );
+
+				add_submenu_item( 	elgg_echo('album:yours:friends'), 
+									$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
+									'tidypics-a');
+				
+				if ($view_count != 'disabled') {
+					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
+										$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/",
+										'tidypics-a');
+				}
+				
+				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
+									$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/",
+									'tidypics-a');
+			} else if (isloggedin()) {
+				
+				$user = get_loggedin_user();
+				
+				// logged in not owner gets "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent"
+				// and then "your albums", "your most viewed", "your most recent"
+				add_submenu_item(	elgg_echo("album:yours"), 
+									$CONFIG->wwwroot . "pg/photos/owned/{$user->username}/", 
+									'tidypics-b' );
+				
+				if ($view_count != 'disabled') {
+					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
+										$CONFIG->wwwroot . "pg/photos/mostviewed/{$user->username}/",
+										'tidypics-b');
+				}
+				
+				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
+									$CONFIG->wwwroot . "pg/photos/mostrecent/{$user->username}/",
+									'tidypics-b');
+									
+				if($page_owner->name) { // check to make sure the owner set their display name
+					add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name), 
+										$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
+										'tidypics-a' );
+					add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name), 
+										$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
+										'tidypics-a');
+					
+					if ($view_count != 'disabled') {
+						add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), 
+											$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/", 
+											'tidypics-a');
+					}
+					
+					add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name), 
+										$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/", 
+										'tidypics-a');
+				}
+			} else if ($page_owner->guid) {
+				// non logged in user gets "page owners albums", "page owner's friends albums" 
+				add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name), 
+									$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
+									'tidypics-a' );
+				add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name), 
+									$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
+									'tidypics-a');
+			}
+			
+			// everyone gets world albums, most recent, most viewed, most recently viewed, recently commented 
+			add_submenu_item(	elgg_echo('album:all'), 
+								$CONFIG->wwwroot . "pg/photos/world/", 
+								'tidypics-z');
+			add_submenu_item(	elgg_echo('tidypics:mostrecent'),
+								$CONFIG->wwwroot . 'pg/photos/mostrecent/',
+								'tidypics-z');
+			
+			if ($view_count != 'disabled') {
+				add_submenu_item(	elgg_echo('tidypics:mostviewed'),
+									$CONFIG->wwwroot . 'pg/photos/mostviewed/',
+									'tidypics-z');
+				add_submenu_item(	elgg_echo('tidypics:recentlyviewed'),
+									$CONFIG->wwwroot . 'pg/photos/recentlyviewed/',
+									'tidypics-z');
+			}
+			add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
+								$CONFIG->wwwroot . 'pg/photos/recentlycommented/',
+								'tidypics-z');
+			add_submenu_item(	'Flickr Integration',
+								$CONFIG->wwwroot . 'mod/tidypics/pages/flickr/setup.php',
+								'tidypics-z');
+
+		}
+		
+	}
+	
+	/**
+	 * Sets up tidypics admin menu. Triggered on pagesetup.
+	 */
+	function tidypics_adminmenu()
+	{
+		global $CONFIG;
+		if (get_context() == 'admin' && isadminloggedin()) {
+			add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "mod/tidypics/pages/admin.php");
+		}
+	}
+
+	/**
+	 * Sets up submenus for tidypics most viewed pages
+	 */
+	function tidypics_mostviewed_submenus() {
+		
+		global $CONFIG;
+		
+		add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostvieweddashboard.php");
+		add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthisyear.php");
+		add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthismonth.php");
+		add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimageslastmonth.php");
+		add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagestoday.php");
+		add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimages.php");
+		add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagesthismonth.php");
+		add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagestoday.php");
+		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented/');
+	}
+
+	/**
+	 * tidypics page handler
+	 *
+	 * @param array $page Array of page elements, forwarded by the page handling mechanism
+	 */
+	function tidypics_page_handler($page) {
+		
+		global $CONFIG;
+		
+		if (isset($page[0])) 
+		{
+			switch($page[0]) 
+			{
+				case "owned":  //view list of albums owned by container
+					if (isset($page[1])) set_input('username',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/ownedalbums.php");
+				break;
+
+				case "view": //view an image individually
+					if (isset($page[1])) set_input('guid',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");
+				break;
+
+				case "album": //view an album individually
+					if (isset($page[1])) set_input('guid',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/viewalbum.php");
+				break;
+
+				case "new":  //create new album
+					if (isset($page[1])) set_input('username',$page[1]); 
+					include($CONFIG->pluginspath . "tidypics/pages/newalbum.php");
+				break;
+
+				case "upload": //upload images to album
+					if (isset($page[1])) set_input('container_guid',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/upload.php");
+				break;
+
+				case "edit": //edit image or album
+					if (isset($page[1])) set_input('guid',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/edit.php");
+				break;
+
+				case "friends": // albums of friends
+					if (isset($page[1])) set_input('username',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/friends.php");
+				break;
+
+				case "world": // all site albums
+					include($CONFIG->pluginspath . "tidypics/pages/world.php");
+				break;
+				
+				case "download": // download an image
+					if (isset($page[1])) set_input('file_guid', $page[1]);
+					if (isset($page[2])) set_input('type', $page[2]);
+					include($CONFIG->pluginspath . "tidypics/pages/download.php");
+				break;
+				
+				case "tagged": // all photos tagged with user 
+					if (isset($page[1])) set_input('guid',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/tagged.php");
+				break;
+
+				case "mostviewed": // images with the most views
+					if (isset($page[1])) set_input('username',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/lists/mostviewedimages.php");
+				break;
+				
+				case "mostrecent": // images uploaded most recently
+					if (isset($page[1])) set_input('username',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/lists/mostrecentimages.php");
+				break;
+								
+				case "recentlyviewed": // images most recently viewed
+					include($CONFIG->pluginspath . "tidypics/pages/lists/recentlyviewed.php");
+				break;
+				
+				case "recentlycommented": // images with the most recent comments
+					include($CONFIG->pluginspath . "tidypics/pages/lists/recentlycommented.php");
+				break;
+				
+				case "highestrated": // images with the highest average rating
+					include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
+				break;
+				
+				case "flickr":
+					if (isset($page[1])) set_input('username',$page[1]);
+					include($CONFIG->pluginspath . "tidypics/pages/flickr/setup.php");
+				break;
+			}
+		}
+		else
+		{
+			// going to all site albums if something goes wrong with the page handler 
+			include($CONFIG->pluginspath . "tidypics/pages/world.php");
+		}
+		
+	}
+
+	/**
+	 * Override permissions for group albums and images
+	 *
+	 */
+	function tidypics_permission_override($hook, $entity_type, $returnvalue, $params)
+	{
+		$entity = $params['entity'];
+		$user   = $params['user'];
+		
+		if ($entity->subtype == get_subtype_id('object', 'album')) {
+			// test that the user can edit the container
+			return can_write_to_container(0, $entity->container_guid);
+		}
+
+		if ($entity->subtype == get_subtype_id('object', 'image')) {
+			// test that the user can edit the container
+			return can_write_to_container(0, $entity->container_guid);
+		}
+	}
+	
+	
+	/**
+	 * Notification message handler
+	 */
+	function tidypics_notify_message($hook, $entity_type, $returnvalue, $params)
+	{
+		$entity = $params['entity'];
+		$to_entity = $params['to_entity'];
+		$method = $params['method'];
+		if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'album'))
+		{
+			// block notification message when the album doesn't have any photos
+			if ($entity->new_album == TP_NEW_ALBUM)
+				return false;
+				
+			$descr = $entity->description;
+			$title = $entity->title;
+			$owner = $entity->getOwnerEntity();
+			return sprintf(elgg_echo('album:river:created'), $owner->name) . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
+		}
+		return null;
+	}
+	
+	/**
+	 * Populates the ->getUrl() method for file objects
+	 * Registered in the init function
+	 *
+	 * @param ElggEntity $entity album/image entity
+	 * @return string File URL
+	 */
+	function tidypics_image_url($entity) {
+		global $CONFIG;
+		$title = $entity->title;
+		$title = friendly_title($title);
+		return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title;
+	}
+
+	function tidypics_album_url($entity) {
+		global $CONFIG;
+		$title = $entity->title;
+		$title = friendly_title($title);
+		return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title;
+	}
+	
+	
+	/**
+	 * Catch the plugin hook and add the default album slideshow
+	 * 
+	 * @param $hook - 'tidypics:slideshow'
+	 * @param $entity_type - 'album'
+	 * @param $returnvalue - if set, return because another plugin has used the hook
+	 * @param $params - album entity
+	 * @return unknown_type
+	 */
+	function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
+		
+		if ($returnvalue !== null) {
+			// someone has already added a slideshow or requested that the slideshow is not used
+			return $returnvalue;
+		}
+		
+		$slideshow_link = 'javascript:PicLensLite.start({maxScale:0,feedUrl:PicLensLite.indexFeeds()[0].url})';
+		
+		// add the slideshow javascript to the header
+		extend_view('metatags', 'js/slideshow');
+		
+		return $slideshow_link;
+	}
+	
+	function tp_mostrecentimages($max = 8, $pagination = true) {
+		return list_entities("object", "image", 0, $max, false, false, $pagination);	
+	}
+	
+
+	// Make sure tidypics_init is called on initialisation
+	register_elgg_event_handler('init','system','tidypics_init');
+	register_elgg_event_handler('pagesetup','system','tidypics_submenus');
+	register_elgg_event_handler('pagesetup','system','tidypics_adminmenu');
+	
+	// Register actions
+	register_action("tidypics/settings", false, $CONFIG->pluginspath . "tidypics/actions/settings.php");
+	register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
+	register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
+	register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
+	register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
+	register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
+	register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
+	register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
+	register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");
+
 ?>
\ No newline at end of file
diff --git a/thumbnail.php b/thumbnail.php
index f310aee95..79d487210 100644
--- a/thumbnail.php
+++ b/thumbnail.php
@@ -1,78 +1,78 @@
-getSubtype() != "image")
-		forward('mod/tidypics/graphics/' . $error_image);
-	
-	// Get filename
-	if ($size == "thumb") {
-		$thumbfile = $file->thumbnail;
-	} else if ($size == "small") {
-		$thumbfile = $file->smallthumb;
-	} else {
-		$thumbfile = $file->largethumb;
-	}
-	
-	if (!$thumbfile)
-		forward('mod/tidypics/graphics/' . $error_image);
-	
-	// create Elgg File object
-	$readfile = new ElggFile();
-	$readfile->owner_guid = $file->owner_guid;
-	$readfile->setFilename($thumbfile);
-	$contents = $readfile->grabFile();
-
-	// send error image if file could not be read
-	if (!$contents) {
-		forward('mod/tidypics/graphics/' . $error_image);
-	}
-	
-	// expires every 14 days
-	$expires = 14 * 60*60*24;
-
-	// overwrite header caused by php session code so images can be cached
-	$mime = $file->getMimeType();
-	header("Content-Type: $mime");
-	header("Content-Length: " . strlen($contents));
-	header("Cache-Control: public", true);
-	header("Pragma: public", true);
-	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
-	
-	// Return the thumbnail and exit
-	echo $contents;
-	exit;
-?>
+getSubtype() != "image")
+		forward('mod/tidypics/graphics/' . $error_image);
+	
+	// Get filename
+	if ($size == "thumb") {
+		$thumbfile = $file->thumbnail;
+	} else if ($size == "small") {
+		$thumbfile = $file->smallthumb;
+	} else {
+		$thumbfile = $file->largethumb;
+	}
+	
+	if (!$thumbfile)
+		forward('mod/tidypics/graphics/' . $error_image);
+	
+	// create Elgg File object
+	$readfile = new ElggFile();
+	$readfile->owner_guid = $file->owner_guid;
+	$readfile->setFilename($thumbfile);
+	$contents = $readfile->grabFile();
+
+	// send error image if file could not be read
+	if (!$contents) {
+		forward('mod/tidypics/graphics/' . $error_image);
+	}
+	
+	// expires every 14 days
+	$expires = 14 * 60*60*24;
+
+	// overwrite header caused by php session code so images can be cached
+	$mime = $file->getMimeType();
+	header("Content-Type: $mime");
+	header("Content-Length: " . strlen($contents));
+	header("Cache-Control: public", true);
+	header("Pragma: public", true);
+	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+	
+	// Return the thumbnail and exit
+	echo $contents;
+	exit;
+?>
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index c0fb05d3a..8156a4bb4 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -1,21 +1,21 @@
-subject_guid);
-	$object = get_entity($vars['item']->object_guid);
-	$url = $object->getURL();
-	$subtype = get_subtype_from_id($object->subtype);
-	$title = $object->title;
-	if (!$title)
-		$title = elgg_echo('untitled');
-
-	$url = "getURL()}\">{$performed_by->name}";
-	$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
-	$string .= elgg_echo("{$subtype}:river:annotate") . " getURL() . "\">" . $title . "";
-
-?>
-
+subject_guid);
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+	$subtype = get_subtype_from_id($object->subtype);
+	$title = $object->title;
+	if (!$title)
+		$title = elgg_echo('untitled');
+
+	$url = "getURL()}\">{$performed_by->name}";
+	$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
+	$string .= elgg_echo("{$subtype}:river:annotate") . " getURL() . "\">" . $title . "";
+
+?>
+
 
\ No newline at end of file
diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php
index bd6890502..d8abda24c 100644
--- a/views/default/js/tagging.php
+++ b/views/default/js/tagging.php
@@ -1,303 +1,303 @@
-
-
-
- 
-
+
+ 
+
\ No newline at end of file
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index a9b261566..20f9293d7 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -1,42 +1,42 @@
-subject_guid);
-	$album = get_entity($vars['item']->object_guid);
-	
-	$group_album = ($album->owner_guid != $album->container_guid);
-	if ($group_album) {
-		$group = get_entity($album->container_guid);
-		$group_name = $group->name;
-		$group_link = $group->getURL();
-	}
-	
-	$url = "getURL()}\">{$performed_by->name}";
-	$string = sprintf(elgg_echo("album:river:created"),$url) . " ";
-	$string .= "getURL() . "\">" . $album->title . "";
-	if ($group_album)
-		$string .= ' ' . elgg_echo('album:river:group') . ' ' . "{$group_name}";
-
-	$album_river_view = get_plugin_setting('album_river_view', 'tidypics');
-	
-	if ($album_river_view == "cover") {
-		if ($album->cover) {
-			$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
-		}
-	} else {
-
-		$string .= "
      ";
-		
-		$images = get_entities("object", "image", $album->guid, 'time_created desc', 7);
-
-		if (count($images)) {
-			foreach($images as $image){
-				$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
-			}
-		}
-
-		$string .= "
      ";
-	}
-
-echo $string;
-
-?>
+subject_guid);
+	$album = get_entity($vars['item']->object_guid);
+	
+	$group_album = ($album->owner_guid != $album->container_guid);
+	if ($group_album) {
+		$group = get_entity($album->container_guid);
+		$group_name = $group->name;
+		$group_link = $group->getURL();
+	}
+	
+	$url = "getURL()}\">{$performed_by->name}";
+	$string = sprintf(elgg_echo("album:river:created"),$url) . " ";
+	$string .= "getURL() . "\">" . $album->title . "";
+	if ($group_album)
+		$string .= ' ' . elgg_echo('album:river:group') . ' ' . "{$group_name}";
+
+	$album_river_view = get_plugin_setting('album_river_view', 'tidypics');
+	
+	if ($album_river_view == "cover") {
+		if ($album->cover) {
+			$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
+		}
+	} else {
+
+		$string .= "
      ";
+		
+		$images = get_entities("object", "image", $album->guid, 'time_created desc', 7);
+
+		if (count($images)) {
+			foreach($images as $image){
+				$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
+			}
+		}
+
+		$string .= "
      ";
+	}
+
+echo $string;
+
+?>
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 5229e109a..2f1777f64 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,29 +1,29 @@
-subject_guid);
-	$image = get_entity($vars['item']->object_guid);
-	if($image->title) {
-		$title = $image->title;
-	} else {
-		$title = "untitled";
-	}
-
-	$url = "getURL()}\">{$performed_by->name}";
-	$album = get_entity($image->container_guid);
-
-	$album_link = "" . $album->title . "";
-	$image_link = "getURL() . "\">" . $title . "";
-	
-	$string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link);
-		
-	$string .= "
      ";
-
-/*	// this adds the album cover to the river display 
-	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
-*/
-	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
-	$string .= "
      ";
-	
-	echo $string;
-
+subject_guid);
+	$image = get_entity($vars['item']->object_guid);
+	if($image->title) {
+		$title = $image->title;
+	} else {
+		$title = "untitled";
+	}
+
+	$url = "getURL()}\">{$performed_by->name}";
+	$album = get_entity($image->container_guid);
+
+	$album_link = "" . $album->title . "";
+	$image_link = "getURL() . "\">" . $title . "";
+	
+	$string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link);
+		
+	$string .= "
      ";
+
+/*	// this adds the album cover to the river display 
+	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
+*/
+	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
+	$string .= "
      ";
+	
+	echo $string;
+
 ?>
\ No newline at end of file
diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php
index 6e60d5af3..1b3589afb 100644
--- a/views/default/river/object/image/tag.php
+++ b/views/default/river/object/image/tag.php
@@ -1,23 +1,23 @@
-subject_guid);
-	$person_tagged = get_entity($vars['item']->object_guid);
-	if($image->title) {
-		$title = $image->title;
-	} else {
-		$title = "untitled";
-	}
-	
-	// viewer may not have permission to view image
-	if (!$image)
-		return;
-	
-	
-	$image_url = "getURL()}\">{$title}";
-	$person_url = "getURL()}\">{$person_tagged->name}";
-	
-	$string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url;
-	
-	echo $string;
-
+subject_guid);
+	$person_tagged = get_entity($vars['item']->object_guid);
+	if($image->title) {
+		$title = $image->title;
+	} else {
+		$title = "untitled";
+	}
+	
+	// viewer may not have permission to view image
+	if (!$image)
+		return;
+	
+	
+	$image_url = "getURL()}\">{$title}";
+	$person_url = "getURL()}\">{$person_tagged->name}";
+	
+	$string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url;
+	
+	echo $string;
+
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/admin/help.php b/views/default/tidypics/admin/help.php
index 4014be9ce..7f871598c 100644
--- a/views/default/tidypics/admin/help.php
+++ b/views/default/tidypics/admin/help.php
@@ -1,25 +1,25 @@
-
      
-
      White screen when uploading images
      
-
      
-Tidypics tries to calculate the maximum size of an image that your server will support. If it
-guesses incorrectly and someone uploads a photo that is too large, the script may crash when
-resizing the image if you are using GD. The easiest way to test this is to set display_errors
-to 1 in your .htaccess file and upload large images. If this causes a problem, a php memory error
-should display on the screen. You can increased your php memory limit (see the docs directory).
-A better option is to use ImageMagick if your server supports it (again see the docs directory).
-
      
-If it is not a memory issue, you should see some other error appear. Once you have fixed the error,
-change display_error back to 0.  
-
      
-
      Question mark images appear
      
-
      
-If you see question mark images when you look at your albums, this means the resizing of the images
-failed. This could be due to the memory limits as described above. There are other causes. Tidypics
-tries to detect these problems and write the cause to the error log. You should check your server
-error log right after an upload that results in a question mark for these error messages. The messages
-will begin with "Tidypics warning:". It is possible if you have turned off php warnings that you will 
-not see these warnings.
-
      
-Another possible cause is using ImageMagick when your server does not support it or specifying
-the wrong path to the ImageMagick executables.
+
      
+
      White screen when uploading images
      
+
      
+Tidypics tries to calculate the maximum size of an image that your server will support. If it
+guesses incorrectly and someone uploads a photo that is too large, the script may crash when
+resizing the image if you are using GD. The easiest way to test this is to set display_errors
+to 1 in your .htaccess file and upload large images. If this causes a problem, a php memory error
+should display on the screen. You can increased your php memory limit (see the docs directory).
+A better option is to use ImageMagick if your server supports it (again see the docs directory).
+
      
+If it is not a memory issue, you should see some other error appear. Once you have fixed the error,
+change display_error back to 0.  
+
      
+
      Question mark images appear
      
+
      
+If you see question mark images when you look at your albums, this means the resizing of the images
+failed. This could be due to the memory limits as described above. There are other causes. Tidypics
+tries to detect these problems and write the cause to the error log. You should check your server
+error log right after an upload that results in a question mark for these error messages. The messages
+will begin with "Tidypics warning:". It is possible if you have turned off php warnings that you will 
+not see these warnings.
+
      
+Another possible cause is using ImageMagick when your server does not support it or specifying
+the wrong path to the ImageMagick executables.
 
      
\ No newline at end of file
diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php
index deb32d0f3..b4656afe1 100644
--- a/views/default/tidypics/admin/imagelib.php
+++ b/views/default/tidypics/admin/imagelib.php
@@ -1,62 +1,62 @@
-dbprefix}entities where subtype={$img_type}";
-	$total = get_data_row($query);
-	$num_images = $total->total;
-	
-	$img_type = get_subtype_id('object', 'album');
-	$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
-	$total = get_data_row($query);
-	$num_albums = $total->total;
-
-	$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment');
-	$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment');
-	
-	$num_views = count_annotations(0, 'object', 'image', 'tp_view');
-	
-	if (get_plugin_setting('tagging', 'tidypics') != "disabled")
-		$num_tags = count_annotations(0, 'object', 'image', 'phototag');
-?>
-
      
-
      Overview
      
-
      
-An image library is required by Tidypics to perform various manipulations: resizing on upload, watermarking, rotation, and cropping.
-There are three image library options with Tidypics: PHP extension GD, 
-ImageMagick called via a system call, and the PHP extension 
-imagick. GD is the most common of the three on hosted servers but suffers 
-from serious memory usage problems when resizing photos. If you have access to ImageMagick (whether through system calls or the
-PHP extension), we recommend that you use that.
-
      
-
      Testing ImageMagick Commandline
      
-
      
-To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can check our 
-server analysis page to find out the 
-configuration of your server. Next, you need to determine the path to ImageMagick on your server. Your hosting service should 
-be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of 
-ImageMagick installed on your server.  
-
      
-
      
-
      
-
      
-
-
-
      
-
      
-
-
\ No newline at end of file
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
index 1b449cfc7..ff7d330e2 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -1,25 +1,25 @@
- elgg_echo("tidypics:admin:instructions")));
-	
-	global $CONFIG;  
-	$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
-	$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/actions/upgrade.php';
-	
-	$upgrade = false;
-	if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album'))
-		$upgrade = true;
-?>
-
      
-
-Upgrade
      
-
-Run Server Analysis
-
      
- elgg_echo("tidypics:admin:instructions")));
+	
+	global $CONFIG;  
+	$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
+	$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/actions/upgrade.php';
+	
+	$upgrade = false;
+	if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album'))
+		$upgrade = true;
+?>
+
      
+
+Upgrade
      
+
+Run Server Analysis
+
      
+
\ No newline at end of file
diff --git a/views/default/tidypics/admin/stats.php b/views/default/tidypics/admin/stats.php
index 8de3415a1..aea5e75ba 100644
--- a/views/default/tidypics/admin/stats.php
+++ b/views/default/tidypics/admin/stats.php
@@ -1,35 +1,35 @@
-dbprefix}entities where subtype={$img_type}";
-	$total = get_data_row($query);
-	$num_images = $total->total;
-	
-	$img_type = get_subtype_id('object', 'album');
-	$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
-	$total = get_data_row($query);
-	$num_albums = $total->total;
-
-	$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment');
-	$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment');
-	
-	$num_views = count_annotations(0, 'object', 'image', 'tp_view');
-	
-	if (get_plugin_setting('tagging', 'tidypics') != "disabled")
-		$num_tags = count_annotations(0, 'object', 'image', 'phototag');
-?>
-
      
-
      
-Photos: 
      
-Albums: 
      
-Comments on photos: 
      
-Comments on albums: 
      
-Total views: 
      
-
-Photo tags: 
      
-
+dbprefix}entities where subtype={$img_type}";
+	$total = get_data_row($query);
+	$num_images = $total->total;
+	
+	$img_type = get_subtype_id('object', 'album');
+	$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
+	$total = get_data_row($query);
+	$num_albums = $total->total;
+
+	$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment');
+	$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment');
+	
+	$num_views = count_annotations(0, 'object', 'image', 'tp_view');
+	
+	if (get_plugin_setting('tagging', 'tidypics') != "disabled")
+		$num_tags = count_annotations(0, 'object', 'image', 'phototag');
+?>
+
      
+
      
+Photos: 
      
+Albums: 
      
+Comments on photos: 
      
+Comments on albums: 
      
+Total views: 
      
+
+Photo tags: 
      
+
 
      
\ No newline at end of file
diff --git a/views/default/tidypics/admin/thumbnails.php b/views/default/tidypics/admin/thumbnails.php
index 0af59090e..ccd884005 100644
--- a/views/default/tidypics/admin/thumbnails.php
+++ b/views/default/tidypics/admin/thumbnails.php
@@ -1,33 +1,33 @@
-
      
-
      Overview
      
-
      
-This page allows you to create thumbnails for images when the thumbnail creation failed during upload. 
-You may experience problems with thumbnail creation if your image library in not configured properly or
-if there is not enough memory for the GD library to load and resize an image. If your users have 
-experienced problems with thumbnail creation and you have modified your setup, you can try to redo the
-thumbnails. Find the unique identifier of the photo (it is the number near the end of the url when viewing
-a photo) and enter it below. 
-
      
-
      Thumbnail Creation
      
-
      
-:
-
-
-
      
-
      
-
\ No newline at end of file
diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php
index 9c75bf024..42ac15afe 100644
--- a/views/default/tidypics/albums.php
+++ b/views/default/tidypics/albums.php
@@ -1,51 +1,51 @@
-';
-
-	if ($owner_albums) { 
-		foreach($owner_albums as $album) {
-
-			if($album->cover)
-				$album_cover = '' . $album->title . '';
-			else
-				$album_cover = '' . $album->title . '';
-?>
-		
      
-			
      title;?>
      
-			
       time_created);?>
      
-getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")
      ";
-?>
-			
-		
      
-username) || empty($owner->username)) {
-			echo '
      ' . elgg_echo('album:all') . '
      ';
-		} else {
-			echo '
      ' . elgg_echo('album:more') . '
      ';
-		}
-
-	}
-
-	if (can_write_to_container(0, $owner->guid)) {
-		echo '
      username . '>' . elgg_echo("album:create") . '
      ';
-	}
-
-
-	//close album_widget_container div
-	echo "
      ";
+';
+
+	if ($owner_albums) { 
+		foreach($owner_albums as $album) {
+
+			if($album->cover)
+				$album_cover = '' . $album->title . '';
+			else
+				$album_cover = '' . $album->title . '';
+?>
+		
      
+			
      title;?>
      
+			
       time_created);?>
      
+getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")
      ";
+?>
+			
+		
      
+username) || empty($owner->username)) {
+			echo '
      ' . elgg_echo('album:all') . '
      ';
+		} else {
+			echo '
      ' . elgg_echo('album:more') . '
      ';
+		}
+
+	}
+
+	if (can_write_to_container(0, $owner->guid)) {
+		echo '
      username . '>' . elgg_echo("album:create") . '
      ';
+	}
+
+
+	//close album_widget_container div
+	echo "
      ";
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/breadcrumbs.php b/views/default/tidypics/breadcrumbs.php
index 1a96e921c..c4d347e6e 100644
--- a/views/default/tidypics/breadcrumbs.php
+++ b/views/default/tidypics/breadcrumbs.php
@@ -1,22 +1,22 @@
-wwwroot . "pg/photos/owned/" . $page_owner->username;
-	if (get_loggedin_userid() == $page_owner->guid)
-		$first_level_text = elgg_echo('album:yours');
-	else
-		$first_level_text = sprintf(elgg_echo('album:user'), $page_owner->name);
-?>
-
-title;
-		$second_level_link = $vars['album']->getURL();
-?>
->>  
-
+wwwroot . "pg/photos/owned/" . $page_owner->username;
+	if (get_loggedin_userid() == $page_owner->guid)
+		$first_level_text = elgg_echo('album:yours');
+	else
+		$first_level_text = sprintf(elgg_echo('album:user'), $page_owner->name);
+?>
+
+title;
+		$second_level_link = $vars['album']->getURL();
+?>
+>>  
+
diff --git a/views/default/tidypics/exif.php b/views/default/tidypics/exif.php
index 525665754..0100ac575 100644
--- a/views/default/tidypics/exif.php
+++ b/views/default/tidypics/exif.php
@@ -1,14 +1,14 @@
-';
-		foreach ($exif as $name => $value) {
-			echo $name . ': ' . $value . '
      ';
-		}
-		echo '
      ';
-	}
-	
+';
+		foreach ($exif as $name => $value) {
+			echo $name . ': ' . $value . '
      ';
+		}
+		echo '
      ';
+	}
+	
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index cec1945f0..342ac8822 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -1,118 +1,118 @@
-title;
-		$body = $vars['entity']->description;
-		$tags = $vars['entity']->tags;
-		$access_id = $vars['entity']->access_id;
-		$subtype = $vars['subtype'];
-
-	// if nothing is sent, create new, but only new albums are sent here
-	// new images are sent to upload.php
-	} else  {
-		$action = "tidypics/addalbum";
-		$tags = "";
-		$title = "";
-		$body = "";
-		if (defined('ACCESS_DEFAULT'))
-			$access_id = ACCESS_DEFAULT;
-		else
-			$access_id = 1; // logged_in by default
-		$subtype = 'album';
-		
-		$title = $_SESSION['tidypicstitle'];
-		$body = $_SESSION['tidypicsbody'];
-		$tags = $_SESSION['tidypicstags'];
-
-		unset($_SESSION['tidypicstitle']); 
-		unset($_SESSION['tidypicsbody']); 
-		unset($_SESSION['tidypicstags']);
-	}
-
-	// group or individual 
-	$container_guid = page_owner();
-
-?>
-
      
-	
      
-		
      
-			
-			 "tidypicstitle", "value" => $title,));  ?>
-		
      
-
-		
      
-			
-			 "tidypicsbody","value" => $body,)); ?>
-		
      
-
-		
      
-			
-			 "tidypicsbody","value" => $body,"class" => 'tidypics_caption_input')); ?>
-		
      
-
-		
      
-			
-			 "tidypicstags","value" => $tags,));  ?>
-		
      
-
-container_guid;
-			
-			// should this image be the cover for the album - only ask for non-cover photos
-			// determine if it is already the cover
-			$img_guid = $vars['entity']->guid;
-			$album = get_entity($container_guid);
-			$cover_guid = $album->cover;
-			
-			if ($cover_guid != $img_guid) { 
-			
-?>
-		
      
- "cover", 
-													'options' => array(elgg_echo("album:cover")),
-													));
-?>
-		
      
-
-			
      
-				
-				 'access_id','value' => $access_id)); ?>
-			
      
-
-
-			
-
-		
-		
-		
      
-	
      
+title;
+		$body = $vars['entity']->description;
+		$tags = $vars['entity']->tags;
+		$access_id = $vars['entity']->access_id;
+		$subtype = $vars['subtype'];
+
+	// if nothing is sent, create new, but only new albums are sent here
+	// new images are sent to upload.php
+	} else  {
+		$action = "tidypics/addalbum";
+		$tags = "";
+		$title = "";
+		$body = "";
+		if (defined('ACCESS_DEFAULT'))
+			$access_id = ACCESS_DEFAULT;
+		else
+			$access_id = 1; // logged_in by default
+		$subtype = 'album';
+		
+		$title = $_SESSION['tidypicstitle'];
+		$body = $_SESSION['tidypicsbody'];
+		$tags = $_SESSION['tidypicstags'];
+
+		unset($_SESSION['tidypicstitle']); 
+		unset($_SESSION['tidypicsbody']); 
+		unset($_SESSION['tidypicstags']);
+	}
+
+	// group or individual 
+	$container_guid = page_owner();
+
+?>
+
      
+	
      
+		
      
+			
+			 "tidypicstitle", "value" => $title,));  ?>
+		
      
+
+		
      
+			
+			 "tidypicsbody","value" => $body,)); ?>
+		
      
+
+		
      
+			
+			 "tidypicsbody","value" => $body,"class" => 'tidypics_caption_input')); ?>
+		
      
+
+		
      
+			
+			 "tidypicstags","value" => $tags,));  ?>
+		
      
+
+container_guid;
+			
+			// should this image be the cover for the album - only ask for non-cover photos
+			// determine if it is already the cover
+			$img_guid = $vars['entity']->guid;
+			$album = get_entity($container_guid);
+			$cover_guid = $album->cover;
+			
+			if ($cover_guid != $img_guid) { 
+			
+?>
+		
      
+ "cover", 
+													'options' => array(elgg_echo("album:cover")),
+													));
+?>
+		
      
+
+			
      
+				
+				 'access_id','value' => $access_id)); ?>
+			
      
+
+
+			
+
+		
+		
+		
      
+	
      
 
      
\ No newline at end of file
diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php
index 4c4a111f5..4031b7968 100644
--- a/views/default/tidypics/forms/edit_multi.php
+++ b/views/default/tidypics/forms/edit_multi.php
@@ -1,58 +1,58 @@
-
-
      
-
      
-cover) $no_cover = true;
-	
-	foreach ($file_array as $key => $file_guid){
-		$entity = get_entity($file_guid);
-		$guid = $entity->guid;
-		$body = $entity->description;
-		$title = $entity->title;
-		$tags = $entity->tags;
-		$container_guid = $entity->container_guid;
-		
-		// first one is default cover if there isn't one already
-		if ($no_cover) {
-			$val = $guid;
-			$no_cover = false;
-		}
-		
-		echo '
      ';
-		echo '' . $title . '';
-		echo '
      ';
-		echo '
      ';
-		echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n";
-		echo '
      ';
-		echo '
      ";
-		echo elgg_view("input/longtext",array("internalname" => "caption[$key]", "value" => $body, "class" => 'tidypics_caption_input',)) . "\n";
-		echo "
      ";
-		echo '
      \n";
-		echo elgg_view("input/tags", array( "internalname" => "tags[$key]","value" => $tags)) . "\n";
-		echo '
      ';
-		echo '' . "\n";
-		echo elgg_view('input/securitytoken');
-		
-		echo elgg_view("input/radio", array("internalname" => "cover",
-											"value" => $val,
-											'options' => array(	elgg_echo('album:cover') => $guid,
-																),
-													));
-		echo '
      ';
-		echo '
      ';
-	}
-	
-?>
-
-
      
-
      
+
+
      
+
      
+cover) $no_cover = true;
+	
+	foreach ($file_array as $key => $file_guid){
+		$entity = get_entity($file_guid);
+		$guid = $entity->guid;
+		$body = $entity->description;
+		$title = $entity->title;
+		$tags = $entity->tags;
+		$container_guid = $entity->container_guid;
+		
+		// first one is default cover if there isn't one already
+		if ($no_cover) {
+			$val = $guid;
+			$no_cover = false;
+		}
+		
+		echo '
      ';
+		echo '' . $title . '';
+		echo '
      ';
+		echo '
      ';
+		echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n";
+		echo '
      ';
+		echo '
      ";
+		echo elgg_view("input/longtext",array("internalname" => "caption[$key]", "value" => $body, "class" => 'tidypics_caption_input',)) . "\n";
+		echo "
      ";
+		echo '
      \n";
+		echo elgg_view("input/tags", array( "internalname" => "tags[$key]","value" => $tags)) . "\n";
+		echo '
      ';
+		echo '' . "\n";
+		echo elgg_view('input/securitytoken');
+		
+		echo elgg_view("input/radio", array("internalname" => "cover",
+											"value" => $val,
+											'options' => array(	elgg_echo('album:cover') => $guid,
+																),
+													));
+		echo '
      ';
+		echo '
      ';
+	}
+	
+?>
+
+
      
+
      
 
      
\ No newline at end of file
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index 6ab9dfcc9..6cfed661f 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -1,145 +1,145 @@
-version) {
-		set_plugin_setting('version', 1.62, 'tidypics');
-	}
-	
-	if (extension_loaded('imagick'))
-		$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
-		
-	$disablefunc = explode(',', ini_get('disable_functions'));
-	if (is_callable('exec') && !in_array('exec',$disablefunc))
-		$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
-
-	$img_lib_options['GD'] = 'GD';
-
-
-	// Image Library
-	$image_lib = $plugin->image_lib;
-	if (!$image_lib) $image_lib = 'GD';
-	$form_body = '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
-	$form_body .= elgg_view('input/pulldown', array(
-					'internalname' => 'params[image_lib]',
-					'options_values' => $img_lib_options,
-					'value' => $image_lib
-	));
-	$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
-
-	if (is_callable('exec') && !in_array('exec',$disablefunc)) {
-		// Image Magick Path
-		$im_path = $plugin->im_path;
-		if(!$im_path) $im_path = "/usr/bin/";
-		$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
-		$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
-	}
-
-	// Tagging
-	$tagging = $plugin->tagging;
-	if(!$tagging) $tagging = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
-
-	// Download Link
-	$download_link = $plugin->download_link;
-	if(!$download_link) $download_link = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
-
-	// Ratings
-	$photo_ratings = $plugin->photo_ratings;
-	if(!$photo_ratings) $photo_ratings = "disabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
-
-	// Show EXIF
-	$exif = $plugin->exif;
-	if(!$exif) $exif = "disabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
-
-	// Show View count
-	$view_count = $plugin->view_count;
-	if(!$view_count) $view_count = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
-
-	// Watermark Text
-	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
-
-	// Max Image Size
-	$maxfilesize = $plugin->maxfilesize;
-	if (!$maxfilesize) $maxfilesize = (int)5; // 5 MB
-	$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
-
-	// Quota Size
-	$quota = $plugin->quota;
-	if (!$quota) $quota = 0;
-	$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
-
-	// River Image options
-	$img_river_view = $plugin->img_river_view;
-	if (!$img_river_view) $img_river_view = '1';
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view');
-	$form_body .= elgg_view('input/pulldown', array(
-					'internalname' => 'params[img_river_view]',
-					'options_values' => array(
-						'all' => 'all',
-						'1' => '1',
-						'none' => 'none',
-					),
-					'value' => $img_river_view
-	));
-	$form_body .= '
      ';
-
-	// River Album options
-	$album_river_view = $plugin->album_river_view;
-	if (!$album_river_view) $album_river_view = 'set';
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view');
-	$form_body .= elgg_view('input/pulldown', array(
-					'internalname' => 'params[album_river_view]',
-					'options_values' => array(
-						'cover' => 'cover',
-						'set' => 'set',
-					),
-					'value' => $album_river_view
-	));
-	$form_body .= '
      ';
-
-	// Thumbnail sizes
-	$image_sizes = $plugin->image_sizes;
-	if(!$image_sizes) {
-		$image_sizes = array(); // set default values 
-		$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
-		$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
-		$image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60;
-	} else {
-		$image_sizes = unserialize($image_sizes);
-	}
-	$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
-	$form_body .= 'width:    ';
-	$form_body .= 'height: 
      ';
-	$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
-	$form_body .= 'width:    ';
-	$form_body .= 'height: 
      ';
-	$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
-	$form_body .= 'width:    ';
-	$form_body .= 'height: 
      ';
-
-
-	// Group permission override
-	$grp_perm_override = $plugin->grp_perm_override;
-	if(!$grp_perm_override) $grp_perm_override = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
-
-	$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-	
+version) {
+		set_plugin_setting('version', 1.62, 'tidypics');
+	}
+	
+	if (extension_loaded('imagick'))
+		$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
+		
+	$disablefunc = explode(',', ini_get('disable_functions'));
+	if (is_callable('exec') && !in_array('exec',$disablefunc))
+		$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
+
+	$img_lib_options['GD'] = 'GD';
+
+
+	// Image Library
+	$image_lib = $plugin->image_lib;
+	if (!$image_lib) $image_lib = 'GD';
+	$form_body = '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
+	$form_body .= elgg_view('input/pulldown', array(
+					'internalname' => 'params[image_lib]',
+					'options_values' => $img_lib_options,
+					'value' => $image_lib
+	));
+	$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
+
+	if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+		// Image Magick Path
+		$im_path = $plugin->im_path;
+		if(!$im_path) $im_path = "/usr/bin/";
+		$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
+		$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
+	}
+
+	// Tagging
+	$tagging = $plugin->tagging;
+	if(!$tagging) $tagging = "enabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
+
+	// Download Link
+	$download_link = $plugin->download_link;
+	if(!$download_link) $download_link = "enabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
+
+	// Ratings
+	$photo_ratings = $plugin->photo_ratings;
+	if(!$photo_ratings) $photo_ratings = "disabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
+
+	// Show EXIF
+	$exif = $plugin->exif;
+	if(!$exif) $exif = "disabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
+
+	// Show View count
+	$view_count = $plugin->view_count;
+	if(!$view_count) $view_count = "enabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
+
+	// Watermark Text
+	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
+
+	// Max Image Size
+	$maxfilesize = $plugin->maxfilesize;
+	if (!$maxfilesize) $maxfilesize = (int)5; // 5 MB
+	$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
+
+	// Quota Size
+	$quota = $plugin->quota;
+	if (!$quota) $quota = 0;
+	$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
+
+	// River Image options
+	$img_river_view = $plugin->img_river_view;
+	if (!$img_river_view) $img_river_view = '1';
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view');
+	$form_body .= elgg_view('input/pulldown', array(
+					'internalname' => 'params[img_river_view]',
+					'options_values' => array(
+						'all' => 'all',
+						'1' => '1',
+						'none' => 'none',
+					),
+					'value' => $img_river_view
+	));
+	$form_body .= '
      ';
+
+	// River Album options
+	$album_river_view = $plugin->album_river_view;
+	if (!$album_river_view) $album_river_view = 'set';
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view');
+	$form_body .= elgg_view('input/pulldown', array(
+					'internalname' => 'params[album_river_view]',
+					'options_values' => array(
+						'cover' => 'cover',
+						'set' => 'set',
+					),
+					'value' => $album_river_view
+	));
+	$form_body .= '
      ';
+
+	// Thumbnail sizes
+	$image_sizes = $plugin->image_sizes;
+	if(!$image_sizes) {
+		$image_sizes = array(); // set default values 
+		$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
+		$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
+		$image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60;
+	} else {
+		$image_sizes = unserialize($image_sizes);
+	}
+	$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
+	$form_body .= 'width:    ';
+	$form_body .= 'height: 
      ';
+	$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
+	$form_body .= 'width:    ';
+	$form_body .= 'height: 
      ';
+	$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
+	$form_body .= 'width:    ';
+	$form_body .= 'height: 
      ';
+
+
+	// Group permission override
+	$grp_perm_override = $plugin->grp_perm_override;
+	if(!$grp_perm_override) $grp_perm_override = "enabled";
+	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
+
+	$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
+	
 	echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
diff --git a/views/default/tidypics/gallery.php b/views/default/tidypics/gallery.php
index 29c706bb1..dd7c1cdcf 100644
--- a/views/default/tidypics/gallery.php
+++ b/views/default/tidypics/gallery.php
@@ -1,64 +1,64 @@
- 0 && $viewtypetoggle) {
-	$nav .= elgg_view('navigation/viewtype', array(
-		'baseurl' => $baseurl,
-		'offset' => $offset,
-		'count' => $count,
-		'viewtype' => $viewtype,
-	));
-}
-
-if ($pagination) {
-	$nav .= elgg_view('navigation/pagination',array(
-		'baseurl' => $baseurl,
-		'offset' => $offset,
-		'count' => $count,
-		'limit' => $limit,
-	));
-}
-
-$html .= $nav;
-if ($viewtype == 'list') {
-	if (is_array($entities) && sizeof($entities) > 0) {
-		foreach($entities as $entity) {
-			$html .= elgg_view_entity($entity, $fullview);
-		}
-	}
-} else {
-	if (is_array($entities) && sizeof($entities) > 0) {
-		$html .= elgg_view('entities/gallery', array('entities' => $entities));
-	}
-}
-
-$html .= '
      ';
-
-if ($count) {
-	$html .= $nav;
-}
-
+ 0 && $viewtypetoggle) {
+	$nav .= elgg_view('navigation/viewtype', array(
+		'baseurl' => $baseurl,
+		'offset' => $offset,
+		'count' => $count,
+		'viewtype' => $viewtype,
+	));
+}
+
+if ($pagination) {
+	$nav .= elgg_view('navigation/pagination',array(
+		'baseurl' => $baseurl,
+		'offset' => $offset,
+		'count' => $count,
+		'limit' => $limit,
+	));
+}
+
+$html .= $nav;
+if ($viewtype == 'list') {
+	if (is_array($entities) && sizeof($entities) > 0) {
+		foreach($entities as $entity) {
+			$html .= elgg_view_entity($entity, $fullview);
+		}
+	}
+} else {
+	if (is_array($entities) && sizeof($entities) > 0) {
+		$html .= elgg_view('entities/gallery', array('entities' => $entities));
+	}
+}
+
+$html .= '
      ';
+
+if ($count) {
+	$html .= $nav;
+}
+
 echo $html;
\ No newline at end of file
diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php
index 7f28705c7..a7e143ae9 100644
--- a/views/default/tidypics/groupprofile_albums.php
+++ b/views/default/tidypics/groupprofile_albums.php
@@ -1,15 +1,15 @@
-photos_enable != 'no') {
-	echo '
      ';
-	echo '
      ' . elgg_echo('album:group') . '
      ';
-	echo elgg_view('tidypics/albums', array('num_albums' => 5));
-	echo '
      ';
-}
+photos_enable != 'no') {
+	echo '
      ';
+	echo '
      ' . elgg_echo('album:group') . '
      ';
+	echo elgg_view('tidypics/albums', array('num_albums' => 5));
+	echo '
      ';
+}
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/hover_menu.php b/views/default/tidypics/hover_menu.php
index a36c4be17..240891f51 100644
--- a/views/default/tidypics/hover_menu.php
+++ b/views/default/tidypics/hover_menu.php
@@ -1,12 +1,12 @@
-
-
-	
      
-			
+
+
+	
      
+			
 	
      
\ No newline at end of file
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 9e7a53969..983f900b4 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -1,51 +1,51 @@
-container_guid);
-		if ($container instanceof ElggGroup) {
-			$can_tag = $viewer && $container->isMember($viewer);
-		} else {
-			$can_tag = $viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid);
-		}
-		
-		// only owner and friends of owner can tag
-		if ($can_tag) {
-?>
-
      33. 
-guid == $owner->guid) {
-?>
-
      34. 
-
-
      35. 
-container_guid);
+		if ($container instanceof ElggGroup) {
+			$can_tag = $viewer && $container->isMember($viewer);
+		} else {
+			$can_tag = $viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid);
+		}
+		
+		// only owner and friends of owner can tag
+		if ($can_tag) {
+?>
+
      36. 
+guid == $owner->guid) {
+?>
+
      37. 
+
+
      38. 
+
\ No newline at end of file
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 9ebec7c1e..ae3fa2b27 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -1,87 +1,87 @@
-getPhotoTags();
-
-	// defining json text as "" makes sure the tagging javascript code doesn't throw errors if no tags
-	$photo_tags_json = "\"\"";
-	if ($tag_info) {
-		$photo_tags_json = $tag_info['json'];
-	}
-	
-	if ($tag_info) { 
-?>
-
      
-	
      
-	
-
      
-
-
      
-	
      
-	
      
-
      
-
      
-	
      
-";
-		$content .= "";
-		$content .= "";
-		$content .= "";
-		$content .= "";
-	
-		$content .= "
      ";
-		
-		$content .= "
      ";
-		
-		echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content));
-	}
-
-?>
-
      
-
      
-
      
-
      
-guid}' />";
-		foreach ($tag_info['links'] as $id => $link) {
-			$text = htmlentities($link['text'], ENT_QUOTES, 'UTF-8');
-			$content .= "
      ";
-		}
-
-		$content .= "";
-		$content .= ""; 
-
-		echo elgg_view('input/form', array('internalname' => 'phototag_deletetag_form', 'action' => "{$vars['url']}action/tidypics/deletetag", 'method' => 'post', 'body' => $content));
-
-	}
-	echo '
      '; // tidypics_delete_tag_menu
-	
-	echo elgg_view('js/tagging', array('photo_tags_json' => $photo_tags_json,) );
+getPhotoTags();
+
+	// defining json text as "" makes sure the tagging javascript code doesn't throw errors if no tags
+	$photo_tags_json = "\"\"";
+	if ($tag_info) {
+		$photo_tags_json = $tag_info['json'];
+	}
+	
+	if ($tag_info) { 
+?>
+
      
+	
      
+	
+
      
+
+
      
+	
      
+	
      
+
      
+
      
+	
      
+";
+		$content .= "";
+		$content .= "";
+		$content .= "";
+		$content .= "";
+	
+		$content .= "
      ";
+		
+		$content .= "
      ";
+		
+		echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content));
+	}
+
+?>
+
      
+
      
+
      
+
      
+guid}' />";
+		foreach ($tag_info['links'] as $id => $link) {
+			$text = htmlentities($link['text'], ENT_QUOTES, 'UTF-8');
+			$content .= "
      ";
+		}
+
+		$content .= "";
+		$content .= ""; 
+
+		echo elgg_view('input/form', array('internalname' => 'phototag_deletetag_form', 'action' => "{$vars['url']}action/tidypics/deletetag", 'method' => 'post', 'body' => $content));
+
+	}
+	echo '
      '; // tidypics_delete_tag_menu
+	
+	echo elgg_view('js/tagging', array('photo_tags_json' => $photo_tags_json,) );
 ?>
\ No newline at end of file
diff --git a/views/default/widgets/album_view/edit.php b/views/default/widgets/album_view/edit.php
index 1fea6764a..992699cb0 100644
--- a/views/default/widgets/album_view/edit.php
+++ b/views/default/widgets/album_view/edit.php
@@ -1,24 +1,24 @@
-
      
-num_display == '') $vars['entity']->num_display = 5;
-	
-?>
-	
+
      
+num_display == '') $vars['entity']->num_display = 5;
+	
+?>
+	
 
      
\ No newline at end of file
diff --git a/views/default/widgets/latest_photos/edit.php b/views/default/widgets/latest_photos/edit.php
index 15a56af82..3b334d722 100644
--- a/views/default/widgets/latest_photos/edit.php
+++ b/views/default/widgets/latest_photos/edit.php
@@ -1,15 +1,15 @@
-
      
-num_display == '') $vars['entity']->num_display = 6;
-	
-?>
-	
+
      
+num_display == '') $vars['entity']->num_display = 6;
+	
+?>
+	
 
      
\ No newline at end of file
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 990322baf..2ad4ed9f7 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -1,45 +1,45 @@
-cover) {
-		// Set title
-		$vars['title'] = $album->title;
-		if (empty($vars['title'])) {
-			$title = $vars['config']->sitename;
-		} else if (empty($vars['config']->sitename)) {
-			$title = $vars['title'];
-		} else {
-			$title = $vars['config']->sitename . ": " . $vars['title'];
-		}
-		$album_cover_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb';
-?>		
-			
-			<![CDATA[<?php echo $title; ?>]]>
-			getURL() . '?view=rss'; ?>
-		
-guid);
-
-
-	foreach ($images as $image) {
-		echo elgg_view_entity($image);
-	}
-
-}
+cover) {
+		// Set title
+		$vars['title'] = $album->title;
+		if (empty($vars['title'])) {
+			$title = $vars['config']->sitename;
+		} else if (empty($vars['config']->sitename)) {
+			$title = $vars['title'];
+		} else {
+			$title = $vars['config']->sitename . ": " . $vars['title'];
+		}
+		$album_cover_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb';
+?>		
+			
+			<![CDATA[<?php echo $title; ?>]]>
+			getURL() . '?view=rss'; ?>
+		
+guid);
+
+
+	foreach ($images as $image) {
+		echo elgg_view_entity($image);
+	}
+
+}
 ?>
\ No newline at end of file
diff --git a/views/rss/object/file.php b/views/rss/object/file.php
index e40da4f69..36740f003 100644
--- a/views/rss/object/file.php
+++ b/views/rss/object/file.php
@@ -1,23 +1,23 @@
-title;
-	if (empty($title)) {
-		$title = substr($vars['entity']->description,0,32);
-		if (strlen($vars['entity']->description) > 32)
-			$title .= " ...";
-	}
-
-?>
-
-	
-	  getURL(); ?>
-	  time_created) ?>
-	  getURL(); ?>
-	  <![CDATA[<?php echo $title; ?>]]>
-	  description)); ?>]]>
-	  
-	
+title;
+	if (empty($title)) {
+		$title = substr($vars['entity']->description,0,32);
+		if (strlen($vars['entity']->description) > 32)
+			$title .= " ...";
+	}
+
+?>
+
+	
+	  getURL(); ?>
+	  time_created) ?>
+	  getURL(); ?>
+	  <![CDATA[<?php echo $title; ?>]]>
+	  description)); ?>]]>
+	  
+	
diff --git a/views/rss/object/image.php b/views/rss/object/image.php
index dafc05f45..b93592081 100644
--- a/views/rss/object/image.php
+++ b/views/rss/object/image.php
@@ -1,19 +1,19 @@
-title;
-$descr = $vars['entity']->description;
-$download = $vars['url'] . 'pg/photos/download/' . $vars['entity']->guid . '/inline/';
-$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
-?>
-
-	
-		<?php echo $title; ?>
-		guid . '&size=large'; ?>
-		
-		time_created); ?>
-		getURL(); ?>
-		
-		
-		
-		
+title;
+$descr = $vars['entity']->description;
+$download = $vars['url'] . 'pg/photos/download/' . $vars['entity']->guid . '/inline/';
+$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
+?>
+
+	
+		<?php echo $title; ?>
+		guid . '&size=large'; ?>
+		
+		time_created); ?>
+		getURL(); ?>
+		
+		
+		
+		
 	
\ No newline at end of file
diff --git a/views/rss/tidypics/gallery.php b/views/rss/tidypics/gallery.php
index 2fcf2ac76..2c285fca5 100644
--- a/views/rss/tidypics/gallery.php
+++ b/views/rss/tidypics/gallery.php
@@ -1,18 +1,18 @@
- 0) {
-	foreach($entities as $entity) {
-		echo elgg_view_entity($entity);
-	}
-}
-
+ 0) {
+	foreach($entities as $entity) {
+		echo elgg_view_entity($entity);
+	}
+}
+
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From c2feaa1bbed0831c4e4bf7d769f4e028b390fa2c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 12 Dec 2009 21:31:43 +0000
Subject: starting process of moving thumbnail to page handler

---
 pages/thumbnail.php | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 start.php           |  6 +++++
 2 files changed, 82 insertions(+)
 create mode 100644 pages/thumbnail.php

diff --git a/pages/thumbnail.php b/pages/thumbnail.php
new file mode 100644
index 000000000..3aad5969d
--- /dev/null
+++ b/pages/thumbnail.php
@@ -0,0 +1,76 @@
+getSubtype() != "image")
+		forward('mod/tidypics/graphics/' . $error_image);
+	
+	// Get filename
+	if ($size == "thumb") {
+		$thumbfile = $file->thumbnail;
+	} else if ($size == "small") {
+		$thumbfile = $file->smallthumb;
+	} else {
+		$thumbfile = $file->largethumb;
+	}
+	
+	if (!$thumbfile)
+		forward('mod/tidypics/graphics/' . $error_image);
+	
+	// create Elgg File object
+	$readfile = new ElggFile();
+	$readfile->owner_guid = $file->owner_guid;
+	$readfile->setFilename($thumbfile);
+	$contents = $readfile->grabFile();
+
+	// send error image if file could not be read
+	if (!$contents) {
+		forward('mod/tidypics/graphics/' . $error_image);
+	}
+	
+	// expires every 14 days
+	$expires = 14 * 60*60*24;
+
+	// overwrite header caused by php session code so images can be cached
+	$mime = $file->getMimeType();
+	header("Content-Type: $mime");
+	header("Content-Length: " . strlen($contents));
+	header("Cache-Control: public", true);
+	header("Pragma: public", true);
+	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+	
+	// Return the thumbnail and exit
+	echo $contents;
+	exit;
+	
\ No newline at end of file
diff --git a/start.php b/start.php
index 472bf4881..f2732b3de 100644
--- a/start.php
+++ b/start.php
@@ -283,6 +283,12 @@
 					include($CONFIG->pluginspath . "tidypics/pages/download.php");
 				break;
 				
+				case "thumbnail": // tidypics thumbnail
+					if (isset($page[1])) set_input('file_guid', $page[1]);
+					if (isset($page[2])) set_input('size', $page[2]);
+					include($CONFIG->pluginspath . "tidypics/pages/thumbnail.php");
+				break;
+				
 				case "tagged": // all photos tagged with user 
 					if (isset($page[1])) set_input('guid',$page[1]);
 					include($CONFIG->pluginspath . "tidypics/pages/tagged.php");
-- 
cgit v1.2.3


From f743d5a49af135d647243861b1c7e546f8b4c200 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 12 Dec 2009 21:34:18 +0000
Subject: made a modification in image view for albums so that plugins have
 more flexibility

---
 views/default/object/image.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 72b245d17..02444eaad 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -66,22 +66,22 @@
 		if (!$vars['full']) {
 			
 ?>
-	
      
  $image), $image_html);
 	
 	if ($image_html) {
 		echo $image_html;
 	} else {
 		// default link to image if no one overrides
 ?>
-		thumbnail
+	
      
+		<?php echo $image->title; ?>
+	
      
 
-	
      
 
Date: Sun, 13 Dec 2009 00:49:02 +0000
Subject: improved the plugin hooks

---
 pages/viewalbum.php            |  2 +-
 start.php                      |  2 +-
 views/default/object/image.php | 19 ++++++++-----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pages/viewalbum.php b/pages/viewalbum.php
index 9ebc31fae..050b124cb 100644
--- a/pages/viewalbum.php
+++ b/pages/viewalbum.php
@@ -33,7 +33,7 @@
 	}
 	
 	// allow other plugins to override the slideshow
-	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', $album, null);
+	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array('album' => $album), null);
 	if ($slideshow_link) {
 		add_submenu_item(elgg_echo('album:slideshow'),
 						$slideshow_link,
diff --git a/start.php b/start.php
index f2732b3de..7b6e46805 100644
--- a/start.php
+++ b/start.php
@@ -401,7 +401,7 @@
 	 * @param $hook - 'tidypics:slideshow'
 	 * @param $entity_type - 'album'
 	 * @param $returnvalue - if set, return because another plugin has used the hook
-	 * @param $params - album entity
+	 * @param $params - arry containing album entity
 	 * @return unknown_type
 	 */
 	function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 02444eaad..ee81d800f 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -69,7 +69,7 @@
  $image), $image_html);
+	$image_html = trigger_plugin_hook('tp_thumbnail_link', 'album', array('image' => $image), $image_html);
 	
 	if ($image_html) {
 		echo $image_html;
@@ -161,20 +161,17 @@
 		
      
 			\"{$title}\"";
+					$image_html = "";
+					$image_html .= "\"{$title}\"";
+					$image_html .= "";
 				} else {
-					// no link for this image
-					echo "\"{$title}\"";
+					$image_html = "\"{$title}\"";
 				}
+				// does any plugin want to override the link
+				$image_html = trigger_plugin_hook('tp_thumbnail_link', 'image', array('image' => $image), $image_html);
+				echo $image_html;
 				?>
 			
      
 		
      
-- 
cgit v1.2.3


From e7a7c88d81f494d8a0c99f36338247caaf6b4bd3 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 13 Dec 2009 00:50:11 +0000
Subject: added slideshows to the lists

---
 pages/lists/mostrecentimages.php  |  8 ++++++++
 pages/lists/mostviewedimages.php  | 10 +++++++++-
 pages/lists/recentlycommented.php |  9 +++++++++
 pages/lists/recentlyviewed.php    |  9 +++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 8a9f8dbdb..99dfeb4c9 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -30,6 +30,14 @@
 			set_page_owner(get_loggedin_userid());
 		}
 	}
+	
+	// allow other plugins to override the slideshow
+	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+	if ($slideshow_link) {
+		add_submenu_item(elgg_echo('album:slideshow'),
+						$slideshow_link,
+						'photos' );
+	}
 
 	// how many do we display
 	$max = 12;
diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index 1e856edc6..d945680f1 100644
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -49,7 +49,15 @@
 	}
 */
 	//error_log("custom query is " . (float)(microtime(true) - $start));
-
+	
+	// allow other plugins to override the slideshow
+	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+	if ($slideshow_link) {
+		add_submenu_item(elgg_echo('album:slideshow'),
+						$slideshow_link,
+						'photos' );
+	}
+													
 	if ($owner_guid) {
 		if ($owner_guid == get_loggedin_userid()) {
 			$title = elgg_echo("tidypics:yourmostviewed");	
diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index a39caf6ae..1d5f7aea7 100644
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -13,6 +13,15 @@
 		set_page_owner(get_loggedin_userid());
 	}
 	
+	// allow other plugins to override the slideshow
+	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+	if ($slideshow_link) {
+		add_submenu_item(elgg_echo('album:slideshow'),
+						$slideshow_link,
+						'photos' );
+	}
+	
+	
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
 	$max_limit = 200; //get extra because you'll have multiple views per image in the result set
diff --git a/pages/lists/recentlyviewed.php b/pages/lists/recentlyviewed.php
index b61107fc4..16ad474df 100644
--- a/pages/lists/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -13,6 +13,15 @@
 		set_page_owner(get_loggedin_userid());
 	}
 	
+	// allow other plugins to override the slideshow
+	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+	if ($slideshow_link) {
+		add_submenu_item(elgg_echo('album:slideshow'),
+						$slideshow_link,
+						'photos' );
+	}
+	
+	
 	global $CONFIG;
 	$prefix = $CONFIG->dbprefix;
 	$max_limit = 200; //get extra because you'll have multiple views per image in the result set
-- 
cgit v1.2.3


From dd8ff039f642b9eb6ea65cc1a58017ce867ec7b3 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 13 Dec 2009 02:03:17 +0000
Subject: fixed display of some album pages - caused a cascade of changes
 required

---
 lib/tidypics.php                           | 10 ++++++----
 pages/friends.php                          |  5 ++++-
 pages/lists/mostrecentimages.php           |  2 +-
 pages/ownedalbums.php                      |  6 ++++--
 pages/world.php                            |  8 +++-----
 start.php                                  | 23 ++++++++++++-----------
 views/default/object/album.php             |  8 +++++---
 views/default/tidypics/content_wrapper.php |  2 ++
 views/default/tidypics/css.php             |  9 ++++++++-
 views/default/tidypics/gallery.php         | 12 +++---------
 views/rss/object/album.php                 |  9 +++++++++
 views/rss/tidypics/content_wrapper.php     |  2 ++
 12 files changed, 59 insertions(+), 37 deletions(-)
 create mode 100644 views/rss/tidypics/content_wrapper.php

diff --git a/lib/tidypics.php b/lib/tidypics.php
index b0a8a70d2..f2a1ccce4 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -33,7 +33,7 @@
 	function tp_get_latest_photos($num_images, $owner_guid = 0)
 	{
 		$prev_context = set_context('front');
-		$image_html = tp_list_entities('object', 'image', $owner_guid, $num_images, false, false, false);  
+		$image_html = tp_list_entities('object', 'image', $owner_guid, 0, $num_images, false, false, false);  
 		set_context($prev_context);
 		return $image_html;
 	}
@@ -152,6 +152,7 @@
 		foreach ($where as $w)
 			$query .= " $w and ";
 		$query .= get_access_sql_suffix(); // Add access controls
+
 		if (!$count) {
 			$query .= " order by $order_by";
 			if ($limit) $query .= " limit $offset, $limit"; // Add order and limit
@@ -163,11 +164,12 @@
 		}
 	}
 
-	function tp_list_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = false, $pagination = true) {
+	function tp_list_entities($type= "", $subtype = "", $owner_guid = 0, $container_guid = null, $limit = 10, $fullview = true, $viewtypetoggle = false, $pagination = true) {
 		
 		$offset = (int) get_input('offset');
-		$count = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true);
-		$entities = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset);
+		$count = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true, 0, $container_guid);
+		
+		$entities = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, false, 0, $container_guid);
 
 		return tp_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
 	}
diff --git a/pages/friends.php b/pages/friends.php
index e35adce04..03ae1300a 100644
--- a/pages/friends.php
+++ b/pages/friends.php
@@ -26,11 +26,14 @@
 	
 	$area2 = elgg_view_title($title);
 	
+	$albums = get_user_friends_objects($user->guid, 'album', 12);
+	
 	// get html for viewing list of photo albums
 	set_context('search');
 	set_input('search_viewtype', 'gallery'); // need to force gallery view
-	$area2 .= list_user_friends_objects($user->guid, 'album', 10, true, false);
+	$content = tp_view_entity_list($albums, count($albums), 0, 12, false, false, true);
 	
+	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
 	
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	
diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 99dfeb4c9..178e3c722 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -43,7 +43,7 @@
 	$max = 12;
 	
 	// grab the html to display the images
-	$images = tp_list_entities("object", "image", $user_id, $max, false, false, true);
+	$images = tp_list_entities("object", "image", $user_id, null, $max, false, false, true);
 	
 	
 	// this view takes care of the title on the main column and the content wrapper
diff --git a/pages/ownedalbums.php b/pages/ownedalbums.php
index f43c2c5eb..d22c6d44a 100644
--- a/pages/ownedalbums.php
+++ b/pages/ownedalbums.php
@@ -39,9 +39,11 @@
 	set_context('search');
 	set_input('search_viewtype', 'gallery');
 	if ($owner instanceof ElggGroup)
-		$area2 .= list_entities("object", "album", $owner->guid, 12, false);
+		$content .= tp_list_entities("object", "album", 0, $owner->guid, 12, false);
 	else
-		$area2 .= list_entities("object", "album", $owner->guid, 12, false);
+		$content .= tp_list_entities("object", "album", $owner->guid, $owner->guid, 12, false);
+	
+	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
 	
 	set_context('photos');
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
diff --git a/pages/world.php b/pages/world.php
index 9488f2620..48a3345d4 100644
--- a/pages/world.php
+++ b/pages/world.php
@@ -14,16 +14,14 @@
 	$num_albums = 16;
 	
 	$title = elgg_echo('album:all');
-	
-	set_context('photos');
 	$area2 = elgg_view_title($title);
 	
 	set_context('search');
 	set_input('search_viewtype', 'gallery');
-	$albums_html .= list_entities('object','album', 0, $num_albums, false);
+	$content .= tp_list_entities('object','album', 0, null, $num_albums, false);
+	set_context('photos');
 
-	
-	$area2 .= $albums_html;
+	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
 	
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 
diff --git a/start.php b/start.php
index 7b6e46805..2c6057635 100644
--- a/start.php
+++ b/start.php
@@ -97,7 +97,7 @@
 			
 			$view_count = get_plugin_setting('view_count', 'tidypics');
 			
-			// owner gets "your albumn", "your friends albums", "your most viewed", "your most recent"
+			// owner gets "your albumn", "your friends albums", "your most recent", "your most viewed"
 			if (get_loggedin_userid() && get_loggedin_userid() == $page_owner->guid) {
 								
 				add_submenu_item(	elgg_echo('album:create'), 
@@ -112,36 +112,37 @@
 									$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
 									'tidypics-a');
 				
+				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
+									$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/",
+									'tidypics-a');
+				
 				if ($view_count != 'disabled') {
 					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
 										$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/",
 										'tidypics-a');
 				}
 				
-				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
-									$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/",
-									'tidypics-a');
 			} else if (isloggedin()) {
 				
 				$user = get_loggedin_user();
 				
 				// logged in not owner gets "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent"
-				// and then "your albums", "your most viewed", "your most recent"
+				// and then "your albums", "your most recent", "your most viewed"
 				add_submenu_item(	elgg_echo("album:yours"), 
 									$CONFIG->wwwroot . "pg/photos/owned/{$user->username}/", 
 									'tidypics-b' );
-				
+								
+				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
+									$CONFIG->wwwroot . "pg/photos/mostrecent/{$user->username}/",
+									'tidypics-b');
+									
 				if ($view_count != 'disabled') {
 					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
 										$CONFIG->wwwroot . "pg/photos/mostviewed/{$user->username}/",
 										'tidypics-b');
 				}
 				
-				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
-									$CONFIG->wwwroot . "pg/photos/mostrecent/{$user->username}/",
-									'tidypics-b');
-									
-				if($page_owner->name) { // check to make sure the owner set their display name
+				if ($page_owner->name) { // check to make sure the owner set their display name
 					add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name), 
 										$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
 										'tidypics-a' );
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 6ef6bc356..31e46d46d 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -22,20 +22,22 @@
  *
  *  Gallery view of an album object
  * 
- *  This is called when looking at page of albums (index.php).
+ *  This is called when looking at page of albums
  *
  *
  *****************************************************************************/
 
 			//get album cover if one was set 
 			if ($album->cover)
-				$album_cover = 'thumbnail';
+				$album_cover = '' . $title . '';
 			else
 				$album_cover = 'new album';
 
 ?>
 
      
-	
      
+	
      
+		
+	
      
 	
      
 	name;?> 
      
 
 
      
+
      
 
+
      
 
      
\ No newline at end of file
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index b65d73789..556787da7 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -80,7 +80,7 @@ text-align:center;
 .tidypics_album_cover {
 padding:2px;
 border:1px solid #dedede;
-margin:8px 0;
+margin:5px 0;
 }
 
 .tidypics_album_widget_single_item {
@@ -88,9 +88,16 @@ margin-bottom:8px;
 }
 
 .tidypics_album_gallery_item {
+float:left;
+margin-bottom:20px;
+padding: 4px;
 text-align:center;
 }
 
+.tidypics_gallery_title {
+font-weight:bold;
+}
+
 .tidypics_popup {
 border:1px solid #3B5999; 
 width:200px; 
diff --git a/views/default/tidypics/gallery.php b/views/default/tidypics/gallery.php
index dd7c1cdcf..b9a50bdab 100644
--- a/views/default/tidypics/gallery.php
+++ b/views/default/tidypics/gallery.php
@@ -43,15 +43,9 @@ if ($pagination) {
 }
 
 $html .= $nav;
-if ($viewtype == 'list') {
-	if (is_array($entities) && sizeof($entities) > 0) {
-		foreach($entities as $entity) {
-			$html .= elgg_view_entity($entity, $fullview);
-		}
-	}
-} else {
-	if (is_array($entities) && sizeof($entities) > 0) {
-		$html .= elgg_view('entities/gallery', array('entities' => $entities));
+if (is_array($entities) && sizeof($entities) > 0) {
+	foreach($entities as $entity) {
+		$html .= elgg_view_entity($entity, $fullview);
 	}
 }
 
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 2ad4ed9f7..9c037b20f 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -5,7 +5,16 @@
 
 // for now catch the albums view and ignore it
 if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
+?>
+	
+	  getURL(); ?>
+	  time_created) ?>
+	  getURL(); ?>
+	  <![CDATA[<?php echo $$vars['entity']->title; ?>]]>
+	  description)); ?>]]>
+	
 
+
Date: Sun, 13 Dec 2009 02:04:33 +0000
Subject: forgot one small change due to tp_list_entities changing parameters

---
 lib/tidypics.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tidypics.php b/lib/tidypics.php
index f2a1ccce4..086885a89 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -33,7 +33,7 @@
 	function tp_get_latest_photos($num_images, $owner_guid = 0)
 	{
 		$prev_context = set_context('front');
-		$image_html = tp_list_entities('object', 'image', $owner_guid, 0, $num_images, false, false, false);  
+		$image_html = tp_list_entities('object', 'image', $owner_guid, null, $num_images, false, false, false);  
 		set_context($prev_context);
 		return $image_html;
 	}
-- 
cgit v1.2.3


From 066a30d42aa814637facc30f5cc24e8a50d908d8 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 13 Dec 2009 02:13:13 +0000
Subject: 1.6.5 version

---
 contributions.txt | 19 +++++++++++++++++++
 manifest.xml      |  8 ++++----
 start.php         |  3 ++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index e324f71f5..0a6c98f49 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,24 @@
 See individual change logs for contributors to those builds
 
+
+------------------------------------------------------------------------
+Version 1.6.5 Change List
+Release Date: 12/12/2009
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.5 CHANGES
+------------------------------------------------------------------------
+ * Bug fixes
+ * Better plugin hooks for adding slideshows and lightboxes
+ * Better display of album pages and tweaked css
+ * Slideshows available on more pages
+ * Made a change to parameters in tp_list_entities - added container
+ * Added Danish translation from erikernstm
+ * Added French translation from Fx Nion
+------------------------------------------------------------------------
+END VERSION 1.6.5 CHANGES
+------------------------------------------------------------------------
+
+
 ------------------------------------------------------------------------
 Version 1.6.4 Change List
 Release Date: 10/05/2009
diff --git a/manifest.xml b/manifest.xml
index d58672722..255461025 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,10 +1,10 @@
 
 
-        
-        
-        
+        
+        
         
-        
+        
         
         
 
diff --git a/start.php b/start.php
index 2c6057635..3cd501611 100644
--- a/start.php
+++ b/start.php
@@ -189,10 +189,11 @@
 			add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
 								$CONFIG->wwwroot . 'pg/photos/recentlycommented/',
 								'tidypics-z');
+/*
 			add_submenu_item(	'Flickr Integration',
 								$CONFIG->wwwroot . 'mod/tidypics/pages/flickr/setup.php',
 								'tidypics-z');
-
+*/
 		}
 		
 	}
-- 
cgit v1.2.3


From 6d59bac1b049d881c488ee458808c32a91fbfe8a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 6 Jan 2010 01:33:57 +0000
Subject: no longer depending on file plugin for delete messages

---
 actions/delete.php | 14 +++++++-------
 languages/en.php   |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/actions/delete.php b/actions/delete.php
index 5506c2303..cab996ec5 100644
--- a/actions/delete.php
+++ b/actions/delete.php
@@ -14,12 +14,12 @@
 
 	$entity = get_entity($guid);
 	if (!$entity) { // unable to get Elgg entity
-		register_error(elgg_echo("file:deletefailed"));
+		register_error(elgg_echo("tidypics:deletefailed"));
 		forward($forward_url);
 	}
 	
 	if (!$entity->canEdit()) { // user doesn't have permissions
-		register_error(elgg_echo("file:deletefailed"));
+		register_error(elgg_echo("tidypics:deletefailed"));
 		forward($forward_url);
 	}
 
@@ -27,7 +27,7 @@
 	$container = get_entity($entity->container_guid);
 	
 	if ($subtype != 'image' && $subtype != 'album') { // how did we even get here?
-		register_error(elgg_echo("file:deletefailed"));
+		register_error(elgg_echo("tidypics:deletefailed"));
 		forward($forward_url);
 	}
 
@@ -83,9 +83,9 @@
 			$image_repo_size -= $delfile->size();
 			
 			if (!$delfile->delete()) {
-				if ($subtype=='image') register_error(elgg_echo("file:deletefailed")); //unable to delete object
+				if ($subtype=='image') register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
 			} else {
-				if ($subtype=='image') system_message(elgg_echo("file:deleted")); //successfully deleted object
+				if ($subtype=='image') system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
 			}
 		} //end delete actual image file
 	} //end looping through each image to delete it
@@ -108,9 +108,9 @@
 		
 		//delete object from database
 		if (!$entity->delete()) {
-			register_error(elgg_echo("file:deletefailed")); //unable to delete object
+			register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
 		} else {
-			system_message(elgg_echo("file:deleted")); //successfully deleted object
+			system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
 		}
 	} //end of delete album
 
diff --git a/languages/en.php b/languages/en.php
index 7fa5f2e73..aaab21b39 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -198,7 +198,8 @@ The photo can be viewed here: %s",
 			'tidypics:unk_error' => "Unknown upload error",
 			'tidypics:save_error' => "Unknown error saving the image on server",
 			'tidypics:not_image' => "This is not a recognized image type",
-			'image:deletefailed' => "Your image could not be deleted at this time.",
+			'tidypics:deletefailed' => "Sorry. Deletion failed.",
+			'tidypics:deleted' => "Successful deletion.",
 			'image:downloadfailed' => "Sorry; this image is not available at this time.",
 			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
 			'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator",
-- 
cgit v1.2.3


From 634e663091a45fbeff10fc7ded4cec9b3f7cf381 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 11 Jan 2010 13:01:27 +0000
Subject: missed a quote on version number in manifest

---
 manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.xml b/manifest.xml
index 255461025..b30ec9860 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
         
-        
         
         
         
-- 
cgit v1.2.3


From f07c000fb091158328d4aa57ddef113b93227f7f Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Feb 2010 19:33:25 +0000
Subject: not using the cooliris javascript to find rss feed anymore

---
 start.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.php b/start.php
index 3cd501611..3cc1ea7aa 100644
--- a/start.php
+++ b/start.php
@@ -413,7 +413,7 @@
 			return $returnvalue;
 		}
 		
-		$slideshow_link = 'javascript:PicLensLite.start({maxScale:0,feedUrl:PicLensLite.indexFeeds()[0].url})';
+		$slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:location.href+'?view=rss'})";
 		
 		// add the slideshow javascript to the header
 		extend_view('metatags', 'js/slideshow');
-- 
cgit v1.2.3


From 3c6ab131a1a843b595a1d4385c828f8b356a8000 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 22 Feb 2010 00:17:13 +0000
Subject: Fixes #111 - elgg_echo was used in language file for flickr strings

---
 languages/en.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index aaab21b39..16f10d0ec 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -55,7 +55,7 @@
 			'flickr:albumdesc' => 'Album to import photos to:',
 			'flickr:importmanager' => 'Photoset Import Manager',
 			'flickr:desc' => 'Click on the set you wish to import into this site.
      Copies of the photos will be made and stored on this site where they can be viewed and commented on.',
-			'flickr:intro' => 'Flickr Integration allows you to import photos from your flickr account into this Elgg site. By entering your username and choosing an album to import into, you can begin the process. 
      When you have saved your username and album selection, click on the ' . elgg_echo( 'flickr:menuimport' ) . ' link to the left to select which Flickr set you would like to import photos from.',
+			'flickr:intro' => 'Flickr Integration allows you to import photos from your flickr account into this Elgg site. By entering your username and choosing an album to import into, you can begin the process. 
      When you have saved your username and album selection, click on the Import Flickr Photos link to the left to select which Flickr set you would like to import photos from.',
 			'flickr:menusetup' => 'Flickr Setup',
 			'flickr:menuimport' => 'Import Flickr Photos',
 			
@@ -219,4 +219,4 @@ The photo can be viewed here: %s",
 	);
 
 	add_translation("en",$english);
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3


From 5fe18f0778902fa6c0541b99d988415ae921a4ca Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 22 Feb 2010 00:39:14 +0000
Subject: added some comments to help people who look at convert command line

---
 lib/resize.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/resize.php b/lib/resize.php
index c35eb09ea..250511d66 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -534,6 +534,8 @@
 					$im_path = "/usr/bin/";
 				}
 				if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/";
+				// see imagemagick web site for explanation of these parameters
+				// the ^ in the resize means those are minimum width and height values
 				$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
 				exec($command);
 				return true;
@@ -544,4 +546,4 @@
 		return false;
 	}
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3


From 4ea3fc8331ff29abc55c3c7f082a6d8c7110b21c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Mar 2010 22:07:35 +0000
Subject: changed the line endings on rss content wrapper

---
 views/rss/tidypics/content_wrapper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/rss/tidypics/content_wrapper.php b/views/rss/tidypics/content_wrapper.php
index 20d98862e..0b16f2357 100644
--- a/views/rss/tidypics/content_wrapper.php
+++ b/views/rss/tidypics/content_wrapper.php
@@ -1,2 +1,2 @@
-
Date: Sat, 6 Mar 2010 22:35:15 +0000
Subject: fixed bug with delete tags menu item

---
 lib/image.php                         | 19 ++++++++++++-------
 views/default/tidypics/image_menu.php |  2 +-
 views/default/tidypics/tagging.php    |  8 +++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/image.php b/lib/image.php
index 0c4049183..183d03c1c 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -27,10 +27,11 @@
 		public function isPhotoTagged()
 		{
 			$num_tags = count_annotations($this->getGUID(), 'object', 'image', 'phototag');
-			if ($num_tags > 0)
+			if ($num_tags > 0) {
 				return true;
-			else
+			} else {
 				return false;
+			}
 		}
 		
 		/**
@@ -61,10 +62,11 @@
 				if ($photo_tag->type === 'user') 
 				{
 					$user = get_entity($photo_tag->value);
-					if ($user)
+					if ($user) {
 						$phototag_text = $user->name;
-					else
+					} else {
 						$phototag_text = "unknown user";
+					}
 					
 					$phototag_link = $CONFIG->wwwroot . "pg/photos/tagged/" . $photo_tag->value;
 				}
@@ -73,8 +75,9 @@
 					// hack to handle format of Pedro Prez's tags - ugh
 					$photo_tag->coords = "\"x1\":\"{$photo_tag->x1}\",\"y1\":\"{$photo_tag->y1}\",\"width\":\"{$photo_tag->width}\",\"height\":\"{$photo_tag->height}\""; 
 					$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
-				} else
+				} else {
 					$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
+				}
 				
 				// prepare variable arrays for tagging view
 				$photo_tag_links[$p->id] = array('text' => $phototag_text, 'url' => $phototag_link);
@@ -115,8 +118,9 @@
 					$my_views = 0;
 					foreach ($views as $view)
 					{
-						if ($view->owner_guid == $viewer_guid)
+						if ($view->owner_guid == $viewer_guid) {
 							$my_views++;
+						}
 					}
 				}
 				
@@ -138,8 +142,9 @@
 		 */
 		public function addView($viewer_guid)
 		{
-			if ($viewer_guid != $this->owner_guid && tp_is_person())
+			if ($viewer_guid != $this->owner_guid && tp_is_person()) {
 				create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC);
+			}
 		}
 	}
 	
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 983f900b4..498cfe724 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -37,7 +37,7 @@
 		// only owner can delete tags
 		if ($anytags && $viewer && $viewer->guid == $owner->guid) {
 ?>
-
      39. 
+
      40. 
 
      
 
      
 
      
-
      
+	
      
+
 guid}' />";
@@ -81,7 +82,8 @@
 		echo elgg_view('input/form', array('internalname' => 'phototag_deletetag_form', 'action' => "{$vars['url']}action/tidypics/deletetag", 'method' => 'post', 'body' => $content));
 
 	}
-	echo '
      '; // tidypics_delete_tag_menu
-	
+?>
+
      
+ $photo_tags_json,) );
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From a34144019c09311561a1b209bced308095b833a0 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Mar 2010 23:01:19 +0000
Subject: better error checking for imagemagick

---
 lib/resize.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/resize.php b/lib/resize.php
index 250511d66..fdc321ab1 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -406,8 +406,9 @@
 											$image_sizes['thumb_image_width'],
 											$image_sizes['thumb_image_height'], 
 											true);
-		if (!$rtn_code)
+		if (!$rtn_code) {
 			return false;
+		}
 		$file->thumbnail = $prefix."thumb".$filestorename;
 
 
@@ -419,8 +420,9 @@
 											$image_sizes['small_image_width'],
 											$image_sizes['small_image_height'], 
 											true); 
-		if (!$rtn_code)
+		if (!$rtn_code) {
 			return false;
+		}
 		$file->smallthumb = $prefix."smallthumb".$filestorename;
 
 
@@ -432,8 +434,9 @@
 											$image_sizes['large_image_width'],
 											$image_sizes['large_image_height'], 
 											false); 
-		if (!$rtn_code)
+		if (!$rtn_code) {
 			return false;
+		}
 		$file->largethumb = $prefix."largethumb".$filestorename;
 		
 		
@@ -537,13 +540,21 @@
 				// see imagemagick web site for explanation of these parameters
 				// the ^ in the resize means those are minimum width and height values
 				$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
-				exec($command);
+				$output = array();
+				$ret = 0;
+				exec($command, $output, $ret);
+				if ($ret == 127) {
+					trigger_error('Tidypics warning: Image Magick convert is not found', E_USER_WARNING);
+					return false;
+				} else if ($ret > 0) {
+					trigger_error('Tidypics warning: Image Magick convert failed', E_USER_WARNING);
+					return false;
+				}
 				return true;
-
 			}
 		}
 
 		return false;
 	}
 
-?>
+?>
\ No newline at end of file
-- 
cgit v1.2.3


From 21237146f5afe4183f8c842c0118e51a49535571 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 7 Mar 2010 00:00:31 +0000
Subject: Tidypics 1.6.6

---
 contributions.txt | 13 +++++++++++++
 manifest.xml      |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index 0a6c98f49..370acc405 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,18 @@
 See individual change logs for contributors to those builds
 
+------------------------------------------------------------------------
+Version 1.6.6 Change List
+Release Date: 03/06/2009
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.6 CHANGES
+------------------------------------------------------------------------
+ * Tweaked slideshow start code
+ * Fixed bug with delete tags menu item
+ * Fixed bug in en.php
+ * Better error checking for ImageMagick resizing
+------------------------------------------------------------------------
+END VERSION 1.6.6 CHANGES
+------------------------------------------------------------------------
 
 ------------------------------------------------------------------------
 Version 1.6.5 Change List
diff --git a/manifest.xml b/manifest.xml
index b30ec9860..f0b6b0fb3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,10 +1,10 @@
 
 
         
-        
+        
         
         
         
-        
+        
         
 
-- 
cgit v1.2.3


From c940ce7ad01482798205a5d2e2b7336aef83bb05 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 25 Apr 2010 00:56:53 +0000
Subject: a minor integration of categories plugin

---
 views/default/object/album.php        | 13 +++++++++++++
 views/default/tidypics/forms/edit.php | 10 ++++++++++
 2 files changed, 23 insertions(+)

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 31e46d46d..60015d2b1 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -135,9 +135,22 @@
 ?>
 		 name; ?>  
      
 		 
      
+
+		
      
+: 
+			
 	
      
 
 
+		
      
+			
+		
      
+
+
 			
      
 				
-- 
cgit v1.2.3


From 0ccf8f23e31eb946b907da9e1d9365ce45831d15 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 25 Apr 2010 01:15:26 +0000
Subject: better quota message on upload form - need to start moving more
 functionality into libraries

---
 views/default/tidypics/forms/upload.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index 077e90b1e..6e755612c 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -15,9 +15,17 @@
 	if ($quota) {
 		$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
 		$image_repo_size = (int)$image_repo_size_md->value;
-		$image_repo_size = round($image_repo_size / 1024 / 1024);
-		if ($image_repo_size > $quota)
+		$image_repo_size = $image_repo_size / 1024 / 1024;
+		$quote_percentage = round(100 * ($image_repo_size / $quota));
+		// for small quotas, so one decimal place
+		if ($quota < 10) {
+			$image_repo_size = sprintf('%.1f', $image_repo_size);
+		} else {
+			$image_repo_size = round($image_repo_size);
+		}
+		if ($image_repo_size > $quota) {
 			$image_repo_size = $quota;
+		}
 	}
 
 ?>
@@ -32,7 +40,7 @@
 
-	
      
+	
      
 
-- 
cgit v1.2.3


From bbaf1bfa96b7034929426e7e88dec0ac7d030b64 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 25 Apr 2010 01:16:47 +0000
Subject: don't display numbers on upload list

---
 views/default/tidypics/css.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 556787da7..538deeb5f 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -289,3 +289,7 @@ padding-right:10px;
 margin:2px 0px; 
 display:inline;
 } 
+
+#tidypics_image_upload_list {
+list-style: none;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From e0dd607271019b434301aa4411ebd77085b56549 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 25 Apr 2010 01:24:54 +0000
Subject: Tidypics 1.6.7

---
 contributions.txt | 15 ++++++++++++++-
 manifest.xml      |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index 370acc405..611f24dea 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,8 +1,21 @@
 See individual change logs for contributors to those builds
 
+------------------------------------------------------------------------
+Version 1.6.7 Change List
+Release Date: 04/24/2010
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.7 CHANGES
+------------------------------------------------------------------------
+ * Added categories integration
+ * Added a better quota display message - includes percentage now
+ * Tweaked the css so that upload list is enumerated (#tidypics_image_upload_list)
+------------------------------------------------------------------------
+END VERSION 1.6.7 CHANGES
+------------------------------------------------------------------------
+
 ------------------------------------------------------------------------
 Version 1.6.6 Change List
-Release Date: 03/06/2009
+Release Date: 03/06/2010
 ------------------------------------------------------------------------
 BEGIN VERSION 1.6.6 CHANGES
 ------------------------------------------------------------------------
diff --git a/manifest.xml b/manifest.xml
index f0b6b0fb3..6def17f54 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,10 +1,10 @@
 
 
         
-        
+        
         
         
-        
+        
         
         
 
-- 
cgit v1.2.3


From 7aafab15bc81a27076e5b843871a272975934524 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 25 Apr 2010 12:29:58 +0000
Subject: moves javascript into a better directory

---
 views/default/js/slideshow.php          |   1 -
 views/default/js/tagging.php            | 303 --------------------------------
 views/default/tidypics/js/slideshow.php |   1 +
 views/default/tidypics/js/tagging.php   |   0
 views/default/tidypics/tagging.php      |   2 +-
 5 files changed, 2 insertions(+), 305 deletions(-)
 delete mode 100644 views/default/js/slideshow.php
 delete mode 100644 views/default/js/tagging.php
 create mode 100644 views/default/tidypics/js/slideshow.php
 create mode 100644 views/default/tidypics/js/tagging.php

diff --git a/views/default/js/slideshow.php b/views/default/js/slideshow.php
deleted file mode 100644
index 20eafd7c4..000000000
--- a/views/default/js/slideshow.php
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/views/default/js/tagging.php b/views/default/js/tagging.php
deleted file mode 100644
index d8abda24c..000000000
--- a/views/default/js/tagging.php
+++ /dev/null
@@ -1,303 +0,0 @@
-
-
-
- 
-
\ No newline at end of file
diff --git a/views/default/tidypics/js/slideshow.php b/views/default/tidypics/js/slideshow.php
new file mode 100644
index 000000000..20eafd7c4
--- /dev/null
+++ b/views/default/tidypics/js/slideshow.php
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/views/default/tidypics/js/tagging.php b/views/default/tidypics/js/tagging.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 536bf6b20..251534b80 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -85,5 +85,5 @@
 ?>
 
      
  $photo_tags_json,) );
+	echo elgg_view('tidypics/js/tagging', array('photo_tags_json' => $photo_tags_json,) );
 ?>
\ No newline at end of file
-- 
cgit v1.2.3


From 40587e2bae0e7985815c2e5e534ef4fb926123bb Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 25 Apr 2010 12:37:57 +0000
Subject: finishing up reorg of javascript

---
 start.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.php b/start.php
index 3cc1ea7aa..02f0c6414 100644
--- a/start.php
+++ b/start.php
@@ -416,7 +416,7 @@
 		$slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:location.href+'?view=rss'})";
 		
 		// add the slideshow javascript to the header
-		extend_view('metatags', 'js/slideshow');
+		extend_view('metatags', 'tidypics/js/slideshow');
 		
 		return $slideshow_link;
 	}
-- 
cgit v1.2.3


From 56b871bbe4981d51ca4f62e4059ce0dc45de5fa5 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 25 Apr 2010 12:45:30 +0000
Subject: okay - not quite done - this finishes the javascript reorg

---
 views/default/tidypics/js/slideshow.php |   3 +-
 views/default/tidypics/js/tagging.php   | 304 ++++++++++++++++++++++++++++++++
 2 files changed, 306 insertions(+), 1 deletion(-)

diff --git a/views/default/tidypics/js/slideshow.php b/views/default/tidypics/js/slideshow.php
index 20eafd7c4..d134ca809 100644
--- a/views/default/tidypics/js/slideshow.php
+++ b/views/default/tidypics/js/slideshow.php
@@ -1 +1,2 @@
-
\ No newline at end of file
+
+
diff --git a/views/default/tidypics/js/tagging.php b/views/default/tidypics/js/tagging.php
index e69de29bb..3ffa20cfb 100644
--- a/views/default/tidypics/js/tagging.php
+++ b/views/default/tidypics/js/tagging.php
@@ -0,0 +1,304 @@
+
+
+
+
+
+
-- 
cgit v1.2.3


From f037a597462f6c97fc6aba5dabcbf3eb753763e6 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 30 Apr 2010 14:33:47 +0000
Subject: added a better group profile widget no photos message

---
 contributions.txt                              | 12 ++++++++++++
 languages/en.php                               |  2 ++
 views/default/tidypics/groupprofile_albums.php |  5 ++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/contributions.txt b/contributions.txt
index 611f24dea..2df8cb6c1 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,17 @@
 See individual change logs for contributors to those builds
 
+
+------------------------------------------------------------------------
+Version 1.6.8 Change List
+Release Date: 
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.8 CHANGES
+------------------------------------------------------------------------
+ * New language strings: tidypics:nophotosingroup
+------------------------------------------------------------------------
+END VERSION 1.6.8 CHANGES
+------------------------------------------------------------------------
+
 ------------------------------------------------------------------------
 Version 1.6.7 Change List
 Release Date: 04/24/2010
diff --git a/languages/en.php b/languages/en.php
index 16f10d0ec..7211ed9be 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -49,6 +49,8 @@
 			'tidypics:viewsbyothers' => "(%s by you)",
 			'tidypics:administration' => 'Tidypics Administration',
 			'tidypics:stats' => 'Stats',
+			'tidypics:nophotosingroup' => 'This groups does not have any photos yet',
+
 			'flickr:setup' => 'Flickr Setup',
 			'flickr:usernamesetup' => 'Please enter your Flickr username here:',
 			'flickr:selectalbum' => 'Select album to import photos into',
diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php
index a7e143ae9..7cb89bf1c 100644
--- a/views/default/tidypics/groupprofile_albums.php
+++ b/views/default/tidypics/groupprofile_albums.php
@@ -8,7 +8,10 @@
 
 if ($vars['entity']->photos_enable != 'no') {
 	echo '
      ';
-	echo '
      ' . elgg_echo('album:group') . '
      ';
+?>
+	
      guid; ?>">Group albums
      
+' . elgg_echo('album:group') . '';
 	echo elgg_view('tidypics/albums', array('num_albums' => 5));
 	echo '
      ';
 }
-- 
cgit v1.2.3


From e3d33b1275020758f887e0bba9378c9bc1823ad0 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 30 Apr 2010 14:39:03 +0000
Subject: fixed bug with album RSS titles

---
 views/rss/object/album.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 9c037b20f..8542b95f4 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -10,7 +10,7 @@ if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
 	  getURL(); ?>
 	  time_created) ?>
 	  getURL(); ?>
-	  <![CDATA[<?php echo $$vars['entity']->title; ?>]]>
+	  <![CDATA[<?php echo $vars['entity']->title; ?>]]>
 	  description)); ?>]]>
 	
 
-- 
cgit v1.2.3


From 6e330270c7c8a9edd4c57b258c6ff0920c7fed1c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 1 May 2010 03:33:58 +0000
Subject: re-encoded the admin page just because some where having problems
 with it

---
 pages/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/admin.php b/pages/admin.php
index 33d44b6c4..437d2f47c 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -1,7 +1,7 @@
 
Date: Sat, 1 May 2010 04:04:44 +0000
Subject: better layout of photo album covers

---
 contributions.txt                  | 5 ++++-
 views/default/object/album.php     | 3 ++-
 views/default/tidypics/css.php     | 6 ++++++
 views/default/tidypics/gallery.php | 9 +++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index 2df8cb6c1..fac5edc6f 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -3,11 +3,14 @@ See individual change logs for contributors to those builds
 
 ------------------------------------------------------------------------
 Version 1.6.8 Change List
-Release Date: 
+Release Date: 05/01/2010
 ------------------------------------------------------------------------
 BEGIN VERSION 1.6.8 CHANGES
 ------------------------------------------------------------------------
  * New language strings: tidypics:nophotosingroup
+ * Fixed bug in titles of albums RSS
+ * Added a new css element: tidypics_line_break
+ * Fixed layout of album covers due to long titles or other text
 ------------------------------------------------------------------------
 END VERSION 1.6.8 CHANGES
 ------------------------------------------------------------------------
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 60015d2b1..85dd69ac9 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -39,7 +39,8 @@
 		
 	
      
 	
      
-	name;?> 
      
+	name;?> 
+	

      
  0) {
+	$counter = 0;
 	foreach($entities as $entity) {
+		if ($counter % $num_wide == 0) {
+			$html .= "
      ";
+		}
 		$html .= elgg_view_entity($entity, $fullview);
+		$counter++;
 	}
 }
 
-- 
cgit v1.2.3


From faeb704ed004777c57389f829519feeb2e235f11 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 1 May 2010 11:41:56 +0000
Subject: Cleaned up the upload script

---
 actions/upload.php | 453 ++++++++++++++++++++++++++---------------------------
 contributions.txt  |   2 +-
 languages/en.php   |   1 +
 3 files changed, 227 insertions(+), 229 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index 0913ed937..b1eb4efe1 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -1,255 +1,252 @@
 getGUID();
-
-	$album = get_entity($container_guid);
-
-	$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); 
-	if (!$maxfilesize)
-		$maxfilesize = 5; // default to 5 MB if not set 
-	$maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs
-
-	$quota = get_plugin_setting('quota','tidypics');
-	$quota = 1024 * 1024 * $quota;
-	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
-	$image_repo_size = (int)$image_repo_size_md->value;
-
-	$image_lib = get_plugin_setting('image_lib', 'tidypics');
-	if (!$image_lib)
-		$image_lib = "GD";
-
-	// post limit exceeded
-	if (count($_FILES) == 0) {
-		trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
-		register_error(elgg_echo('tidypics:exceedpostlimit'));
-		forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
+/**
+ * Elgg multi-image uploader action
+ *
+ * This will upload up to 10 images at at time to an album
+ */
+
+include dirname(dirname(__FILE__)) . "/lib/resize.php";
+include dirname(dirname(__FILE__)) . "/lib/exif.php";
+
+// Get common variables
+$access_id = (int) get_input("access_id");
+$container_guid = (int) get_input('container_guid', 0);
+$album = get_entity($container_guid);
+if (!$album) {
+	register_error(elgg_echo('tidypics:baduploadform'));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); 
+if (!$maxfilesize) {
+	$maxfilesize = 5; // default to 5 MB if not set
+}
+$maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs
+
+$quota = get_plugin_setting('quota','tidypics');
+$quota = 1024 * 1024 * $quota;
+$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
+$image_repo_size = (int)$image_repo_size_md->value;
+
+$image_lib = get_plugin_setting('image_lib', 'tidypics');
+if (!$image_lib) {
+	$image_lib = "GD";
+}
+
+// post limit exceeded
+if (count($_FILES) == 0) {
+	trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
+	register_error(elgg_echo('tidypics:exceedpostlimit'));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+// test to make sure at least 1 image was selected by user
+$num_images = 0;
+foreach($_FILES as $key => $sent_file) {
+	if (!empty($sent_file['name'])) {
+		$num_images++;
 	}
+}
+if ($num_images == 0) {
+	// have user try again
+	register_error(elgg_echo('tidypics:noimages'));
+	forward($_SERVER['HTTP_REFERER']);
+}
 
-	// test to make sure at least 1 image was selected by user
-	$num_images = 0;
-	foreach($_FILES as $key => $sent_file) {
-		if (!empty($sent_file['name']))
-			$num_images++;
-	}
-	if ($num_images == 0) {
-		// have user try again
-		register_error(elgg_echo('tidypics:noimages'));
-		forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
+$uploaded_images = array();
+$not_uploaded = array();
+$error_msgs = array();
+
+$img_river_view = get_plugin_setting('img_river_view', 'tidypics');
+
+$accepted_formats = array(
+		'image/jpeg',
+		'image/png',
+		'image/gif',
+		'image/pjpeg',
+		'image/x-png',
+);
+
+
+foreach($_FILES as $key => $sent_file) {
+
+	// skip empty entries
+	if (empty($sent_file['name'])) {
+		continue;
 	}
 
-	$uploaded_images = array();
-	$not_uploaded = array();
-	$error_msgs = array();
-	
-	$img_river_view = get_plugin_setting('img_river_view', 'tidypics');
-	
-	$accepted_formats = array(
-								'image/jpeg',
-								'image/png',
-								'image/gif',
-								'image/pjpeg',
-								'image/x-png',
-								);
-
-
-	foreach($_FILES as $key => $sent_file) {
-		
-		// skip empty entries 
-		if (empty($sent_file['name']))
-			continue;
-		
-		$name = $sent_file['name'];
-		$mime = $sent_file['type'];
+	$name = $sent_file['name'];
+	$mime = $sent_file['type'];
 
-		if ($sent_file['error']) {
-			array_push($not_uploaded, $sent_file['name']);
-			if ($sent_file['error'] == 1) {
-				trigger_error('Tidypics warning: image exceed server php upload limit', E_USER_WARNING);
-				array_push($error_msgs, elgg_echo('tidypics:image_mem'));
-			}
-			else {
-				array_push($error_msgs, elgg_echo('tidypics:unk_error'));
-			}
-			continue;
-		}
-		
-		//make sure file is an image
-		if (!in_array($mime, $accepted_formats)) {
-			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:not_image'));
-			continue;
+	if ($sent_file['error']) {
+		array_push($not_uploaded, $sent_file['name']);
+		if ($sent_file['error'] == 1) {
+			trigger_error('Tidypics warning: image exceeded server php upload limit', E_USER_WARNING);
+			array_push($error_msgs, elgg_echo('tidypics:image_mem'));
+		} else {
+			array_push($error_msgs, elgg_echo('tidypics:unk_error'));
 		}
+		continue;
+	}
 
-		// check quota
-		if ($quota) {
-			if ($image_repo_size + $sent_file['size'] > $quota) {
-				array_push($not_uploaded, $sent_file['name']);
-				array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
-				continue;
-			}
-		}
-		
-		// make sure file does not exceed memory limit
-		if ($sent_file['size'] > $maxfilesize) {
+	//make sure file is an image
+	if (!in_array($mime, $accepted_formats)) {
+		array_push($not_uploaded, $sent_file['name']);
+		array_push($error_msgs, elgg_echo('tidypics:not_image'));
+		continue;
+	}
+
+	// check quota
+	if ($quota) {
+		if ($image_repo_size + $sent_file['size'] > $quota) {
 			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:image_mem'));
+			array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
 			continue;
 		}
-		
-		// make sure the in memory image size does not exceed memory available - GD only
-		$imginfo = getimagesize($sent_file['tmp_name']);
-		$mem_avail = ini_get('memory_limit');
-		$mem_avail = rtrim($mem_avail, 'M');
-		$mem_avail = $mem_avail * 1024 * 1024;
-		if ($image_lib == 'GD') {
-			$mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);
-			
-			$mem_used = memory_get_usage();
-				
-			$mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer
-			if ($mem_required > $mem_avail) {
-				array_push($not_uploaded, $sent_file['name']);
-				array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
-				trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
-				continue;
-			}
-		} else if ($image_lib == 'ImageMagickPHP') {
-			// haven't been able to determine a limit like there is for GD
-		}
+	}
 
-		//this will save to users folder in /image/ and organize by photo album
-		$prefix = "image/" . $container_guid . "/";
-		$file = new ElggFile();
-		$filestorename = strtolower(time().$name);
-		$file->setFilename($prefix.$filestorename);
-		$file->setMimeType($mime);
-		$file->originalfilename = $name;
-		$file->subtype="image";
-		$file->simpletype="image";
-		$file->access_id = $access_id;
-		if ($container_guid) {
-			$file->container_guid = $container_guid;
-		}
-		$file->open("write");
-		$file->write(get_uploaded_file($key));
-		$file->close();
-		$result = $file->save();
+	// make sure file does not exceed memory limit
+	if ($sent_file['size'] > $maxfilesize) {
+		array_push($not_uploaded, $sent_file['name']);
+		array_push($error_msgs, elgg_echo('tidypics:image_mem'));
+		continue;
+	}
+
+	// make sure the in memory image size does not exceed memory available - GD only
+	$imginfo = getimagesize($sent_file['tmp_name']);
+	$mem_avail = ini_get('memory_limit');
+	$mem_avail = rtrim($mem_avail, 'M');
+	$mem_avail = $mem_avail * 1024 * 1024;
+	if ($image_lib == 'GD') {
+		$mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);
 
-		if (!$result) {
+		$mem_used = memory_get_usage();
+
+		$mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer
+		if ($mem_required > $mem_avail) {
 			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:save_error'));
+			array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
+			trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
 			continue;
 		}
-		
-		//get and store the exif data
-		td_get_exif($file);
-		
-		
-		// resize photos to create thumbnails
-		if ($image_lib == 'ImageMagick') { // ImageMagick command line
-			
-			if (tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
-			}
-			
-		} else if ($image_lib == 'ImageMagickPHP') {  // imagick php extension 
-			
-			if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
-			}
-		
-		} else { 
-			
-			if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
-			}
-			
-		} // end of image library selector
-
-		//keep one file handy so we can add a notice to the river if single image option selected
-		if(!$file_for_river) {
-			$file_for_river = $file;
-		}
+	} else if ($image_lib == 'ImageMagickPHP') {
+		// haven't been able to determine a limit like there is for GD
+	}
 
-		array_push($uploaded_images, $file->guid);
+	//this will save to users folder in /image/ and organize by photo album
+	$prefix = "image/" . $container_guid . "/";
+	$file = new ElggFile();
+	$filestorename = strtolower(time().$name);
+	$file->setFilename($prefix.$filestorename);
+	$file->setMimeType($mime);
+	$file->originalfilename = $name;
+	$file->subtype="image";
+	$file->simpletype="image";
+	$file->access_id = $access_id;
+	if ($container_guid) {
+		$file->container_guid = $container_guid;
+	}
+	$file->open("write");
+	$file->write(get_uploaded_file($key));
+	$file->close();
+	$result = $file->save();
+
+	if (!$result) {
+		array_push($not_uploaded, $sent_file['name']);
+		array_push($error_msgs, elgg_echo('tidypics:save_error'));
+		continue;
+	}
 
-		// update user/group size for checking quota
-		$image_repo_size += $sent_file['size'];
+	//get and store the exif data
+	td_get_exif($file);
 
-		// plugins can register to be told when a new image has been uploaded
-		trigger_elgg_event('upload', 'tp_image', $file);
-		
-		// successful upload so check if this is a new album and throw river event/notification if so
-		if ($album->new_album == TP_NEW_ALBUM) {
-			$album->new_album = TP_OLD_ALBUM;
 
-			// we throw the notification manually here so users are not told about the new album until there
-			// is at least a few photos in it
-			object_notifications('create', 'object', $album);
-			
-			if (function_exists('add_to_river'))
-				add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
-		}
-	
-		if ($img_river_view == "all") {
-			add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
+	// resize photos to create thumbnails
+	if ($image_lib == 'ImageMagick') { // ImageMagick command line
+
+		if (tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
 		}
-		unset($file);  // may not be needed but there seems to be a memory leak
-
-	} //end of for loop
-				
-	if (count($not_uploaded) > 0) {
-		if (count($uploaded_images) > 0)
-			$error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images))  . '
      ';
-		else
-			$error = elgg_echo("tidypics:completeuploadfailure") . '
      ';
-
-		$num_failures = count($not_uploaded);
-		for ($i = 0; $i < $num_failures; $i++) {
-			$error .= "{$not_uploaded[$i]}: {$error_msgs[$i]} 
      ";
+
+	} else if ($image_lib == 'ImageMagickPHP') {  // imagick php extension
+
+		if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
 		}
-		register_error($error);
-		
-		if (count($uploaded_images) == 0)
-			forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page
-		else {
-			// some images did upload so we fall through
+
+	} else {
+
+		if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {
+			trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
 		}
+
+	} // end of image library selector
+
+	//keep one file handy so we can add a notice to the river if single image option selected
+	if (!$file_for_river) {
+		$file_for_river = $file;
+	}
+
+	array_push($uploaded_images, $file->guid);
+
+	// update user/group size for checking quota
+	$image_repo_size += $sent_file['size'];
+
+	// plugins can register to be told when a new image has been uploaded
+	trigger_elgg_event('upload', 'tp_image', $file);
+
+	// successful upload so check if this is a new album and throw river event/notification if so
+	if ($album->new_album == TP_NEW_ALBUM) {
+		$album->new_album = TP_OLD_ALBUM;
+
+		// we throw the notification manually here so users are not told about the new album until there
+		// is at least a few photos in it
+		object_notifications('create', 'object', $album);
+
+		add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
+	}
+
+	if ($img_river_view == "all") {
+		add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
+	}
+	unset($file);  // may not be needed but there seems to be a memory leak
+
+} //end of for loop
+
+if (count($not_uploaded) > 0) {
+	if (count($uploaded_images) > 0) {
+		$error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images))  . '
      ';
 	} else {
-			system_message(elgg_echo('tidypics:upl_success'));
+		$error = elgg_echo("tidypics:completeuploadfailure") . '
      ';
 	}
 
-	
-	if (count($uploaded_images) && $img_river_view == "1") {
-		if (function_exists('add_to_river')) {
-			add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
-		}
+	$num_failures = count($not_uploaded);
+	for ($i = 0; $i < $num_failures; $i++) {
+		$error .= "{$not_uploaded[$i]}: {$error_msgs[$i]} 
      ";
+	}
+	register_error($error);
+
+	if (count($uploaded_images) == 0) {
+		//upload failed, so forward to previous page
+		forward($_SERVER['HTTP_REFERER']);
+	} else {
+		// some images did upload so we fall through
 	}
-	
-	// update image repo size
-	create_metadata($album->container_guid, "image_repo_size", $image_repo_size, 'integer', $album->container_guid);
-	
-	// plugins can register to be told when a Tidypics album has had images added
-	trigger_elgg_event('upload', 'tp_album', $album);
-	
-	
-	//forward to multi-image edit page
-	forward($CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images)); 
-
-?>
+} else {
+	system_message(elgg_echo('tidypics:upl_success'));
+}
+
+
+if (count($uploaded_images) && $img_river_view == "1") {
+	add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
+}
+
+// update image repo size
+create_metadata($album->container_guid, "image_repo_size", $image_repo_size, 'integer', $album->container_guid);
+
+// plugins can register to be told when a Tidypics album has had images added
+trigger_elgg_event('upload', 'tp_album', $album);
+
+
+//forward to multi-image edit page
+forward($CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images)); 
diff --git a/contributions.txt b/contributions.txt
index fac5edc6f..2e09ca1cf 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -7,7 +7,7 @@ Release Date: 05/01/2010
 ------------------------------------------------------------------------
 BEGIN VERSION 1.6.8 CHANGES
 ------------------------------------------------------------------------
- * New language strings: tidypics:nophotosingroup
+ * New language strings: tidypics:nophotosingroup, tidypics:baduploadform
  * Fixed bug in titles of albums RSS
  * Added a new css element: tidypics_line_break
  * Fixed layout of album covers due to long titles or other text
diff --git a/languages/en.php b/languages/en.php
index 7211ed9be..30cef2db4 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -191,6 +191,7 @@ The photo can be viewed here: %s",
 
 		//Error messages
 
+			'tidypics:baduploadform' => "There was an error with the upload form",
 			'tidypics:partialuploadfailure' => "There were errors uploading some of the images (%s of %s images).",
 			'tidypics:completeuploadfailure' => "Upload of images failed.",
 			'tidypics:exceedpostlimit' => "Too many large images - try to upload fewer or smaller images.",
-- 
cgit v1.2.3


From ec7f055fd50b809ea50b7917b9c2e0cee5cd50d6 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 1 May 2010 12:24:16 +0000
Subject: cleaned up library files

---
 lib/album.php     |  34 +-
 lib/exif.php      |  64 +++-
 lib/image.php     | 331 +++++++++---------
 lib/migrate.php   |   6 +
 lib/resize.php    | 992 +++++++++++++++++++++++++++---------------------------
 lib/tidypics.php  | 508 ++++++++++++++--------------
 lib/watermark.php | 146 +++++---
 7 files changed, 1066 insertions(+), 1015 deletions(-)

diff --git a/lib/album.php b/lib/album.php
index 7e03ed6eb..7cd27dcde 100644
--- a/lib/album.php
+++ b/lib/album.php
@@ -1,23 +1,19 @@
 attributes['subtype'] = "album";
-		}
-		
-		public function __construct($guid = null) 
-		{
-			parent::__construct($guid);
-		}
+class TidypicsAlbum extends ElggObject {
+	protected function initialise_attributes() {
+		parent::initialise_attributes();
+
+		$this->attributes['subtype'] = "album";
+	}
+
+	public function __construct($guid = null) {
+		parent::__construct($guid);
 	}
-	
-?>
\ No newline at end of file
+}
diff --git a/lib/exif.php b/lib/exif.php
index 81f5dd960..55612a433 100644
--- a/lib/exif.php
+++ b/lib/exif.php
@@ -1,51 +1,75 @@
 mimetype;
-	if ($mime != 'image/jpeg' && $mime != 'image/pjpeg')
+	if ($mime != 'image/jpeg' && $mime != 'image/pjpeg') {
 		return;
+	}
 
 	$filename = $file->getFilenameOnFilestore();
 	$exif = exif_read_data($filename);
 	create_metadata($file->getGUID(), "tp_exif", serialize($exif), "text", $file->getObjectOwnerGUID(), ACCESS_PUBLIC);
 }
 
+/**
+ * Grab array of EXIF data for display
+ * 
+ * @param int $file_guid GUID of TidypicsImage
+ * @return array|false
+ */
 function tp_exif_formatted($file_guid) {
 
 	$metadata_exif = get_metadata_byname($file_guid, "tp_exif");
-	if (!$metadata_exif) { //try to load it from the file if its not in the database
+	if (!$metadata_exif) { 
+		// //try to load it from the file if its not in the database
 		$file = new ElggFile($file_guid);
 		td_get_exif($file);
 		unset($file);
 		$metadata_exif = get_metadata_byname($file_guid, "tp_exif");
 	}
-	
+
 	if (!$metadata_exif) {
 		return false;
 	}
 
 	$exif = unserialize($metadata_exif["value"]);
-	
+
 	$model = $exif['Model'];
-	if(!$model) $model = "N/A";
+	if (!$model) {
+		$model = "N/A";
+	}
 	$exif_data['Model'] = $model;
 
 	$exposure = $exif['ExposureTime'];
-	if (!$exposure) $exposure = "N/A";
+	if (!$exposure) {
+		$exposure = "N/A";
+	}
 	$exif_data['Shutter'] = $exposure;
 
 	//got the code snippet below from http://www.zenphoto.org/support/topic.php?id=17
 	//convert the raw values to understandible values
 	$Fnumber = explode("/", $exif['FNumber']);
-	if ($Fnumber[1] != 0)
+	if ($Fnumber[1] != 0) {
 		$Fnumber = $Fnumber[0] / $Fnumber[1];
-	else
+	} else {
 		$Fnumber = 0;
+	}
 	if (!$Fnumber) {
 		$Fnumber = "N/A";
 	} else {
@@ -54,15 +78,20 @@ function tp_exif_formatted($file_guid) {
 	$exif_data['Aperture'] = $Fnumber;
 
 	$iso = $exif['ISOSpeedRatings'];
-	if (!$iso) $iso = "N/A";
+	if (!$iso) {
+		$iso = "N/A";
+	}
 	$exif_data['ISO Speed'] = $iso;
 
 	$Focal = explode("/", $exif['FocalLength']);
-	if ($Focal[1] != 0)
+	if ($Focal[1] != 0) {
 		$Focal = $Focal[0] / $Focal[1];
-	else
+	} else {
 		$Focal = 0;
-	if (!$Focal || round($Focal) == "0") $Focal = 0;
+	}
+	if (!$Focal || round($Focal) == "0") {
+		$Focal = 0;
+	}
 	if (round($Focal) == 0) {
 		$Focal = "N/A";
 	} else {
@@ -71,9 +100,10 @@ function tp_exif_formatted($file_guid) {
 	$exif_data['Focal Length'] = $Focal;
 
 	$captured = $exif['DateTime'];
-	if (!$captured) $captured = "N/A";
+	if (!$captured) {
+		$captured = "N/A";
+	}
 	$exif_data['Captured'] = $captured;
 
 	return $exif_data;
 }
-?>
\ No newline at end of file
diff --git a/lib/image.php b/lib/image.php
index 183d03c1c..4100f3f7b 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -1,200 +1,179 @@
 attributes['subtype'] = "image";
+	}
+
+	public function __construct($guid = null) {
+		parent::__construct($guid);
+	}
+
 	/**
-	 * Tidypics Image class
-	 * 
+	 * Has the photo been tagged with "in this photo" tags
+	 *
+	 * @return true/false
 	 */
+	public function isPhotoTagged() {
+		$num_tags = count_annotations($this->getGUID(), 'object', 'image', 'phototag');
+		if ($num_tags > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
+	/**
+	 * Get an array of photo tag information
+	 *
+	 * @return array of json representations of the tags and the tag link text
+	 */
+	public function getPhotoTags() {
+		global $CONFIG;
 
-	class TidypicsImage extends ElggFile
-	{
-		protected function initialise_attributes()
-		{
-			parent::initialise_attributes();
-			
-			$this->attributes['subtype'] = "image";
-		}
-		
-		public function __construct($guid = null) 
-		{
-			parent::__construct($guid);
+		// get tags as annotations
+		$photo_tags = get_annotations($this->getGUID(), 'object', 'image', 'phototag');
+		if (!$photo_tags) {
+			// no tags or user doesn't have permission to tags, so return
+			return false;
 		}
-		
-		/**
-		 * Has the photo been tagged with "in this photo" tags
-		 *
-		 * @return true/false
-		 */
-		public function isPhotoTagged()
-		{
-			$num_tags = count_annotations($this->getGUID(), 'object', 'image', 'phototag');
-			if ($num_tags > 0) {
-				return true;
+
+		$photo_tags_json = "[";
+		foreach ($photo_tags as $p) {
+			$photo_tag = unserialize($p->value);
+
+			// create link to page with other photos tagged with same tag
+			$phototag_text = $photo_tag->value;
+			$phototag_link = $CONFIG->wwwroot . 'search/?tag=' . $phototag_text . '&subtype=image&object=object';
+			if ($photo_tag->type === 'user') {
+				$user = get_entity($photo_tag->value);
+				if ($user) {
+					$phototag_text = $user->name;
+				} else {
+					$phototag_text = "unknown user";
+				}
+
+				$phototag_link = $CONFIG->wwwroot . "pg/photos/tagged/" . $photo_tag->value;
+			}
+
+			if (isset($photo_tag->x1)) {
+				// hack to handle format of Pedro Prez's tags - ugh
+				$photo_tag->coords = "\"x1\":\"{$photo_tag->x1}\",\"y1\":\"{$photo_tag->y1}\",\"width\":\"{$photo_tag->width}\",\"height\":\"{$photo_tag->height}\"";
+				$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
 			} else {
-				return false;
+				$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
 			}
+
+			// prepare variable arrays for tagging view
+			$photo_tag_links[$p->id] = array('text' => $phototag_text, 'url' => $phototag_link);
 		}
-		
-		/**
-		 * Get an array of photo tag information
-		 *
-		 * @return array of json representations of the tags and the tag link text
-		 */
-		public function getPhotoTags() 
-		{
-			global $CONFIG;
-			
-			// get tags as annotations
-			$photo_tags = get_annotations($this->getGUID(), 'object', 'image', 'phototag');
-			if (!$photo_tags) 
-			{
-				// no tags or user doesn't have permission to tags, so return
-				return false;
-			}
-			
-			$photo_tags_json = "[";
-			foreach ($photo_tags as $p) 
-			{
-				$photo_tag = unserialize($p->value);
-				
-				// create link to page with other photos tagged with same tag
-				$phototag_text = $photo_tag->value;
-				$phototag_link = $CONFIG->wwwroot . 'search/?tag=' . $phototag_text . '&subtype=image&object=object';
-				if ($photo_tag->type === 'user') 
-				{
-					$user = get_entity($photo_tag->value);
-					if ($user) {
-						$phototag_text = $user->name;
-					} else {
-						$phototag_text = "unknown user";
-					}
-					
-					$phototag_link = $CONFIG->wwwroot . "pg/photos/tagged/" . $photo_tag->value;
-				}
-				
-				if (isset($photo_tag->x1)) {
-					// hack to handle format of Pedro Prez's tags - ugh
-					$photo_tag->coords = "\"x1\":\"{$photo_tag->x1}\",\"y1\":\"{$photo_tag->y1}\",\"width\":\"{$photo_tag->width}\",\"height\":\"{$photo_tag->height}\""; 
-					$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
-				} else {
-					$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
+
+		$photo_tags_json = rtrim($photo_tags_json,',');
+		$photo_tags_json .= ']';
+
+		$ret_data = array('json' => $photo_tags_json, 'links' => $photo_tag_links);
+		return $ret_data;
+	}
+
+	/**
+	 * Get the view information for this image
+	 *
+	 * @param $viewer_guid the guid of the viewer (0 if not logged in)
+	 * @return array with number of views, number of unique viewers, and number of views for this viewer
+	 */
+	public function getViews($viewer_guid) {
+		$views = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 99999);
+		if ($views) {
+			$total_views = count($views);
+
+			if ($this->owner_guid == $viewer_guid) {
+				// get unique number of viewers
+				foreach ($views as $view) {
+					$diff_viewers[$view->owner_guid] = 1;
 				}
-				
-				// prepare variable arrays for tagging view
-				$photo_tag_links[$p->id] = array('text' => $phototag_text, 'url' => $phototag_link);
+				$unique_viewers = count($diff_viewers);
 			}
-			
-			$photo_tags_json = rtrim($photo_tags_json,',');
-			$photo_tags_json .= ']';
-			
-			$ret_data = array('json' => $photo_tags_json, 'links' => $photo_tag_links);
-			return $ret_data;
-		}
-		
-		/**
-		 * Get the view information for this image
-		 * 
-		 * @param $viewer_guid the guid of the viewer (0 if not logged in)
-		 * @return array with number of views, number of unique viewers, and number of views for this viewer
-		 */
-		public function getViews($viewer_guid)
-		{
-			$views = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 99999);
-			if ($views) 
-			{
-				$total_views = count($views);
-				
-				if ($this->owner_guid == $viewer_guid)
-				{
-					// get unique number of viewers
-					foreach ($views as $view)
-					{
-						$diff_viewers[$view->owner_guid] = 1;
-					}
-					$unique_viewers = count($diff_viewers);
-				} 
-				else if ($viewer_guid) 
-				{
-					// get the number of times this user has viewed the photo
-					$my_views = 0;
-					foreach ($views as $view)
-					{
-						if ($view->owner_guid == $viewer_guid) {
-							$my_views++;
-						}
+			else if ($viewer_guid) {
+				// get the number of times this user has viewed the photo
+				$my_views = 0;
+				foreach ($views as $view) {
+					if ($view->owner_guid == $viewer_guid) {
+						$my_views++;
 					}
 				}
-				
-				$view_info = array("total" => $total_views, "unique" => $unique_viewers, "mine" => $my_views);
 			}
-			else
-			{
-				$view_info = array("total" => 0, "unique" => 0, "mine" => 0);
-			}
-			
-			return $view_info;
+
+			$view_info = array("total" => $total_views, "unique" => $unique_viewers, "mine" => $my_views);
 		}
-		
-		/**
-		 * Add a tidypics view annotation to this image
-		 * 
-		 * @param $viewer_guid
-		 * @return none
-		 */
-		public function addView($viewer_guid)
-		{
-			if ($viewer_guid != $this->owner_guid && tp_is_person()) {
-				create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC);
-			}
+		else {
+			$view_info = array("total" => 0, "unique" => 0, "mine" => 0);
 		}
+
+		return $view_info;
 	}
-	
+
 	/**
-	 * get a list of people that can be tagged in an image
-	 * 
-	 * @param $viewer entity
-	 * @return array of guid->name for tagging
+	 * Add a tidypics view annotation to this image
+	 *
+	 * @param $viewer_guid
+	 * @return none
 	 */
-	function tp_get_tag_list($viewer)
-	{
-		$friends = get_user_friends($viewer->getGUID(), '', 999, 0); 
-		$friend_list = array();
-		if ($friends) {
-			foreach($friends as $friend) {
-				//error_log("friend $friend->name");
-				$friend_list[$friend->guid] = $friend->name;
-			}
+	public function addView($viewer_guid) {
+		if ($viewer_guid != $this->owner_guid && tp_is_person()) {
+			create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC);
 		}
-		
-		// is this a group
-		$is_group = tp_is_group_page();
-		if ($is_group)
-		{
-			$group_guid = page_owner();
-			$viewer_guid = $viewer->guid;
-			$members = get_group_members($group_guid, 999);
-			if (is_array($members))
-			{
-				foreach ($members as $member)
-				{
-					if ($viewer_guid != $member->guid) 
-					{
-						$group_list[$member->guid] = $member->name;
-						//error_log("group $member->name");
-					}
+	}
+}
+
+/**
+ * get a list of people that can be tagged in an image
+ *
+ * @param $viewer entity
+ * @return array of guid->name for tagging
+ */
+function tp_get_tag_list($viewer) {
+	$friends = get_user_friends($viewer->getGUID(), '', 999, 0);
+	$friend_list = array();
+	if ($friends) {
+		foreach($friends as $friend) {
+			//error_log("friend $friend->name");
+			$friend_list[$friend->guid] = $friend->name;
+		}
+	}
+
+	// is this a group
+	$is_group = tp_is_group_page();
+	if ($is_group) {
+		$group_guid = page_owner();
+		$viewer_guid = $viewer->guid;
+		$members = get_group_members($group_guid, 999);
+		if (is_array($members)) {
+			foreach ($members as $member) {
+				if ($viewer_guid != $member->guid) {
+					$group_list[$member->guid] = $member->name;
+					//error_log("group $member->name");
 				}
-				
-				// combine group and friends list
-				$intersect = array_intersect_key($friend_list, $group_list);
-				$unique_friends = array_diff_key($friend_list, $group_list);
-				$unique_members = array_diff_key($group_list, $friend_list);
-				//$friend_list = array_merge($friend_list, $group_list);
-				//$friend_list = array_unique($friend_list);
-				$friend_list = $intersect + $unique_friends + $unique_members;
 			}
+
+			// combine group and friends list
+			$intersect = array_intersect_key($friend_list, $group_list);
+			$unique_friends = array_diff_key($friend_list, $group_list);
+			$unique_members = array_diff_key($group_list, $friend_list);
+			//$friend_list = array_merge($friend_list, $group_list);
+			//$friend_list = array_unique($friend_list);
+			$friend_list = $intersect + $unique_friends + $unique_members;
 		}
-		
-		asort($friend_list);
-		
-		return $friend_list;
 	}
-?>
\ No newline at end of file
+
+	asort($friend_list);
+
+	return $friend_list;
+}
diff --git a/lib/migrate.php b/lib/migrate.php
index ca68ec8c4..f8e68a1be 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -1,4 +1,10 @@
 owner_guid = $file->owner_guid;
+	$thumb->container_guid = $file->container_guid;
+
+	// tiny thumbail
+	$thumb->setFilename($prefix."thumb".$filestorename);
+	$thumbname = $thumb->getFilenameOnFilestore();
+	$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+								$thumbname,
+								false,
+								$image_sizes['thumb_image_width'],
+								$image_sizes['thumb_image_height'],
+								true);
+	if (!$rtn_code) {
+		return false;
+	}
+	$file->thumbnail = $prefix."thumb".$filestorename;
+
+	// album thumbnail
+	$thumb->setFilename($prefix."smallthumb".$filestorename);
+	$thumbname = $thumb->getFilenameOnFilestore();
+	$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+								$thumbname,
+								false,
+								$image_sizes['small_image_width'],
+								$image_sizes['small_image_height'],
+								true);
+	if (!$rtn_code) {
+		return false;
+	}
+	$file->smallthumb = $prefix."smallthumb".$filestorename;
+
+
+	// main image
+	$thumb->setFilename($prefix."largethumb".$filestorename);
+	$thumbname = $thumb->getFilenameOnFilestore();
+	$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+								$thumbname,
+								true,
+								$image_sizes['large_image_width'],
+								$image_sizes['large_image_height'],
+								false);
+	if (!$rtn_code) {
+		return false;
+	}
+	$file->largethumb = $prefix."largethumb".$filestorename;
+
+
+	unset($thumb);
+
+	return true;
+}
+
+/**
+ * Writes resized version of an already uploaded image - original from Elgg filestore.php
+ * Saves it in the same format as uploaded
+ *
+ * @param string $input_name The name of the file on the disk
+ * @param string $output_name The name of the file to be written
+ * @param bool - watermark this image?
+ * @param int $maxwidth The maximum width of the resized image
+ * @param int $maxheight The maximum height of the resized image
+ * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+ * @return bool true on success or false on failure
+ */
+function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+
+	// Get the size information from the image
+	$imgsizearray = getimagesize($input_name);
+	if (!imgsizearray) {
+		return false;
+	}
+
+	// Get width and height
+	$width = $imgsizearray[0];
+	$height = $imgsizearray[1];
+	$newwidth = $width;
+	$newheight = $height;
+
+	// Square the image dimensions if we're wanting a square image
+	if ($square) {
+		if ($width < $height) {
+			$height = $width;
+		} else {
+			$width = $height;
 		}
-		$image_sizes = unserialize($image_sizes);
 
-		$thumb = new ElggFile();
-		$thumb->owner_guid = $file->owner_guid;
-		$thumb->container_guid = $file->container_guid;
+		$newwidth = $width;
+		$newheight = $height;
+	}
+
+	if ($width > $maxwidth) {
+		$newheight = floor($height * ($maxwidth / $width));
+		$newwidth = $maxwidth;
+	}
+	if ($newheight > $maxheight) {
+		$newwidth = floor($newwidth * ($maxheight / $newheight));
+		$newheight = $maxheight;
+	}
+
+	$accepted_formats = array(
+			'image/jpeg' => 'jpeg',
+			'image/pjpeg' => 'jpeg',
+			'image/png' => 'png',
+			'image/x-png' => 'png',
+			'image/gif' => 'gif'
+	);
+
+	// make sure the function is available
+	$function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']];
+	if (!is_callable($function)) {
+		return false;
+	}
+
+	// load old image
+	$oldimage = $function($input_name);
+	if (!$oldimage) {
+		return false;
+	}
+
+	// allocate the new image
+	$newimage = imagecreatetruecolor($newwidth, $newheight);
+	if (!$newimage) {
+		return false;
+	}
+
+	// Crop the image if we need a square
+	if ($square) {
+		if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+			$widthoffset = floor(($imgsizearray[0] - $width) / 2);
+			$heightoffset = floor(($imgsizearray[1] - $height) / 2);
+		} else {
+			$widthoffset = $x1;
+			$heightoffset = $y1;
+			$width = ($x2 - $x1);
+			$height = $width;
+		}
+	} else {
+		if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+			$widthoffset = 0;
+			$heightoffset = 0;
+		} else {
+			$widthoffset = $x1;
+			$heightoffset = $y1;
+			$width = ($x2 - $x1);
+			$height = ($y2 - $y1);
+		}
+	}
+
+	if ($square) {
+		$newheight = $maxheight;
+		$newwidth = $maxwidth;
+	}
+
+	$rtn_code = imagecopyresampled($newimage, $oldimage, 0,0,$widthoffset,$heightoffset,$newwidth,$newheight,$width,$height);
+	if (!rtn_code) {
+		return $rtn_code;
+	}
+
+	if ($watermark) {
+		tp_gd_watermark($newimage);
+	}
+
+	switch ($imgsizearray['mime']) {
+		case 'image/jpeg':
+		case 'image/pjpeg':
+			$rtn_code = imagejpeg($newimage, $output_name, 85);
+			break;
+		case 'image/png':
+		case 'image/x-png':
+			$rtn_code = imagepng($newimage, $output_name);
+			break;
+		case 'image/gif':
+			$rtn_code = imagegif($newimage, $output_name);
+			break;
+	}
+
+	imagedestroy($newimage);
+	imagedestroy($oldimage);
+
+	return $rtn_code;
+}
+
+
+/**
+ * Create thumbnails using PHP imagick extension
+ *
+ * @param ElggFile holds the image that was uploaded
+ * @param string   folder to store thumbnail in
+ * @param string   name of the thumbnail
+ * @return bool    true on success
+ */
+function tp_create_imagick_thumbnails($file, $prefix, $filestorename) {
+	$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
+	if (!$image_sizes) {
+		register_error(elgg_echo('tidypics:nosettings'));
+		return false;
+	}
+	$image_sizes = unserialize($image_sizes);
+
+	$thumb = new ElggFile();
+	$thumb->owner_guid = $file->owner_guid;
+	$thumb->container_guid = $file->container_guid;
 
-		// tiny thumbail
-		$thumb->setFilename($prefix."thumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+	// tiny thumbnail
+	$thumb->setFilename($prefix."thumb".$filestorename);
+	$thumbname = $thumb->getFilenameOnFilestore();
+	$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
 									$thumbname,
-									false,
 									$image_sizes['thumb_image_width'],
-									$image_sizes['thumb_image_height'], 
+									$image_sizes['thumb_image_height'],
 									true);
-		if (!$rtn_code)
-			return false;
-		$file->thumbnail = $prefix."thumb".$filestorename;
-
+	if (!$rtn_code) {
+		return false;
+	}
+	$file->thumbnail = $prefix."thumb".$filestorename;
 
-		// album thumbnail
-		$thumb->setFilename($prefix."smallthumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+	// album thumbnail
+	$thumb->setFilename($prefix."smallthumb".$filestorename);
+	$thumbname = $thumb->getFilenameOnFilestore();
+	$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
 									$thumbname,
-									false,
 									$image_sizes['small_image_width'],
-									$image_sizes['small_image_height'], 
-									true); 
-		if (!$rtn_code)
-			return false;
-		$file->smallthumb = $prefix."smallthumb".$filestorename;
-
+									$image_sizes['small_image_height'],
+									true);
+	if (!$rtn_code) {
+		return false;
+	}
+	$file->smallthumb = $prefix."smallthumb".$filestorename;
 
-		// main image
-		$thumb->setFilename($prefix."largethumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
+	// main image
+	$thumb->setFilename($prefix."largethumb".$filestorename);
+	$thumbname = $thumb->getFilenameOnFilestore();
+	$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
 									$thumbname,
-									true,
 									$image_sizes['large_image_width'],
-									$image_sizes['large_image_height'], 
-									false); 
-		if (!$rtn_code)
-			return false;
-		$file->largethumb = $prefix."largethumb".$filestorename;
-		
-
-		unset($thumb);
-
-		return true;
-	}
-
-	/**
-	 * Writes resized version of an already uploaded image - original from Elgg filestore.php 
-	 * Saves it in the same format as uploaded
-	 *
-	 * @param string $input_name The name of the file on the disk
-	 * @param string $output_name The name of the file to be written
-	 * @param bool - watermark this image? 
-	 * @param int $maxwidth The maximum width of the resized image
-	 * @param int $maxheight The maximum height of the resized image
-	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
-	 * @return bool true on success or false on failure
-	 */
-	function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
-		
-		// Get the size information from the image
-		$imgsizearray = getimagesize($input_name);
-		if (!imgsizearray)
-			return false;
-		
-		// Get width and height
-		$width = $imgsizearray[0];
-		$height = $imgsizearray[1];
-		$newwidth = $width;
-		$newheight = $height;
-		
-		// Square the image dimensions if we're wanting a square image
-		if ($square) {
-			if ($width < $height) {
-				$height = $width;
-			} else {
-				$width = $height;
-			}
-			
-			$newwidth = $width;
-			$newheight = $height;
-			
+									$image_sizes['large_image_height'],
+									false);
+	if (!$rtn_code) {
+		return false;
+	}
+	$file->largethumb = $prefix."largethumb".$filestorename;
+
+	tp_imagick_watermark($thumbname);
+
+	unset($thumb);
+
+	return true;
+}
+
+
+/**
+ * Resize using PHP imagick extension
+ *
+ * Writes resized version of an already uploaded image
+ *
+ *
+ * @param string $input_name The name of the file input field on the submission form
+ * @param string $output_name The name of the file to be written
+ * @param int $maxwidth The maximum width of the resized image
+ * @param int $maxheight The maximum height of the resized image
+ * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+ * @return bool true on success
+ */
+function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+
+	// Get the size information from the image
+	$imgsizearray = getimagesize($input_name);
+	if (!$imgsizearray) {
+		return false;
+	}
+
+	// Get width and height
+	$width = $imgsizearray[0];
+	$height = $imgsizearray[1];
+	$newwidth = $width;
+	$newheight = $height;
+
+	// initial guess at final dimensions for new image (doesn't check for squareness yet
+	if ($newwidth > $maxwidth) {
+		$newheight = floor($newheight * ($maxwidth / $newwidth));
+		$newwidth = $maxwidth;
+	}
+	if ($newheight > $maxheight) {
+		$newwidth = floor($newwidth * ($maxheight / $newheight));
+		$newheight = $maxheight;
+	}
+
+	// Handle squareness for both original and new image
+	if ($square) {
+		if ($width < $height) {
+			$height = $width;
+		} else {
+			$width = $height;
 		}
-		
-		if ($width > $maxwidth) {
-			$newheight = floor($height * ($maxwidth / $width));
+
+		if ($maxheight == $maxwidth) {
+			// if input arguments = square, no need to use above calculations (which can have round-off errors)
 			$newwidth = $maxwidth;
-		}
-		if ($newheight > $maxheight) {
-			$newwidth = floor($newwidth * ($maxheight / $newheight));
-			$newheight = $maxheight; 
-		}
-		
-		$accepted_formats = array(
-										'image/jpeg' => 'jpeg',
-										'image/pjpeg' => 'jpeg',
-										'image/png' => 'png',
-										'image/x-png' => 'png',
-										'image/gif' => 'gif'
-								);
-
-		// make sure the function is available
-		$function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']];
-		if (!is_callable($function))
-			return false;
-		
-		
-		// load old image
-		$oldimage = $function($input_name);
-		if (!$oldimage)
-			return false;
-		
-		// allocate the new image
-		$newimage = imagecreatetruecolor($newwidth, $newheight);
-		if (!$newimage)
-			return false;
-		
-		// Crop the image if we need a square
-		if ($square) {
-			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-				$widthoffset = floor(($imgsizearray[0] - $width) / 2);
-				$heightoffset = floor(($imgsizearray[1] - $height) / 2);
-			} else {
-				$widthoffset = $x1;
-				$heightoffset = $y1;
-				$width = ($x2 - $x1);
-				$height = $width;
-			}
+			$newheight = $maxheight;
 		} else {
-			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-				$widthoffset = 0;
-				$heightoffset = 0;
+			if ($newwidth < $newheight) {
+				$newheight = $newwidth;
 			} else {
-				$widthoffset = $x1;
-				$heightoffset = $y1;
-				$width = ($x2 - $x1);
-				$height = ($y2 - $y1);
+				$newwidth = $newheight;
 			}
 		}
-		
-		if ($square) {
-			$newheight = $maxheight;
-			$newwidth = $maxwidth;
+	}
+
+
+	// Crop the original image - this needs to be checked over
+	if ($square) {
+		if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+			$xoffset = floor(($imgsizearray[0] - $width) / 2);
+			$yoffset = floor(($imgsizearray[1] - $height) / 2);
+		} else { // assume we're being passed good croping coordinates
+			$xoffset = $x1;
+			$yoffset = $y1;
+			$width = ($x2 - $x1);
+			$height = $width;
 		}
-		
-		$rtn_code = imagecopyresampled($newimage, $oldimage, 0,0,$widthoffset,$heightoffset,$newwidth,$newheight,$width,$height);
-		if (!rtn_code)
-			return $rtn_code;
-		
-		if ($watermark)
-			tp_gd_watermark($newimage);
-		
-		switch ($imgsizearray['mime']) {
-			case 'image/jpeg':
-			case 'image/pjpeg':
-				$rtn_code = imagejpeg($newimage, $output_name, 85); 
-				break;
-			case 'image/png':
-			case 'image/x-png':
-				$rtn_code = imagepng($newimage, $output_name);
-				break;
-			case 'image/gif':
-				$rtn_code = imagegif($newimage, $output_name);
-				break;
+	} else {
+		if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+			$xoffset = 0;
+			$yoffset = 0;
+		} else {
+			$xoffset = $x1;
+			$yoffset = $y1;
+			$width = ($x2 - $x1);
+			$height = ($y2 - $y1);
 		}
-		
-		imagedestroy($newimage);
-		imagedestroy($oldimage);
-		
-		return $rtn_code;
 	}
 
 
-	/**
-	 * Create thumbnails using PHP imagick extension
-	 *
-	 * @param ElggFile holds the image that was uploaded
-	 * @param string   folder to store thumbnail in
-	 * @param string   name of the thumbnail
-	 * @return bool    true on success 
-	 */
-	function tp_create_imagick_thumbnails($file, $prefix, $filestorename)
-	{
-		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
-		if (!$image_sizes) {
-			register_error(elgg_echo('tidypics:nosettings'));
-			return false;
-		}
-		$image_sizes = unserialize($image_sizes);
+	try {
+		$img = new Imagick($input_name);
+	} catch (ImagickException $e) {
+		return false;
+	}
 
-		$thumb = new ElggFile();
-		$thumb->owner_guid = $file->owner_guid;
-		$thumb->container_guid = $file->container_guid;
+	$img->cropImage($width, $height, $xoffset, $yoffset);
 
-		// tiny thumbnail
-		$thumb->setFilename($prefix."thumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
+	// use the default IM filter (windowing filter), I think 1 means default blurring or number of lobes
+	$img->resizeImage($newwidth, $newheight, imagick::FILTER_LANCZOS, 1);
+	$img->setImagePage($newwidth, $newheight, 0, 0);
+
+	if ($img->writeImage($output_name) != true) {
+		$img->destroy();
+		return false;
+	}
+
+	$img->destroy();
+
+	return true;
+}
+
+/**
+ * Create thumbnails using ImageMagick executables
+ *
+ * @param ElggFile holds the image that was uploaded
+ * @param string   folder to store thumbnail in
+ * @param string   name of the thumbnail
+ * @return bool    true on success
+ */
+function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) {
+	$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
+	if (!$image_sizes) {
+		register_error(elgg_echo('tidypics:nosettings'));
+		return false;
+	}
+	$image_sizes = unserialize($image_sizes);
+
+	$thumb = new ElggFile();
+	$thumb->owner_guid = $file->owner_guid;
+	$thumb->container_guid = $file->container_guid;
+
+	// tiny thumbnail
+	$thumb->setFilename($prefix."thumb".$filestorename);
+	$thumbname = $thumb->getFilenameOnFilestore();
+	$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
 										$thumbname,
 										$image_sizes['thumb_image_width'],
-										$image_sizes['thumb_image_height'], 
+										$image_sizes['thumb_image_height'],
 										true);
-		if (!$rtn_code)
-			return false;
-		$file->thumbnail = $prefix."thumb".$filestorename;
+	if (!$rtn_code) {
+		return false;
+	}
+	$file->thumbnail = $prefix."thumb".$filestorename;
 
 
-		// album thumbnail
-		$thumb->setFilename($prefix."smallthumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
+	// album thumbnail
+	$thumb->setFilename($prefix."smallthumb".$filestorename);
+	$thumbname = $thumb->getFilenameOnFilestore();
+	$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
 										$thumbname,
 										$image_sizes['small_image_width'],
-										$image_sizes['small_image_height'], 
-										true); 
-		if (!$rtn_code)
-			return false;
-		$file->smallthumb = $prefix."smallthumb".$filestorename;
-
+										$image_sizes['small_image_height'],
+										true);
+	if (!$rtn_code) {
+		return false;
+	}
+	$file->smallthumb = $prefix."smallthumb".$filestorename;
 
-		// main image
-		$thumb->setFilename($prefix."largethumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_imagick_resize(	$file->getFilenameOnFilestore(),
+	// main image
+	$thumb->setFilename($prefix."largethumb".$filestorename);
+	$thumbname = $thumb->getFilenameOnFilestore();
+	$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
 										$thumbname,
 										$image_sizes['large_image_width'],
-										$image_sizes['large_image_height'], 
-										false); 
-		if (!$rtn_code)
-			return false;
-		$file->largethumb = $prefix."largethumb".$filestorename;
-		
-		tp_imagick_watermark($thumbname);
-
-		unset($thumb);
-
-		return true;
-	}
-
-	
-	/**
-	 * Resize using PHP imagick extension
-	 *
-	 * Writes resized version of an already uploaded image
-	 * 
-	 *
-	 * @param string $input_name The name of the file input field on the submission form
-	 * @param string $output_name The name of the file to be written
-	 * @param int $maxwidth The maximum width of the resized image
-	 * @param int $maxheight The maximum height of the resized image
-	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
-	 * @return bool true on success
-	 */
-	function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
-		
-		// Get the size information from the image
-		$imgsizearray = getimagesize($input_name);
-		if (!$imgsizearray)
-			return false;
-		
+										$image_sizes['large_image_height'],
+										false);
+	if (!$rtn_code) {
+		return false;
+	}
+	$file->largethumb = $prefix."largethumb".$filestorename;
+
+
+	tp_im_cmdline_watermark($thumbname);
+
+	unset($thumb);
+
+	return true;
+}
+
+/**
+ * Gets the jpeg contents of the resized version of an already uploaded image
+ * (Returns false if the uploaded file was not an image)
+ *
+ * @param string $input_name The name of the file input field on the submission form
+ * @param string $output_name The name of the file to be written
+ * @param int $maxwidth The maximum width of the resized image
+ * @param int $maxheight The maximum height of the resized image
+ * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+ * @return bool
+ */
+function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+
+
+	// Get the size information from the image
+	if ($imgsizearray = getimagesize($input_name)) {
 
 		// Get width and height
 		$width = $imgsizearray[0];
 		$height = $imgsizearray[1];
 		$newwidth = $width;
 		$newheight = $height;
-		
-		// initial guess at final dimensions for new image (doesn't check for squareness yet
-		if ($newwidth > $maxwidth) {
-			$newheight = floor($newheight * ($maxwidth / $newwidth));
-			$newwidth = $maxwidth;
-		}
-		if ($newheight > $maxheight) {
-			$newwidth = floor($newwidth * ($maxheight / $newheight));
-			$newheight = $maxheight; 
-		}
-		
-		// Handle squareness for both original and new image
+
+		// Square the image dimensions if we're wanting a square image
 		if ($square) {
 			if ($width < $height) {
 				$height = $width;
 			} else {
 				$width = $height;
 			}
-			
-			if ($maxheight == $maxwidth) {
-				// if input arguments = square, no need to use above calculations (which can have round-off errors)
-				$newwidth = $maxwidth;
-				$newheight = $maxheight;
-			} else {
-				if ($newwidth < $newheight) {
-					$newheight = $newwidth;
-				} else {
-					$newwidth = $newheight;
-				}
-			}
-		}
-		
-		
-		// Crop the original image - this needs to be checked over
-		if ($square) {
-			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-				$xoffset = floor(($imgsizearray[0] - $width) / 2);
-				$yoffset = floor(($imgsizearray[1] - $height) / 2);
-			} else { // assume we're being passed good croping coordinates
-				$xoffset = $x1;
-				$yoffset = $y1;
-				$width = ($x2 - $x1);
-				$height = $width;
-			}
-		} else {
-			if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-				$xoffset = 0;
-				$yoffset = 0;
-			} else {
-				$xoffset = $x1;
-				$yoffset = $y1;
-				$width = ($x2 - $x1);
-				$height = ($y2 - $y1);
-			}
-		}
 
+			$newwidth = $width;
+			$newheight = $height;
 
-		try {
-			$img = new Imagick($input_name);
-		} catch (ImagickException $e) {
-			return false;
-		}
-		
-		$img->cropImage($width, $height, $xoffset, $yoffset);
-		
-		// use the default IM filter (windowing filter), I think 1 means default blurring or number of lobes
-		$img->resizeImage($newwidth, $newheight, imagick::FILTER_LANCZOS, 1);
-		$img->setImagePage($newwidth, $newheight, 0, 0);
-		
-		if ($img->writeImage($output_name) != true) {
-			$img->destroy();
-			return false;
-		}
-		
-		$img->destroy();
-		
-		return true;
-	}
-
-	/**
-	 * Create thumbnails using ImageMagick executables
-	 *
-	 * @param ElggFile holds the image that was uploaded
-	 * @param string   folder to store thumbnail in
-	 * @param string   name of the thumbnail
-	 * @return bool    true on success 
-	 */
-	function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename)
-	{
-		$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
-		if (!$image_sizes) {
-			register_error(elgg_echo('tidypics:nosettings'));
-			return false;
-		}
-		$image_sizes = unserialize($image_sizes);
-
-		$thumb = new ElggFile();
-		$thumb->owner_guid = $file->owner_guid;
-		$thumb->container_guid = $file->container_guid;
-
-		// tiny thumbnail
-		$thumb->setFilename($prefix."thumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
-											$thumbname,
-											$image_sizes['thumb_image_width'],
-											$image_sizes['thumb_image_height'], 
-											true);
-		if (!$rtn_code) {
-			return false;
 		}
-		$file->thumbnail = $prefix."thumb".$filestorename;
-
-
-		// album thumbnail
-		$thumb->setFilename($prefix."smallthumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
-											$thumbname,
-											$image_sizes['small_image_width'],
-											$image_sizes['small_image_height'], 
-											true); 
-		if (!$rtn_code) {
-			return false;
+
+		if ($width > $maxwidth) {
+			$newheight = floor($height * ($maxwidth / $width));
+			$newwidth = $maxwidth;
 		}
-		$file->smallthumb = $prefix."smallthumb".$filestorename;
-
-
-		// main image
-		$thumb->setFilename($prefix."largethumb".$filestorename);
-		$thumbname = $thumb->getFilenameOnFilestore();
-		$rtn_code = tp_im_cmdline_resize(	$file->getFilenameOnFilestore(),
-											$thumbname,
-											$image_sizes['large_image_width'],
-											$image_sizes['large_image_height'], 
-											false); 
-		if (!$rtn_code) {
-			return false;
+		if ($newheight > $maxheight) {
+			$newwidth = floor($newwidth * ($maxheight / $newheight));
+			$newheight = $maxheight;
 		}
-		$file->largethumb = $prefix."largethumb".$filestorename;
-		
-		
-		tp_im_cmdline_watermark($thumbname);
-		
-
-
-		unset($thumb);
-
-		return true;
-	}
-
-	/*
-	 * Gets the jpeg contents of the resized version of an already uploaded image
-	 * (Returns false if the uploaded file was not an image)
-	 *
-	 * @param string $input_name The name of the file input field on the submission form
-	 * @param string $output_name The name of the file to be written
-	 * @param int $maxwidth The maximum width of the resized image
-	 * @param int $maxheight The maximum height of the resized image
-	 * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
-	 * @return bool
-	 */
-	function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
-		
-		
-		// Get the size information from the image
-		if ($imgsizearray = getimagesize($input_name)) {
-
-			// Get width and height
-			$width = $imgsizearray[0];
-			$height = $imgsizearray[1];
-			$newwidth = $width;
-			$newheight = $height;
-			
-			// Square the image dimensions if we're wanting a square image
+
+		$accepted_formats = array(
+				'image/jpeg' => 'jpeg',
+				'image/pjpeg' => 'jpeg',
+				'image/png' => 'png',
+				'image/x-png' => 'png',
+				'image/gif' => 'gif'
+		);
+		// If it's a file we can manipulate ...
+		if (array_key_exists($imgsizearray['mime'],$accepted_formats)) {
+
+			// Crop the image if we need a square
 			if ($square) {
-				if ($width < $height) {
+				if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+					$widthoffset = floor(($imgsizearray[0] - $width) / 2);
+					$heightoffset = floor(($imgsizearray[1] - $height) / 2);
+				} else {
+					$widthoffset = $x1;
+					$heightoffset = $y1;
+					$width = ($x2 - $x1);
 					$height = $width;
+				}
+			} else {
+				if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
+					$widthoffset = 0;
+					$heightoffset = 0;
 				} else {
-					$width = $height;
+					$widthoffset = $x1;
+					$heightoffset = $y1;
+					$width = ($x2 - $x1);
+					$height = ($y2 - $y1);
 				}
-				
-				$newwidth = $width;
-				$newheight = $height;
-				
 			}
 
-			if ($width > $maxwidth) {
-				$newheight = floor($height * ($maxwidth / $width));
+			// Resize and return the image contents!
+			if ($square) {
+				$newheight = $maxheight;
 				$newwidth = $maxwidth;
 			}
-			if ($newheight > $maxheight) {
-				$newwidth = floor($newwidth * ($maxheight / $newheight));
-				$newheight = $maxheight;
+			$im_path = get_plugin_setting('im_path', 'tidypics');
+			if (!$im_path) {
+				$im_path = "/usr/bin/";
 			}
-
-			$accepted_formats = array(
-										'image/jpeg' => 'jpeg',
-										'image/pjpeg' => 'jpeg',
-										'image/png' => 'png',
-										'image/x-png' => 'png',
-										'image/gif' => 'gif'
-								);
-			// If it's a file we can manipulate ...
-			if (array_key_exists($imgsizearray['mime'],$accepted_formats)) {
-
-				// Crop the image if we need a square
-				if ($square) {
-					if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-						$widthoffset = floor(($imgsizearray[0] - $width) / 2);
-						$heightoffset = floor(($imgsizearray[1] - $height) / 2);
-					} else {
-						$widthoffset = $x1;
-						$heightoffset = $y1;
-						$width = ($x2 - $x1);
-						$height = $width;
-					}
-				} else {
-					if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-						$widthoffset = 0;
-						$heightoffset = 0;
-					} else {
-						$widthoffset = $x1;
-						$heightoffset = $y1;
-						$width = ($x2 - $x1);
-						$height = ($y2 - $y1);
-					}
-				}
-				
-				// Resize and return the image contents!
-				if ($square) {
-					$newheight = $maxheight;
-					$newwidth = $maxwidth;
-				}
-				$im_path = get_plugin_setting('im_path', 'tidypics');
-				if(!$im_path) {
-					$im_path = "/usr/bin/";
-				}
-				if(substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/";
-				// see imagemagick web site for explanation of these parameters
-				// the ^ in the resize means those are minimum width and height values
-				$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
-				$output = array();
-				$ret = 0;
-				exec($command, $output, $ret);
-				if ($ret == 127) {
-					trigger_error('Tidypics warning: Image Magick convert is not found', E_USER_WARNING);
-					return false;
-				} else if ($ret > 0) {
-					trigger_error('Tidypics warning: Image Magick convert failed', E_USER_WARNING);
-					return false;
-				}
-				return true;
+			if (substr($im_path, strlen($im_path)-1, 1) != "/") {
+				$im_path .= "/";
+			}
+			// see imagemagick web site for explanation of these parameters
+			// the ^ in the resize means those are minimum width and height values
+			$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
+			$output = array();
+			$ret = 0;
+			exec($command, $output, $ret);
+			if ($ret == 127) {
+				trigger_error('Tidypics warning: Image Magick convert is not found', E_USER_WARNING);
+				return false;
+			} else if ($ret > 0) {
+				trigger_error('Tidypics warning: Image Magick convert failed', E_USER_WARNING);
+				return false;
 			}
+			return true;
 		}
-
-		return false;
 	}
 
-?>
\ No newline at end of file
+	return false;
+}
+
diff --git a/lib/tidypics.php b/lib/tidypics.php
index 086885a89..539db451a 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -1,89 +1,87 @@
 
-	
-		
      
-			
      
-			
      
-			
-			
      
-		
      
-
-
-	 * Good luck
-	 */
-	function tp_get_latest_photos($num_images, $owner_guid = 0)
-	{
-		$prev_context = set_context('front');
-		$image_html = tp_list_entities('object', 'image', $owner_guid, null, $num_images, false, false, false);  
-		set_context($prev_context);
-		return $image_html;
-	}
-	
-	
-	/**
-	 * Get image directory path
-	 *
-	 * Each album gets a subdirectory based on its container id
-	 *
-	 * @return string	path to image directory
-	 */
-	function tp_get_img_dir()
-	{
-		$file = new ElggFile();
-		return $file->getFilenameOnFilestore() . 'image/';
-	}
-	
-	
+/**
+ * Elgg tidypics library of common functions
+ *
+ * @package TidypicsCommon
+ */
+
+/**
+ * Get images for display on front page
+ *
+ * @param int number of images
+ * @param int (optional) guid of owner
+ * @return string of html for display
+ *
+ * To use with the custom index plugin, use something like this:
 	
-	/*********************************************************************
-	 * the functions below replace broken core functions or add functions 
-	 * that could/should exist in the core
-	 */
-	 
-	/**
-	 *
-	 */
-	function tp_get_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null, $timelower = 0, $timeupper = 0)
-	{
-		global $CONFIG;
-		
-		if ($subtype === false || $subtype === null || $subtype === 0)
-			return false;
-		
-		if ($order_by == "") $order_by = "time_created desc";
-		$order_by = sanitise_string($order_by);
-		$limit = (int)$limit;
-		$offset = (int)$offset;
-		$site_guid = (int) $site_guid;
-		$timelower = (int) $timelower;
-		$timeupper = (int) $timeupper;
-		if ($site_guid == 0)
-			$site_guid = $CONFIG->site_guid;
-				
-		$where = array();
-		
-		if (is_array($subtype)) {
-			$tempwhere = "";
-			if (sizeof($subtype))
+ if (is_plugin_enabled('tidypics')) {
+ ?>
+ 
+ 
      
+	
      
+	
      
+ 
+	
      
+ 
      
+ 
+
+ * Good luck
+ */
+function tp_get_latest_photos($num_images, $owner_guid = 0) {
+	$prev_context = set_context('front');
+	$image_html = tp_list_entities('object', 'image', $owner_guid, null, $num_images, false, false, false);
+	set_context($prev_context);
+	return $image_html;
+}
+
+
+/**
+ * Get image directory path
+ *
+ * Each album gets a subdirectory based on its container id
+ *
+ * @return string	path to image directory
+ */
+function tp_get_img_dir() {
+	$file = new ElggFile();
+	return $file->getFilenameOnFilestore() . 'image/';
+}
+
+
+
+/*********************************************************************
+ * the functions below replace broken core functions or add functions 
+ * that could/should exist in the core
+ */
+
+/**
+ *
+ */
+function tp_get_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null, $timelower = 0, $timeupper = 0) {
+	global $CONFIG;
+
+	if ($subtype === false || $subtype === null || $subtype === 0)
+		return false;
+
+	if ($order_by == "") $order_by = "time_created desc";
+	$order_by = sanitise_string($order_by);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$site_guid = (int) $site_guid;
+	$timelower = (int) $timelower;
+	$timeupper = (int) $timeupper;
+	if ($site_guid == 0)
+		$site_guid = $CONFIG->site_guid;
+
+	$where = array();
+
+	if (is_array($subtype)) {
+		$tempwhere = "";
+		if (sizeof($subtype))
 			foreach($subtype as $typekey => $subtypearray) {
 				foreach($subtypearray as $subtypeval) {
 					$typekey = sanitise_string($typekey);
@@ -100,84 +98,84 @@
 					$tempwhere .= "(type = '{$typekey}' and subtype = {$subtypeval})";
 				}
 			}
-			if (!empty($tempwhere)) $where[] = "({$tempwhere})";
-			
-		} else {
-		
-			$type = sanitise_string($type);
-			if ($subtype !== "" AND !$subtype = get_subtype_id($type, $subtype))
-				return false;
-			
-			if ($type != "")
-				$where[] = "type='$type'";
-			if ($subtype!=="")
-				$where[] = "subtype=$subtype";
-		}
+		if (!empty($tempwhere)) $where[] = "({$tempwhere})";
 
-		if ($owner_guid != "") {
-			if (!is_array($owner_guid)) {
-				$owner_array = array($owner_guid);
-				$owner_guid = (int) $owner_guid;
-				$where[] = "owner_guid = '$owner_guid'";
-			} else if (sizeof($owner_guid) > 0) {
-				$owner_array = array_map('sanitise_int', $owner_guid);
-				// Cast every element to the owner_guid array to int
-				$owner_guid = array_map("sanitise_int", $owner_guid);
-				$owner_guid = implode(",",$owner_guid);
-				$where[] = "owner_guid in ({$owner_guid})";
-			}
-		}
-		if ($site_guid > 0)
-			$where[] = "site_guid = {$site_guid}";
-
-		if (!is_null($container_guid)) {
-			if (is_array($container_guid)) {
-				foreach($container_guid as $key => $val) $container_guid[$key] = (int) $val;
-				$where[] = "container_guid in (" . implode(",",$container_guid) . ")";
-			} else {
-				$container_guid = (int) $container_guid;
-				$where[] = "container_guid = {$container_guid}";
-			}
-		}
-		if ($timelower)
-			$where[] = "time_created >= {$timelower}";
-		if ($timeupper)
-			$where[] = "time_created <= {$timeupper}";
-			
-		if (!$count) {
-			$query = "SELECT * from {$CONFIG->dbprefix}entities where ";
-		} else {
-			$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where ";
+	} else {
+
+		$type = sanitise_string($type);
+		if ($subtype !== "" AND !$subtype = get_subtype_id($type, $subtype))
+			return false;
+
+		if ($type != "")
+			$where[] = "type='$type'";
+		if ($subtype!=="")
+			$where[] = "subtype=$subtype";
+	}
+
+	if ($owner_guid != "") {
+		if (!is_array($owner_guid)) {
+			$owner_array = array($owner_guid);
+			$owner_guid = (int) $owner_guid;
+			$where[] = "owner_guid = '$owner_guid'";
+		} else if (sizeof($owner_guid) > 0) {
+			$owner_array = array_map('sanitise_int', $owner_guid);
+			// Cast every element to the owner_guid array to int
+			$owner_guid = array_map("sanitise_int", $owner_guid);
+			$owner_guid = implode(",",$owner_guid);
+			$where[] = "owner_guid in ({$owner_guid})";
 		}
-		foreach ($where as $w)
-			$query .= " $w and ";
-		$query .= get_access_sql_suffix(); // Add access controls
-
-		if (!$count) {
-			$query .= " order by $order_by";
-			if ($limit) $query .= " limit $offset, $limit"; // Add order and limit
-			$dt = get_data($query, "entity_row_to_elggstar");
-			return $dt;
+	}
+	if ($site_guid > 0)
+		$where[] = "site_guid = {$site_guid}";
+
+	if (!is_null($container_guid)) {
+		if (is_array($container_guid)) {
+			foreach($container_guid as $key => $val) $container_guid[$key] = (int) $val;
+			$where[] = "container_guid in (" . implode(",",$container_guid) . ")";
 		} else {
-			$total = get_data_row($query);
-			return $total->total;
+			$container_guid = (int) $container_guid;
+			$where[] = "container_guid = {$container_guid}";
 		}
 	}
+	if ($timelower)
+		$where[] = "time_created >= {$timelower}";
+	if ($timeupper)
+		$where[] = "time_created <= {$timeupper}";
 
-	function tp_list_entities($type= "", $subtype = "", $owner_guid = 0, $container_guid = null, $limit = 10, $fullview = true, $viewtypetoggle = false, $pagination = true) {
-		
-		$offset = (int) get_input('offset');
-		$count = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true, 0, $container_guid);
-		
-		$entities = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, false, 0, $container_guid);
+	if (!$count) {
+		$query = "SELECT * from {$CONFIG->dbprefix}entities where ";
+	} else {
+		$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where ";
+	}
+	foreach ($where as $w)
+		$query .= " $w and ";
+	$query .= get_access_sql_suffix(); // Add access controls
 
-		return tp_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
+	if (!$count) {
+		$query .= " order by $order_by";
+		if ($limit) $query .= " limit $offset, $limit"; // Add order and limit
+		$dt = get_data($query, "entity_row_to_elggstar");
+		return $dt;
+	} else {
+		$total = get_data_row($query);
+		return $total->total;
 	}
-	
-	function tp_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = false, $pagination = true) {
-		$context = get_context();
+}
+
+function tp_list_entities($type= "", $subtype = "", $owner_guid = 0, $container_guid = null, $limit = 10, $fullview = true, $viewtypetoggle = false, $pagination = true) {
+
+	$offset = (int) get_input('offset');
+	$count = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true, 0, $container_guid);
 
-		$html = elgg_view('tidypics/gallery',array(
+	$entities = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, false, 0, $container_guid);
+
+	return tp_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
+}
+
+function tp_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = false, $pagination = true) {
+	$context = get_context();
+
+	$html = elgg_view('tidypics/gallery',array(
 			'entities' => $entities,
 			'count' => $count,
 			'offset' => $offset,
@@ -188,114 +186,110 @@
 			'viewtypetoggle' => $viewtypetoggle,
 			'viewtype' => get_input('search_viewtype','list'),
 			'pagination' => $pagination
-		));
-		
-		return $html;
+	));
+
+	return $html;
+}
+
+function tp_get_entities_from_annotations_calculate_x($sum = "sum", $entity_type = "", $entity_subtype = "", $name = "", $mdname = '', $mdvalue = '', $owner_guid = 0, $limit = 10, $offset = 0, $orderdir = 'desc', $count = false) {
+	global $CONFIG;
+
+	$sum = sanitise_string($sum);
+	$entity_type = sanitise_string($entity_type);
+	$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
+	$name = get_metastring_id($name);
+	$limit = (int) $limit;
+	$offset = (int) $offset;
+	$owner_guid = (int) $owner_guid;
+	if (!empty($mdname) && !empty($mdvalue)) {
+		$meta_n = get_metastring_id($mdname);
+		$meta_v = get_metastring_id($mdvalue);
 	}
-	
-	function tp_get_entities_from_annotations_calculate_x($sum = "sum", $entity_type = "", $entity_subtype = "", $name = "", $mdname = '', $mdvalue = '', $owner_guid = 0, $limit = 10, $offset = 0, $orderdir = 'desc', $count = false)
-	{
-		global $CONFIG;
-		
-		$sum = sanitise_string($sum);
-		$entity_type = sanitise_string($entity_type);
-		$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
-		$name = get_metastring_id($name);
-		$limit = (int) $limit;
-		$offset = (int) $offset;
-		$owner_guid = (int) $owner_guid;
-		if (!empty($mdname) && !empty($mdvalue)) {
-			$meta_n = get_metastring_id($mdname);
-			$meta_v = get_metastring_id($mdvalue);
-		}
-		
-		if (empty($name)) return 0;
-		
-		$where = array();
-		
-		if ($entity_type!="")
-			$where[] = "e.type='$entity_type'";
-		if ($owner_guid > 0)
-			$where[] = "e.owner_guid = $owner_guid";
-		if ($entity_subtype)
-			$where[] = "e.subtype=$entity_subtype";
-		if ($name!="")
-			$where[] = "a.name_id='$name'";
-			
-		if (!empty($mdname) && !empty($mdvalue)) {
-			if ($mdname!="")
-				$where[] = "m.name_id='$meta_n'";
-			if ($mdvalue!="")
-				$where[] = "m.value_id='$meta_v'";
-		}
-			
-		if ($sum != "count")
-			$where[] = "a.value_type='integer'"; // Limit on integer types
 
-		if (!$count) {
-			$query = "SELECT distinct e.*, $sum(ms.string) as sum ";
-		} else {
-			$query = "SELECT count(distinct e.guid) as num, $sum(ms.string) as sum ";
-		}
-		$query .= " from {$CONFIG->dbprefix}entities e JOIN {$CONFIG->dbprefix}annotations a on a.entity_guid = e.guid JOIN {$CONFIG->dbprefix}metastrings ms on a.value_id=ms.id ";
-		
-		if (!empty($mdname) && !empty($mdvalue)) {
-			$query .= " JOIN {$CONFIG->dbprefix}metadata m on m.entity_guid = e.guid "; 
-		}
-		
-		$query .= " WHERE ";
-		foreach ($where as $w)
-			$query .= " $w and ";
-		$query .= get_access_sql_suffix("a"); // now add access
-		$query .= ' and ' . get_access_sql_suffix("e"); // now add access
-		if (!$count) $query .= ' group by e.guid';
-		
-		if (!$count) {
-			$query .= ' order by sum ' . $orderdir;
-			$query .= ' limit ' . $offset . ' , ' . $limit;
-			return get_data($query, "entity_row_to_elggstar");
-		} else {
-			if ($row = get_data_row($query)) {
-				return $row->num;
-			}
-		}
-		return false;
+	if (empty($name)) return 0;
+
+	$where = array();
+
+	if ($entity_type!="")
+		$where[] = "e.type='$entity_type'";
+	if ($owner_guid > 0)
+		$where[] = "e.owner_guid = $owner_guid";
+	if ($entity_subtype)
+		$where[] = "e.subtype=$entity_subtype";
+	if ($name!="")
+		$where[] = "a.name_id='$name'";
+
+	if (!empty($mdname) && !empty($mdvalue)) {
+		if ($mdname!="")
+			$where[] = "m.name_id='$meta_n'";
+		if ($mdvalue!="")
+			$where[] = "m.value_id='$meta_v'";
 	}
-	
-	/**
-	 * Is page owner a group - convenience function
-	 * 
-	 * @return true/false
-	 */
-	function tp_is_group_page() {
-		
-		if ($group = page_owner_entity()) {
-			if ($group instanceof ElggGroup)
-				return true;
+
+	if ($sum != "count")
+		$where[] = "a.value_type='integer'"; // Limit on integer types
+
+	if (!$count) {
+		$query = "SELECT distinct e.*, $sum(ms.string) as sum ";
+	} else {
+		$query = "SELECT count(distinct e.guid) as num, $sum(ms.string) as sum ";
+	}
+	$query .= " from {$CONFIG->dbprefix}entities e JOIN {$CONFIG->dbprefix}annotations a on a.entity_guid = e.guid JOIN {$CONFIG->dbprefix}metastrings ms on a.value_id=ms.id ";
+
+	if (!empty($mdname) && !empty($mdvalue)) {
+		$query .= " JOIN {$CONFIG->dbprefix}metadata m on m.entity_guid = e.guid ";
+	}
+
+	$query .= " WHERE ";
+	foreach ($where as $w)
+		$query .= " $w and ";
+	$query .= get_access_sql_suffix("a"); // now add access
+	$query .= ' and ' . get_access_sql_suffix("e"); // now add access
+	if (!$count) $query .= ' group by e.guid';
+
+	if (!$count) {
+		$query .= ' order by sum ' . $orderdir;
+		$query .= ' limit ' . $offset . ' , ' . $limit;
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($row = get_data_row($query)) {
+			return $row->num;
 		}
-		
-		return false;
 	}
-	
-	
-	/**
-	 * Is the request from a known browser
-	 * 
-	 * @return true/false
-	 */
-	function tp_is_person()
-	{
-		$known = array('msie', 'mozilla', 'firefox', 'safari', 'webkit', 'opera', 'netscape', 'konqueror', 'gecko');
-		
-		$agent = strtolower($_SERVER['HTTP_USER_AGENT']);
-		
-		foreach ($known as $browser)
-		{
-			if (strpos($agent, $browser) !== false) {
-				return true;
-			}
+	return false;
+}
+
+/**
+ * Is page owner a group - convenience function
+ *
+ * @return true/false
+ */
+function tp_is_group_page() {
+
+	if ($group = page_owner_entity()) {
+		if ($group instanceof ElggGroup)
+			return true;
+	}
+
+	return false;
+}
+
+
+/**
+ * Is the request from a known browser
+ *
+ * @return true/false
+ */
+function tp_is_person() {
+	$known = array('msie', 'mozilla', 'firefox', 'safari', 'webkit', 'opera', 'netscape', 'konqueror', 'gecko');
+
+	$agent = strtolower($_SERVER['HTTP_USER_AGENT']);
+
+	foreach ($known as $browser) {
+		if (strpos($agent, $browser) !== false) {
+			return true;
 		}
-		
-		return false;
 	}
-?>
\ No newline at end of file
+
+	return false;
+}
diff --git a/lib/watermark.php b/lib/watermark.php
index c7b8503c5..6b16f0e4a 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -1,132 +1,175 @@
 name, $text);
 	$text = str_replace("%sitename%", $CONFIG->sitename, $text);
-	
+
 	return $text;
 }
 
+/**
+ * Create the watermark image filename
+ *
+ * @param string $text
+ * @param ElggUser $owner
+ * @return string
+ */
 function tp_get_watermark_filename($text, $owner) {
-	global $CONFIG;
 
 	$base = strtolower($text);
 	$base = preg_replace("/[^\w-]+/", "-", $base);
 	$base = trim($base, '-');
-	
+
 	$filename = tp_get_img_dir();
 	$filename .= strtolower($owner->username . "_" . $base . "_stamp");
-	
+
 	return $filename;
 }
 
+/**
+ * Use GD to apply watermark to image
+ *
+ * @param resource $image GD image resource
+ */
 function tp_gd_watermark($image) {
+	global $CONFIG;
+	
 	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
-	if (!$watermark_text)
+	if (!$watermark_text) {
 		return;
-	
+	}
+
 	// plugins can do their own watermark and return false to prevent this function from running
-	if (trigger_plugin_hook('tp_watermark', 'gd', $image, true) === false)
+	if (trigger_plugin_hook('tp_watermark', 'gd', $image, true) === false) {
 		return;
-	
-	global $CONFIG;
-		
+	}
+
 	$owner = get_loggedin_user();
 
 	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
-		
+
 	// transparent gray
 	imagealphablending($image, true);
 	$textcolor = imagecolorallocatealpha($image, 50, 50, 50, 60);
-	
+
 	// font and location
-	$font = $CONFIG->pluginspath . "tidypics/fonts/LiberationSerif-Regular.ttf"; 
+	$font = $CONFIG->pluginspath . "tidypics/fonts/LiberationSerif-Regular.ttf";
 	$bbox = imagettfbbox(20, 0, $font, $watermark_text);
-	
+
 	$text_width = $bbox[2] - $bbox[0];
 	$text_height = $bbox[1] - $bbox[7];
-	
+
 	$image_width = imagesx($image);
 	$image_height = imagesy($image);
-	
+
 	$left = $image_width / 2 - $text_width / 2;
 	$top = $image_height - 20;
-	
+
 	// write the text on the image
 	imagettftext($image, 20, 0, $left, $top, $textcolor, $font, $watermark_text);
 }
 
+/**
+ * imagick watermarking
+ *
+ * @param string $filename
+ * @return bool
+ */
 function tp_imagick_watermark($filename) {
 
 	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
-	if (!$watermark_text)
-		return;
-	
+	if (!$watermark_text) {
+		return false;
+	}
+
 	// plugins can do their own watermark and return false to prevent this function from running
-	if (trigger_plugin_hook('tp_watermark', 'imagick', $filename, true) === false)
-		return;
-	
+	if (trigger_plugin_hook('tp_watermark', 'imagick', $filename, true) === false) {
+		return true;
+	}
+
 	$owner = get_loggedin_user();
 
 	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
-	
-    $img = new Imagick($filename);
 
-    $img->readImage($image);
+	$img = new Imagick($filename);
+
+	$img->readImage($image);
 
-    $draw = new ImagickDraw();
+	$draw = new ImagickDraw();
 
-    //$draw->setFont("");
+	//$draw->setFont("");
 
-    $draw->setFontSize(28);
+	$draw->setFontSize(28);
 
-    $draw->setFillOpacity(0.5);
+	$draw->setFillOpacity(0.5);
 
-    $draw->setGravity(Imagick::GRAVITY_SOUTH);
+	$draw->setGravity(Imagick::GRAVITY_SOUTH);
+
+	$img->annotateImage($draw, 0, 0, 0, $watermark_text);
 
-    $img->annotateImage($draw, 0, 0, 0, $watermark_text);
-    	
 	if ($img->writeImage($filename) != true) {
 		$img->destroy();
 		return false;
 	}
-	
+
 	$img->destroy();
-	
+
 	return true;
 }
 
+/**
+ * ImageMagick watermarking
+ *
+ * @param string $filename
+ */
 function tp_im_cmdline_watermark($filename) {
-	
+
 	$watermark_text = get_plugin_setting('watermark_text', 'tidypics');
-	if (!$watermark_text)
+	if (!$watermark_text) {
 		return;
-	
+	}
+
 	// plugins can do their own watermark and return false to prevent this function from running
-	if (trigger_plugin_hook('tp_watermark', 'imagemagick', $filename, true) === false)
+	if (trigger_plugin_hook('tp_watermark', 'imagemagick', $filename, true) === false) {
 		return;
-	
+	}
+
 	$im_path = get_plugin_setting('im_path', 'tidypics');
 	if (!$im_path) {
 		$im_path = "/usr/bin/";
 	}
-	
+
 	// make sure end of path is /
-	if (substr($im_path, strlen($im_path)-1, 1) != "/") $im_path .= "/";
+	if (substr($im_path, strlen($im_path)-1, 1) != "/") {
+		$im_path .= "/";
+	}
+
 
-	
 	$owner = get_loggedin_user();
 
 	$watermark_text = tp_process_watermark_text($watermark_text, $owner);
-	
+
 	$ext = ".png";
-	
+
 	$user_stamp_base = tp_get_watermark_filename($watermark_text, $owner);
-	
-	
-	if ( !file_exists( $user_stamp_base . $ext )) { //create the watermark if it doesn't exist
+
+
+	if ( !file_exists( $user_stamp_base . $ext )) {
+		//create the watermark image if it doesn't exist
 		$commands = array();
 		$commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70  text 0,0  \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"';
 		$commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white  text  1,1  \''. $watermark_text . '\' text  0,0  \''. $watermark_text . '\' fill black  text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext;
@@ -134,12 +177,12 @@ function tp_im_cmdline_watermark($filename) {
 		$commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"';
 		$commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"';
 		$commands[] = 'rm "' . $user_stamp_base . '_fgnd' . $ext . '"';
-		
+
 		foreach( $commands as $command ) {
 			exec( $command );
 		}
 	}
-	
+
 	//apply the watermark
 	$commands = array();
 	$commands[] = $im_path . 'composite -gravity south -geometry +0+10 "' . $user_stamp_base . $ext . '" "' . $filename . '" "' . $filename . '_watermarked"';
@@ -148,4 +191,3 @@ function tp_im_cmdline_watermark($filename) {
 		exec( $command );
 	}
 }
-?>
\ No newline at end of file
-- 
cgit v1.2.3


From f99dbd38aeb0f4242592787ff5d113e03fc51eb3 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 1 May 2010 13:27:19 +0000
Subject: Fixed some bugs in resize library and centralized the resizing
 parameter calculation

---
 lib/resize.php | 297 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 158 insertions(+), 139 deletions(-)

diff --git a/lib/resize.php b/lib/resize.php
index 95db9db2b..1054cbb5b 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -47,6 +47,8 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
 	$file->thumbnail = $prefix."thumb".$filestorename;
 
 	// album thumbnail
+	global $CONFIG;
+	$CONFIG->debug = 'WARNING';
 	$thumb->setFilename($prefix."smallthumb".$filestorename);
 	$thumbname = $thumb->getFilenameOnFilestore();
 	$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
@@ -59,7 +61,7 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
 		return false;
 	}
 	$file->smallthumb = $prefix."smallthumb".$filestorename;
-
+	unset($CONFIG->debug);
 
 	// main image
 	$thumb->setFilename($prefix."largethumb".$filestorename);
@@ -97,36 +99,25 @@ function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheig
 
 	// Get the size information from the image
 	$imgsizearray = getimagesize($input_name);
-	if (!imgsizearray) {
-		return false;
+	if (!$imgsizearray) {
+		return FALSE;
 	}
 
-	// Get width and height
+	// Get width and height of image
 	$width = $imgsizearray[0];
 	$height = $imgsizearray[1];
-	$newwidth = $width;
-	$newheight = $height;
 
-	// Square the image dimensions if we're wanting a square image
-	if ($square) {
-		if ($width < $height) {
-			$height = $width;
-		} else {
-			$width = $height;
-		}
-
-		$newwidth = $width;
-		$newheight = $height;
-	}
-
-	if ($width > $maxwidth) {
-		$newheight = floor($height * ($maxwidth / $width));
-		$newwidth = $maxwidth;
-	}
-	if ($newheight > $maxheight) {
-		$newwidth = floor($newwidth * ($maxheight / $newheight));
-		$newheight = $maxheight;
+	$params = tp_im_calc_resize_params($width, $height, $maxwidth, $maxheight, $square, $x1, $y1, $x2, $y2);
+	if (!$params) {
+		return FALSE;
 	}
+	
+	$new_width = $params['new_width'];
+	$new_height = $params['new_height'];
+	$region_width = $params['region_width'];
+	$region_height = $params['region_height'];
+	$widthoffset = $params['width_offset'];
+	$heightoffset = $params['height_offset'];
 
 	$accepted_formats = array(
 			'image/jpeg' => 'jpeg',
@@ -149,41 +140,22 @@ function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheig
 	}
 
 	// allocate the new image
-	$newimage = imagecreatetruecolor($newwidth, $newheight);
+	$newimage = imagecreatetruecolor($new_width, $new_height);
 	if (!$newimage) {
 		return false;
 	}
 
-	// Crop the image if we need a square
-	if ($square) {
-		if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-			$widthoffset = floor(($imgsizearray[0] - $width) / 2);
-			$heightoffset = floor(($imgsizearray[1] - $height) / 2);
-		} else {
-			$widthoffset = $x1;
-			$heightoffset = $y1;
-			$width = ($x2 - $x1);
-			$height = $width;
-		}
-	} else {
-		if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-			$widthoffset = 0;
-			$heightoffset = 0;
-		} else {
-			$widthoffset = $x1;
-			$heightoffset = $y1;
-			$width = ($x2 - $x1);
-			$height = ($y2 - $y1);
-		}
-	}
-
-	if ($square) {
-		$newheight = $maxheight;
-		$newwidth = $maxwidth;
-	}
-
-	$rtn_code = imagecopyresampled($newimage, $oldimage, 0,0,$widthoffset,$heightoffset,$newwidth,$newheight,$width,$height);
-	if (!rtn_code) {
+	$rtn_code = imagecopyresampled(	$newimage,
+									$oldimage,
+									0,
+									0,
+									$widthoffset,
+									$heightoffset,
+									$new_width,
+									$new_height,
+									$region_width,
+									$region_height);
+	if (!$rtn_code) {
 		return $rtn_code;
 	}
 
@@ -467,98 +439,145 @@ function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight,
 
 
 	// Get the size information from the image
-	if ($imgsizearray = getimagesize($input_name)) {
-
-		// Get width and height
-		$width = $imgsizearray[0];
-		$height = $imgsizearray[1];
-		$newwidth = $width;
-		$newheight = $height;
-
-		// Square the image dimensions if we're wanting a square image
-		if ($square) {
-			if ($width < $height) {
-				$height = $width;
-			} else {
-				$width = $height;
-			}
+	$imgsizearray = getimagesize($input_name);
+	if (!$imgsizearray) {
+		return FALSE;
+	}
+
+	// Get width and height
+	$orig_width = $imgsizearray[0];
+	$orig_height = $imgsizearray[1];
+
+	$params = tp_im_calc_resize_params($orig_width, $orig_height, $maxwidth, $maxheight, $square, $x1, $y1, $x2, $y2);
+	if (!$params) {
+		return FALSE;
+	}
+
+	$newwidth = $params['new_width'];
+	$newheight = $params['new_height'];
+	
+	$accepted_formats = array(
+			'image/jpeg' => 'jpeg',
+			'image/pjpeg' => 'jpeg',
+			'image/png' => 'png',
+			'image/x-png' => 'png',
+			'image/gif' => 'gif'
+	);
 
-			$newwidth = $width;
-			$newheight = $height;
+	// If it's a file we can manipulate ...
+	if (!array_key_exists($imgsizearray['mime'],$accepted_formats)) {
+		return FALSE;
+	}
+
+	$im_path = get_plugin_setting('im_path', 'tidypics');
+	if (!$im_path) {
+		$im_path = "/usr/bin/";
+	}
+	if (substr($im_path, strlen($im_path)-1, 1) != "/") {
+		$im_path .= "/";
+	}
+
+	// see imagemagick web site for explanation of these parameters
+	// the ^ in the resize means those are minimum width and height values
+	$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
+	$output = array();
+	$ret = 0;
+	exec($command, $output, $ret);
+	if ($ret == 127) {
+		trigger_error('Tidypics warning: Image Magick convert is not found', E_USER_WARNING);
+		return FALSE;
+	} else if ($ret > 0) {
+		trigger_error('Tidypics warning: Image Magick convert failed', E_USER_WARNING);
+		return FALSE;
+	}
+	
+	return TRUE;
+}
+
+/**
+ * Calculate the resizing/cropping parameters
+ *
+ * @param int $orig_width
+ * @param int $orig_height
+ * @param int $new_width
+ * @param int $new_height
+ * @param bool $square
+ * @param int $x1
+ * @param int $y1
+ * @param int $x2
+ * @param int $y2
+ * @return array|false
+ */
+function tp_im_calc_resize_params($orig_width, $orig_height, $new_width, $new_height, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+	// crop image first?
+	$crop = TRUE;
+	if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 == 0) {
+		$crop = FALSE;
+	}
 
+	// how large a section of the image has been selected
+	if ($crop) {
+		$region_width = $x2 - $x1;
+		$region_height = $y2 - $y1;
+	} else {
+		// everything selected if no crop parameters
+		$region_width = $orig_width;
+		$region_height = $orig_height;
+	}
+
+	// determine cropping offsets
+	if ($square) {
+		// asking for a square image back
+
+		// detect case where someone is passing crop parameters that are not for a square
+		if ($crop == TRUE && $region_width != $region_height) {
+			return FALSE;
 		}
 
-		if ($width > $maxwidth) {
-			$newheight = floor($height * ($maxwidth / $width));
-			$newwidth = $maxwidth;
+		// size of the new square image
+		$new_width = $new_height = min($new_width, $new_height);
+
+		// find largest square that fits within the selected region
+		$region_width = $region_height = min($region_width, $region_height);
+
+		// set offsets for crop
+		if ($crop) {
+			$widthoffset = $x1;
+			$heightoffset = $y1;
+			$orig_width = $x2 - $x1;
+			$orig_height = $orig_width;
+		} else {
+			// place square region in the center
+			$widthoffset = floor(($orig_width - $region_width) / 2);
+			$heightoffset = floor(($orig_height - $region_height) / 2);
 		}
-		if ($newheight > $maxheight) {
-			$newwidth = floor($newwidth * ($maxheight / $newheight));
-			$newheight = $maxheight;
+	} else {
+		// non-square new image
+
+		// maintain aspect ratio of original image/crop
+		if (($region_height / (float)$new_height) > ($region_width / (float)$new_width)) {
+			$new_width = floor($new_height * $region_width / (float)$region_height);
+		} else {
+			$new_height = floor($new_width * $region_height / (float)$region_width);
 		}
 
-		$accepted_formats = array(
-				'image/jpeg' => 'jpeg',
-				'image/pjpeg' => 'jpeg',
-				'image/png' => 'png',
-				'image/x-png' => 'png',
-				'image/gif' => 'gif'
-		);
-		// If it's a file we can manipulate ...
-		if (array_key_exists($imgsizearray['mime'],$accepted_formats)) {
-
-			// Crop the image if we need a square
-			if ($square) {
-				if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-					$widthoffset = floor(($imgsizearray[0] - $width) / 2);
-					$heightoffset = floor(($imgsizearray[1] - $height) / 2);
-				} else {
-					$widthoffset = $x1;
-					$heightoffset = $y1;
-					$width = ($x2 - $x1);
-					$height = $width;
-				}
-			} else {
-				if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-					$widthoffset = 0;
-					$heightoffset = 0;
-				} else {
-					$widthoffset = $x1;
-					$heightoffset = $y1;
-					$width = ($x2 - $x1);
-					$height = ($y2 - $y1);
-				}
-			}
+		// by default, use entire image
+		$widthoffset = 0;
+		$heightoffset = 0;
 
-			// Resize and return the image contents!
-			if ($square) {
-				$newheight = $maxheight;
-				$newwidth = $maxwidth;
-			}
-			$im_path = get_plugin_setting('im_path', 'tidypics');
-			if (!$im_path) {
-				$im_path = "/usr/bin/";
-			}
-			if (substr($im_path, strlen($im_path)-1, 1) != "/") {
-				$im_path .= "/";
-			}
-			// see imagemagick web site for explanation of these parameters
-			// the ^ in the resize means those are minimum width and height values
-			$command = $im_path . "convert \"$input_name\" -resize ".$newwidth."x".$newheight."^ -gravity center -extent ".$newwidth."x".$newheight." \"$output_name\"";
-			$output = array();
-			$ret = 0;
-			exec($command, $output, $ret);
-			if ($ret == 127) {
-				trigger_error('Tidypics warning: Image Magick convert is not found', E_USER_WARNING);
-				return false;
-			} else if ($ret > 0) {
-				trigger_error('Tidypics warning: Image Magick convert failed', E_USER_WARNING);
-				return false;
-			}
-			return true;
+		if ($crop) {
+			$widthoffset = $x1;
+			$heightoffset = $y1;
 		}
 	}
 
-	return false;
-}
+	$resize_params = array();
+	$resize_params['new_width'] = $new_width;
+	$resize_params['new_height'] = $new_height;
+	$resize_params['region_width'] = $region_width;
+	$resize_params['region_height'] = $region_height;
+	$resize_params['width_offset'] = $widthoffset;
+	$resize_params['height_offset'] = $heightoffset;
 
+	return $resize_params;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 8e5a221350d2fb1425ce76387d0ff1b4e9122dd9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 1 May 2010 18:49:30 +0000
Subject: pulled out size calculations for imagick also

---
 lib/resize.php | 84 +++++++++++++---------------------------------------------
 1 file changed, 19 insertions(+), 65 deletions(-)

diff --git a/lib/resize.php b/lib/resize.php
index 1054cbb5b..b0cfb8de3 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -269,91 +269,45 @@ function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $sq
 	// Get the size information from the image
 	$imgsizearray = getimagesize($input_name);
 	if (!$imgsizearray) {
-		return false;
+		return FALSE;
 	}
 
 	// Get width and height
 	$width = $imgsizearray[0];
 	$height = $imgsizearray[1];
-	$newwidth = $width;
-	$newheight = $height;
-
-	// initial guess at final dimensions for new image (doesn't check for squareness yet
-	if ($newwidth > $maxwidth) {
-		$newheight = floor($newheight * ($maxwidth / $newwidth));
-		$newwidth = $maxwidth;
-	}
-	if ($newheight > $maxheight) {
-		$newwidth = floor($newwidth * ($maxheight / $newheight));
-		$newheight = $maxheight;
-	}
-
-	// Handle squareness for both original and new image
-	if ($square) {
-		if ($width < $height) {
-			$height = $width;
-		} else {
-			$width = $height;
-		}
-
-		if ($maxheight == $maxwidth) {
-			// if input arguments = square, no need to use above calculations (which can have round-off errors)
-			$newwidth = $maxwidth;
-			$newheight = $maxheight;
-		} else {
-			if ($newwidth < $newheight) {
-				$newheight = $newwidth;
-			} else {
-				$newwidth = $newheight;
-			}
-		}
-	}
-
-
-	// Crop the original image - this needs to be checked over
-	if ($square) {
-		if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-			$xoffset = floor(($imgsizearray[0] - $width) / 2);
-			$yoffset = floor(($imgsizearray[1] - $height) / 2);
-		} else { // assume we're being passed good croping coordinates
-			$xoffset = $x1;
-			$yoffset = $y1;
-			$width = ($x2 - $x1);
-			$height = $width;
-		}
-	} else {
-		if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 ==0) {
-			$xoffset = 0;
-			$yoffset = 0;
-		} else {
-			$xoffset = $x1;
-			$yoffset = $y1;
-			$width = ($x2 - $x1);
-			$height = ($y2 - $y1);
-		}
+	
+	$params = tp_im_calc_resize_params($width, $height, $maxwidth, $maxheight, $square, $x1, $y1, $x2, $y2);
+	if (!$params) {
+		return FALSE;
 	}
-
+	
+	$new_width = $params['new_width'];
+	$new_height = $params['new_height'];
+	$region_width = $params['region_width'];
+	$region_height = $params['region_height'];
+	$widthoffset = $params['width_offset'];
+	$heightoffset = $params['height_offset'];
 
 	try {
 		$img = new Imagick($input_name);
 	} catch (ImagickException $e) {
-		return false;
+		return FALSE;
 	}
 
-	$img->cropImage($width, $height, $xoffset, $yoffset);
+	$img->cropImage($region_width, $region_height, $widthoffset, $heightoffset);
 
 	// use the default IM filter (windowing filter), I think 1 means default blurring or number of lobes
-	$img->resizeImage($newwidth, $newheight, imagick::FILTER_LANCZOS, 1);
-	$img->setImagePage($newwidth, $newheight, 0, 0);
+	$img->resizeImage($new_width, $new_height, imagick::FILTER_LANCZOS, 1);
+	$img->setImagePage($new_width, $new_height, 0, 0);
 
-	if ($img->writeImage($output_name) != true) {
+	if ($img->writeImage($output_name) != TRUE) {
 		$img->destroy();
-		return false;
+		return FALSE;
 	}
 
 	$img->destroy();
 
-	return true;
+	return TRUE;
 }
 
 /**
-- 
cgit v1.2.3


From 994774afb56e3474b84a15c16f8e36b7f0457fcb Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 1 May 2010 19:24:58 +0000
Subject: Users cannot change the 2 smallest thumbnails from square now - less
 confusing interface

---
 actions/settings.php                      |  6 ++-
 contributions.txt                         |  7 ++-
 languages/en.php                          | 10 +++-
 lib/resize.php                            | 88 +++++++++++++++----------------
 views/default/tidypics/forms/settings.php | 18 +++++--
 5 files changed, 75 insertions(+), 54 deletions(-)

diff --git a/actions/settings.php b/actions/settings.php
index e16e7960e..a4f102b89 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -57,9 +57,11 @@
 	$image_sizes['large_image_width'] = get_input('large_thumb_width');
 	$image_sizes['large_image_height'] = get_input('large_thumb_height');
 	$image_sizes['small_image_width'] = get_input('small_thumb_width');
-	$image_sizes['small_image_height'] = get_input('small_thumb_height');
+	//$image_sizes['small_image_height'] = get_input('small_thumb_height');
+	$image_sizes['small_image_height'] = get_input('small_thumb_width');
 	$image_sizes['thumb_image_width'] = get_input('thumb_width');
-	$image_sizes['thumb_image_height'] = get_input('thumb_height');
+	//$image_sizes['thumb_image_height'] = get_input('thumb_height');
+	$image_sizes['thumb_image_height'] = get_input('thumb_width');
 	set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics');
 
 
diff --git a/contributions.txt b/contributions.txt
index 2e09ca1cf..3cea54bd9 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,4 +1,4 @@
-See individual change logs for contributors to those builds
+Changelog and contributors list
 
 
 ------------------------------------------------------------------------
@@ -8,9 +8,14 @@ Release Date: 05/01/2010
 BEGIN VERSION 1.6.8 CHANGES
 ------------------------------------------------------------------------
  * New language strings: tidypics:nophotosingroup, tidypics:baduploadform
+                         tidypics:settings:heading:img_lib, tidypics:settings:heading:main,
+						 tidypics:settings:heading:river, tidypics:settings:heading:sizes,
+						 tidypics:settings:heading:groups
  * Fixed bug in titles of albums RSS
  * Added a new css element: tidypics_line_break
  * Fixed layout of album covers due to long titles or other text
+ * Fixed some bugs with image resizing when images are wide and short
+ * Improved interface of admin settings
 ------------------------------------------------------------------------
 END VERSION 1.6.8 CHANGES
 ------------------------------------------------------------------------
diff --git a/languages/en.php b/languages/en.php
index 30cef2db4..934c8ae5a 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -75,14 +75,20 @@
 			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
 			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
-			'tidypics:settings:watermark' => "Enter text to appear in the watermark - not for production sites yet",
+			'tidypics:settings:watermark' => "Enter text to appear in the watermark",
 			'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands (with trailing slash)",
-			'tidypics:settings:img_river_view' => "How many entries in river for each batch of uploaded images",
+			'tidypics:settings:img_river_view' => "How many entries in activity river for each batch of uploaded images",
 			'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album",
 			'tidypics:settings:largesize' => "Primary image size",
 			'tidypics:settings:smallsize' => "Album view image size",
 			'tidypics:settings:thumbsize' => "Thumbnail image size",
 			'tidypics:settings:im_id' => "Image ID",
+
+			'tidypics:settings:heading:img_lib' => "Image Library Settings",
+			'tidypics:settings:heading:main' => "Major Settings",
+			'tidypics:settings:heading:river' => "Activity Integration Options",
+			'tidypics:settings:heading:sizes' => "Thumbnail Size",
+			'tidypics:settings:heading:groups' => "Group Settings",
 	
 		//actions
 
diff --git a/lib/resize.php b/lib/resize.php
index b0cfb8de3..857d0ba1c 100644
--- a/lib/resize.php
+++ b/lib/resize.php
@@ -14,7 +14,7 @@ include dirname(__FILE__) . "/watermark.php";
  * @param ElggFile holds the image that was uploaded
  * @param string   folder to store thumbnail in
  * @param string   name of the thumbnail
- * @return bool    true on success
+ * @return bool    TRUE on success
  */
 function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
 	global $CONFIG;
@@ -24,7 +24,7 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
 		// move this out of library
 		register_error(elgg_echo('tidypics:nosettings'));
 		forward($_SERVER['HTTP_REFERER']);
-		return false;
+		return FALSE;
 	}
 	$image_sizes = unserialize($image_sizes);
 
@@ -37,12 +37,12 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
 	$thumbname = $thumb->getFilenameOnFilestore();
 	$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
 								$thumbname,
-								false,
+								FALSE,
 								$image_sizes['thumb_image_width'],
 								$image_sizes['thumb_image_height'],
-								true);
+								TRUE);
 	if (!$rtn_code) {
-		return false;
+		return FALSE;
 	}
 	$file->thumbnail = $prefix."thumb".$filestorename;
 
@@ -53,12 +53,12 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
 	$thumbname = $thumb->getFilenameOnFilestore();
 	$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
 								$thumbname,
-								false,
+								FALSE,
 								$image_sizes['small_image_width'],
 								$image_sizes['small_image_height'],
-								true);
+								TRUE);
 	if (!$rtn_code) {
-		return false;
+		return FALSE;
 	}
 	$file->smallthumb = $prefix."smallthumb".$filestorename;
 	unset($CONFIG->debug);
@@ -68,19 +68,19 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
 	$thumbname = $thumb->getFilenameOnFilestore();
 	$rtn_code = tp_gd_resize(	$file->getFilenameOnFilestore(),
 								$thumbname,
-								true,
+								TRUE,
 								$image_sizes['large_image_width'],
 								$image_sizes['large_image_height'],
-								false);
+								FALSE);
 	if (!$rtn_code) {
-		return false;
+		return FALSE;
 	}
 	$file->largethumb = $prefix."largethumb".$filestorename;
 
 
 	unset($thumb);
 
-	return true;
+	return TRUE;
 }
 
 /**
@@ -92,10 +92,10 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) {
  * @param bool - watermark this image?
  * @param int $maxwidth The maximum width of the resized image
  * @param int $maxheight The maximum height of the resized image
- * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
- * @return bool true on success or false on failure
+ * @param TRUE|FALSE $square If set to TRUE, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+ * @return bool TRUE on success or FALSE on failure
  */
-function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheight, $square = FALSE, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 
 	// Get the size information from the image
 	$imgsizearray = getimagesize($input_name);
@@ -130,19 +130,19 @@ function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheig
 	// make sure the function is available
 	$function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']];
 	if (!is_callable($function)) {
-		return false;
+		return FALSE;
 	}
 
 	// load old image
 	$oldimage = $function($input_name);
 	if (!$oldimage) {
-		return false;
+		return FALSE;
 	}
 
 	// allocate the new image
 	$newimage = imagecreatetruecolor($new_width, $new_height);
 	if (!$newimage) {
-		return false;
+		return FALSE;
 	}
 
 	$rtn_code = imagecopyresampled(	$newimage,
@@ -190,13 +190,13 @@ function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheig
  * @param ElggFile holds the image that was uploaded
  * @param string   folder to store thumbnail in
  * @param string   name of the thumbnail
- * @return bool    true on success
+ * @return bool    TRUE on success
  */
 function tp_create_imagick_thumbnails($file, $prefix, $filestorename) {
 	$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
 	if (!$image_sizes) {
 		register_error(elgg_echo('tidypics:nosettings'));
-		return false;
+		return FALSE;
 	}
 	$image_sizes = unserialize($image_sizes);
 
@@ -211,9 +211,9 @@ function tp_create_imagick_thumbnails($file, $prefix, $filestorename) {
 									$thumbname,
 									$image_sizes['thumb_image_width'],
 									$image_sizes['thumb_image_height'],
-									true);
+									TRUE);
 	if (!$rtn_code) {
-		return false;
+		return FALSE;
 	}
 	$file->thumbnail = $prefix."thumb".$filestorename;
 
@@ -224,9 +224,9 @@ function tp_create_imagick_thumbnails($file, $prefix, $filestorename) {
 									$thumbname,
 									$image_sizes['small_image_width'],
 									$image_sizes['small_image_height'],
-									true);
+									TRUE);
 	if (!$rtn_code) {
-		return false;
+		return FALSE;
 	}
 	$file->smallthumb = $prefix."smallthumb".$filestorename;
 
@@ -237,9 +237,9 @@ function tp_create_imagick_thumbnails($file, $prefix, $filestorename) {
 									$thumbname,
 									$image_sizes['large_image_width'],
 									$image_sizes['large_image_height'],
-									false);
+									FALSE);
 	if (!$rtn_code) {
-		return false;
+		return FALSE;
 	}
 	$file->largethumb = $prefix."largethumb".$filestorename;
 
@@ -247,7 +247,7 @@ function tp_create_imagick_thumbnails($file, $prefix, $filestorename) {
 
 	unset($thumb);
 
-	return true;
+	return TRUE;
 }
 
 
@@ -261,10 +261,10 @@ function tp_create_imagick_thumbnails($file, $prefix, $filestorename) {
  * @param string $output_name The name of the file to be written
  * @param int $maxwidth The maximum width of the resized image
  * @param int $maxheight The maximum height of the resized image
- * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
- * @return bool true on success
+ * @param TRUE|FALSE $square If set to TRUE, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+ * @return bool TRUE on success
  */
-function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $square = FALSE, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 
 	// Get the size information from the image
 	$imgsizearray = getimagesize($input_name);
@@ -316,13 +316,13 @@ function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $sq
  * @param ElggFile holds the image that was uploaded
  * @param string   folder to store thumbnail in
  * @param string   name of the thumbnail
- * @return bool    true on success
+ * @return bool    TRUE on success
  */
 function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) {
 	$image_sizes = get_plugin_setting('image_sizes', 'tidypics');
 	if (!$image_sizes) {
 		register_error(elgg_echo('tidypics:nosettings'));
-		return false;
+		return FALSE;
 	}
 	$image_sizes = unserialize($image_sizes);
 
@@ -337,9 +337,9 @@ function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) {
 										$thumbname,
 										$image_sizes['thumb_image_width'],
 										$image_sizes['thumb_image_height'],
-										true);
+										TRUE);
 	if (!$rtn_code) {
-		return false;
+		return FALSE;
 	}
 	$file->thumbnail = $prefix."thumb".$filestorename;
 
@@ -351,9 +351,9 @@ function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) {
 										$thumbname,
 										$image_sizes['small_image_width'],
 										$image_sizes['small_image_height'],
-										true);
+										TRUE);
 	if (!$rtn_code) {
-		return false;
+		return FALSE;
 	}
 	$file->smallthumb = $prefix."smallthumb".$filestorename;
 
@@ -364,9 +364,9 @@ function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) {
 										$thumbname,
 										$image_sizes['large_image_width'],
 										$image_sizes['large_image_height'],
-										false);
+										FALSE);
 	if (!$rtn_code) {
-		return false;
+		return FALSE;
 	}
 	$file->largethumb = $prefix."largethumb".$filestorename;
 
@@ -375,21 +375,21 @@ function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) {
 
 	unset($thumb);
 
-	return true;
+	return TRUE;
 }
 
 /**
  * Gets the jpeg contents of the resized version of an already uploaded image
- * (Returns false if the uploaded file was not an image)
+ * (Returns FALSE if the uploaded file was not an image)
  *
  * @param string $input_name The name of the file input field on the submission form
  * @param string $output_name The name of the file to be written
  * @param int $maxwidth The maximum width of the resized image
  * @param int $maxheight The maximum height of the resized image
- * @param true|false $square If set to true, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
+ * @param TRUE|FALSE $square If set to TRUE, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped.
  * @return bool
  */
-function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, $square = FALSE, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 
 
 	// Get the size information from the image
@@ -460,9 +460,9 @@ function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight,
  * @param int $y1
  * @param int $x2
  * @param int $y2
- * @return array|false
+ * @return array|FALSE
  */
-function tp_im_calc_resize_params($orig_width, $orig_height, $new_width, $new_height, $square = false, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
+function tp_im_calc_resize_params($orig_width, $orig_height, $new_width, $new_height, $square = FALSE, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) {
 	// crop image first?
 	$crop = TRUE;
 	if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 == 0) {
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index 6cfed661f..21b85b83f 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -26,9 +26,10 @@
 
 
 	// Image Library
+	$form_body = '
      ' . elgg_echo('tidypics:settings:heading:img_lib') . '
      ';
 	$image_lib = $plugin->image_lib;
 	if (!$image_lib) $image_lib = 'GD';
-	$form_body = '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
 	$form_body .= elgg_view('input/pulldown', array(
 					'internalname' => 'params[image_lib]',
 					'options_values' => $img_lib_options,
@@ -45,6 +46,7 @@
 	}
 
 	// Tagging
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:main') . '
      ';
 	$tagging = $plugin->tagging;
 	if(!$tagging) $tagging = "enabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
@@ -86,6 +88,7 @@
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
 
 	// River Image options
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:river') . '
      ';
 	$img_river_view = $plugin->img_river_view;
 	if (!$img_river_view) $img_river_view = '1';
 	$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view');
@@ -115,6 +118,8 @@
 	$form_body .= '
      ';
 
 	// Thumbnail sizes
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:sizes') . '
      ';
+	$form_body .= "
      You must edit the css if you change the default sizes
      ";
 	$image_sizes = $plugin->image_sizes;
 	if(!$image_sizes) {
 		$image_sizes = array(); // set default values 
@@ -127,15 +132,18 @@
 	$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
 	$form_body .= 'width:    ';
 	$form_body .= 'height: 
      ';
+
 	$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
-	$form_body .= 'width:    ';
-	$form_body .= 'height: 
      ';
+	$form_body .= 'width and height:    ';
+	//$form_body .= 'height: 
      ';
+
 	$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
-	$form_body .= 'width:    ';
-	$form_body .= 'height: 
      ';
+	$form_body .= 'width and height:    ';
+	//$form_body .= 'height: 
      ';
 
 
 	// Group permission override
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:groups') . '
      ';
 	$grp_perm_override = $plugin->grp_perm_override;
 	if(!$grp_perm_override) $grp_perm_override = "enabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
-- 
cgit v1.2.3


From 76d0f767eb42cb2c4bf20b5db63c6722c64fa28c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 1 May 2010 19:35:28 +0000
Subject: switched order of image library and main settings on the admin
 settings page

---
 views/default/tidypics/forms/settings.php | 63 +++++++++++++++++--------------
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index 21b85b83f..0729b536b 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -15,38 +15,11 @@
 		set_plugin_setting('version', 1.62, 'tidypics');
 	}
 	
-	if (extension_loaded('imagick'))
-		$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
-		
-	$disablefunc = explode(',', ini_get('disable_functions'));
-	if (is_callable('exec') && !in_array('exec',$disablefunc))
-		$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
 
-	$img_lib_options['GD'] = 'GD';
-
-
-	// Image Library
-	$form_body = '
      ' . elgg_echo('tidypics:settings:heading:img_lib') . '
      ';
-	$image_lib = $plugin->image_lib;
-	if (!$image_lib) $image_lib = 'GD';
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
-	$form_body .= elgg_view('input/pulldown', array(
-					'internalname' => 'params[image_lib]',
-					'options_values' => $img_lib_options,
-					'value' => $image_lib
-	));
-	$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
-
-	if (is_callable('exec') && !in_array('exec',$disablefunc)) {
-		// Image Magick Path
-		$im_path = $plugin->im_path;
-		if(!$im_path) $im_path = "/usr/bin/";
-		$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
-		$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
-	}
+	// Main settings
+	$form_body = '
      ' . elgg_echo('tidypics:settings:heading:main') . '
      ';
 
 	// Tagging
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:main') . '
      ';
 	$tagging = $plugin->tagging;
 	if(!$tagging) $tagging = "enabled";
 	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
@@ -87,6 +60,38 @@
 	$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
 
+	// Image Library
+	if (extension_loaded('imagick')) {
+		$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
+	}
+
+	$disablefunc = explode(',', ini_get('disable_functions'));
+	if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+		$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
+	}
+
+	$img_lib_options['GD'] = 'GD';
+
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:img_lib') . '
      ';
+	$image_lib = $plugin->image_lib;
+	if (!$image_lib) $image_lib = 'GD';
+	$form_body .= '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
+	$form_body .= elgg_view('input/pulldown', array(
+					'internalname' => 'params[image_lib]',
+					'options_values' => $img_lib_options,
+					'value' => $image_lib
+	));
+	$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
+
+	if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+		// Image Magick Path
+		$im_path = $plugin->im_path;
+		if(!$im_path) $im_path = "/usr/bin/";
+		$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
+		$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
+	}
+
+
 	// River Image options
 	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:river') . '
      ';
 	$img_river_view = $plugin->img_river_view;
-- 
cgit v1.2.3


From 4096298f0e0bcdaf8b3247305211d851e6eacdf6 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 1 May 2010 19:36:26 +0000
Subject: Tidypics 1.6.8

---
 manifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.xml b/manifest.xml
index 6def17f54..d630e9601 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
         
-        
+        
         
         
         
-- 
cgit v1.2.3


From 2c5882e91c3479d2e06b41e6c8d21be5fc8620b2 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 8 May 2010 11:47:15 +0000
Subject: Elgg now includes a decent RSS page shell so we don't need this

---
 views/rss/pageshells/pageshell.php | 46 --------------------------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 views/rss/pageshells/pageshell.php

diff --git a/views/rss/pageshells/pageshell.php b/views/rss/pageshells/pageshell.php
deleted file mode 100644
index 2dfc8917f..000000000
--- a/views/rss/pageshells/pageshell.php
+++ /dev/null
@@ -1,46 +0,0 @@
-\n";
-
-	
-	
-	// Set title
-		if (empty($vars['title'])) {
-			$title = $vars['config']->sitename;
-		} else if (empty($vars['config']->sitename)) {
-			$title = $vars['title'];
-		} else {
-			$title = $vars['config']->sitename . ": " . $vars['title'];
-		}
-		
-	// Remove RSS from URL
-		$url = str_replace('?view=rss','',full_url());
-		$url = str_replace('&view=rss','',full_url());
-
-?>
-
- >
-	
-		<![CDATA[<?php echo $title; ?>]]>
-		
-		
-		
-	
-
\ No newline at end of file
-- 
cgit v1.2.3


From 04f814d1de0d42ae0c6d7043a6f86a687ec981bc Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 8 May 2010 11:50:54 +0000
Subject: admin pages do not set page owner any more in Elgg

---
 pages/admin.php  | 1 -
 pages/upload.php | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/admin.php b/pages/admin.php
index 437d2f47c..d3e810351 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -11,7 +11,6 @@
 
 	admin_gatekeeper();
 	set_context('admin');
-	set_page_owner($_SESSION['guid']);
 	
 	$tab = isset($_GET['tab']) ? $_GET['tab'] : 'settings';
 
diff --git a/pages/upload.php b/pages/upload.php
index 84d237287..5c123537e 100644
--- a/pages/upload.php
+++ b/pages/upload.php
@@ -36,6 +36,8 @@
 	$area2 .= elgg_view_title($title);
 	
 	$area2 .= elgg_view("tidypics/forms/upload", array('album' => $album_guid ) );
+//	$area2 .= elgg_view("tidypics/forms/flash_upload", array('album' => $album_guid ) );
+
 	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 	
 	page_draw($title, $body);
-- 
cgit v1.2.3


From 2ed508ec1f416f31ccc058f160f78b7adf144f6c Mon Sep 17 00:00:00 2001
From: Nick Whitt 
Date: Mon, 24 May 2010 21:30:17 +0000
Subject: Updating plugin to use new administration links and canvas.

---
 pages/admin.php |  2 +-
 start.php       | 32 +++++++++++++-------------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/pages/admin.php b/pages/admin.php
index d3e810351..addff5b50 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -18,6 +18,6 @@
 	
 	$body .= elgg_view("tidypics/admin/tidypics", array('tab' => $tab));
 	
-	page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));
+	page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("administration", $body));
 
 ?>
\ No newline at end of file
diff --git a/start.php b/start.php
index 02f0c6414..c447c2a34 100644
--- a/start.php
+++ b/start.php
@@ -27,17 +27,17 @@
 		}
 				
 		// Extend CSS
-		extend_view('css', 'tidypics/css');
+		elgg_extend_view('css', 'tidypics/css');
 		
 		// Extend hover-over and profile menu
-		extend_view('profile/menu/links','tidypics/hover_menu');
+		elgg_extend_view('profile/menu/links','tidypics/hover_menu');
 		
 		//group view  ** psuedo widget view for group pages**
-		extend_view('groups/right_column','tidypics/groupprofile_albums');
+		elgg_extend_view('groups/right_column','tidypics/groupprofile_albums');
 		
 		// rss extensions
-		extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
-		extend_view('extensions/channel', 'extensions/tidypics/channel');
+		elgg_extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
+		elgg_extend_view('extensions/channel', 'extensions/tidypics/channel');
 		
 		// Register a page handler, so we can have nice URLs
 		register_page_handler('photos','tidypics_page_handler');
@@ -72,7 +72,13 @@
 		}
 		
 		// slideshow plugin hook
-		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');		
+		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
+		
+		elgg_add_submenu_item(array(
+			'text' => elgg_echo('tidypics:administration'),
+			'href' => "{$CONFIG->wwwroot}mod/tidypics/pages/admin.php",
+			'parent_id' => 'site',
+		), 'admin', 'default');
 	}
 	
 	/**
@@ -197,17 +203,6 @@
 		}
 		
 	}
-	
-	/**
-	 * Sets up tidypics admin menu. Triggered on pagesetup.
-	 */
-	function tidypics_adminmenu()
-	{
-		global $CONFIG;
-		if (get_context() == 'admin' && isadminloggedin()) {
-			add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "mod/tidypics/pages/admin.php");
-		}
-	}
 
 	/**
 	 * Sets up submenus for tidypics most viewed pages
@@ -416,7 +411,7 @@
 		$slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:location.href+'?view=rss'})";
 		
 		// add the slideshow javascript to the header
-		extend_view('metatags', 'tidypics/js/slideshow');
+		elgg_extend_view('metatags', 'tidypics/js/slideshow');
 		
 		return $slideshow_link;
 	}
@@ -429,7 +424,6 @@
 	// Make sure tidypics_init is called on initialisation
 	register_elgg_event_handler('init','system','tidypics_init');
 	register_elgg_event_handler('pagesetup','system','tidypics_submenus');
-	register_elgg_event_handler('pagesetup','system','tidypics_adminmenu');
 	
 	// Register actions
 	register_action("tidypics/settings", false, $CONFIG->pluginspath . "tidypics/actions/settings.php");
-- 
cgit v1.2.3


From 39eaa3450e32756944dcefc940f39fd1d4cb719d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 24 Jul 2010 20:30:52 +0000
Subject: undid the 1.8 changes that leaked into trunk

---
 pages/admin.php |  2 +-
 start.php       | 31 +++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/pages/admin.php b/pages/admin.php
index addff5b50..d3e810351 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -18,6 +18,6 @@
 	
 	$body .= elgg_view("tidypics/admin/tidypics", array('tab' => $tab));
 	
-	page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("administration", $body));
+	page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));
 
 ?>
\ No newline at end of file
diff --git a/start.php b/start.php
index c447c2a34..dc7debcd6 100644
--- a/start.php
+++ b/start.php
@@ -30,14 +30,14 @@
 		elgg_extend_view('css', 'tidypics/css');
 		
 		// Extend hover-over and profile menu
-		elgg_extend_view('profile/menu/links','tidypics/hover_menu');
+		extend_view('profile/menu/links','tidypics/hover_menu');
 		
 		//group view  ** psuedo widget view for group pages**
-		elgg_extend_view('groups/right_column','tidypics/groupprofile_albums');
+		extend_view('groups/right_column','tidypics/groupprofile_albums');
 		
 		// rss extensions
-		elgg_extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
-		elgg_extend_view('extensions/channel', 'extensions/tidypics/channel');
+		extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
+		extend_view('extensions/channel', 'extensions/tidypics/channel');
 		
 		// Register a page handler, so we can have nice URLs
 		register_page_handler('photos','tidypics_page_handler');
@@ -72,13 +72,7 @@
 		}
 		
 		// slideshow plugin hook
-		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
-		
-		elgg_add_submenu_item(array(
-			'text' => elgg_echo('tidypics:administration'),
-			'href' => "{$CONFIG->wwwroot}mod/tidypics/pages/admin.php",
-			'parent_id' => 'site',
-		), 'admin', 'default');
+		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');		
 	}
 	
 	/**
@@ -204,6 +198,18 @@
 		
 	}
 
+	/**
+	 * Sets up tidypics admin menu. Triggered on pagesetup.
+	 */
+	function tidypics_adminmenu()
+	{
+		global $CONFIG;
+
+		if (get_context() == 'admin' && isadminloggedin()) {
+			add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "mod/tidypics/pages/admin.php");
+		}
+	}
+
 	/**
 	 * Sets up submenus for tidypics most viewed pages
 	 */
@@ -411,7 +417,7 @@
 		$slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:location.href+'?view=rss'})";
 		
 		// add the slideshow javascript to the header
-		elgg_extend_view('metatags', 'tidypics/js/slideshow');
+		extend_view('metatags', 'tidypics/js/slideshow');
 		
 		return $slideshow_link;
 	}
@@ -424,6 +430,7 @@
 	// Make sure tidypics_init is called on initialisation
 	register_elgg_event_handler('init','system','tidypics_init');
 	register_elgg_event_handler('pagesetup','system','tidypics_submenus');
+	register_elgg_event_handler('pagesetup','system','tidypics_adminmenu');
 	
 	// Register actions
 	register_action("tidypics/settings", false, $CONFIG->pluginspath . "tidypics/actions/settings.php");
-- 
cgit v1.2.3


From c6e46b0d8d2707c542923ae5594fe5ae3c194eca Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 24 Jul 2010 20:35:04 +0000
Subject: added further instructions on Tidypics help for admin settings

---
 views/default/tidypics/admin/help.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/views/default/tidypics/admin/help.php b/views/default/tidypics/admin/help.php
index 7f871598c..b939a74a8 100644
--- a/views/default/tidypics/admin/help.php
+++ b/views/default/tidypics/admin/help.php
@@ -22,4 +22,11 @@ not see these warnings.
 
      
 Another possible cause is using ImageMagick when your server does not support it or specifying
 the wrong path to the ImageMagick executables.
+
      
+
      Unable to save settings
      
+
      If you are unable to settings, there are two possible causes. First,
+Apache can be configured to block pages that use file paths as Tidypics
+does when setting the location of the ImageMagick executable. In this case,
+leave that field blank. Second, there is some bad code in the Izaps video
+plugin that can prevent the settings from being saved. Try disabling that plugin.
 
      
\ No newline at end of file
-- 
cgit v1.2.3


From 83c4591aad6e7598a35a8ee358ef562f132d78b8 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 24 Jul 2010 20:41:19 +0000
Subject: added action token to upgrade link

---
 views/default/tidypics/admin/settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
index ff7d330e2..ce5652c16 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -5,6 +5,7 @@
 	global $CONFIG;  
 	$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
 	$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/actions/upgrade.php';
+	$upgrade_url = elgg_add_action_tokens_to_url($upgrade_url);
 	
 	$upgrade = false;
 	if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album'))
-- 
cgit v1.2.3


From 791ec4925346cb38ecca9a2f2574b012ab64a88a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 25 Jul 2010 00:37:23 +0000
Subject: fixed bug where uploader of image does not get link in river

---
 views/default/river/object/image/create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 2f1777f64..cd2351a2e 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -14,7 +14,7 @@
 	$album_link = "" . $album->title . "";
 	$image_link = "getURL() . "\">" . $title . "";
 	
-	$string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link);
+	$string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_link);
 		
 	$string .= "
      ";
 
-- 
cgit v1.2.3


From 73403645808a81425381f43c25e0ea2c92705312 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 25 Jul 2010 02:01:36 +0000
Subject: first go at brining tidypics up to code standards

---
 actions/addalbum.php                           | 128 ++--
 actions/addtag.php                             | 170 +++---
 actions/create_thumbnails.php                  | 115 ++--
 actions/delete.php                             | 211 ++++---
 actions/deletetag.php                          |  97 ++-
 actions/edit.php                               | 135 ++--
 actions/edit_multi.php                         | 113 ++--
 actions/flickrImportPhotoset.php               |   7 +-
 actions/flickrSetup.php                        |   2 -
 actions/imtest.php                             |  35 +-
 actions/settings.php                           | 135 ++--
 actions/upgrade.php                            |  55 +-
 contributions.txt                              |  12 +
 languages/en.php                               |   8 +-
 lib/flickr.php                                 |   2 -
 manifest.xml                                   |  14 +-
 mostvieweddashboard.php                        |  65 +-
 pages/admin.php                                |  24 +-
 pages/download.php                             |  96 ++-
 pages/edit.php                                 |  79 +--
 pages/edit_multiple.php                        |  72 +--
 pages/friends.php                              |  80 +--
 pages/lists/mostcommentedimages.php            |  63 +-
 pages/lists/mostrecentimages.php               | 102 ++--
 pages/lists/mostviewedimages.php               | 121 ++--
 pages/lists/recentlycommented.php              | 111 ++--
 pages/lists/recentlyviewed.php                 | 105 ++--
 pages/newalbum.php                             |  54 +-
 pages/ownedalbums.php                          | 102 ++--
 pages/server_analysis.php                      |  62 +-
 pages/tagged.php                               |  96 ++-
 pages/thumbnail.php                            | 146 ++---
 pages/upload.php                               |  82 +--
 pages/viewalbum.php                            | 114 ++--
 pages/viewimage.php                            | 104 ++--
 pages/world.php                                |  55 +-
 start.php                                      | 812 +++++++++++++------------
 thumbnail.php                                  | 148 ++---
 views/default/annotation/annotate.php          |  31 +-
 views/default/object/album.php                 | 192 +++---
 views/default/object/image.php                 | 295 +++++----
 views/default/river/object/album/create.php    |  65 +-
 views/default/river/object/image/create.php    |  38 +-
 views/default/river/object/image/tag.php       |  39 +-
 views/default/settings/tidypics/edit.php       |   6 +-
 views/default/tidypics/admin/imagelib.php      |  88 +--
 views/default/tidypics/admin/settings.php      |  36 +-
 views/default/tidypics/admin/stats.php         |  51 +-
 views/default/tidypics/admin/tidypics.php      |  58 +-
 views/default/tidypics/albums.php              |  74 +--
 views/default/tidypics/breadcrumbs.php         |  33 +-
 views/default/tidypics/exif.php                |  20 +-
 views/default/tidypics/forms/edit.php          | 145 +++--
 views/default/tidypics/forms/edit_multi.php    |  12 +-
 views/default/tidypics/forms/settings.php      | 336 +++++-----
 views/default/tidypics/forms/setupFlickr.php   |   1 -
 views/default/tidypics/forms/upload.php        | 123 ++--
 views/default/tidypics/groupprofile_albums.php |   1 -
 views/default/tidypics/image_menu.php          |  77 ++-
 views/default/tidypics/tagging.php             |  57 +-
 views/default/widgets/album_view/edit.php      |  11 +-
 views/default/widgets/album_view/view.php      |  13 +-
 views/default/widgets/latest_photos/edit.php   |   8 +-
 views/default/widgets/latest_photos/view.php   |  17 +-
 views/rss/object/album.php                     |   1 -
 views/rss/object/file.php                      |  18 +-
 views/rss/tidypics/gallery.php                 |   8 +-
 67 files changed, 2923 insertions(+), 2863 deletions(-)

diff --git a/actions/addalbum.php b/actions/addalbum.php
index 8df488a92..accdd082b 100644
--- a/actions/addalbum.php
+++ b/actions/addalbum.php
@@ -1,74 +1,72 @@
 getGUID());
+// Get input data
+$title = get_input('tidypicstitle');
+$body = get_input('tidypicsbody');
+$tags = get_input('tidypicstags');
+$access = get_input('access_id');
+$container_guid = get_input('container_guid', get_loggedin_userid());
 
-	// Cache to the session
-	$_SESSION['tidypicstitle'] = $title;
-	$_SESSION['tidypicsbody'] = $body;
-	$_SESSION['tidypicstags'] = $tags;
+// Cache to the session
+$_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
-		}
-		
-		// Now let's add tags
-		if (is_array($tagarray)) {
-			$album->tags = $tagarray;
-		}
-		
-		
-		
-		// Success message
-		system_message(elgg_echo("album:created"));
-		
-		// Remove the album post cache
-		unset($_SESSION['tidypicstitle']); 
-		unset($_SESSION['tidypicsbody']); 
-		unset($_SESSION['tidypicstags']);
+// 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 {
 
-		// plugins can register to be told when a new Tidypics album has been created
-		trigger_elgg_event('add', 'tp_album', $album);
+	// Initialise a new ElggObject
+	$album = new ElggObject();
+	// Tell the system it's an album
+	$album->subtype = "album";
 
-		forward("pg/photos/upload/" . $album->guid);
+	// 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
 	}
 
-?>
\ No newline at end of file
+	// Now let's add tags
+	if (is_array($tagarray)) {
+		$album->tags = $tagarray;
+	}
+
+
+
+	// Success message
+	system_message(elgg_echo("album:created"));
+
+	// 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);
+
+	forward("pg/photos/upload/" . $album->guid);
+}
diff --git a/actions/addtag.php b/actions/addtag.php
index 56268783e..115a81bc6 100644
--- a/actions/addtag.php
+++ b/actions/addtag.php
@@ -1,104 +1,106 @@
 tags)) {
+		if ($image->tags != $word) {
+			$new_word_tag = true;
+			$tagarray = $image->tags . ',' . $word;
+			$tagarray = string_to_tag_array($tagarray);
+		}
 	} else {
-		$relationships_type = 'word';
-		$value = $word;
-		
-		// check to see if the photo has this tag and add if not
-		if (!is_array($image->tags)) {
-			if ($image->tags != $word) {
-				$new_word_tag = true;
-				$tagarray = $image->tags . ',' . $word;
-				$tagarray = string_to_tag_array($tagarray);
-			}
-		} else {
-			if (!in_array($word, $image->tags)) {
-				$new_word_tag = true;
-				$tagarray = $image->tags;
-				$tagarray[] = $word;
-			}
+		if (!in_array($word, $image->tags)) {
+			$new_word_tag = true;
+			$tagarray = $image->tags;
+			$tagarray[] = $word;
 		}
 	}
-	
-	// add new tag now so it is available in search
-	if ($new_word_tag) {
-		$image->clearMetadata('tags');
-		$image->tags = $tagarray;
-	}
+}
+
+// add new tag now so it is available in search
+if ($new_word_tag) {
+	$image->clearMetadata('tags');
+	$image->tags = $tagarray;
+}
+
+// create string for javascript tag object
+$tag->coords = $coordinates_str;
+$tag->type   = $relationships_type;
+$tag->value  = $value;
+
+$access_id = $image->getAccessID();
+$owner_id = get_loggedin_userid();
+$tagger = get_loggedin_user();
 
-	// create string for javascript tag object
-	$tag->coords = $coordinates_str;
-	$tag->type   = $relationships_type;
-	$tag->value  = $value;
-
-	$access_id = $image->getAccessID();
-	$owner_id = get_loggedin_userid();
-	$tagger = get_loggedin_user();
-
-	//Save annotation
-	if ($image->annotate('phototag', serialize($tag), $access_id, $owner_id)) {
-		// if tag is a user id, add relationship for searching (find all images with user x)
-		if ($relationships_type === 'user') {
-			if (!check_entity_relationship($user_id, 'phototag', $image_guid)) {
-				add_entity_relationship($user_id, 'phototag', $image_guid);
-				
-				// also add this to the river - subject is image, object is the tagged user
-				if (function_exists('add_to_river'))
-					add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id, $access_id);
-				
-				// notify user of tagging as long as not self
-				if ($owner_id != $user_id)
-					notify_user($user_id, $owner_id, elgg_echo('tidypics:tag:subject'), 
+//Save annotation
+if ($image->annotate('phototag', serialize($tag), $access_id, $owner_id)) {
+	// if tag is a user id, add relationship for searching (find all images with user x)
+	if ($relationships_type === 'user') {
+		if (!check_entity_relationship($user_id, 'phototag', $image_guid)) {
+			add_entity_relationship($user_id, 'phototag', $image_guid);
+
+			// also add this to the river - subject is image, object is the tagged user
+			if (function_exists('add_to_river')) {
+				add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id, $access_id);
+			}
+
+			// notify user of tagging as long as not self
+			if ($owner_id != $user_id) {
+				notify_user(
+						$user_id,
+						$owner_id,
+						elgg_echo('tidypics:tag:subject'),
 						sprintf(
-									elgg_echo('tidypics:tag:body'),
-									$image->title,
-									$tagger->name,
-									$image->getURL()
-								)
-					);
+							elgg_echo('tidypics:tag:body'),
+							$image->title,
+							$tagger->name,
+							$image->getURL()
+						)
+				);
 			}
 		}
-	
-		system_message(elgg_echo("tidypics:phototagging:success"));
 	}
 
+	system_message(elgg_echo("tidypics:phototagging:success"));
+}
 
-	forward($_SERVER['HTTP_REFERER']);
 
-?>
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/create_thumbnails.php b/actions/create_thumbnails.php
index 09743eef6..18dae6b78 100644
--- a/actions/create_thumbnails.php
+++ b/actions/create_thumbnails.php
@@ -1,61 +1,60 @@
 getFilename();
+$container_guid = $image->container_guid;
+if (!$filename || !$container_guid) {
+	echo "Error retrieving information about the image";
+	return;
+}
+
+$title = $image->title;
+$prefix = "image/$container_guid/";
+$filestorename = substr($filename, strlen($prefix));
+
+$image_lib = get_plugin_setting('image_lib', 'tidypics');
+if (!$image_lib) {
+	$image_lib = "GD";
+}
+
+if ($image_lib == 'ImageMagick') { // ImageMagick command line
+
+	if (tp_create_im_cmdline_thumbnails($image, $prefix, $filestorename) != true) {
+		trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
+		echo "Failed to create thumbnails";
+	}
+
+} else if ($image_lib == 'ImageMagickPHP') {  // imagick PHP extension
+
+	if (tp_create_imagick_thumbnails($image, $prefix, $filestorename) != true) {
+		trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
+		echo "Failed to create thumbnails";
 	}
-	
-	$filename = $image->getFilename();
-	$container_guid = $image->container_guid;
-	if (!$filename || !$container_guid) {
-		echo "Error retrieving information about the image";
-		return;
+
+} else {
+
+	if (tp_create_gd_thumbnails($image, $prefix, $filestorename) != true) {
+		trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
+		echo "Failed to create thumbnails";
 	}
-	
-	$title = $image->title;
-	$prefix = "image/" . $container_guid . "/";
-	$filestorename = substr($filename, strlen($prefix));
-	
-	$image_lib = get_plugin_setting('image_lib', 'tidypics');
-	if (!$image_lib)
-		$image_lib = "GD";
-	
-	if ($image_lib == 'ImageMagick') { // ImageMagick command line
-		
-		if (tp_create_im_cmdline_thumbnails($image, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
-			echo "Failed to create thumbnails";
-		}
-		
-	} else if ($image_lib == 'ImageMagickPHP') {  // imagick PHP extension 
-		
-		if (tp_create_imagick_thumbnails($image, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
-			echo "Failed to create thumbnails";
-		}
-	
-	} else { 
-		
-		if (tp_create_gd_thumbnails($image, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
-			echo "Failed to create thumbnails";
-		}
-		
-	} // end of image library selector
-	
-	echo "wwwroot}mod/tidypics/thumbnail.php?file_guid={$guid}&size=large\" alt=\"{$title}\" />";
-				
-?>
+
+} // end of image library selector
+
+echo "wwwroot}mod/tidypics/thumbnail.php?file_guid={$guid}&size=large\" alt=\"{$title}\" />";
diff --git a/actions/delete.php b/actions/delete.php
index cab996ec5..c1e0ed59e 100644
--- a/actions/delete.php
+++ b/actions/delete.php
@@ -1,121 +1,120 @@
 canEdit()) { // user doesn't have permissions
-		register_error(elgg_echo("tidypics:deletefailed"));
-		forward($forward_url);
-	}
+$entity = get_entity($guid);
+if (!$entity) { // unable to get Elgg entity
+	register_error(elgg_echo("tidypics:deletefailed"));
+	forward($forward_url);
+}
 
-	$subtype = $entity->getSubtype();
-	$container = get_entity($entity->container_guid);
-	
-	if ($subtype != 'image' && $subtype != 'album') { // how did we even get here?
-		register_error(elgg_echo("tidypics:deletefailed"));
-		forward($forward_url);
-	}
+if (!$entity->canEdit()) { // user doesn't have permissions
+	register_error(elgg_echo("tidypics:deletefailed"));
+	forward($forward_url);
+}
+
+$subtype = $entity->getSubtype();
+$container = get_entity($entity->container_guid);
+
+if ($subtype != 'image' && $subtype != 'album') { // how did we even get here?
+	register_error(elgg_echo("tidypics:deletefailed"));
+	forward($forward_url);
+}
+
+$owner_guid = 0; // group or user
+if ($subtype == 'image') { //deleting an image
+	$album = get_entity($entity->container_guid);
+	$owner_guid = $album->container_guid;
+	$forward_url = $container->getURL(); //forward back to album after deleting pictures
+	$images = array($entity);
+	// plugins can register to be told when a Tidypics image has been deleted
+	trigger_elgg_event('delete', 'tp_image', $entity);
+} else { //deleting an album
+	$owner_guid = $entity->container_guid;
+	$forward_url = 'pg/photos/owned/' . $container->username;
+	//get all the images from this album as long as less than 999 images
+	$images = get_entities("object", "image", $guid, '', 999);
+	// plugins can register to be told when a Tidypics album has been deleted
+	trigger_elgg_event('delete', 'tp_album', $entity);
+}
+
+// make sure we decrease the repo size for the size quota
+$image_repo_size_md = get_metadata_byname($owner_guid, "image_repo_size");
+$image_repo_size = (int)$image_repo_size_md->value;
 
-	$owner_guid = 0; // group or user
-	if ($subtype == 'image') { //deleting an image
-		$album = get_entity($entity->container_guid);
-		$owner_guid = $album->container_guid;
-		$forward_url = $container->getURL(); //forward back to album after deleting pictures
-		$images = array($entity);
-		// plugins can register to be told when a Tidypics image has been deleted
-		trigger_elgg_event('delete', 'tp_image', $entity);
-	} else { //deleting an album
-		$owner_guid = $entity->container_guid;
-		$forward_url = 'pg/photos/owned/' . $container->username;
-		//get all the images from this album as long as less than 999 images
-		$images = get_entities("object", "image", $guid, '', 999); 
-		// plugins can register to be told when a Tidypics album has been deleted
-		trigger_elgg_event('delete', 'tp_album', $entity);
+//loop through all images and delete them
+foreach($images as $im) {
+	$thumbnail = $im->thumbnail;
+	$smallthumb = $im->smallthumb;
+	$largethumb = $im->largethumb;
+
+	if ($thumbnail) { //delete standard thumbnail image
+		$delfile = new ElggFile();
+		$delfile->owner_guid = $im->getOwner();
+		$delfile->setFilename($thumbnail);
+		$delfile->delete();
+	}
+	if ($smallthumb) { //delete small thumbnail image
+		$delfile = new ElggFile();
+		$delfile->owner_guid = $im->getOwner();
+		$delfile->setFilename($smallthumb);
+		$delfile->delete();
+	}
+	if ($largethumb) { //delete large thumbnail image
+		$delfile = new ElggFile();
+		$delfile->owner_guid = $im->getOwner();
+		$delfile->setFilename($largethumb);
+		$delfile->delete();
 	}
+	if ($im) { //delete actual image file
+		$delfile = new ElggFile($im->getGUID());
+		$delfile->owner_guid = $im->getOwner();
+		//$delfile->setFilename($im->originalfilename);
+		$image_repo_size -= $delfile->size();
 
-	// make sure we decrease the repo size for the size quota
-	$image_repo_size_md = get_metadata_byname($owner_guid, "image_repo_size");
-	$image_repo_size = (int)$image_repo_size_md->value;
-
-	//loop through all images and delete them
-	foreach($images as $im) {
-		$thumbnail = $im->thumbnail;
-		$smallthumb = $im->smallthumb;
-		$largethumb = $im->largethumb;
-
-		if ($thumbnail) { //delete standard thumbnail image
-			$delfile = new ElggFile();
-			$delfile->owner_guid = $im->getOwner();
-			$delfile->setFilename($thumbnail);
-			$delfile->delete();
-		}
-		if ($smallthumb) { //delete small thumbnail image
-			$delfile = new ElggFile();
-			$delfile->owner_guid = $im->getOwner();
-			$delfile->setFilename($smallthumb);
-			$delfile->delete();
-		}
-		if ($largethumb) { //delete large thumbnail image
-			$delfile = new ElggFile();
-			$delfile->owner_guid = $im->getOwner();
-			$delfile->setFilename($largethumb);
-			$delfile->delete();
-		}
-		if ($im) { //delete actual image file
-			$delfile = new ElggFile($im->getGUID());
-			$delfile->owner_guid = $im->getOwner();
-			//$delfile->setFilename($im->originalfilename);
-			$image_repo_size -= $delfile->size();
-			
-			if (!$delfile->delete()) {
-				if ($subtype=='image') register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
-			} else {
-				if ($subtype=='image') system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
-			}
-		} //end delete actual image file
-	} //end looping through each image to delete it
-	
-	//now that all images have been deleted, delete the album
-	if ($subtype == 'album') {
-		//delete the album's directory manually; first create a temp file to get the directory path
-		$tmpfile = new ElggFile();
-		$tmpfile->setFilename('image/' . $guid . '/._tmp_del_tidypics_album_');
-		$tmpfile->subtype = 'image';
-		$tmpfile->container_guid = $guid;
-		$tmpfile->open("write");
-		$tmpfile->write('');
-		$tmpfile->close();
-		$tmpfile->save();
-		$albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore());
-		$tmpfile->delete();
-		if (is_dir($albumdir))
-			rmdir($albumdir);
-		
-		//delete object from database
-		if (!$entity->delete()) {
-			register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
+		if (!$delfile->delete()) {
+			if ($subtype=='image') register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
 		} else {
-			system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
+			if ($subtype=='image') system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
 		}
-	} //end of delete album
+	} //end delete actual image file
+} //end looping through each image to delete it
 
-	create_metadata($owner_guid, "image_repo_size", $image_repo_size, 'integer', $owner_guid);
+//now that all images have been deleted, delete the album
+if ($subtype == 'album') {
+	//delete the album's directory manually; first create a temp file to get the directory path
+	$tmpfile = new ElggFile();
+	$tmpfile->setFilename('image/' . $guid . '/._tmp_del_tidypics_album_');
+	$tmpfile->subtype = 'image';
+	$tmpfile->container_guid = $guid;
+	$tmpfile->open("write");
+	$tmpfile->write('');
+	$tmpfile->close();
+	$tmpfile->save();
+	$albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore());
+	$tmpfile->delete();
+	if (is_dir($albumdir)) {
+		rmdir($albumdir);
+	}
 
-	forward($forward_url);
+	//delete object from database
+	if (!$entity->delete()) {
+		register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
+	} else {
+		system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
+	}
+} //end of delete album
+
+create_metadata($owner_guid, "image_repo_size", $image_repo_size, 'integer', $owner_guid);
 
-?>
\ No newline at end of file
+forward($forward_url);
diff --git a/actions/deletetag.php b/actions/deletetag.php
index becf1fedb..97c1081f8 100644
--- a/actions/deletetag.php
+++ b/actions/deletetag.php
@@ -1,57 +1,54 @@
  $value) {		
-		// delete normal tag if it exists
-		if (is_array($image->tags)) {
-			$index = array_search($value, $image->tags);
-			if ($index !== false) {
-				$tagarray = $image->tags;
-				unset($tagarray[$index]);
-				$image->clearMetadata('tags');
-				$image->tags = $tagarray;
-			}
-		} else {
-			if ($value === $image->tags) {
-				$image->clearMetadata('tags');
-			}
+gatekeeper();
+action_gatekeeper();
+
+$image_guid = get_input('image_guid');
+$tags = get_input('tags');
+
+
+if ($image_guid == 0) {
+	register_error(elgg_echo("tidypics:phototagging:error"));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+$image = get_entity($image_guid);
+if (!$image) {
+	register_error(elgg_echo("tidypics:phototagging:error"));
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+foreach ($tags as $id => $value) {
+	// delete normal tag if it exists
+	if (is_array($image->tags)) {
+		$index = array_search($value, $image->tags);
+		if ($index !== false) {
+			$tagarray = $image->tags;
+			unset($tagarray[$index]);
+			$image->clearMetadata('tags');
+			$image->tags = $tagarray;
 		}
-		
-		// delete relationship if this tag is a user
-		$annotation = get_annotation($id);
-		$photo_tag = unserialize($annotation->value);
-		if ($photo_tag->type == 'user') {
-			remove_entity_relationship($photo_tag->value, 'phototag', $image_guid);
+	} else {
+		if ($value === $image->tags) {
+			$image->clearMetadata('tags');
 		}
-		
-		// delete the photo tag annotation
-		delete_annotation($id);
 	}
-	
-	system_message(elgg_echo("tidypics:deletetag:success"));
 
-	forward($_SERVER['HTTP_REFERER']);
+	// delete relationship if this tag is a user
+	$annotation = get_annotation($id);
+	$photo_tag = unserialize($annotation->value);
+	if ($photo_tag->type == 'user') {
+		remove_entity_relationship($photo_tag->value, 'phototag', $image_guid);
+	}
+
+	// delete the photo tag annotation
+	delete_annotation($id);
+}
+
+system_message(elgg_echo("tidypics:deletetag:success"));
 
-?>
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/edit.php b/actions/edit.php
index cdf9420b2..db6e26ab9 100644
--- a/actions/edit.php
+++ b/actions/edit.php
@@ -1,81 +1,82 @@
 canEdit()) {
-		forward();
-	}
+// Get input data
+$guid    = (int) get_input('guid');  // guid of image or album
+$title   = get_input('tidypicstitle');
+$body    = get_input('tidypicsbody');
+$access  = get_input('access_id');
+$tags    = get_input('tidypicstags');
+$subtype = get_input('subtype');
+$cover   = get_input('cover');
+if (is_array($cover)) {
+	$cover = $cover[0];
+}
 
-	// Get owning user/group
-	$owner = get_entity($entity->getOwner());
+$container_guid = get_input('container_guid');
 
-	// change access only if access is different from current
-	if ($subtype == 'album' && $entity->access_id != $access) {
-		$entity->access_id = $access;
-	
-		//get images from album and update access on image entities
-		$images = get_entities("object","image", $guid, '', 999, '', false);
-		foreach ($images as $im) {
-			$im->access_id = $access;
-			$im->save();
-		}
-	}
+// Make sure we actually have permission to edit
+$entity = get_entity($guid);
+if (!$entity->canEdit()) {
+	forward();
+}
 
+// Get owning user/group
+$owner = get_entity($entity->getOwner());
 
-	// Set its title and description appropriately
-	$entity->title = $title;
-	$entity->description = $body;
+// change access only if access is different from current
+if ($subtype == 'album' && $entity->access_id != $access) {
+	$entity->access_id = $access;
 
-	// Before we can set metadata, we need to save the entity
-	if (!$entity->save()) {
-		register_error(elgg_echo("album:error"));
-		$entity->delete();
-		forward($_SERVER['HTTP_REFERER']); //failed, so forward to previous page
+	//get images from album and update access on image entities
+	$images = get_entities("object","image", $guid, '', 999, '', false);
+	foreach ($images as $im) {
+		$im->access_id = $access;
+		$im->save();
 	}
+}
 
-	// Now let's add tags
-	$tagarray = string_to_tag_array($tags);
-	$entity->clearMetadata('tags');
-	if (is_array($tagarray)) {
-		$entity->tags = $tagarray;
-	}
 
-	//if cover meta is sent from image save as metadata
-	if ($subtype == 'image' && $cover == elgg_echo('album:cover')) {
-		$album = get_entity($container_guid); 
-		$album->cover = $entity->guid;
-	}
+// Set its title and description appropriately
+$entity->title = $title;
+$entity->description = $body;
 
-	// Success message
-	if ($subtype == 'album') {
-		system_message(elgg_echo("album:edited"));
-		// plugins can register to be told when a Tidypics album has been updated
-		trigger_elgg_event('update', 'tp_album', $entity);
-	} else {
-		system_message(elgg_echo('images:edited'));
-		// plugins can register to be told when a Tidypics image has been updated
-		trigger_elgg_event('update', 'tp_image', $entity);
-	}
+// Before we can set metadata, we need to save the entity
+if (!$entity->save()) {
+	register_error(elgg_echo("album:error"));
+	$entity->delete();
+	forward($_SERVER['HTTP_REFERER']); //failed, so forward to previous page
+}
+
+// Now let's add tags
+$tagarray = string_to_tag_array($tags);
+$entity->clearMetadata('tags');
+if (is_array($tagarray)) {
+	$entity->tags = $tagarray;
+}
+
+//if cover meta is sent from image save as metadata
+if ($subtype == 'image' && $cover == elgg_echo('album:cover')) {
+	$album = get_entity($container_guid);
+	$album->cover = $entity->guid;
+}
+
+// Success message
+if ($subtype == 'album') {
+	system_message(elgg_echo("album:edited"));
+	// plugins can register to be told when a Tidypics album has been updated
+	trigger_elgg_event('update', 'tp_album', $entity);
+} else {
+	system_message(elgg_echo('images:edited'));
+	// plugins can register to be told when a Tidypics image has been updated
+	trigger_elgg_event('update', 'tp_image', $entity);
+}
 
-	forward($entity->getURL());
-?>
+forward($entity->getURL());
diff --git a/actions/edit_multi.php b/actions/edit_multi.php
index c7099e6db..c938e6065 100644
--- a/actions/edit_multi.php
+++ b/actions/edit_multi.php
@@ -1,66 +1,65 @@
  $im) {
-		$image = get_entity($im);
-		
-		if ($image->canEdit()) {
-			
-			// Convert string of tags into a preformatted array
-			$tagarray = string_to_tag_array($tags_array[$key]);
+// Get input data
+$title_array = get_input('title');
+$caption_array = get_input('caption');
+$tags_array = get_input('tags');
+$image_guid_array = get_input('image_guid');
+$container_guid = get_input('container_guid');
+$album_entity = get_entity($container_guid);
+$cover = get_input('cover');
+$not_updated = array();
 
-			//set title appropriately
-			if ($title_array[$key])
-				$image->title = $title_array[$key];
-			else
-				$image->title = substr($image->originalfilename, 0, strrpos($image->originalfilename, '.'));
-			
-			//set description appropriately
-			$image->description = $caption_array[$key];
+foreach($image_guid_array as $key => $im) {
+	$image = get_entity($im);
 
-			// Before we can set metadata, we need to save the image
-			if (!$image->save()) {
-				array_push($not_updated, $image->guid);
-			}
+	if ($image->canEdit()) {
 
-			// Now let's add tags. We can pass an array directly to the object property! Easy.
-			$image->clearMetadata('tags');
-			if (is_array($tagarray)) {
-				$image->tags = $tagarray;
-			}
-				
-			//if cover meta is sent from image save as metadata
-			if ($cover == $im) {
-				$album_entity->cover = $im;
-			}
+		// Convert string of tags into a preformatted array
+		$tagarray = string_to_tag_array($tags_array[$key]);
+
+		//set title appropriately
+		if ($title_array[$key]) {
+			$image->title = $title_array[$key];
+		} else {
+			$image->title = substr($image->originalfilename, 0, strrpos($image->originalfilename, '.'));
+		}
+
+		//set description appropriately
+		$image->description = $caption_array[$key];
+
+		// Before we can set metadata, we need to save the image
+		if (!$image->save()) {
+			array_push($not_updated, $image->guid);
+		}
+
+		// Now let's add tags. We can pass an array directly to the object property! Easy.
+		$image->clearMetadata('tags');
+		if (is_array($tagarray)) {
+			$image->tags = $tagarray;
+		}
+
+		//if cover meta is sent from image save as metadata
+		if ($cover == $im) {
+			$album_entity->cover = $im;
 		}
 	}
-	
-	// Success message
-	if (count($not_updated) > 0) {
-		register_error(elgg_echo("images:notedited"));
-	} else {
-		system_message(elgg_echo("images:edited"));
-	}
-			
-	// Forward to the main album page
-	forward($album_entity->getURL());
+}
+
+// Success message
+if (count($not_updated) > 0) {
+	register_error(elgg_echo("images:notedited"));
+} else {
+	system_message(elgg_echo("images:edited"));
+}
 
-?>
\ No newline at end of file
+// Forward to the main album page
+forward($album_entity->getURL());
diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php
index ec0d65b5d..fd6769e3a 100644
--- a/actions/flickrImportPhotoset.php
+++ b/actions/flickrImportPhotoset.php
@@ -28,11 +28,11 @@ $photos_url = $f->urls_getUserPhotos( $flickr_id->value );
 $photos = $f->photosets_getPhotos( $set_id, null, null, 10, $page_pp );
 
 $photos_to_upload = array();
-foreach( $photos["photoset"]["photo"] as $photo ) {
+foreach ($photos["photoset"]["photo"] as $photo) {
 	
 	//check if we already have this image
 	$meta = get_metadata_byname( $user->guid, $photo["id"] );
-	if( $meta->value == 1 ) { //we've downloaded this already
+	if ($meta->value == 1) { //we've downloaded this already
 		register_error( elgg_echo( 'flickr:errorimageimport' ));
 		continue;
 	}
@@ -41,7 +41,7 @@ foreach( $photos["photoset"]["photo"] as $photo ) {
 
 	$photo_info = $f->photos_getInfo( $photo["id"], $photo["secret"] );
 	$tags = array();
-	foreach( $photo_info["tags"]["tag"] as $tag ) {
+	foreach ($photo_info["tags"]["tag"] as $tag) {
 		$tags[] = $tag["raw"];
 	}
 	$tags = implode( ", ", $tags );
@@ -337,4 +337,3 @@ trigger_elgg_event('upload', 'tp_album', $album);
 $url = $CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images);
 forward($url); 
 
-?>
diff --git a/actions/flickrSetup.php b/actions/flickrSetup.php
index fbc519b02..ee31b8c34 100644
--- a/actions/flickrSetup.php
+++ b/actions/flickrSetup.php
@@ -34,5 +34,3 @@ if( empty( $flickr_username )) {
 
 forward($_SERVER['HTTP_REFERER']);
 //echo "
      "; var_dump( array($flickr_username, $return_url )); echo "
      ";
-
-?>
\ No newline at end of file
diff --git a/actions/imtest.php b/actions/imtest.php
index cbe15a1c1..293a9b2e8 100644
--- a/actions/imtest.php
+++ b/actions/imtest.php
@@ -1,19 +1,18 @@
 
+/**
+ * Tidypics ImageMagick Location Test
+ *
+ *  Called through ajax
+ */
+
+$location = $_GET['location'];
+
+$command = $location . "convert -version";
+
+$result = system($command, $return_val);
+
+if ($return_val == 0) {
+	echo $result;
+} else {
+	echo "Unable to run ImageMagick. Please check the path.";
+}
diff --git a/actions/settings.php b/actions/settings.php
index a4f102b89..2c529d950 100644
--- a/actions/settings.php
+++ b/actions/settings.php
@@ -1,72 +1,77 @@
  $v) {
-		if (!set_plugin_setting($k, $v, 'tidypics')) {
-			register_error(sprintf(elgg_echo('plugins:settings:save:fail'), 'tidypics'));
-			forward($_SERVER['HTTP_REFERER']);
-		}
+// Params array (text boxes and drop downs)
+$params = get_input('params');
+$result = false;
+foreach ($params as $k => $v) {
+	if (!set_plugin_setting($k, $v, 'tidypics')) {
+		register_error(sprintf(elgg_echo('plugins:settings:save:fail'), 'tidypics'));
+		forward($_SERVER['HTTP_REFERER']);
 	}
+}
 
-	// check boxes
-	if (is_array(get_input('download_link'))) // this can be done due to way Elgg uses checkboxes
-		set_plugin_setting('download_link', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('download_link', 'disabled', 'tidypics');
-
-	if (is_array(get_input('tagging')))
-		set_plugin_setting('tagging', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('tagging', 'disabled', 'tidypics');
-
-	if (is_array(get_input('photo_ratings')))
-		set_plugin_setting('photo_ratings', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('photo_ratings', 'disabled', 'tidypics');
-
-	if (is_array(get_input('exif')))
-		set_plugin_setting('exif', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('exif', 'disabled', 'tidypics');
-
-	if (is_array(get_input('view_count')))
-		set_plugin_setting('view_count', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('view_count', 'disabled', 'tidypics');
-
-	if (is_array(get_input('grp_perm_override')))
-		set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
-	else
-		set_plugin_setting('grp_perm_override', 'disabled', 'tidypics');
-
-
-	// image sizes
-	$image_sizes = array();
-	$image_sizes['large_image_width'] = get_input('large_thumb_width');
-	$image_sizes['large_image_height'] = get_input('large_thumb_height');
-	$image_sizes['small_image_width'] = get_input('small_thumb_width');
-	//$image_sizes['small_image_height'] = get_input('small_thumb_height');
-	$image_sizes['small_image_height'] = get_input('small_thumb_width');
-	$image_sizes['thumb_image_width'] = get_input('thumb_width');
-	//$image_sizes['thumb_image_height'] = get_input('thumb_height');
-	$image_sizes['thumb_image_height'] = get_input('thumb_width');
-	set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics');
-
-
-	
-	system_message(elgg_echo('tidypics:settings:save:ok'));
-	
-	forward($_SERVER['HTTP_REFERER']);
-?>
+// check boxes
+if (is_array(get_input('download_link'))) { // this can be done due to way Elgg uses checkboxes
+	set_plugin_setting('download_link', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('download_link', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('tagging'))) {
+	set_plugin_setting('tagging', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('tagging', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('photo_ratings'))) {
+	set_plugin_setting('photo_ratings', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('photo_ratings', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('exif'))) {
+	set_plugin_setting('exif', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('exif', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('view_count'))) {
+	set_plugin_setting('view_count', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('view_count', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('grp_perm_override'))) {
+	set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('grp_perm_override', 'disabled', 'tidypics');
+}
+
+
+// image sizes
+$image_sizes = array();
+$image_sizes['large_image_width'] = get_input('large_thumb_width');
+$image_sizes['large_image_height'] = get_input('large_thumb_height');
+$image_sizes['small_image_width'] = get_input('small_thumb_width');
+//$image_sizes['small_image_height'] = get_input('small_thumb_height');
+$image_sizes['small_image_height'] = get_input('small_thumb_width');
+$image_sizes['thumb_image_width'] = get_input('thumb_width');
+//$image_sizes['thumb_image_height'] = get_input('thumb_height');
+$image_sizes['thumb_image_height'] = get_input('thumb_width');
+set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics');
+
+
+
+system_message(elgg_echo('tidypics:settings:save:ok'));
+
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/upgrade.php b/actions/upgrade.php
index cb200380a..596b90a22 100644
--- a/actions/upgrade.php
+++ b/actions/upgrade.php
@@ -6,35 +6,34 @@
  *
  *********************************************/
 
-	include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
- 
-	admin_gatekeeper();
-	
-	$result = true;
-	
-	// add image class
-	$id = get_subtype_id("object", "image"); 
-	if ($id != 0) {
-		$table = $CONFIG->dbprefix . 'entity_subtypes';
-		$result = update_data("UPDATE {$table} set class='TidypicsImage' where id={$id}");
-		if (!result) {
-			register_error(elgg_echo('tidypics:upgrade:failed'));
-			forward($_SERVER['HTTP_REFERER']);
-		}
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+
+admin_gatekeeper();
+
+$result = true;
+
+// add image class
+$id = get_subtype_id("object", "image"); 
+if ($id != 0) {
+	$table = $CONFIG->dbprefix . 'entity_subtypes';
+	$result = update_data("UPDATE {$table} set class='TidypicsImage' where id={$id}");
+	if (!result) {
+		register_error(elgg_echo('tidypics:upgrade:failed'));
+		forward($_SERVER['HTTP_REFERER']);
 	}
+}
 
-	// add album class
-	$id = get_subtype_id("object", "album"); 
-	if ($id != 0) {
-		$table = $CONFIG->dbprefix . 'entity_subtypes';
-		$result = update_data("UPDATE {$table} set class='TidypicsAlbum' where id={$id}");
-		if (!result) {
-			register_error(elgg_echo('tidypics:upgrade:failed'));
-			forward($_SERVER['HTTP_REFERER']);
-		}
+// add album class
+$id = get_subtype_id("object", "album"); 
+if ($id != 0) {
+	$table = $CONFIG->dbprefix . 'entity_subtypes';
+	$result = update_data("UPDATE {$table} set class='TidypicsAlbum' where id={$id}");
+	if (!result) {
+		register_error(elgg_echo('tidypics:upgrade:failed'));
+		forward($_SERVER['HTTP_REFERER']);
 	}
+}
+
+system_message(elgg_echo('tidypics:upgrade:success'));
 
-	system_message(elgg_echo('tidypics:upgrade:success'));
-	
-	forward($_SERVER['HTTP_REFERER']);
-?>
\ No newline at end of file
+forward($_SERVER['HTTP_REFERER']);
diff --git a/contributions.txt b/contributions.txt
index 3cea54bd9..947f2b069 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,17 @@
 Changelog and contributors list
 
+------------------------------------------------------------------------
+Version 1.6.9 Change List
+Release Date: 07/25/2010
+------------------------------------------------------------------------
+BEGIN VERSION 1.6.9 CHANGES
+------------------------------------------------------------------------
+ * Fixed bug where old installs of Tidypics would not upgrade
+ * Fixed bug in activity river with link on image entry
+ * 
+------------------------------------------------------------------------
+END VERSION 1.6.9 CHANGES
+------------------------------------------------------------------------
 
 ------------------------------------------------------------------------
 Version 1.6.8 Change List
diff --git a/languages/en.php b/languages/en.php
index 934c8ae5a..2ee3a6e5e 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1,11 +1,10 @@
  "untitled",
 
 		// Menu items and titles
-
 			'image' => "Image",
 			'images' => "Images",
 			'caption' => "Caption",
@@ -225,7 +224,6 @@ The photo can be viewed here: %s",
 			'flickr:errorusername2' => 'You must enter a username',
 			'flickr:errorimageimport' => 'This image has already been imported',
 			'flickr:errornoalbum' => "No album selected.  Please choose and save an album: %s" 
-	);
+);
 
-	add_translation("en",$english);
-?>
+add_translation("en", $english);
diff --git a/lib/flickr.php b/lib/flickr.php
index effd186c4..7f91b0f01 100644
--- a/lib/flickr.php
+++ b/lib/flickr.php
@@ -4,5 +4,3 @@ function flickr_menu() {
 	add_submenu_item( elgg_echo( 'flickr:menusetup' ), "/mod/tidypics/pages/flickr/setup.php");
 	add_submenu_item( elgg_echo( 'flickr:menuimport' ), "/mod/tidypics/pages/flickr/importPhotosets.php" );
 }
-	
-?>
\ No newline at end of file
diff --git a/manifest.xml b/manifest.xml
index d630e9601..f19991546 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,10 +1,10 @@
 
 
-        
-        
-        
-        
-        
-        
-        
+	
+	
+	
+	
+	
+	
+	
 
diff --git a/mostvieweddashboard.php b/mostvieweddashboard.php
index 5e7dc41c2..e98e784da 100644
--- a/mostvieweddashboard.php
+++ b/mostvieweddashboard.php
@@ -1,22 +1,22 @@
 dbprefix;
-	$max = 24;
-	
-	//this works but is wildly inefficient
-	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
-	
-	$sql = "SELECT ent.guid, count( * ) AS views
+/**
+ * Tidypics full view of an image
+ * Given a GUID, this page will try and display any entity
+ *
+ */
+
+// Load Elgg engine
+include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+global $CONFIG;
+$prefix = $CONFIG->dbprefix;
+$max = 24;
+
+//this works but is wildly inefficient
+//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+
+$sql = "SELECT ent.guid, count( * ) AS views
 			FROM " . $prefix . "entities ent
 			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
 			AND sub.subtype = 'image'
@@ -26,19 +26,18 @@
 			GROUP BY ent.guid
 			ORDER BY views DESC
 			LIMIT $max";
-	
-	$result = get_data($sql);
-
-	$entities = array();
-	foreach($result as $entity) {
-		$entities[] = get_entity($entity->guid);
-	}
-	
-	tidypics_mostviewed_submenus();
-	
-	$title = elgg_echo("tidypics:mostvieweddashboard");
-	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-?>
+
+$result = get_data($sql);
+
+$entities = array();
+foreach($result as $entity) {
+	$entities[] = get_entity($entity->guid);
+}
+
+tidypics_mostviewed_submenus();
+
+$title = elgg_echo("tidypics:mostvieweddashboard");
+$area2 = elgg_view_title($title);
+$area2 .= elgg_view_entity_list($entities, $max, 0, $max);
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body);
diff --git a/pages/admin.php b/pages/admin.php
index d3e810351..4013e55ac 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -1,23 +1,21 @@
  $tab));
-	
-	page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));
+$tab = get_input('tab', 'settings');
 
-?>
\ No newline at end of file
+$body = elgg_view_title(elgg_echo('tidypics:administration'));
+
+$body .= elgg_view("tidypics/admin/tidypics", array('tab' => $tab));
+
+page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body));
diff --git a/pages/download.php b/pages/download.php
index e4ad2e855..23c3e39f4 100644
--- a/pages/download.php
+++ b/pages/download.php
@@ -1,52 +1,50 @@
 originalfilename;
-		$mime = $file->mimetype;
-		
-		header("Content-Type: $mime");
-		if ($type == "inline")
-			header("Content-Disposition: inline; filename=\"$filename\"");
-		else
-			header("Content-Disposition: attachment; filename=\"$filename\"");
-
-		
-		$readfile = new ElggFile($file_guid);
-		$readfile->owner_guid = $file->owner_guid;
-		
-		$contents = $readfile->grabFile();
-		
-		if (empty($contents)) {
-			echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );
-		} else {
-			
-			// expires every 60 days
-			$expires = 60 * 60*60*24;
-			
-			header("Content-Length: " . strlen($contents));
-			header("Cache-Control: public", true);
-			header("Pragma: public", true);
-			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
-			
-			
-			echo $contents;
-		}
-		
-		exit;
+/**
+ * Tidypics Download Photos
+ *
+ * do not call this directly - call through page handler
+ */
+
+global $CONFIG;
+
+$file_guid = (int) get_input("file_guid");
+$file = get_entity($file_guid);
+
+$type = get_input("type");
+
+if ($file) {
+	$filename = $file->originalfilename;
+	$mime = $file->mimetype;
+
+	header("Content-Type: $mime");
+	if ($type == "inline") {
+		header("Content-Disposition: inline; filename=\"$filename\"");
+	} else {
+		header("Content-Disposition: attachment; filename=\"$filename\"");
+	}
+
+	$readfile = new ElggFile($file_guid);
+	$readfile->owner_guid = $file->owner_guid;
+
+	$contents = $readfile->grabFile();
+
+	if (empty($contents)) {
+		echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" );
+	} else {
+
+		// expires every 60 days
+		$expires = 60 * 60*60*24;
+
+		header("Content-Length: " . strlen($contents));
+		header("Cache-Control: public", true);
+		header("Pragma: public", true);
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+
+
+		echo $contents;
 	}
-	else
-		register_error(elgg_echo("image:downloadfailed"));
 
-?>
\ No newline at end of file
+	exit;
+} else {
+	register_error(elgg_echo("image:downloadfailed"));
+}
\ No newline at end of file
diff --git a/pages/edit.php b/pages/edit.php
index abf1a0fdd..06d3dd9c4 100644
--- a/pages/edit.php
+++ b/pages/edit.php
@@ -1,51 +1,54 @@
 canEdit()) 
-		forward();
+if (!$entity = get_entity($guid)) {
+	forward();
+}
 
-	$subtype = $entity->getSubtype();
-		
-	if ($subtype == 'album') {
-		$title = elgg_echo('album:edit');
+if (!$entity->canEdit()) {
+	forward();
+}
 
-		if ($container = $entity->container_guid)
-			set_page_owner($container);
+$subtype = $entity->getSubtype();
 
-	} else if ($subtype == 'image') {
-		$title = elgg_echo('image:edit');
+if ($subtype == 'album') {
+	$title = elgg_echo('album:edit');
 
-		if ($container = get_entity($entity->container_guid)->container_guid)
-			set_page_owner($container);	
-
-	} else {
-		forward();
+	if ($container = $entity->container_guid) {
+		set_page_owner($container);
 	}
-	
-	$page_owner = page_owner_entity();
-	if ($page_owner instanceof ElggGroup) {
-		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+
+} else if ($subtype == 'image') {
+	$title = elgg_echo('image:edit');
+
+	if ($container = get_entity($entity->container_guid)->container_guid) {
+		set_page_owner($container);
 	}
 
-	
-	$area2 .= elgg_view_title($title);
-	$area2 .= elgg_view('tidypics/forms/edit', array('entity' => $entity, 'subtype' => $subtype));
-	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+} else {
+	forward();
+}
+
+$page_owner = page_owner_entity();
+if ($page_owner instanceof ElggGroup) {
+	add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name),
+			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+}
+
+
+$area2 .= elgg_view_title($title);
+$area2 .= elgg_view('tidypics/forms/edit', array('entity' => $entity, 'subtype' => $subtype));
+$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
 
-	page_draw($title, $body);
-?>
\ No newline at end of file
+page_draw($title, $body);
diff --git a/pages/edit_multiple.php b/pages/edit_multiple.php
index 49b7dd6f3..ec507ba4b 100644
--- a/pages/edit_multiple.php
+++ b/pages/edit_multiple.php
@@ -1,47 +1,47 @@
 owner_guid);
-	$album = get_entity($photo->container_guid);
-	if ($album) {
-		$owner_guid = $album->container_guid;
-		if ($owner_guid)
-			set_page_owner($owner_guid);
+// set page owner based on owner of photo album
+set_page_owner($photo->owner_guid);
+$album = get_entity($photo->container_guid);
+if ($album) {
+	$owner_guid = $album->container_guid;
+	if ($owner_guid) {
+		set_page_owner($owner_guid);
 	}
+}
 
-	foreach ($file_array_sent as $file_guid) {
-		if ($entity = get_entity($file_guid)) {
-			if ($entity->canEdit()){
-				array_push($new_file_array, $file_guid);
-			}
-			if (!$album_guid) 
-				$album_guid = $entity->container_guid;
-			
+foreach ($file_array_sent as $file_guid) {
+	if ($entity = get_entity($file_guid)) {
+		if ($entity->canEdit()) {
+			array_push($new_file_array, $file_guid);
+		}
+		if (!$album_guid) {
+			$album_guid = $entity->container_guid;
 		}
 	}
+}
 
-	$title = elgg_echo('tidypics:editprops');
-	$area2 .= elgg_view_title($title);
-	$area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid));
-	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-	page_draw($title, $body);
-?>
+$title = elgg_echo('tidypics:editprops');
+$area2 .= elgg_view_title($title);
+$area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid));
+$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+page_draw($title, $body);
diff --git a/pages/friends.php b/pages/friends.php
index 03ae1300a..d5dfdba5c 100644
--- a/pages/friends.php
+++ b/pages/friends.php
@@ -1,41 +1,41 @@
 guid == get_loggedin_userid())
-		$title = elgg_echo('album:yours:friends');
-	else
-		$title = sprintf(elgg_echo('album:friends'), $user->name);
-	
-	$area2 = elgg_view_title($title);
-	
-	$albums = get_user_friends_objects($user->guid, 'album', 12);
-	
-	// get html for viewing list of photo albums
-	set_context('search');
-	set_input('search_viewtype', 'gallery'); // need to force gallery view
-	$content = tp_view_entity_list($albums, count($albums), 0, 12, false, false, true);
-	
-	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
-	
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	
-	page_draw($title, $body);
-?>
\ No newline at end of file
+/**
+ * Tidypics Friends Albums Listing
+ *
+ * List all the albums of someone's friends
+ */
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+
+$username = get_input('username');
+
+// if no username, redirect to world photo albums
+if (!$username) {
+	forward('pg/photos/world');
+}
+
+// setup title
+$user = get_user_by_username($username);
+if (!$user) {
+	forward('pg/photos/world');
+}
+if ($user->guid == get_loggedin_userid()) {
+	$title = elgg_echo('album:yours:friends');
+} else {
+	$title = sprintf(elgg_echo('album:friends'), $user->name);
+}
+
+$area2 = elgg_view_title($title);
+
+$albums = get_user_friends_objects($user->guid, 'album', 12);
+
+// get html for viewing list of photo albums
+set_context('search');
+set_input('search_viewtype', 'gallery'); // need to force gallery view
+$content = tp_view_entity_list($albums, count($albums), 0, 12, false, false, true);
+
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+
+page_draw($title, $body);
diff --git a/pages/lists/mostcommentedimages.php b/pages/lists/mostcommentedimages.php
index 801409fdc..0a4eb9622 100644
--- a/pages/lists/mostcommentedimages.php
+++ b/pages/lists/mostcommentedimages.php
@@ -1,22 +1,22 @@
 dbprefix;
-	$max = 24;
-	
-	//this works but is wildly inefficient
-	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
-	
-	$sql = "SELECT ent.guid, count( * ) AS views
+/**
+ * Tidypics full view of an image
+ * Given a GUID, this page will try and display any entity
+ *
+ */
+
+// Load Elgg engine
+include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
+
+global $CONFIG;
+$prefix = $CONFIG->dbprefix;
+$max = 24;
+
+//this works but is wildly inefficient
+//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+
+$sql = "SELECT ent.guid, count( * ) AS views
 			FROM " . $prefix . "entities ent
 			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
 			AND sub.subtype = 'image'
@@ -26,18 +26,17 @@
 			GROUP BY ent.guid
 			ORDER BY views DESC
 			LIMIT $max";
-	
-	$result = get_data($sql);
-
-	$entities = array();
-	foreach($result as $entity) {
-		$entities[] = get_entity($entity->guid);
-	}
-	
-	tidypics_mostviewed_submenus();
-	$title = elgg_echo("tidypics:mostcommented");
-	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-?>
\ No newline at end of file
+
+$result = get_data($sql);
+
+$entities = array();
+foreach ($result as $entity) {
+	$entities[] = get_entity($entity->guid);
+}
+
+tidypics_mostviewed_submenus();
+$title = elgg_echo("tidypics:mostcommented");
+$area2 = elgg_view_title($title);
+$area2 .= elgg_view_entity_list($entities, $max, 0, $max, false);
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body);
\ No newline at end of file
diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 178e3c722..722f1fc32 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -1,56 +1,58 @@
 guid;
-			
-			if ($user_id == get_loggedin_userid())
-				$title = elgg_echo('tidypics:yourmostrecent');
-			else
-				$title = sprintf(elgg_echo("tidypics:friendmostrecent"), $user->name);
-		}
-	} else {
-		// world view - set page owner to logged in user
-		if (isloggedin()) {
-			set_page_owner(get_loggedin_userid());
+/**
+ * Most recently uploaded images - individual or world
+ *
+ */
+
+// Load Elgg engine
+include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
+
+// start with assumption this is for all site photos
+$title = elgg_echo('tidypics:mostrecent');
+$user_id = 0;
+
+// is this all site or an individuals images
+$username = get_input('username');
+if ($username) {
+	$user = get_user_by_username($username);
+	if ($user) {
+		$user_id = $user->guid;
+
+		if ($user_id == get_loggedin_userid()) {
+			$title = elgg_echo('tidypics:yourmostrecent');
+		} else {
+			$title = sprintf(elgg_echo("tidypics:friendmostrecent"), $user->name);
 		}
 	}
-	
-	// allow other plugins to override the slideshow
-	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-	if ($slideshow_link) {
-		add_submenu_item(elgg_echo('album:slideshow'),
-						$slideshow_link,
-						'photos' );
+} else {
+	// world view - set page owner to logged in user
+	if (isloggedin()) {
+		set_page_owner(get_loggedin_userid());
 	}
+}
+
+// allow other plugins to override the slideshow
+$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+if ($slideshow_link) {
+	add_submenu_item(elgg_echo('album:slideshow'),
+			$slideshow_link,
+			'photos' );
+}
+
+// how many do we display
+$max = 12;
+
+// grab the html to display the images
+$images = tp_list_entities("object", "image", $user_id, null, $max, false, false, true);
+
+
+// this view takes care of the title on the main column and the content wrapper
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+if (empty($area2)) {
+	$area2 = $images;
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 
-	// how many do we display
-	$max = 12;
-	
-	// grab the html to display the images
-	$images = tp_list_entities("object", "image", $user_id, null, $max, false, false, true);
-	
-	
-	// this view takes care of the title on the main column and the content wrapper
-	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
-	if( empty( $area2 )) $area2 = $images; 
-		
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	
-	page_draw($title, $body);
-?>
\ No newline at end of file
+page_draw($title, $body);
diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index d945680f1..eb87bc17c 100644
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -1,33 +1,33 @@
 dbprefix;
-	$max = 24;
-	
-	$owner_guid = page_owner();
-	
-	//$start = microtime(true);
-	$photos = tp_get_entities_from_annotations_calculate_x(	
-													'count',
-													'object', 
-													'image', 
-													'tp_view', 
-													'', 
-													'', 
-													$owner_guid, 
-													$max);
-	//error_log("elgg query is " . (float)(microtime(true) - $start));
-		
-	//this works but is wildly inefficient
-	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+global $CONFIG;
+$prefix = $CONFIG->dbprefix;
+$max = 24;
+
+$owner_guid = page_owner();
+
+//$start = microtime(true);
+$photos = tp_get_entities_from_annotations_calculate_x(	
+		'count',
+		'object',
+		'image',
+		'tp_view',
+		'',
+		'',
+		$owner_guid,
+		$max);
+//error_log("elgg query is " . (float)(microtime(true) - $start));
+
+//this works but is wildly inefficient
+//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
 /*
 	$start = microtime(true);
 	$sql = "SELECT ent.guid, count( * ) AS views
@@ -48,39 +48,40 @@
 		$entities[] = get_entity($entity->guid);
 	}
 */
-	//error_log("custom query is " . (float)(microtime(true) - $start));
-	
-	// allow other plugins to override the slideshow
-	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-	if ($slideshow_link) {
-		add_submenu_item(elgg_echo('album:slideshow'),
-						$slideshow_link,
-						'photos' );
-	}
-													
-	if ($owner_guid) {
-		if ($owner_guid == get_loggedin_userid()) {
-			$title = elgg_echo("tidypics:yourmostviewed");	
-		} else {
-			$title = sprintf(elgg_echo("tidypics:friendmostviewed"), page_owner_entity()->name);
-		}
+//error_log("custom query is " . (float)(microtime(true) - $start));
+
+// allow other plugins to override the slideshow
+$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+if ($slideshow_link) {
+	add_submenu_item(elgg_echo('album:slideshow'),
+			$slideshow_link,
+			'photos' );
+}
+
+if ($owner_guid) {
+	if ($owner_guid == get_loggedin_userid()) {
+		$title = elgg_echo("tidypics:yourmostviewed");
 	} else {
-		// world view - set page owner to logged in user
-		if (isloggedin()) {
-			set_page_owner(get_loggedin_userid());
-		}
-		
-		$title = elgg_echo("tidypics:mostviewed");
+		$title = sprintf(elgg_echo("tidypics:friendmostviewed"), page_owner_entity()->name);
 	}
-	$area2 = elgg_view_title($title);
-	
-	// grab the html to display the images
-	$content = tp_view_entity_list($photos, $max, 0, $max, false);
-	
-	// this view takes care of the title on the main column and the content wrapper
-	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
-	if( empty( $area2 )) $area2 = $content;	
-	
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-?>
\ No newline at end of file
+} else {
+	// world view - set page owner to logged in user
+	if (isloggedin()) {
+		set_page_owner(get_loggedin_userid());
+	}
+
+	$title = elgg_echo("tidypics:mostviewed");
+}
+$area2 = elgg_view_title($title);
+
+// grab the html to display the images
+$content = tp_view_entity_list($photos, $max, 0, $max, false);
+
+// this view takes care of the title on the main column and the content wrapper
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
+if (empty($area2)) {
+	$area2 = $content;
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body);
diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index 1d5f7aea7..f070e8563 100644
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -1,36 +1,36 @@
 dbprefix;
-	$max_limit = 200; //get extra because you'll have multiple views per image in the result set
-	$max = 16; //controls how many actually show on screen
-	
-	//this works but is wildly inefficient
-	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
-	
-	$sql = "SELECT distinct (ent.guid), ann1.time_created
+// world view - set page owner to logged in user
+if (isloggedin()) {
+	set_page_owner(get_loggedin_userid());
+}
+
+// allow other plugins to override the slideshow
+$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+if ($slideshow_link) {
+	add_submenu_item(elgg_echo('album:slideshow'),
+			$slideshow_link,
+			'photos' );
+}
+
+
+global $CONFIG;
+$prefix = $CONFIG->dbprefix;
+$max_limit = 200; //get extra because you'll have multiple views per image in the result set
+$max = 16; //controls how many actually show on screen
+
+//this works but is wildly inefficient
+//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+
+$sql = "SELECT distinct (ent.guid), ann1.time_created
 			FROM " . $prefix . "entities ent
 			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
 			AND sub.subtype = 'image'
@@ -39,34 +39,31 @@
 			AND ms.string = 'generic_comment'			
 			ORDER BY ann1.time_created DESC
 			LIMIT $max_limit";
-	
-	$result = get_data($sql);
 
-	$entities = array();
-	foreach($result as $entity) {
-		if(!$entities[$entity->guid]) {
-			$entities[$entity->guid] = get_entity($entity->guid);	
-		}
-		if(count($entities) >= $max) break;
+$result = get_data($sql);
+
+$entities = array();
+foreach ($result as $entity) {
+	if (!$entities[$entity->guid]) {
+		$entities[$entity->guid] = get_entity($entity->guid);
 	}
-	
-	$user = get_loggedin_user();
-	if( $user->guid == 9 ) {
-		echo "
      ";
-		var_dump( $sql);
-//		var_dump( $result );
-		echo "
      ";
+	if (count($entities) >= $max) {
+		break;
 	}
-	$title = elgg_echo("tidypics:recentlycommented");
-	$area2 = elgg_view_title($title);
-	
-	// grab the html to display the images
-	$images = tp_view_entity_list($entities, $max, 0, $max, false);
-	
-	// this view takes care of the title on the main column and the content wrapper
-	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
-	if( empty( $area2 )) $area2 = $images;
-		
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-?>
\ No newline at end of file
+}
+
+$user = get_loggedin_user();
+$title = elgg_echo("tidypics:recentlycommented");
+$area2 = elgg_view_title($title);
+
+// grab the html to display the images
+$images = tp_view_entity_list($entities, $max, 0, $max, false);
+
+// this view takes care of the title on the main column and the content wrapper
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+if (empty($area2)) {
+	$area2 = $images;
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body);
diff --git a/pages/lists/recentlyviewed.php b/pages/lists/recentlyviewed.php
index 16ad474df..419576d8e 100644
--- a/pages/lists/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -1,36 +1,36 @@
 dbprefix;
-	$max_limit = 200; //get extra because you'll have multiple views per image in the result set
-	$max = 16; //controls how many actually show on screen
-	
-	//this works but is wildly inefficient
-	//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
-	
-	$sql = "SELECT distinct ent.guid, ann1.time_created
+// world view - set page owner to logged in user
+if (isloggedin()) {
+	set_page_owner(get_loggedin_userid());
+}
+
+// allow other plugins to override the slideshow
+$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
+if ($slideshow_link) {
+	add_submenu_item(elgg_echo('album:slideshow'),
+			$slideshow_link,
+			'photos' );
+}
+
+
+global $CONFIG;
+$prefix = $CONFIG->dbprefix;
+$max_limit = 200; //get extra because you'll have multiple views per image in the result set
+$max = 16; //controls how many actually show on screen
+
+//this works but is wildly inefficient
+//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000);
+
+$sql = "SELECT distinct ent.guid, ann1.time_created
 			FROM " . $prefix . "entities ent
 			INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id
 			AND sub.subtype = 'image'
@@ -39,27 +39,30 @@
 			AND ms.string = 'tp_view'
 			ORDER BY ann1.id DESC
 			LIMIT $max_limit";
-	
-	$result = get_data($sql);
 
-	$entities = array();
-	foreach($result as $entity) {
-		if(!$entities[$entity->guid]) {
-			$entities[$entity->guid] = get_entity($entity->guid);	
-		}
-		if(count($entities) >= $max) break;
+$result = get_data($sql);
+
+$entities = array();
+foreach ($result as $entity) {
+	if (!$entities[$entity->guid]) {
+		$entities[$entity->guid] = get_entity($entity->guid);
+	}
+	if (count($entities) >= $max) {
+		break;
 	}
-	
-	$title = elgg_echo("tidypics:recentlyviewed");
-	$area2 = elgg_view_title($title);
-	
-	// grab the html to display the images
-	$images = tp_view_entity_list($entities, $max, 0, $max, false);
-	
-	// this view takes care of the title on the main column and the content wrapper
-	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
-	if( empty( $area2 )) $area2 = $images;
-	
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	page_draw($title, $body);
-?>
\ No newline at end of file
+}
+
+$title = elgg_echo("tidypics:recentlyviewed");
+$area2 = elgg_view_title($title);
+
+// grab the html to display the images
+$images = tp_view_entity_list($entities, $max, 0, $max, false);
+
+// this view takes care of the title on the main column and the content wrapper
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $images,));
+if (empty($area2)) {
+	$area2 = $images;
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+page_draw($title, $body);
diff --git a/pages/newalbum.php b/pages/newalbum.php
index fda886d52..535116237 100644
--- a/pages/newalbum.php
+++ b/pages/newalbum.php
@@ -1,32 +1,30 @@
 name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-	}
-	
-	$area2 = elgg_view_title(elgg_echo('album:add'));
-	$area2 .= elgg_view("tidypics/forms/edit");
-	
-	// Display page
-	page_draw(elgg_echo('album:add'),elgg_view_layout("two_column_left_sidebar", $area1, $area2, $area3 ));
+// Load Elgg engine
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
 
-?>
\ No newline at end of file
+// must be logged in to create a new album
+gatekeeper();
+
+// Get the current page's owner	
+$page_owner = page_owner_entity();
+if ($page_owner === false || is_null($page_owner)) {
+	$page_owner = get_loggedin_user();
+	set_page_owner($page_owner->guid);
+}
+
+if ($page_owner instanceof ElggGroup) {
+	add_submenu_item(sprintf(elgg_echo('album:group'), $page_owner->name),
+			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+}
+
+$area2 = elgg_view_title(elgg_echo('album:add'));
+$area2 .= elgg_view("tidypics/forms/edit");
+
+// Display page
+page_draw(elgg_echo('album:add'),elgg_view_layout("two_column_left_sidebar", '', $area2));
diff --git a/pages/ownedalbums.php b/pages/ownedalbums.php
index d22c6d44a..67583c65c 100644
--- a/pages/ownedalbums.php
+++ b/pages/ownedalbums.php
@@ -1,53 +1,55 @@
 username) || empty($owner->username))  {
-		forward('pg/photos/world');
-	}
+/**
+ * tidypics photo gallery album listing page for a person/group
+ *
+ * Shows all the albums that belong to that person or group
+ */
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+
+// if this page belongs to a closed group, prevent anyone outside group from seeing
+if (is_callable('group_gatekeeper')) {
+	group_gatekeeper();
+}
+
+//get the owner of the current page
+$owner = page_owner_entity();
+
+
+//if page owner cannot be found, forward to world album list
+if (is_null($owner->username) || empty($owner->username)) {
+	forward('pg/photos/world');
+}
 
-	
-	// setup group menu for album index
-	if ($owner instanceof ElggGroup) {
-				add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name), 
-									$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
-		if (can_write_to_container(0, $owner->guid)) {
-				add_submenu_item(	elgg_echo('album:create'),
-									$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
-									'tidypics');
-		}
+
+// setup group menu for album index
+if ($owner instanceof ElggGroup) {
+	add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name),
+			$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
+	if (can_write_to_container(0, $owner->guid)) {
+		add_submenu_item(	elgg_echo('album:create'),
+				$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
+				'tidypics');
 	}
-	
-	//set the title
-	$title = sprintf(elgg_echo('album:user'), $owner->name);
-	$area2 = elgg_view_title($title);
-		
-	// Get objects
-	set_context('search');
-	set_input('search_viewtype', 'gallery');
-	if ($owner instanceof ElggGroup)
-		$content .= tp_list_entities("object", "album", 0, $owner->guid, 12, false);
-	else
-		$content .= tp_list_entities("object", "album", $owner->guid, $owner->guid, 12, false);
-	
-	$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
-	
-	set_context('photos');
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	
-	// Finally draw the page
-	page_draw($title, $body);
-?>
\ No newline at end of file
+}
+
+//set the title
+$title = sprintf(elgg_echo('album:user'), $owner->name);
+$area2 = elgg_view_title($title);
+
+// Get objects
+set_context('search');
+set_input('search_viewtype', 'gallery');
+if ($owner instanceof ElggGroup) {
+	$content .= tp_list_entities("object", "album", 0, $owner->guid, 12, false);
+} else {
+	$content .= tp_list_entities("object", "album", $owner->guid, $owner->guid, 12, false);
+}
+
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
+
+set_context('photos');
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+
+// Finally draw the page
+page_draw($title, $body);
\ No newline at end of file
diff --git a/pages/server_analysis.php b/pages/server_analysis.php
index ccffc1632..db3aed5f6 100644
--- a/pages/server_analysis.php
+++ b/pages/server_analysis.php
@@ -8,48 +8,49 @@
  *
  ********************************************************************/   
 
-	include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
 
-	global $CONFIG;
+global $CONFIG;
 
-	admin_gatekeeper();
+admin_gatekeeper();
 
-	set_context('admin');
+set_context('admin');
 
-	$title = 'TidyPics Server Analysis'; 
+$title = 'TidyPics Server Analysis'; 
 
 
-	function tp_readable_size($bytes) 
-	{
-		if (strpos($bytes, 'M'))
-			return $bytes . 'B';
-		
-		$size = $bytes / 1024;
+function tp_readable_size($bytes) {
+	if (strpos($bytes, 'M')) {
+		return $bytes . 'B';
+	}
+
+	$size = $bytes / 1024;
+	if ($size < 1024) {
+		$size = number_format($size, 2);
+		$size .= ' KB';
+	} else {
+		$size = $size / 1024;
 		if ($size < 1024) {
 			$size = number_format($size, 2);
-			$size .= ' KB';
+			$size .= ' MB';
 		} else {
 			$size = $size / 1024;
-			if($size < 1024) {
-				$size = number_format($size, 2);
-				$size .= ' MB';
-			} else {
-				$size = $size / 1024;
-				$size = number_format($size, 2);
-				$size .= ' GB';
-			} 
+			$size = number_format($size, 2);
+			$size .= ' GB';
 		}
-	return $size;
 	}
+	return $size;
+}
 
-	$disablefunc = explode(',', ini_get('disable_functions'));
-	$exec_avail = "Disabled";
-	if (is_callable('exec') && !in_array('exec',$disablefunc))
-		$exec_avail = "Enabled";
+$disablefunc = explode(',', ini_get('disable_functions'));
+$exec_avail = "Disabled";
+if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+	$exec_avail = "Enabled";
+}
 
-	ob_start();
+ob_start();
 
-	echo elgg_view_title($title);
+echo elgg_view_title($title);
 ?>
 
      
 	
@@ -130,9 +131,8 @@
 
\ No newline at end of file
+echo page_draw($title, $body);
\ No newline at end of file
diff --git a/pages/tagged.php b/pages/tagged.php
index b5a879809..34ea8a709 100644
--- a/pages/tagged.php
+++ b/pages/tagged.php
@@ -1,50 +1,48 @@
 name);
-	else
-		$title = "User does not exist";
-		
-	
-	
-	// create main column
-	$body = elgg_view_title($title);
-	
-	set_context('search');
-	set_input('search_viewtype', 'gallery'); // need to force gallery view
-	$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); 
-
-	// Set up submenus
-	if (isloggedin()) {
-		add_submenu_item(	elgg_echo("album:yours"), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, 
-							'tidypics-b' );
-	}
-	add_submenu_item(	elgg_echo('album:all'), 
-						$CONFIG->wwwroot . "pg/photos/world/", 
-						'tidypics-z');
-	add_submenu_item(	elgg_echo('tidypics:mostrecent'),
-						$CONFIG->wwwroot . 'pg/photos/mostrecent',
-						'tidypics-z');
-
-	
-	
-	$body = elgg_view_layout('two_column_left_sidebar','',$body);
-	
-
-	page_draw($title,$body);
-
-?>
\ No newline at end of file
+/**
+ * Tidypics Tagged Listing
+ *
+ * List all photos tagged with a user
+ */
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+
+
+// Get user guid
+$guid = get_input('guid');
+
+$user = get_entity($guid);
+
+if ($user) {
+	$title = sprintf(elgg_echo('tidypics:usertag'), $user->name);
+} else {
+	$title = "User does not exist";
+}
+
+
+// create main column
+$body = elgg_view_title($title);
+
+set_context('search');
+set_input('search_viewtype', 'gallery'); // need to force gallery view
+$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); 
+
+// Set up submenus
+if (isloggedin()) {
+	add_submenu_item(	elgg_echo("album:yours"),
+			$CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username,
+			'tidypics-b' );
+}
+add_submenu_item(	elgg_echo('album:all'), 
+		$CONFIG->wwwroot . "pg/photos/world/",
+		'tidypics-z');
+add_submenu_item(	elgg_echo('tidypics:mostrecent'),
+		$CONFIG->wwwroot . 'pg/photos/mostrecent',
+		'tidypics-z');
+
+
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $body);
+
+
+page_draw($title, $body);
diff --git a/pages/thumbnail.php b/pages/thumbnail.php
index 3aad5969d..9daa2f9c0 100644
--- a/pages/thumbnail.php
+++ b/pages/thumbnail.php
@@ -1,76 +1,78 @@
 getSubtype() != "image")
-		forward('mod/tidypics/graphics/' . $error_image);
-	
-	// Get filename
-	if ($size == "thumb") {
-		$thumbfile = $file->thumbnail;
-	} else if ($size == "small") {
-		$thumbfile = $file->smallthumb;
-	} else {
-		$thumbfile = $file->largethumb;
-	}
-	
-	if (!$thumbfile)
-		forward('mod/tidypics/graphics/' . $error_image);
-	
-	// create Elgg File object
-	$readfile = new ElggFile();
-	$readfile->owner_guid = $file->owner_guid;
-	$readfile->setFilename($thumbfile);
-	$contents = $readfile->grabFile();
+/**
+ * Tidypics Thumbnail
+ *
+ */
 
-	// send error image if file could not be read
-	if (!$contents) {
-		forward('mod/tidypics/graphics/' . $error_image);
-	}
-	
-	// expires every 14 days
-	$expires = 14 * 60*60*24;
+// Get file GUID
+$file_guid = (int) get_input('file_guid');
 
-	// overwrite header caused by php session code so images can be cached
-	$mime = $file->getMimeType();
-	header("Content-Type: $mime");
-	header("Content-Length: " . strlen($contents));
-	header("Cache-Control: public", true);
-	header("Pragma: public", true);
-	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
-	
-	// Return the thumbnail and exit
-	echo $contents;
-	exit;
-	
\ No newline at end of file
+// Get file thumbnail size
+$size = get_input('size');
+// only 3 possibilities
+if ($size != 'small' && $size != 'thumb') {
+	$size = 'large';
+}
+
+$error_image = '';
+switch ($size) {
+	case 'thumb':
+		$error_image = "image_error_thumb.png";
+		break;
+	case 'small':
+		$error_image = "image_error_small.png";
+		break;
+	case 'large':
+		$error_image = "image_error_large.png";
+		break;
+}
+
+// Get file entity
+$file = get_entity($file_guid);
+if (!$file) {
+	forward('mod/tidypics/graphics/' . $error_image);
+}
+
+if ($file->getSubtype() != "image") {
+	forward('mod/tidypics/graphics/' . $error_image);
+}
+
+// Get filename
+if ($size == "thumb") {
+	$thumbfile = $file->thumbnail;
+} else if ($size == "small") {
+	$thumbfile = $file->smallthumb;
+} else {
+	$thumbfile = $file->largethumb;
+}
+
+if (!$thumbfile) {
+	forward('mod/tidypics/graphics/' . $error_image);
+}
+
+// create Elgg File object
+$readfile = new ElggFile();
+$readfile->owner_guid = $file->owner_guid;
+$readfile->setFilename($thumbfile);
+$contents = $readfile->grabFile();
+
+// send error image if file could not be read
+if (!$contents) {
+	forward('mod/tidypics/graphics/' . $error_image);
+}
+
+// expires every 14 days
+$expires = 14 * 60*60*24;
+
+// overwrite header caused by php session code so images can be cached
+$mime = $file->getMimeType();
+header("Content-Type: $mime");
+header("Content-Length: " . strlen($contents));
+header("Cache-Control: public", true);
+header("Pragma: public", true);
+header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+
+// Return the thumbnail and exit
+echo $contents;
+exit;
diff --git a/pages/upload.php b/pages/upload.php
index 5c123537e..6f8db288d 100644
--- a/pages/upload.php
+++ b/pages/upload.php
@@ -1,44 +1,44 @@
 canEdit()) {
-		// throw warning and forward to previous page
-		forward($_SERVER['HTTP_REFERER']);
-	}
-
-	// set page owner based on container (user or group) 
-	$container = $album->container_guid;
-	set_page_owner($container);
-
-	$page_owner = page_owner_entity();
-	if ($page_owner instanceof ElggGroup) {
-		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-	}
-
-	set_context('photos');
-	$title = elgg_echo('album:addpix') . ': ' . $album->title;
-	$area2 .= elgg_view_title($title);
-	
-	$area2 .= elgg_view("tidypics/forms/upload", array('album' => $album_guid ) );
+/**
+ * Tidypics Upload Images Page
+ *
+ */
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+
+// must be logged in to upload images
+gatekeeper();
+
+$album_guid = (int) get_input('container_guid');
+if (!$album_guid) {
+	forward();
+}
+
+$album = get_entity($album_guid);
+
+//if album does not exist or user does not have access
+if (!$album || !$album->canEdit()) {
+	// throw warning and forward to previous page
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+// set page owner based on container (user or group) 
+$container = $album->container_guid;
+set_page_owner($container);
+
+$page_owner = page_owner_entity();
+if ($page_owner instanceof ElggGroup) {
+	add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name),
+			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+}
+
+set_context('photos');
+$title = elgg_echo('album:addpix') . ': ' . $album->title;
+$area2 .= elgg_view_title($title);
+
+$area2 .= elgg_view("tidypics/forms/upload", array('album' => $album_guid ) );
 //	$area2 .= elgg_view("tidypics/forms/flash_upload", array('album' => $album_guid ) );
 
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-	
-	page_draw($title, $body);
-?>
\ No newline at end of file
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+
+page_draw($title, $body);
diff --git a/pages/viewalbum.php b/pages/viewalbum.php
index 050b124cb..fe3c5bc62 100644
--- a/pages/viewalbum.php
+++ b/pages/viewalbum.php
@@ -1,68 +1,72 @@
 container_guid)
-		set_page_owner($album->container_guid);
-	else
-		set_page_owner($album->owner_guid);
+// container should always be set, but just in case
+if ($album->container_guid) {
+	set_page_owner($album->container_guid);
+} else {
+	set_page_owner($album->owner_guid);
+}
 
-	$owner = page_owner_entity();
+$owner = page_owner_entity();
 
-	// setup group menu
-	if ($owner instanceof ElggGroup) {
-		add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
-	}
-	
-	// allow other plugins to override the slideshow
-	$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array('album' => $album), null);
-	if ($slideshow_link) {
-		add_submenu_item(elgg_echo('album:slideshow'),
-						$slideshow_link,
-						'photos' );
-	}
+// setup group menu
+if ($owner instanceof ElggGroup) {
+	add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name),
+			$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
+}
 
-	if (can_write_to_container(0, $album->container_guid)) {
-		if ($owner instanceof ElggGroup) {
-			add_submenu_item(	elgg_echo('album:create'),
-								$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
-								'photos');
-		}
-		add_submenu_item(	elgg_echo('album:addpix'),
-							$CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid,
-							'photos');
-		add_submenu_item(	elgg_echo('album:edit'),
-							$CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid,
-							'photos');
-		$ts = time();
-		$token = generate_action_token($ts);
-		add_submenu_item(	elgg_echo('album:delete'),
-							$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $album_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
-							'photos',
-							true);
+// allow other plugins to override the slideshow
+$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array('album' => $album), null);
+if ($slideshow_link) {
+	add_submenu_item(elgg_echo('album:slideshow'),
+			$slideshow_link,
+			'photos' );
+}
+
+if (can_write_to_container(0, $album->container_guid)) {
+	if ($owner instanceof ElggGroup) {
+		add_submenu_item(	elgg_echo('album:create'),
+				$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
+				'photos');
 	}
+	add_submenu_item(	elgg_echo('album:addpix'),
+			$CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid,
+			'photos');
+	add_submenu_item(	elgg_echo('album:edit'),
+			$CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid,
+			'photos');
+	$ts = time();
+	$token = generate_action_token($ts);
+	add_submenu_item(	elgg_echo('album:delete'),
+			$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $album_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
+			'photos',
+			true);
+}
 
-	// create body
-	$area2 = elgg_view_entity($album, true);
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+// create body
+$area2 = elgg_view_entity($album, true);
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 
-	page_draw($album->title, $body);
-?>
\ No newline at end of file
+page_draw($album->title, $body);
diff --git a/pages/viewimage.php b/pages/viewimage.php
index 025c1ad3b..890f7e8c4 100644
--- a/pages/viewimage.php
+++ b/pages/viewimage.php
@@ -1,58 +1,62 @@
 owner_guid);
-	$album = get_entity($photo->container_guid);
-	if ($album) {
-		$owner_guid = $album->container_guid;
-		if ($owner_guid)
-			set_page_owner($owner_guid);
+/**
+ * Tidypics image view
+ *
+ * Display a view of a single image
+ */
+
+// Load Elgg engine
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+
+// if this page belongs to a closed group, prevent anyone outside group from seeing
+if (is_callable('group_gatekeeper')) {
+	group_gatekeeper();
+}
+
+// get the album entity
+$photo_guid = (int) get_input('guid');
+$photo = get_entity($photo_guid);
+
+// panic if we can't get it
+if (!$photo) {
+	forward();
+}
+
+// set page owner based on owner of photo album
+set_page_owner($photo->owner_guid);
+$album = get_entity($photo->container_guid);
+if ($album) {
+	$owner_guid = $album->container_guid;
+	if ($owner_guid) {
+		set_page_owner($owner_guid);
 	}
+}
 
-	
-	$page_owner = page_owner_entity();
-	if ($page_owner instanceof ElggGroup) {
-		add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
-							$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-	}
 
-	if (can_write_to_container(0, $album->container_guid)) {
-		add_submenu_item(	elgg_echo('image:edit'),
-							$CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid,
-							'photos');
-		$ts = time();
-		$token = generate_action_token($ts);
-		add_submenu_item(	elgg_echo('image:delete'),
-							$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $photo_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
-							'photos',
-							true);
-	}
+$page_owner = page_owner_entity();
+if ($page_owner instanceof ElggGroup) {
+	add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name),
+			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+}
+
+if (can_write_to_container(0, $album->container_guid)) {
+	add_submenu_item(	elgg_echo('image:edit'),
+			$CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid,
+			'photos');
+	$ts = time();
+	$token = generate_action_token($ts);
+	add_submenu_item(	elgg_echo('image:delete'),
+			$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $photo_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
+			'photos',
+			true);
+}
+
 
-	
-	$title = $photo->title;
-	$area2 = elgg_view_title($title);
-	$area2 .= elgg_view_entity($photo, true);
+$title = $photo->title;
+$area2 = elgg_view_title($title);
+$area2 .= elgg_view_entity($photo, true);
 
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 
-	page_draw($title, $body);
-?>
\ No newline at end of file
+page_draw($title, $body);
diff --git a/pages/world.php b/pages/world.php
index 48a3345d4..fe97a882d 100644
--- a/pages/world.php
+++ b/pages/world.php
@@ -1,29 +1,28 @@
  $title, 'content' => $content,));
-	
-	$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
-	page_draw($title, $body);
-?>
\ No newline at end of file
+/**
+ * Tidypics View All Albums on Site
+ *
+ */
+
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+
+// set page owner to logged in user
+if (isloggedin()) {
+	set_page_owner(get_loggedin_userid());
+}
+
+$num_albums = 16;
+
+$title = elgg_echo('album:all');
+$area2 = elgg_view_title($title);
+
+set_context('search');
+set_input('search_viewtype', 'gallery');
+$content .= tp_list_entities('object','album', 0, null, $num_albums, false);
+set_context('photos');
+
+$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+
+page_draw($title, $body);
diff --git a/start.php b/start.php
index dc7debcd6..baaf33f2b 100644
--- a/start.php
+++ b/start.php
@@ -1,446 +1,468 @@
 wwwroot . "pg/photos/owned/" . $_SESSION['user']->username);
-		}
-				
-		// Extend CSS
-		elgg_extend_view('css', 'tidypics/css');
-		
-		// Extend hover-over and profile menu
-		extend_view('profile/menu/links','tidypics/hover_menu');
-		
-		//group view  ** psuedo widget view for group pages**
-		extend_view('groups/right_column','tidypics/groupprofile_albums');
-		
-		// rss extensions
-		extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
-		extend_view('extensions/channel', 'extensions/tidypics/channel');
-		
-		// Register a page handler, so we can have nice URLs
-		register_page_handler('photos','tidypics_page_handler');
-		
-		// Add a new tidypics widget
-		add_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile');
-		add_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile');
-		
-		// Register a URL handler for files
-		register_entity_url_handler('tidypics_image_url', 'object', 'image');
-		register_entity_url_handler('tidypics_album_url', 'object', 'album');
-
-		// add the class files for image and album
-		add_subtype("object", "image", "TidypicsImage");
-		add_subtype("object", "album", "TidypicsAlbum");
-
-		// Register entity type
-		register_entity_type('object','image');
-		register_entity_type('object','album');
-		
-		if (function_exists('add_group_tool_option'))
-			add_group_tool_option('photos',elgg_echo('tidypics:enablephotos'),true);
-		
-		if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled")
-			register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');
-		
-		// Register for notifications 
-		if (is_callable('register_notification_object')) {
-			register_notification_object('object', 'album', elgg_echo('tidypics:newalbum'));
-			
-			register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message');
-		}
-		
-		// slideshow plugin hook
-		register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');		
+/**
+ * Elgg tidypics
+ *
+ */
+
+// set some simple defines
+define('TP_OLD_ALBUM', 0);
+define('TP_NEW_ALBUM', 1);
+
+// include core libraries
+include dirname(__FILE__) . "/lib/tidypics.php";
+include dirname(__FILE__) . "/lib/image.php";
+include dirname(__FILE__) . "/lib/album.php";
+
+/**
+ * tidypics plugin initialisation functions.
+ */
+function tidypics_init() {
+	global $CONFIG;
+
+	// Set up menu for logged in users
+	if (isloggedin()) {
+		add_menu(elgg_echo('photos'), $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username);
 	}
-	
-	/**
-	 * Sets up sidebar menus for tidypics.  Triggered on pagesetup.
-	 */
-	function tidypics_submenus() {
-		
-		global $CONFIG;
-		
-		$page_owner = page_owner_entity();
-		
-		if ($page_owner instanceof ElggGroup) {
-			if (get_context() == "groups") {
-				if ($page_owner->photos_enable != "no") {
-					add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-				}
+
+	// Extend CSS
+	extend_view('css', 'tidypics/css');
+
+	// Extend hover-over and profile menu
+	extend_view('profile/menu/links','tidypics/hover_menu');
+
+	//group view  ** psuedo widget view for group pages**
+	extend_view('groups/right_column','tidypics/groupprofile_albums');
+
+	// rss extensions
+	extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
+	extend_view('extensions/channel', 'extensions/tidypics/channel');
+
+	// Register a page handler, so we can have nice URLs
+	register_page_handler('photos','tidypics_page_handler');
+
+	// Add a new tidypics widget
+	add_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile');
+	add_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile');
+
+	// Register a URL handler for files
+	register_entity_url_handler('tidypics_image_url', 'object', 'image');
+	register_entity_url_handler('tidypics_album_url', 'object', 'album');
+
+	// add the class files for image and album
+	add_subtype("object", "image", "TidypicsImage");
+	add_subtype("object", "album", "TidypicsAlbum");
+
+	// Register entity type
+	register_entity_type('object','image');
+	register_entity_type('object','album');
+
+	if (function_exists('add_group_tool_option')) {
+		add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true);
+	}
+
+	if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled") {
+		register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');
+	}
+
+	// Register for notifications
+	if (is_callable('register_notification_object')) {
+		register_notification_object('object', 'album', elgg_echo('tidypics:newalbum'));
+
+		register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message');
+	}
+
+	// slideshow plugin hook
+	register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
+}
+
+/**
+ * Sets up sidebar menus for tidypics.  Triggered on pagesetup.
+ */
+function tidypics_submenus() {
+
+	global $CONFIG;
+
+	$page_owner = page_owner_entity();
+
+	if ($page_owner instanceof ElggGroup) {
+		if (get_context() == "groups") {
+			if ($page_owner->photos_enable != "no") {
+				add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name),
+						$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
 			}
 		}
-		// context is only set to photos on individual pages, not on group pages
-		else if (get_context() == "photos") {
-			
-			$view_count = get_plugin_setting('view_count', 'tidypics');
-			
-			// owner gets "your albumn", "your friends albums", "your most recent", "your most viewed"
-			if (get_loggedin_userid() && get_loggedin_userid() == $page_owner->guid) {
-								
-				add_submenu_item(	elgg_echo('album:create'), 
-									$CONFIG->wwwroot . "pg/photos/new/{$page_owner->username}/", 
-									'tidypics-a' );
-
-				add_submenu_item(	elgg_echo("album:yours"), 
-									$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
-									'tidypics-a' );
-
-				add_submenu_item( 	elgg_echo('album:yours:friends'), 
-									$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
-									'tidypics-a');
-				
-				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
-									$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/",
-									'tidypics-a');
-				
-				if ($view_count != 'disabled') {
-					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
-										$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/",
-										'tidypics-a');
-				}
-				
-			} else if (isloggedin()) {
-				
-				$user = get_loggedin_user();
-				
-				// logged in not owner gets "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent"
-				// and then "your albums", "your most recent", "your most viewed"
-				add_submenu_item(	elgg_echo("album:yours"), 
-									$CONFIG->wwwroot . "pg/photos/owned/{$user->username}/", 
-									'tidypics-b' );
-								
-				add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
-									$CONFIG->wwwroot . "pg/photos/mostrecent/{$user->username}/",
-									'tidypics-b');
-									
-				if ($view_count != 'disabled') {
-					add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
-										$CONFIG->wwwroot . "pg/photos/mostviewed/{$user->username}/",
-										'tidypics-b');
-				}
-				
-				if ($page_owner->name) { // check to make sure the owner set their display name
-					add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
-										'tidypics-a' );
-					add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
-										'tidypics-a');
-					
-					if ($view_count != 'disabled') {
-						add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), 
-											$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/", 
-											'tidypics-a');
-					}
-					
-					add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name), 
-										$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/", 
-										'tidypics-a');
-				}
-			} else if ($page_owner->guid) {
-				// non logged in user gets "page owners albums", "page owner's friends albums" 
-				add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name), 
-									$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", 
-									'tidypics-a' );
-				add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name), 
-									$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", 
-									'tidypics-a');
+	}
+	// context is only set to photos on individual pages, not on group pages
+	else if (get_context() == "photos") {
+
+		$view_count = get_plugin_setting('view_count', 'tidypics');
+
+		// owner gets "your albumn", "your friends albums", "your most recent", "your most viewed"
+		if (get_loggedin_userid() && get_loggedin_userid() == $page_owner->guid) {
+
+			add_submenu_item(	elgg_echo('album:create'),
+					$CONFIG->wwwroot . "pg/photos/new/{$page_owner->username}/",
+					'tidypics-a' );
+
+			add_submenu_item(	elgg_echo("album:yours"),
+					$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/",
+					'tidypics-a' );
+
+			add_submenu_item( 	elgg_echo('album:yours:friends'),
+					$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/",
+					'tidypics-a');
+
+			add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
+					$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/",
+					'tidypics-a');
+
+			if ($view_count != 'disabled') {
+				add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
+						$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/",
+						'tidypics-a');
 			}
-			
-			// everyone gets world albums, most recent, most viewed, most recently viewed, recently commented 
-			add_submenu_item(	elgg_echo('album:all'), 
-								$CONFIG->wwwroot . "pg/photos/world/", 
-								'tidypics-z');
-			add_submenu_item(	elgg_echo('tidypics:mostrecent'),
-								$CONFIG->wwwroot . 'pg/photos/mostrecent/',
-								'tidypics-z');
-			
+
+		} else if (isloggedin()) {
+
+			$user = get_loggedin_user();
+
+			// logged in not owner gets "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent"
+			// and then "your albums", "your most recent", "your most viewed"
+			add_submenu_item(	elgg_echo("album:yours"),
+					$CONFIG->wwwroot . "pg/photos/owned/{$user->username}/",
+					'tidypics-b' );
+
+			add_submenu_item(	elgg_echo('tidypics:yourmostrecent'),
+					$CONFIG->wwwroot . "pg/photos/mostrecent/{$user->username}/",
+					'tidypics-b');
+
 			if ($view_count != 'disabled') {
-				add_submenu_item(	elgg_echo('tidypics:mostviewed'),
-									$CONFIG->wwwroot . 'pg/photos/mostviewed/',
-									'tidypics-z');
-				add_submenu_item(	elgg_echo('tidypics:recentlyviewed'),
-									$CONFIG->wwwroot . 'pg/photos/recentlyviewed/',
-									'tidypics-z');
+				add_submenu_item(	elgg_echo('tidypics:yourmostviewed'),
+						$CONFIG->wwwroot . "pg/photos/mostviewed/{$user->username}/",
+						'tidypics-b');
 			}
-			add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
-								$CONFIG->wwwroot . 'pg/photos/recentlycommented/',
-								'tidypics-z');
-/*
+
+			if ($page_owner->name) { // check to make sure the owner set their display name
+				add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name),
+						$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/",
+						'tidypics-a' );
+				add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name),
+						$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/",
+						'tidypics-a');
+
+				if ($view_count != 'disabled') {
+					add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name),
+							$CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/",
+							'tidypics-a');
+				}
+
+				add_submenu_item( 	sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name),
+						$CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/",
+						'tidypics-a');
+			}
+		} else if ($page_owner->guid) {
+			// non logged in user gets "page owners albums", "page owner's friends albums"
+			add_submenu_item(	sprintf(elgg_echo("album:user"), $page_owner->name),
+					$CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/",
+					'tidypics-a' );
+			add_submenu_item( 	sprintf(elgg_echo('album:friends'),$page_owner->name),
+					$CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/",
+					'tidypics-a');
+		}
+
+		// everyone gets world albums, most recent, most viewed, most recently viewed, recently commented
+		add_submenu_item(	elgg_echo('album:all'),
+				$CONFIG->wwwroot . "pg/photos/world/",
+				'tidypics-z');
+		add_submenu_item(	elgg_echo('tidypics:mostrecent'),
+				$CONFIG->wwwroot . 'pg/photos/mostrecent/',
+				'tidypics-z');
+
+		if ($view_count != 'disabled') {
+			add_submenu_item(	elgg_echo('tidypics:mostviewed'),
+					$CONFIG->wwwroot . 'pg/photos/mostviewed/',
+					'tidypics-z');
+			add_submenu_item(	elgg_echo('tidypics:recentlyviewed'),
+					$CONFIG->wwwroot . 'pg/photos/recentlyviewed/',
+					'tidypics-z');
+		}
+		add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
+				$CONFIG->wwwroot . 'pg/photos/recentlycommented/',
+				'tidypics-z');
+		/*
 			add_submenu_item(	'Flickr Integration',
 								$CONFIG->wwwroot . 'mod/tidypics/pages/flickr/setup.php',
 								'tidypics-z');
-*/
-		}
-		
+		*/
 	}
 
-	/**
-	 * Sets up tidypics admin menu. Triggered on pagesetup.
-	 */
-	function tidypics_adminmenu()
-	{
-		global $CONFIG;
+}
 
-		if (get_context() == 'admin' && isadminloggedin()) {
-			add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "mod/tidypics/pages/admin.php");
-		}
-	}
+/**
+ * Sets up tidypics admin menu. Triggered on pagesetup.
+ */
+function tidypics_adminmenu() {
+	global $CONFIG;
 
-	/**
-	 * Sets up submenus for tidypics most viewed pages
-	 */
-	function tidypics_mostviewed_submenus() {
-		
-		global $CONFIG;
-		
-		add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostvieweddashboard.php");
-		add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthisyear.php");
-		add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthismonth.php");
-		add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimageslastmonth.php");
-		add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagestoday.php");
-		add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimages.php");
-		add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagesthismonth.php");
-		add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagestoday.php");
-		add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented/');
+	if (get_context() == 'admin' && isadminloggedin()) {
+		add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "mod/tidypics/pages/admin.php");
 	}
+}
+
+/**
+ * Sets up submenus for tidypics most viewed pages
+ */
+function tidypics_mostviewed_submenus() {
+
+	global $CONFIG;
+
+	add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostvieweddashboard.php");
+	add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthisyear.php");
+	add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthismonth.php");
+	add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimageslastmonth.php");
+	add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagestoday.php");
+	add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimages.php");
+	add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagesthismonth.php");
+	add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagestoday.php");
+	add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented/');
+}
+
+/**
+ * tidypics page handler
+ *
+ * @param array $page Array of page elements, forwarded by the page handling mechanism
+ */
+function tidypics_page_handler($page) {
 
-	/**
-	 * tidypics page handler
-	 *
-	 * @param array $page Array of page elements, forwarded by the page handling mechanism
-	 */
-	function tidypics_page_handler($page) {
-		
-		global $CONFIG;
-		
-		if (isset($page[0])) 
-		{
-			switch($page[0]) 
-			{
-				case "owned":  //view list of albums owned by container
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/ownedalbums.php");
+	global $CONFIG;
+
+	if (isset($page[0])) {
+		switch($page[0]) {
+			case "owned":  //view list of albums owned by container
+				if (isset($page[1])) {
+					set_input('username', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/ownedalbums.php");
 				break;
 
-				case "view": //view an image individually
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");
+			case "view": //view an image individually
+				if (isset($page[1])) {
+					set_input('guid', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");
 				break;
 
-				case "album": //view an album individually
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/viewalbum.php");
+			case "album": //view an album individually
+				if (isset($page[1])) {
+					set_input('guid', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/viewalbum.php");
 				break;
 
-				case "new":  //create new album
-					if (isset($page[1])) set_input('username',$page[1]); 
-					include($CONFIG->pluginspath . "tidypics/pages/newalbum.php");
+			case "new":  //create new album
+				if (isset($page[1])) {
+					set_input('username', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/newalbum.php");
 				break;
 
-				case "upload": //upload images to album
-					if (isset($page[1])) set_input('container_guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/upload.php");
+			case "upload": //upload images to album
+				if (isset($page[1])) {
+					set_input('container_guid', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/upload.php");
 				break;
 
-				case "edit": //edit image or album
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/edit.php");
+			case "edit": //edit image or album
+				if (isset($page[1])) {
+					set_input('guid', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/edit.php");
 				break;
 
-				case "friends": // albums of friends
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/friends.php");
+			case "friends": // albums of friends
+				if (isset($page[1])) {
+					set_input('username', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/friends.php");
 				break;
 
-				case "world": // all site albums
-					include($CONFIG->pluginspath . "tidypics/pages/world.php");
+			case "world": // all site albums
+				include($CONFIG->pluginspath . "tidypics/pages/world.php");
 				break;
-				
-				case "download": // download an image
-					if (isset($page[1])) set_input('file_guid', $page[1]);
-					if (isset($page[2])) set_input('type', $page[2]);
-					include($CONFIG->pluginspath . "tidypics/pages/download.php");
+
+			case "download": // download an image
+				if (isset($page[1])) {
+					set_input('file_guid', $page[1]);
+				}
+				if (isset($page[2])) {
+					set_input('type', $page[2]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/download.php");
 				break;
-				
-				case "thumbnail": // tidypics thumbnail
-					if (isset($page[1])) set_input('file_guid', $page[1]);
-					if (isset($page[2])) set_input('size', $page[2]);
-					include($CONFIG->pluginspath . "tidypics/pages/thumbnail.php");
+
+			case "thumbnail": // tidypics thumbnail
+				if (isset($page[1])) {
+					set_input('file_guid', $page[1]);
+				}
+				if (isset($page[2])) {
+					set_input('size', $page[2]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/thumbnail.php");
 				break;
-				
-				case "tagged": // all photos tagged with user 
-					if (isset($page[1])) set_input('guid',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/tagged.php");
+
+			case "tagged": // all photos tagged with user
+				if (isset($page[1])) {
+					set_input('guid', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/tagged.php");
 				break;
 
-				case "mostviewed": // images with the most views
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/lists/mostviewedimages.php");
+			case "mostviewed": // images with the most views
+				if (isset($page[1])) {
+					set_input('username', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/lists/mostviewedimages.php");
 				break;
-				
-				case "mostrecent": // images uploaded most recently
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/lists/mostrecentimages.php");
+
+			case "mostrecent": // images uploaded most recently
+				if (isset($page[1])) {
+					set_input('username', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/lists/mostrecentimages.php");
 				break;
-								
-				case "recentlyviewed": // images most recently viewed
-					include($CONFIG->pluginspath . "tidypics/pages/lists/recentlyviewed.php");
+
+			case "recentlyviewed": // images most recently viewed
+				include($CONFIG->pluginspath . "tidypics/pages/lists/recentlyviewed.php");
 				break;
-				
-				case "recentlycommented": // images with the most recent comments
-					include($CONFIG->pluginspath . "tidypics/pages/lists/recentlycommented.php");
+
+			case "recentlycommented": // images with the most recent comments
+				include($CONFIG->pluginspath . "tidypics/pages/lists/recentlycommented.php");
 				break;
-				
-				case "highestrated": // images with the highest average rating
-					include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
+
+			case "highestrated": // images with the highest average rating
+				include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
 				break;
-				
-				case "flickr":
-					if (isset($page[1])) set_input('username',$page[1]);
-					include($CONFIG->pluginspath . "tidypics/pages/flickr/setup.php");
+
+			case "flickr":
+				if (isset($page[1])) {
+					set_input('username',$page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/flickr/setup.php");
 				break;
-			}
-		}
-		else
-		{
-			// going to all site albums if something goes wrong with the page handler 
-			include($CONFIG->pluginspath . "tidypics/pages/world.php");
 		}
-		
+	}
+	else {
+		// going to all site albums if something goes wrong with the page handler
+		include($CONFIG->pluginspath . "tidypics/pages/world.php");
 	}
 
-	/**
-	 * Override permissions for group albums and images
-	 *
-	 */
-	function tidypics_permission_override($hook, $entity_type, $returnvalue, $params)
-	{
-		$entity = $params['entity'];
-		$user   = $params['user'];
-		
-		if ($entity->subtype == get_subtype_id('object', 'album')) {
-			// test that the user can edit the container
-			return can_write_to_container(0, $entity->container_guid);
-		}
+}
 
-		if ($entity->subtype == get_subtype_id('object', 'image')) {
-			// test that the user can edit the container
-			return can_write_to_container(0, $entity->container_guid);
-		}
-	}
-	
-	
-	/**
-	 * Notification message handler
-	 */
-	function tidypics_notify_message($hook, $entity_type, $returnvalue, $params)
-	{
-		$entity = $params['entity'];
-		$to_entity = $params['to_entity'];
-		$method = $params['method'];
-		if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'album'))
-		{
-			// block notification message when the album doesn't have any photos
-			if ($entity->new_album == TP_NEW_ALBUM)
-				return false;
-				
-			$descr = $entity->description;
-			$title = $entity->title;
-			$owner = $entity->getOwnerEntity();
-			return sprintf(elgg_echo('album:river:created'), $owner->name) . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
-		}
-		return null;
-	}
-	
-	/**
-	 * Populates the ->getUrl() method for file objects
-	 * Registered in the init function
-	 *
-	 * @param ElggEntity $entity album/image entity
-	 * @return string File URL
-	 */
-	function tidypics_image_url($entity) {
-		global $CONFIG;
-		$title = $entity->title;
-		$title = friendly_title($title);
-		return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title;
+/**
+ * Override permissions for group albums and images
+ *
+ */
+function tidypics_permission_override($hook, $entity_type, $returnvalue, $params) {
+	$entity = $params['entity'];
+	$user   = $params['user'];
+
+	if ($entity->subtype == get_subtype_id('object', 'album')) {
+		// test that the user can edit the container
+		return can_write_to_container(0, $entity->container_guid);
 	}
 
-	function tidypics_album_url($entity) {
-		global $CONFIG;
-		$title = $entity->title;
-		$title = friendly_title($title);
-		return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title;
+	if ($entity->subtype == get_subtype_id('object', 'image')) {
+		// test that the user can edit the container
+		return can_write_to_container(0, $entity->container_guid);
 	}
-	
-	
-	/**
-	 * Catch the plugin hook and add the default album slideshow
-	 * 
-	 * @param $hook - 'tidypics:slideshow'
-	 * @param $entity_type - 'album'
-	 * @param $returnvalue - if set, return because another plugin has used the hook
-	 * @param $params - arry containing album entity
-	 * @return unknown_type
-	 */
-	function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
-		
-		if ($returnvalue !== null) {
-			// someone has already added a slideshow or requested that the slideshow is not used
-			return $returnvalue;
+}
+
+
+/**
+ * Notification message handler
+ */
+function tidypics_notify_message($hook, $entity_type, $returnvalue, $params) {
+	$entity = $params['entity'];
+	$to_entity = $params['to_entity'];
+	$method = $params['method'];
+	if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'album')) {
+		// block notification message when the album doesn't have any photos
+		if ($entity->new_album == TP_NEW_ALBUM) {
+			return false;
 		}
-		
-		$slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:location.href+'?view=rss'})";
-		
-		// add the slideshow javascript to the header
-		extend_view('metatags', 'tidypics/js/slideshow');
-		
-		return $slideshow_link;
+
+		$descr = $entity->description;
+		$title = $entity->title;
+		$owner = $entity->getOwnerEntity();
+		return sprintf(elgg_echo('album:river:created'), $owner->name) . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL();
 	}
-	
-	function tp_mostrecentimages($max = 8, $pagination = true) {
-		return list_entities("object", "image", 0, $max, false, false, $pagination);	
+	return null;
+}
+
+/**
+ * Populates the ->getUrl() method for file objects
+ * Registered in the init function
+ *
+ * @param ElggEntity $entity album/image entity
+ * @return string File URL
+ */
+function tidypics_image_url($entity) {
+	global $CONFIG;
+	$title = $entity->title;
+	$title = friendly_title($title);
+	return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title;
+}
+
+function tidypics_album_url($entity) {
+	global $CONFIG;
+	$title = $entity->title;
+	$title = friendly_title($title);
+	return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title;
+}
+
+
+/**
+ * Catch the plugin hook and add the default album slideshow
+ *
+ * @param $hook - 'tidypics:slideshow'
+ * @param $entity_type - 'album'
+ * @param $returnvalue - if set, return because another plugin has used the hook
+ * @param $params - arry containing album entity
+ * @return unknown_type
+ */
+function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
+
+	if ($returnvalue !== null) {
+		// someone has already added a slideshow or requested that the slideshow is not used
+		return $returnvalue;
 	}
-	
-
-	// Make sure tidypics_init is called on initialisation
-	register_elgg_event_handler('init','system','tidypics_init');
-	register_elgg_event_handler('pagesetup','system','tidypics_submenus');
-	register_elgg_event_handler('pagesetup','system','tidypics_adminmenu');
-	
-	// Register actions
-	register_action("tidypics/settings", false, $CONFIG->pluginspath . "tidypics/actions/settings.php");
-	register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
-	register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
-	register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
-	register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
-	register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
-	register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
-	register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
-	register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");
-
-?>
\ No newline at end of file
+
+	$slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:location.href+'?view=rss'})";
+
+	// add the slideshow javascript to the header
+	extend_view('metatags', 'tidypics/js/slideshow');
+
+	return $slideshow_link;
+}
+
+function tp_mostrecentimages($max = 8, $pagination = true) {
+	return list_entities("object", "image", 0, $max, false, false, $pagination);
+}
+
+
+// Make sure tidypics_init is called on initialization
+register_elgg_event_handler('init', 'system', 'tidypics_init');
+register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus');
+register_elgg_event_handler('pagesetup', 'system', 'tidypics_adminmenu');
+
+// Register actions
+register_action("tidypics/settings", false, $CONFIG->pluginspath . "tidypics/actions/settings.php");
+register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
+register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
+register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
+register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
+register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
+register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
+register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
+register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");
diff --git a/thumbnail.php b/thumbnail.php
index 79d487210..f9f9d1e5f 100644
--- a/thumbnail.php
+++ b/thumbnail.php
@@ -1,78 +1,80 @@
 getSubtype() != "image")
-		forward('mod/tidypics/graphics/' . $error_image);
-	
-	// Get filename
-	if ($size == "thumb") {
-		$thumbfile = $file->thumbnail;
-	} else if ($size == "small") {
-		$thumbfile = $file->smallthumb;
-	} else {
-		$thumbfile = $file->largethumb;
-	}
-	
-	if (!$thumbfile)
-		forward('mod/tidypics/graphics/' . $error_image);
-	
-	// create Elgg File object
-	$readfile = new ElggFile();
-	$readfile->owner_guid = $file->owner_guid;
-	$readfile->setFilename($thumbfile);
-	$contents = $readfile->grabFile();
+include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
-	// send error image if file could not be read
-	if (!$contents) {
-		forward('mod/tidypics/graphics/' . $error_image);
-	}
-	
-	// expires every 14 days
-	$expires = 14 * 60*60*24;
+// Get file GUID
+$file_guid = (int) get_input('file_guid');
 
-	// overwrite header caused by php session code so images can be cached
-	$mime = $file->getMimeType();
-	header("Content-Type: $mime");
-	header("Content-Length: " . strlen($contents));
-	header("Cache-Control: public", true);
-	header("Pragma: public", true);
-	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
-	
-	// Return the thumbnail and exit
-	echo $contents;
-	exit;
-?>
+// Get file thumbnail size
+$size = get_input('size');
+// only 3 possibilities
+if ($size != 'small' && $size != 'thumb') {
+	$size = 'large';
+}
+
+$error_image = '';
+switch ($size) {
+	case 'thumb':
+		$error_image = "image_error_thumb.png";
+		break;
+	case 'small':
+		$error_image = "image_error_small.png";
+		break;
+	case 'large':
+		$error_image = "image_error_large.png";
+		break;
+}
+
+// Get file entity
+$file = get_entity($file_guid);
+if (!$file) {
+	forward('mod/tidypics/graphics/' . $error_image);
+}
+
+if ($file->getSubtype() != "image") {
+	forward('mod/tidypics/graphics/' . $error_image);
+}
+
+// Get filename
+if ($size == "thumb") {
+	$thumbfile = $file->thumbnail;
+} else if ($size == "small") {
+	$thumbfile = $file->smallthumb;
+} else {
+	$thumbfile = $file->largethumb;
+}
+
+if (!$thumbfile) {
+	forward('mod/tidypics/graphics/' . $error_image);
+}
+
+// create Elgg File object
+$readfile = new ElggFile();
+$readfile->owner_guid = $file->owner_guid;
+$readfile->setFilename($thumbfile);
+$contents = $readfile->grabFile();
+
+// send error image if file could not be read
+if (!$contents) {
+	forward('mod/tidypics/graphics/' . $error_image);
+}
+
+// expires every 14 days
+$expires = 14 * 60*60*24;
+
+// overwrite header caused by php session code so images can be cached
+$mime = $file->getMimeType();
+header("Content-Type: $mime");
+header("Content-Length: " . strlen($contents));
+header("Cache-Control: public", true);
+header("Pragma: public", true);
+header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+
+// Return the thumbnail and exit
+echo $contents;
+exit;
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 8156a4bb4..f81f2b55c 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -1,21 +1,20 @@
 subject_guid);
-	$object = get_entity($vars['item']->object_guid);
-	$url = $object->getURL();
-	$subtype = get_subtype_from_id($object->subtype);
-	$title = $object->title;
-	if (!$title)
-		$title = elgg_echo('untitled');
+$performed_by = get_entity($vars['item']->subject_guid);
+$object = get_entity($vars['item']->object_guid);
+$url = $object->getURL();
+$subtype = get_subtype_from_id($object->subtype);
+$title = $object->title;
+if (!$title) {
+	$title = elgg_echo('untitled');
+}
 
-	$url = "getURL()}\">{$performed_by->name}";
-	$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
-	$string .= elgg_echo("{$subtype}:river:annotate") . " getURL() . "\">" . $title . "";
+$url = "getURL()}\">{$performed_by->name}";
+$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
+$string .= elgg_echo("{$subtype}:river:annotate") . " getURL() . "\">" . $title . "";
 
-?>
-
-
\ No newline at end of file
+echo $string;
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 85dd69ac9..0db0d3e49 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -1,22 +1,22 @@
 getGUID();
-	$owner = $album->getOwnerEntity();
-	$tags = $album->tags;
-	$title = $album->title;
-	$desc = $album->description;
-	$friendlytime = friendly_time($album->time_created);
-	$mime = $album->mimetype;
+global $CONFIG;
 
-	if (get_context() == "search") {
+$album = $vars['entity'];
+$album_guid = $album->getGUID();
+$owner = $album->getOwnerEntity();
+$tags = $album->tags;
+$title = $album->title;
+$desc = $album->description;
+$friendlytime = friendly_time($album->time_created);
+$mime = $album->mimetype;
 
-		if (get_input('search_viewtype') == "gallery") {
+if (get_context() == "search") {
+
+	if (get_input('search_viewtype') == "gallery") {
 
 /******************************************************************************
  *
@@ -27,30 +27,31 @@
  *
  *****************************************************************************/
 
-			//get album cover if one was set 
-			if ($album->cover)
-				$album_cover = '' . $title . '';
-			else
-				$album_cover = 'new album';
-
+		//get album cover if one was set
+		if ($album->cover) {
+			$album_cover = '' . $title . '';
+		} else {
+			$album_cover = 'new album';
+		}
 ?>
 
      
 	
      
 		
 	
      
 	
      
-	name;?> 
-	

      
-getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
+	name;?>
+		

      
+				getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
+				}
 ?>
 	      
 
      ' . $title . '
      ';
-			$info .= "
      username}\">{$owner->name} {$friendlytime}";
-			$numcomments = elgg_count_comments($album);
-			if ($numcomments)
-				$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
-			$info .= "
      ";
-			
-			//get album cover if one was set 
-			if ($album->cover)
-				$icon = "getURL()}\">" . 'thumbnail';
-			else
-				$icon = "getURL()}\">" . 'new album';
-			
-			echo elgg_view_listing($icon, $info);
+		$info = '
      ' . $title . '
      ';
+		$info .= "
      username}\">{$owner->name} {$friendlytime}";
+		$numcomments = elgg_count_comments($album);
+		if ($numcomments) {
+			$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
 		}
-	} else {
+		$info .= "
      ";
+
+		//get album cover if one was set
+		if ($album->cover) {
+			$icon = "getURL()}\">" . 'thumbnail';
+		} else {
+			$icon = "getURL()}\">" . 'new album';
+		}
+		echo elgg_view_listing($icon, $info);
+	}
+} else {
 
 /******************************************************************************
  *
@@ -86,76 +88,76 @@
  *
  *****************************************************************************/
 
-		$page = get_input("page");
-		list($album_placeholder, $album_id, $album_title) = split("/", $page);
-		
-		$photo_ratings = get_plugin_setting('photo_ratings', 'tidypics');
-		if ($photo_ratings == "enabled")
-			add_submenu_item(	elgg_echo("tidypics:highestrated"),
-								$CONFIG->wwwroot . "pg/photos/highestrated/group:" . $album_id,
-								'photos');
-								
-		echo elgg_view_title($title);
+	$page = get_input("page");
+	list($album_placeholder, $album_id, $album_title) = split("/", $page);
+
+	$photo_ratings = get_plugin_setting('photo_ratings', 'tidypics');
+	if ($photo_ratings == "enabled") {
+		add_submenu_item(	elgg_echo("tidypics:highestrated"),
+				$CONFIG->wwwroot . "pg/photos/highestrated/group:" . $album_id,
+				'photos');
+	}
+	echo elgg_view_title($title);
 ?>
 
      
 	
      
-		
+			
 	
      
-' . autop($desc) . '
      ';
-		
-		$images = get_entities("object", "image", $album_guid, '', 999);
-		
-		//build array for back | next links 
-		$_SESSION['image_sort'] = array();
-		
-		if (is_array($images)) {
-			foreach ($images as $image) {
-				array_push($_SESSION['image_sort'], $image->guid);
-			}
-			
-			// display the simple image views. Uses 'object/image' view
-			echo list_entities("object", "image", $album_guid, 24, false);
-			
-			$num_images = count($images);
-		} else {
-			echo '
      ' . elgg_echo('image:none') . '
      ';
-			$num_images = 0;
+' . autop($desc) . '';
+
+	$images = get_entities("object", "image", $album_guid, '', 999);
+
+	//build array for back | next links
+	$_SESSION['image_sort'] = array();
+
+	if (is_array($images)) {
+		foreach ($images as $image) {
+			array_push($_SESSION['image_sort'], $image->guid);
 		}
-	
+
+		// display the simple image views. Uses 'object/image' view
+		echo list_entities("object", "image", $album_guid, 24, false);
+
+		$num_images = count($images);
+	} else {
+		echo '
      ' . elgg_echo('image:none') . '
      ';
+		$num_images = 0;
+	}
+
 ?>
 	
      
 	
      
-
 		
       $tags));?>
      
-
-		 name; ?>  
      
-		 
      
+	 name; ?>  
      
+	 
      
 
 		
      
-: 
-			:
+
 	
      
 
 ';
-	} // end of individual album view
-?>
+	if ($vars['full']) {
+		echo elgg_view_comments($album);
+	}
+
+	echo '';
+} // end of individual album view
+
diff --git a/views/default/object/image.php b/views/default/object/image.php
index ee81d800f..cd53120de 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -1,19 +1,19 @@
 getGUID();
-	$tags = $image->tags;
-	$title = $image->title;
-	$desc = $image->description;
-	$owner = $image->getOwnerEntity();
-	$friendlytime = friendly_time($image->time_created);
+$image = $vars['entity'];
+$image_guid = $image->getGUID();
+$tags = $image->tags;
+$title = $image->title;
+$desc = $image->description;
+$owner = $image->getOwnerEntity();
+$friendlytime = friendly_time($image->time_created);
 
 
 /********************************************************************
@@ -21,69 +21,65 @@
  * search view of an image
  *
  ********************************************************************/
-	if (get_context() == "search") { 
+if (get_context() == "search") {
 
-		// gallery view is a matrix view showing just the image - size: small
-		if (get_input('search_viewtype') == "gallery") {
-			?>
-			
      
-				thumbnail
-			
      
-			'.$title.'
      ';
-			$info .= "
      username}\">{$owner->name} {$friendlytime}";
-			$numcomments = elgg_count_comments($image);
-			if ($numcomments)
-				$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
-			$info .= "
      ";
-			$icon = "getURL()}\">" . '' . $title . '';
-			
-			echo elgg_view_listing($icon, $info);
+	// gallery view is a matrix view showing just the image - size: small
+	if (get_input('search_viewtype') == "gallery") {
+?>
+
      
+	thumbnail
+
      
+'.$title.'
      ';
+		$info .= "
      username}\">{$owner->name} {$friendlytime}";
+		$numcomments = elgg_count_comments($image);
+		if ($numcomments) {
+			$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
 		}
+		$info .= "
      ";
+		$icon = "getURL()}\">" . '' . $title . '';
+
+		echo elgg_view_listing($icon, $info);
+	}
 
 /***************************************************************
  *
  * front page view 
  *
  ****************************************************************/
-	} else if (get_context() == "front") {
-		// the front page view is a clikcable thumbnail of the image
+} else if (get_context() == "front") {
+	// the front page view is a clickable thumbnail of the image
 ?>
 
-<?php echo $title; ?>
+	<?php echo $title; ?>
 
-
- $image), $image_html);
-	
-	if ($image_html) {
-		echo $image_html;
-	} else {
-		// default link to image if no one overrides
-?>
-	
      
-		<?php echo $image->title; ?>
-	
      
- $image), $image_html);
+
+		if ($image_html) {
+			echo $image_html;
+		} else {
+			// default link to image if no one overrides
 ?>
+
      
+	<?php echo $image->title; ?>
+
      
 container_guid);
 
-			$current = array_search($image_guid, $_SESSION['image_sort']);
+		// Build back and next links
+		$back = '';
+		$next = '';
 
-			if (!$current) {  // means we are no longer using the correct album array
+		$album = get_entity($image->container_guid);
 
-				//rebuild the array
-				$count = get_entities("object","image", $album->guid, '', 999);
-				$_SESSION['image_sort'] = array();
+		$current = array_search($image_guid, $_SESSION['image_sort']);
 
-				foreach ($count as $img) {
-					array_push($_SESSION['image_sort'], $img->guid);
-				}
+		if (!$current) {  // means we are no longer using the correct album array
 
-				if ($_SESSION['image_sort'])
-					$current = array_search($image_guid, $_SESSION['image_sort']);
+			//rebuild the array
+			$count = get_entities("object","image", $album->guid, '', 999);
+			$_SESSION['image_sort'] = array();
+
+			foreach ($count as $img) {
+				array_push($_SESSION['image_sort'], $img->guid);
 			}
 
-			if ($current != 0)
-				$back = '« ' . elgg_echo('image:back') . '';
+			if ($_SESSION['image_sort']) {
+				$current = array_search($image_guid, $_SESSION['image_sort']);
+			}
+		}
 
-			if (sizeof($_SESSION['image_sort']) > $current + 1)
-				$next = '' . elgg_echo('image:next') . ' »';
+		if ($current != 0) {
+			$back = '« ' . elgg_echo('image:back') . '';
+		}
 
+		if (sizeof($_SESSION['image_sort']) > $current + 1) {
+			$next = '' . elgg_echo('image:next') . ' »';
+		}
 
 ?>
 
      
 	
      
 
 		
      
-			 $album,) ); ?> 
      
-			addView($viewer->guid);
-					$views = $image->getViews($viewer->guid);
-					if (is_array($views)) {
-						echo sprintf(elgg_echo("tidypics:views"), $views['total']);
-						if ($owner->guid == $viewer->guid) {
-							echo ' ' . sprintf(elgg_echo("tidypics:viewsbyowner"), $views['unique']);
-						}
-						else {
-							if ($views['mine'])
-								echo ' ' . sprintf(elgg_echo("tidypics:viewsbyothers"), $views['mine']);
+					 $album,) ); ?> 
      
+addView($viewer->guid);
+						$views = $image->getViews($viewer->guid);
+						if (is_array($views)) {
+							echo sprintf(elgg_echo("tidypics:views"), $views['total']);
+							if ($owner->guid == $viewer->guid) {
+								echo ' ' . sprintf(elgg_echo("tidypics:viewsbyowner"), $views['unique']);
+							} else {
+								if ($views['mine']) {
+									echo ' ' . sprintf(elgg_echo("tidypics:viewsbyothers"), $views['mine']);
+								}
+							}
 						}
 					}
-				}
-			?>
+?>
 		
      
 
 		
      
-			
+					
 		
      
 		
      
 			
        
@@ -159,73 +157,74 @@
 			
      
 		
      
 		
      
-			";
-					$image_html .= "\"{$title}\"";
-					$image_html .= "";
-				} else {
-					$image_html = "\"{$title}\"";
-				}
-				// does any plugin want to override the link
-				$image_html = trigger_plugin_hook('tp_thumbnail_link', 'image', array('image' => $image), $image_html);
-				echo $image_html;
-				?>
+					";
+						$image_html .= "\"{$title}\"";
+						$image_html .= "";
+					} else {
+						$image_html = "\"{$title}\"";
+					}
+					// does any plugin want to override the link
+					$image_html = trigger_plugin_hook('tp_thumbnail_link', 'image', array('image' => $image), $image_html);
+					echo $image_html;
+					?>
 			
      
 		
      
-
        ';
-			echo elgg_view('tidypics/image_menu', array('image_guid' => $image_guid, 
-														'viewer' => $viewer,
-														'owner' => $owner,
-														'anytags' => $image->isPhotoTagged(),
-														'album' => $album, ) );
-			echo '
      '; 
-			
-			// tagging code - photo tags on images, photo tag listing and hidden divs used in tagging 
-			if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
-				echo elgg_view('tidypics/tagging', array(	'image' => $image, 
-															'viewer' => $viewer,
-															'owner' => $owner, ) );
-			}
-			
-			
-			if (get_plugin_setting('exif', 'tidypics') == "enabled") {
+				
        ';
+				echo elgg_view('tidypics/image_menu', array(
+					'image_guid' => $image_guid,
+					'viewer' => $viewer,
+					'owner' => $owner,
+					'anytags' => $image->isPhotoTagged(),
+					'album' => $album, ) );
+				echo '
      ';
+
+				// tagging code - photo tags on images, photo tag listing and hidden divs used in tagging
+				if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
+					echo elgg_view('tidypics/tagging', array(
+						'image' => $image,
+						'viewer' => $viewer,
+						'owner' => $owner, ) );
+				}
+
+
+				if (get_plugin_setting('exif', 'tidypics') == "enabled") {
+					echo elgg_view('tidypics/exif', array('guid'=> $image_guid));
+				}
 ?>
-				 $image_guid)); ?>
-
 		
      
-
+
 			
       $tags));?>
      
-
 			
      
-	 $vars['entity'])); ?>
-
      
+							 $vars['entity'])); ?>
+			
      
  name; ?>   name; ?>  
 		
 	 
 ';
-
-			echo '';  // content wrapper
+		echo elgg_view_comments($image);
 
-		} // end of individual image display
+		echo '
      ';
 
-	}
-
-?>
+		echo '';  // content wrapper
 
+	} // end of individual image display
 
+}
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 20f9293d7..ef50f9988 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -1,42 +1,41 @@
 subject_guid);
-	$album = get_entity($vars['item']->object_guid);
-	
-	$group_album = ($album->owner_guid != $album->container_guid);
-	if ($group_album) {
-		$group = get_entity($album->container_guid);
-		$group_name = $group->name;
-		$group_link = $group->getURL();
+$performed_by = get_entity($vars['item']->subject_guid);
+$album = get_entity($vars['item']->object_guid);
+
+$group_album = ($album->owner_guid != $album->container_guid);
+if ($group_album) {
+	$group = get_entity($album->container_guid);
+	$group_name = $group->name;
+	$group_link = $group->getURL();
+}
+
+$url = "getURL()}\">{$performed_by->name}";
+$string = sprintf(elgg_echo("album:river:created"), $url) . " ";
+$string .= "getURL() . "\">" . $album->title . "";
+if ($group_album) {
+	$string .= ' ' . elgg_echo('album:river:group') . ' ' . "{$group_name}";
+}
+
+$album_river_view = get_plugin_setting('album_river_view', 'tidypics');
+
+if ($album_river_view == "cover") {
+	if ($album->cover) {
+		$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
 	}
-	
-	$url = "getURL()}\">{$performed_by->name}";
-	$string = sprintf(elgg_echo("album:river:created"),$url) . " ";
-	$string .= "getURL() . "\">" . $album->title . "";
-	if ($group_album)
-		$string .= ' ' . elgg_echo('album:river:group') . ' ' . "{$group_name}";
-
-	$album_river_view = get_plugin_setting('album_river_view', 'tidypics');
-	
-	if ($album_river_view == "cover") {
-		if ($album->cover) {
-			$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
-		}
-	} else {
+} else {
 
-		$string .= "
      ";
-		
-		$images = get_entities("object", "image", $album->guid, 'time_created desc', 7);
+	$string .= "
      ";
 
-		if (count($images)) {
-			foreach($images as $image){
-				$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
-			}
-		}
+	$images = get_entities("object", "image", $album->guid, 'time_created desc', 7);
 
-		$string .= "
      ";
+	if (count($images)) {
+		foreach($images as $image) {
+			$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
+		}
 	}
 
-echo $string;
+	$string .= "
      ";
+}
 
-?>
+echo $string;
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index cd2351a2e..188fc6ff1 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,29 +1,27 @@
 subject_guid);
-	$image = get_entity($vars['item']->object_guid);
-	if($image->title) {
-		$title = $image->title;
-	} else {
-		$title = "untitled";
-	}
+$performed_by = get_entity($vars['item']->subject_guid);
+$image = get_entity($vars['item']->object_guid);
+if ($image->title) {
+	$title = $image->title;
+} else {
+	$title = "untitled";
+}
 
-	$url = "getURL()}\">{$performed_by->name}";
-	$album = get_entity($image->container_guid);
+$url = "getURL()}\">{$performed_by->name}";
+$album = get_entity($image->container_guid);
 
-	$album_link = "" . $album->title . "";
-	$image_link = "getURL() . "\">" . $title . "";
-	
-	$string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_link);
-		
-	$string .= "
      ";
+$album_link = "" . $album->title . "";
+$image_link = "getURL() . "\">" . $title . "";
+
+$string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_link);
+
+$string .= "
      ";
 
 /*	// this adds the album cover to the river display 
 	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
 */
-	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
-	$string .= "
      ";
-	
-	echo $string;
+$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
+$string .= "
      ";
 
-?>
\ No newline at end of file
+echo $string;
diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php
index 1b3589afb..961761c99 100644
--- a/views/default/river/object/image/tag.php
+++ b/views/default/river/object/image/tag.php
@@ -1,23 +1,22 @@
 subject_guid);
-	$person_tagged = get_entity($vars['item']->object_guid);
-	if($image->title) {
-		$title = $image->title;
-	} else {
-		$title = "untitled";
-	}
-	
-	// viewer may not have permission to view image
-	if (!$image)
-		return;
-	
-	
-	$image_url = "getURL()}\">{$title}";
-	$person_url = "getURL()}\">{$person_tagged->name}";
-	
-	$string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url;
-	
-	echo $string;
+$image = get_entity($vars['item']->subject_guid);
+$person_tagged = get_entity($vars['item']->object_guid);
+if ($image->title) {
+	$title = $image->title;
+} else {
+	$title = "untitled";
+}
 
-?>
\ No newline at end of file
+// viewer may not have permission to view image
+if (!$image) {
+	return;
+}
+
+
+$image_url = "getURL()}\">{$title}";
+$person_url = "getURL()}\">{$person_tagged->name}";
+
+$string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url;
+
+echo $string;
diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php
index eb391c8bc..a6b2c2d0c 100644
--- a/views/default/settings/tidypics/edit.php
+++ b/views/default/settings/tidypics/edit.php
@@ -1,7 +1,7 @@
 wwwroot . 'mod/tidypics/pages/server_analysis.php';
-	$settings_url = $CONFIG->wwwroot . 'mod/tidypics/pages/admin.php';
+global $CONFIG;  
+$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
+$settings_url = $CONFIG->wwwroot . 'mod/tidypics/pages/admin.php';
 ?>
 
 
      
diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php
index b4656afe1..a0d0c19e7 100644
--- a/views/default/tidypics/admin/imagelib.php
+++ b/views/default/tidypics/admin/imagelib.php
@@ -1,62 +1,62 @@
 dbprefix}entities where subtype={$img_type}";
-	$total = get_data_row($query);
-	$num_images = $total->total;
-	
-	$img_type = get_subtype_id('object', 'album');
-	$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
-	$total = get_data_row($query);
-	$num_albums = $total->total;
+$img_type = get_subtype_id('object', 'image');
+$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
+$total = get_data_row($query);
+$num_images = $total->total;
 
-	$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment');
-	$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment');
-	
-	$num_views = count_annotations(0, 'object', 'image', 'tp_view');
-	
-	if (get_plugin_setting('tagging', 'tidypics') != "disabled")
-		$num_tags = count_annotations(0, 'object', 'image', 'phototag');
+$img_type = get_subtype_id('object', 'album');
+$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
+$total = get_data_row($query);
+$num_albums = $total->total;
+
+$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment');
+$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment');
+
+$num_views = count_annotations(0, 'object', 'image', 'tp_view');
+
+if (get_plugin_setting('tagging', 'tidypics') != "disabled")
+	$num_tags = count_annotations(0, 'object', 'image', 'phototag');
 ?>
 
      
 
      Overview
      
 
      
-An image library is required by Tidypics to perform various manipulations: resizing on upload, watermarking, rotation, and cropping.
-There are three image library options with Tidypics: PHP extension GD, 
-ImageMagick called via a system call, and the PHP extension 
-imagick. GD is the most common of the three on hosted servers but suffers 
-from serious memory usage problems when resizing photos. If you have access to ImageMagick (whether through system calls or the
-PHP extension), we recommend that you use that.
+	An image library is required by Tidypics to perform various manipulations: resizing on upload, watermarking, rotation, and cropping.
+	There are three image library options with Tidypics: PHP extension GD,
+	ImageMagick called via a system call, and the PHP extension
+	imagick. GD is the most common of the three on hosted servers but suffers
+	from serious memory usage problems when resizing photos. If you have access to ImageMagick (whether through system calls or the
+	PHP extension), we recommend that you use that.
 
      
 
      Testing ImageMagick Commandline
      
 
      
-To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can check our 
-server analysis page to find out the 
-configuration of your server. Next, you need to determine the path to ImageMagick on your server. Your hosting service should 
-be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of 
-ImageMagick installed on your server.  
+	To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can check our
+	server analysis page to find out the
+	configuration of your server. Next, you need to determine the path to ImageMagick on your server. Your hosting service should
+	be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of
+	ImageMagick installed on your server.
 
      
 
      
 
      
-
      
-
-
+	
      
+	
+	
 
      
 
      
 
 
\ No newline at end of file
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
index ce5652c16..bc0befa16 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -1,26 +1,26 @@
  elgg_echo("tidypics:admin:instructions")));
-	
-	global $CONFIG;  
-	$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
-	$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/actions/upgrade.php';
-	$upgrade_url = elgg_add_action_tokens_to_url($upgrade_url);
-	
-	$upgrade = false;
-	if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album'))
-		$upgrade = true;
+echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
+
+global $CONFIG;  
+$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
+$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/actions/upgrade.php';
+$upgrade_url = elgg_add_action_tokens_to_url($upgrade_url);
+
+$upgrade = false;
+if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) {
+	$upgrade = true;
+}
 ?>
 
      
-
-Upgrade
      
-
+	Upgrade
      
+		
-Run Server Analysis
+	?>
+	Run Server Analysis
 
      
 
\ No newline at end of file
+echo elgg_view("tidypics/forms/settings");
diff --git a/views/default/tidypics/admin/stats.php b/views/default/tidypics/admin/stats.php
index aea5e75ba..0b088dc2e 100644
--- a/views/default/tidypics/admin/stats.php
+++ b/views/default/tidypics/admin/stats.php
@@ -1,35 +1,36 @@
 dbprefix}entities where subtype={$img_type}";
-	$total = get_data_row($query);
-	$num_images = $total->total;
-	
-	$img_type = get_subtype_id('object', 'album');
-	$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
-	$total = get_data_row($query);
-	$num_albums = $total->total;
+$img_type = get_subtype_id('object', 'image');
+$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
+$total = get_data_row($query);
+$num_images = $total->total;
 
-	$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment');
-	$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment');
-	
-	$num_views = count_annotations(0, 'object', 'image', 'tp_view');
-	
-	if (get_plugin_setting('tagging', 'tidypics') != "disabled")
-		$num_tags = count_annotations(0, 'object', 'image', 'phototag');
+$img_type = get_subtype_id('object', 'album');
+$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}";
+$total = get_data_row($query);
+$num_albums = $total->total;
+
+$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment');
+$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment');
+
+$num_views = count_annotations(0, 'object', 'image', 'tp_view');
+
+if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
+	$num_tags = count_annotations(0, 'object', 'image', 'phototag');
+}
 ?>
 
      
-
      
-Photos: 
      
-Albums: 
      
-Comments on photos: 
      
-Comments on albums: 
      
-Total views: 
      
+	
      
+	Photos: 
      
+	Albums: 
      
+	Comments on photos: 
      
+	Comments on albums: 
      
+	Total views: 
      
 
-Photo tags: 
      
+	Photo tags: 
      
 
 
      
\ No newline at end of file
diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
index fa518156c..a46781c2a 100644
--- a/views/default/tidypics/admin/tidypics.php
+++ b/views/default/tidypics/admin/tidypics.php
@@ -1,32 +1,32 @@
 
 
      
 	
      
@@ -38,7 +38,7 @@
 			
    40. >
      41. 
 		
 	
      
-
+	?>
 
      
diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php
index 42ac15afe..a4b2ee906 100644
--- a/views/default/tidypics/albums.php
+++ b/views/default/tidypics/albums.php
@@ -1,51 +1,53 @@
 ';
+echo '
      ';
 
-	if ($owner_albums) { 
-		foreach($owner_albums as $album) {
+if ($owner_albums) {
+	foreach ($owner_albums as $album) {
 
-			if($album->cover)
-				$album_cover = '' . $album->title . '';
-			else
-				$album_cover = '' . $album->title . '';
+		if ($album->cover) {
+			$album_cover = '' . $album->title . '';
+		} else {
+			$album_cover = '' . $album->title . '';
+		}
 ?>
-		
      
-			
      title;?>
      
-			
       time_created);?>
      
-
+	
      title;?>
      
+	
       time_created);?>
      
+			getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")
      ";
+			}
 ?>
-			
-		
      
-username) || empty($owner->username)) {
-			echo '
      ' . elgg_echo('album:all') . '
      ';
-		} else {
-			echo '
      ' . elgg_echo('album:more') . '
      ';
-		}
-
+	
+
      
+		username) || empty($owner->username)) {
+		echo '
      ' . elgg_echo('album:all') . '
      ';
+	} else {
+		echo '
      ' . elgg_echo('album:more') . '
      ';
 	}
 
-	if (can_write_to_container(0, $owner->guid)) {
-		echo '
      username . '>' . elgg_echo("album:create") . '
      ';
-	}
+}
+
+if (can_write_to_container(0, $owner->guid)) {
+	echo '
      username . '>' . elgg_echo("album:create") . '
      ';
+}
 
 
-	//close album_widget_container div
-	echo "";
-?>
\ No newline at end of file
+//close album_widget_container div
+echo "";
diff --git a/views/default/tidypics/breadcrumbs.php b/views/default/tidypics/breadcrumbs.php
index c4d347e6e..e9f491b38 100644
--- a/views/default/tidypics/breadcrumbs.php
+++ b/views/default/tidypics/breadcrumbs.php
@@ -1,22 +1,23 @@
 wwwroot . "pg/photos/owned/" . $page_owner->username;
-	if (get_loggedin_userid() == $page_owner->guid)
-		$first_level_text = elgg_echo('album:yours');
-	else
-		$first_level_text = sprintf(elgg_echo('album:user'), $page_owner->name);
+$first_level_text = '';
+$first_level_link = $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username;
+if (get_loggedin_userid() == $page_owner->guid) {
+	$first_level_text = elgg_echo('album:yours');
+} else {
+	$first_level_text = sprintf(elgg_echo('album:user'), $page_owner->name);
+}
 ?>
 
 title;
-		$second_level_link = $vars['album']->getURL();
-?>
+$second_level_text = '';
+if (isset($vars['album'])) {
+	$second_level_text = $vars['album']->title;
+	$second_level_link = $vars['album']->getURL();
+	?>
 >>  
-
+	';
-		foreach ($exif as $name => $value) {
-			echo $name . ': ' . $value . '
      ';
-		}
-		echo '';
+$guid = $vars['guid'];
+
+$exif = tp_exif_formatted($guid);
+if ($exif) {
+	echo '
      ';
+	foreach ($exif as $name => $value) {
+		echo $name . ': ' . $value . '
      ';
 	}
-	
+	echo '
      ';
+}
+
 ?>
\ No newline at end of file
diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index 1758d14f4..74d8e85ec 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -1,45 +1,42 @@
 title;
-		$body = $vars['entity']->description;
-		$tags = $vars['entity']->tags;
-		$access_id = $vars['entity']->access_id;
-		$subtype = $vars['subtype'];
+/**
+ * Tidypics images edit/add form
+ *  This form is used to:
+ *	- create albums
+ *	- edit albums
+ *	- edit images
+ */
+
+//set stuff if we are editing existing album or image
+if (isset($vars['entity'])) {
+	$action = "tidypics/edit";
+	$title = $vars['entity']->title;
+	$body = $vars['entity']->description;
+	$tags = $vars['entity']->tags;
+	$access_id = $vars['entity']->access_id;
+	$subtype = $vars['subtype'];
 
 	// if nothing is sent, create new, but only new albums are sent here
 	// new images are sent to upload.php
-	} else  {
-		$action = "tidypics/addalbum";
-		$tags = "";
-		$title = "";
-		$body = "";
-		if (defined('ACCESS_DEFAULT'))
-			$access_id = ACCESS_DEFAULT;
-		else
-			$access_id = 1; // logged_in by default
-		$subtype = 'album';
-		
-		$title = $_SESSION['tidypicstitle'];
-		$body = $_SESSION['tidypicsbody'];
-		$tags = $_SESSION['tidypicstags'];
-
-		unset($_SESSION['tidypicstitle']); 
-		unset($_SESSION['tidypicsbody']); 
-		unset($_SESSION['tidypicstags']);
-	}
-
-	// group or individual 
-	$container_guid = page_owner();
+} else {
+	$action = "tidypics/addalbum";
+	$tags = "";
+	$title = "";
+	$body = "";
+	$access_id = ACCESS_DEFAULT;
+	$subtype = 'album';
+
+	$title = $_SESSION['tidypicstitle'];
+	$body = $_SESSION['tidypicsbody'];
+	$tags = $_SESSION['tidypicstags'];
+
+	unset($_SESSION['tidypicstitle']);
+	unset($_SESSION['tidypicsbody']);
+	unset($_SESSION['tidypicstags']);
+}
+
+// group or individual 
+$container_guid = page_owner();
 
 ?>
 
      
@@ -48,79 +45,79 @@
 			
 			 "tidypicstitle", "value" => $title,));  ?>
 		
      
-
+			?>
 		
      
 			
-			 "tidypicsbody","value" => $body,)); ?>
+				 "tidypicsbody","value" => $body,)); ?>
 		
      
-
+			?>
 		
      
 			
-			 "tidypicsbody","value" => $body,"class" => 'tidypics_caption_input')); ?>
+				 "tidypicsbody","value" => $body,"class" => 'tidypics_caption_input')); ?>
 		
      
-
+			
 		
      
 			
 			 "tidypicstags","value" => $tags,));  ?>
 		
      
 
-container_guid;
-			
+
 			// should this image be the cover for the album - only ask for non-cover photos
 			// determine if it is already the cover
 			$img_guid = $vars['entity']->guid;
 			$album = get_entity($container_guid);
 			$cover_guid = $album->cover;
-			
-			if ($cover_guid != $img_guid) { 
-			
-?>
+
+			if ($cover_guid != $img_guid) {
+
+				?>
 		
      
- "cover", 
-													'options' => array(elgg_echo("album:cover")),
-													));
-?>
+					 "cover",
+					'options' => array(elgg_echo("album:cover")),
+					));
+					?>
 		
      
-
+				?>
 		
      
-			
+					
 		
      
 
-
-			
      
-				
+				
+		
      
+			
 				 'access_id','value' => $access_id)); ?>
-			
      
+		
      
 
-
-			
-
+		
+			
+		?>
 		
 		
 		
      
diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php
index 4031b7968..c16c8eea9 100644
--- a/views/default/tidypics/forms/edit_multi.php
+++ b/views/default/tidypics/forms/edit_multi.php
@@ -1,7 +1,7 @@
 
 
      
 
      
@@ -11,9 +11,11 @@
 	
 	// make sure one of the images becomes the cover if there isn't one already
 	$album_entity = get_entity($vars['album_guid']);
-	if (!$album_entity->cover) $no_cover = true;
+	if (!$album_entity->cover) {
+		$no_cover = true;
+	}
 	
-	foreach ($file_array as $key => $file_guid){
+	foreach ($file_array as $key => $file_guid) {
 		$entity = get_entity($file_guid);
 		$guid = $entity->guid;
 		$body = $entity->description;
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index 0729b536b..e7d05adcc 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -1,158 +1,182 @@
 version) {
-		set_plugin_setting('version', 1.62, 'tidypics');
+/**
+ * Tidypics admin settings form
+ */
+
+
+
+$action = $vars['url'] . 'action/tidypics/settings';
+
+$plugin = find_plugin_settings('tidypics');
+
+
+// bootstrap the plugin version here for now
+if (!$plugin->version) {
+	set_plugin_setting('version', 1.62, 'tidypics');
+}
+
+
+// Main settings
+$form_body = '
      ' . elgg_echo('tidypics:settings:heading:main') . '
      ';
+
+// Tagging
+$tagging = $plugin->tagging;
+if (!$tagging) {
+	$tagging = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
+
+// Download Link
+$download_link = $plugin->download_link;
+if (!$download_link) {
+	$download_link = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
+
+// Ratings
+$photo_ratings = $plugin->photo_ratings;
+if (!$photo_ratings) {
+	$photo_ratings = "disabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
+
+// Show EXIF
+$exif = $plugin->exif;
+if (!$exif) {
+	$exif = "disabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
+
+// Show View count
+$view_count = $plugin->view_count;
+if (!$view_count) {
+	$view_count = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
+
+// Watermark Text
+$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
+$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
+
+// Max Image Size
+$maxfilesize = $plugin->maxfilesize;
+if (!$maxfilesize) {
+	$maxfilesize = (int)5; // 5 MB
+}
+$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
+$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
+
+// Quota Size
+$quota = $plugin->quota;
+if (!$quota) {
+	$quota = 0;
+}
+$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
+$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
+
+// Image Library
+if (extension_loaded('imagick')) {
+	$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
+}
+
+$disablefunc = explode(',', ini_get('disable_functions'));
+if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+	$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
+}
+
+$img_lib_options['GD'] = 'GD';
+
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:img_lib') . '
      ';
+$image_lib = $plugin->image_lib;
+if (!$image_lib) {
+	$image_lib = 'GD';
+}
+$form_body .= '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
+$form_body .= elgg_view('input/pulldown', array(
+		'internalname' => 'params[image_lib]',
+		'options_values' => $img_lib_options,
+		'value' => $image_lib
+));
+$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
+
+if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+	// Image Magick Path
+	$im_path = $plugin->im_path;
+	if(!$im_path) {
+		$im_path = "/usr/bin/";
 	}
-	
-
-	// Main settings
-	$form_body = '
      ' . elgg_echo('tidypics:settings:heading:main') . '
      ';
-
-	// Tagging
-	$tagging = $plugin->tagging;
-	if(!$tagging) $tagging = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
-
-	// Download Link
-	$download_link = $plugin->download_link;
-	if(!$download_link) $download_link = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
-
-	// Ratings
-	$photo_ratings = $plugin->photo_ratings;
-	if(!$photo_ratings) $photo_ratings = "disabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
-
-	// Show EXIF
-	$exif = $plugin->exif;
-	if(!$exif) $exif = "disabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
-
-	// Show View count
-	$view_count = $plugin->view_count;
-	if(!$view_count) $view_count = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
-
-	// Watermark Text
-	$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
-
-	// Max Image Size
-	$maxfilesize = $plugin->maxfilesize;
-	if (!$maxfilesize) $maxfilesize = (int)5; // 5 MB
-	$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
-
-	// Quota Size
-	$quota = $plugin->quota;
-	if (!$quota) $quota = 0;
-	$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
-
-	// Image Library
-	if (extension_loaded('imagick')) {
-		$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
-	}
-
-	$disablefunc = explode(',', ini_get('disable_functions'));
-	if (is_callable('exec') && !in_array('exec',$disablefunc)) {
-		$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
-	}
-
-	$img_lib_options['GD'] = 'GD';
-
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:img_lib') . '
      ';
-	$image_lib = $plugin->image_lib;
-	if (!$image_lib) $image_lib = 'GD';
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
-	$form_body .= elgg_view('input/pulldown', array(
-					'internalname' => 'params[image_lib]',
-					'options_values' => $img_lib_options,
-					'value' => $image_lib
-	));
-	$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
-
-	if (is_callable('exec') && !in_array('exec',$disablefunc)) {
-		// Image Magick Path
-		$im_path = $plugin->im_path;
-		if(!$im_path) $im_path = "/usr/bin/";
-		$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
-		$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
-	}
-
-
-	// River Image options
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:river') . '
      ';
-	$img_river_view = $plugin->img_river_view;
-	if (!$img_river_view) $img_river_view = '1';
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view');
-	$form_body .= elgg_view('input/pulldown', array(
-					'internalname' => 'params[img_river_view]',
-					'options_values' => array(
-						'all' => 'all',
-						'1' => '1',
-						'none' => 'none',
-					),
-					'value' => $img_river_view
-	));
-	$form_body .= '
      ';
-
-	// River Album options
-	$album_river_view = $plugin->album_river_view;
-	if (!$album_river_view) $album_river_view = 'set';
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view');
-	$form_body .= elgg_view('input/pulldown', array(
-					'internalname' => 'params[album_river_view]',
-					'options_values' => array(
-						'cover' => 'cover',
-						'set' => 'set',
-					),
-					'value' => $album_river_view
-	));
-	$form_body .= '
      ';
-
-	// Thumbnail sizes
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:sizes') . '
      ';
-	$form_body .= "
      You must edit the css if you change the default sizes
      ";
-	$image_sizes = $plugin->image_sizes;
-	if(!$image_sizes) {
-		$image_sizes = array(); // set default values 
-		$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
-		$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
-		$image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60;
-	} else {
-		$image_sizes = unserialize($image_sizes);
-	}
-	$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
-	$form_body .= 'width:    ';
-	$form_body .= 'height: 
      ';
-
-	$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
-	$form_body .= 'width and height:    ';
-	//$form_body .= 'height: 
      ';
-
-	$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
-	$form_body .= 'width and height:    ';
-	//$form_body .= 'height: 
      ';
-
-
-	// Group permission override
-	$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:groups') . '
      ';
-	$grp_perm_override = $plugin->grp_perm_override;
-	if(!$grp_perm_override) $grp_perm_override = "enabled";
-	$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
-
-	$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-	
-	echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
+	$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
+}
+
+
+// River Image options
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:river') . '
      ';
+$img_river_view = $plugin->img_river_view;
+if (!$img_river_view) {
+	$img_river_view = '1';
+}
+$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view');
+$form_body .= elgg_view('input/pulldown', array(
+		'internalname' => 'params[img_river_view]',
+		'options_values' => array(
+				'all' => 'all',
+				'1' => '1',
+				'none' => 'none',
+		),
+		'value' => $img_river_view
+));
+$form_body .= '
      ';
+
+// River Album options
+$album_river_view = $plugin->album_river_view;
+if (!$album_river_view) {
+	$album_river_view = 'set';
+}
+$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view');
+$form_body .= elgg_view('input/pulldown', array(
+		'internalname' => 'params[album_river_view]',
+		'options_values' => array(
+				'cover' => 'cover',
+				'set' => 'set',
+		),
+		'value' => $album_river_view
+));
+$form_body .= '
      ';
+
+// Thumbnail sizes
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:sizes') . '
      ';
+$form_body .= "
      You must edit the css if you change the default sizes
      ";
+$image_sizes = $plugin->image_sizes;
+if(!$image_sizes) {
+	$image_sizes = array(); // set default values
+	$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
+	$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
+	$image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60;
+} else {
+	$image_sizes = unserialize($image_sizes);
+}
+$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
+$form_body .= 'width:    ';
+$form_body .= 'height: 
      ';
+
+$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
+$form_body .= 'width and height:    ';
+//$form_body .= 'height: 
      ';
+
+$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
+$form_body .= 'width and height:    ';
+//$form_body .= 'height: 
      ';
+
+
+// Group permission override
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:groups') . '
      ';
+$grp_perm_override = $plugin->grp_perm_override;
+if (!$grp_perm_override) {
+	$grp_perm_override = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
+
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
+
+echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
diff --git a/views/default/tidypics/forms/setupFlickr.php b/views/default/tidypics/forms/setupFlickr.php
index 8c31d0883..3a9c76d11 100644
--- a/views/default/tidypics/forms/setupFlickr.php
+++ b/views/default/tidypics/forms/setupFlickr.php
@@ -39,4 +39,3 @@ $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
 flickr_menu();
 
 echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
-?>
\ No newline at end of file
diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index 6e755612c..691d9701b 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -1,78 +1,83 @@
 access_id;
+global $CONFIG;
 
-	$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
-	if (!$maxfilesize)
-		$maxfilesize = 5;
-		
-	$quota = get_plugin_setting('quota','tidypics');
-	if ($quota) {
-		$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
-		$image_repo_size = (int)$image_repo_size_md->value;
-		$image_repo_size = $image_repo_size / 1024 / 1024;
-		$quote_percentage = round(100 * ($image_repo_size / $quota));
-		// for small quotas, so one decimal place
-		if ($quota < 10) {
-			$image_repo_size = sprintf('%.1f', $image_repo_size);
-		} else {
-			$image_repo_size = round($image_repo_size);
-		}
-		if ($image_repo_size > $quota) {
-			$image_repo_size = $quota;
-		}
+//this is for image uploads only. Image edits are handled by edit.php form
+
+$container_guid = get_input('container_guid');
+$album = get_entity($vars['album']);
+$access_id = $album->access_id;
+
+$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
+if (!$maxfilesize) {
+	$maxfilesize = 5;
+}
+
+$quota = get_plugin_setting('quota','tidypics');
+if ($quota) {
+	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
+	$image_repo_size = (int)$image_repo_size_md->value;
+	$image_repo_size = $image_repo_size / 1024 / 1024;
+	$quote_percentage = round(100 * ($image_repo_size / $quota));
+	// for small quotas, so one decimal place
+	if ($quota < 10) {
+		$image_repo_size = sprintf('%.1f', $image_repo_size);
+	} else {
+		$image_repo_size = round($image_repo_size);
+	}
+	if ($image_repo_size > $quota) {
+		$image_repo_size = $quota;
 	}
+}
 
 ?>
 
      
 
      
-
-
      
-	
      
-	
      
-
-	
      
-
+	?>
+	
      
+		
      
+		
      
+		
+		
      
+			
 	
      
-			
      
+		
      
 		
      ...
      
 	
      
 	
        
-' . elgg_view("input/file",array('internalname' => "upload_$x")) . '';
-		} 
-?>
+		}
+		?>
 	
      
 
      
 
      
-';
-		if ($access_id)
-			echo '';
-?>
+	';
+	}
+	if ($access_id) {
+		echo '';
+	}
+	?>
 	" onclick="displayProgress();" />
 
      
  "{$vars['url']}action/tidypics/upload", 
-										'body' => $form_body, 
-										'internalid' => 'tidypicsUpload',
-										'enctype' => 'multipart/form-data',
-										'method' => 'post',));
+$form_body = ob_get_clean();
+
+echo elgg_view('input/form', array(
+	'action' => "{$vars['url']}action/tidypics/upload",
+	'body' => $form_body,
+	'internalid' => 'tidypicsUpload',
+	'enctype' => 'multipart/form-data',
+	'method' => 'post',)
+);
 ?>
 
      
 
\ No newline at end of file
diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php
index 7cb89bf1c..85b32425e 100644
--- a/views/default/tidypics/groupprofile_albums.php
+++ b/views/default/tidypics/groupprofile_albums.php
@@ -15,4 +15,3 @@ if ($vars['entity']->photos_enable != 'no') {
 	echo elgg_view('tidypics/albums', array('num_albums' => 5));
 	echo '
      ';
 }
-?>
\ No newline at end of file
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 498cfe724..50ada2193 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -1,51 +1,50 @@
 container_guid);
-		if ($container instanceof ElggGroup) {
-			$can_tag = $viewer && $container->isMember($viewer);
-		} else {
-			$can_tag = $viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid);
-		}
-		
-		// only owner and friends of owner can tag
-		if ($can_tag) {
+/**************************************************************************
+ *
+ *  Tidypics Image Menu
+ *
+ *  This is the menu that appears below an image. Admins can override the
+ *  menu with a different view to provide a look and feel that matches
+ *  their themes. The view can be extended to provide additional controls.
+ *
+ **************************************************************************/
+
+$image_guid = $vars['image_guid'];
+$viewer = $vars['viewer'];
+$owner = $vars['owner'];
+$anytags = $vars['anytags'];
+$album = $vars['album'];
+
+if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
+
+	$can_tag = false;
+
+	$container = get_entity($album->container_guid);
+	if ($container instanceof ElggGroup) {
+		$can_tag = $viewer && $container->isMember($viewer);
+	} else {
+		$can_tag = $viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid);
+	}
+
+	// only owner and friends of owner can tag
+	if ($can_tag) {
 ?>
 
      42. 
 guid == $owner->guid) {
+	}
+
+	// only owner can delete tags
+	if ($anytags && $viewer && $viewer->guid == $owner->guid) {
 ?>
 
      43. 
 
 
      44. 
 
\ No newline at end of file
+} 
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 251534b80..2993fe71b 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -1,32 +1,32 @@
 getPhotoTags();
+// get photo tags
+$tag_info = $image->getPhotoTags();
 
-	// defining json text as "" makes sure the tagging javascript code doesn't throw errors if no tags
-	$photo_tags_json = "\"\"";
-	if ($tag_info) {
-		$photo_tags_json = $tag_info['json'];
-	}
-	
-	if ($tag_info) { 
+// defining json text as "" makes sure the tagging javascript code doesn't throw errors if no tags
+$photo_tags_json = "\"\"";
+if ($tag_info) {
+	$photo_tags_json = $tag_info['json'];
+}
+
+if ($tag_info) {
 ?>
 
      
 	
      
 	
 
      
 
 
      
 	
      
@@ -34,10 +34,10 @@
 
      
 
      
 	
      
-";
@@ -45,30 +45,30 @@
 		$content .= "";
 		$content .= "";
 		$content .= "";
-	
+
 		$content .= "
      ";
-		
+
 		$content .= "
      ";
-		
+
 		echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content));
 	}
 
-?>
-
      
+	?>
+	
      
 
      
 
      
 	
      
 
-guid}' />";
 		foreach ($tag_info['links'] as $id => $link) {
@@ -77,7 +77,7 @@
 		}
 
 		$content .= "";
-		$content .= ""; 
+		$content .= "";
 
 		echo elgg_view('input/form', array('internalname' => 'phototag_deletetag_form', 'action' => "{$vars['url']}action/tidypics/deletetag", 'method' => 'post', 'body' => $content));
 
@@ -85,5 +85,4 @@
 ?>
 
      
  $photo_tags_json,) );
-?>
\ No newline at end of file
+echo elgg_view('tidypics/js/tagging', array('photo_tags_json' => $photo_tags_json,) );
diff --git a/views/default/widgets/album_view/edit.php b/views/default/widgets/album_view/edit.php
index 992699cb0..9068ffe17 100644
--- a/views/default/widgets/album_view/edit.php
+++ b/views/default/widgets/album_view/edit.php
@@ -1,11 +1,12 @@
 
      
 num_display == '') $vars['entity']->num_display = 5;
-	
+echo elgg_echo("tidypics:widget:num_albums") . ": ";
+
+
+if ($vars['entity']->num_display == '') {
+	$vars['entity']->num_display = 5;
+}
 ?>
 	
 		
diff --git a/views/default/widgets/latest_photos/view.php b/views/default/widgets/latest_photos/view.php
index 0c3193907..d6bc4a0df 100644
--- a/views/default/widgets/latest_photos/view.php
+++ b/views/default/widgets/latest_photos/view.php
@@ -1,15 +1,16 @@
 
       
 num_display;
-	//if no number has been set, default to 6
-	if (!$number)
-		$number = 6;
+//the number of files to display
+$number = (int) $vars['entity']->num_display;
+//if no number has been set, default to 6
+if (!$number) {
+	$number = 6;
+}
 
-	echo '
      ';
-	echo tp_get_latest_photos($number, page_owner());
-	echo '
      ';
+echo '
      ';
+echo tp_get_latest_photos($number, page_owner());
+echo '
      ';
 
 ?>
 
      
\ No newline at end of file
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 8542b95f4..34cf58395 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -51,4 +51,3 @@ if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
 	}
 
 }
-?>
\ No newline at end of file
diff --git a/views/rss/object/file.php b/views/rss/object/file.php
index 36740f003..1ede661ad 100644
--- a/views/rss/object/file.php
+++ b/views/rss/object/file.php
@@ -1,16 +1,16 @@
 title;
-	if (empty($title)) {
-		$title = substr($vars['entity']->description,0,32);
-		if (strlen($vars['entity']->description) > 32)
-			$title .= " ...";
+$title = $vars['entity']->title;
+if (empty($title)) {
+	$title = substr($vars['entity']->description,0,32);
+	if (strlen($vars['entity']->description) > 32) {
+		$title .= " ...";
 	}
-
+}
 ?>
 
 	
diff --git a/views/rss/tidypics/gallery.php b/views/rss/tidypics/gallery.php
index 2c285fca5..0e90a8c44 100644
--- a/views/rss/tidypics/gallery.php
+++ b/views/rss/tidypics/gallery.php
@@ -1,7 +1,7 @@
  0) {
 		echo elgg_view_entity($entity);
 	}
 }
-
-?>
\ No newline at end of file
-- 
cgit v1.2.3


From 9c0cc73e8ff5c389482579452312ca67e9c01a2c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 30 Jul 2010 02:03:23 +0000
Subject: Tidypics now requires Elgg 1.5 or greater

---
 actions/addtag.php               |  4 +---
 actions/flickrImportPhotoset.php |  4 +---
 start.php                        | 11 +++--------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/actions/addtag.php b/actions/addtag.php
index 115a81bc6..9e5313b7f 100644
--- a/actions/addtag.php
+++ b/actions/addtag.php
@@ -78,9 +78,7 @@ if ($image->annotate('phototag', serialize($tag), $access_id, $owner_id)) {
 			add_entity_relationship($user_id, 'phototag', $image_guid);
 
 			// also add this to the river - subject is image, object is the tagged user
-			if (function_exists('add_to_river')) {
-				add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id, $access_id);
-			}
+			add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id, $access_id);
 
 			// notify user of tagging as long as not self
 			if ($owner_id != $user_id) {
diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php
index fd6769e3a..eeb42d622 100644
--- a/actions/flickrImportPhotoset.php
+++ b/actions/flickrImportPhotoset.php
@@ -288,8 +288,7 @@ foreach( $photos_to_upload as $name => $photo ) {
 		// is at least a few photos in it
 		object_notifications('create', 'object', $album);
 		
-		if (function_exists('add_to_river'))
-			add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
+		add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
 	}
 
 	if ($img_river_view == "all") {
@@ -336,4 +335,3 @@ trigger_elgg_event('upload', 'tp_album', $album);
 
 $url = $CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images);
 forward($url); 
-
diff --git a/start.php b/start.php
index baaf33f2b..8589be9fb 100644
--- a/start.php
+++ b/start.php
@@ -56,20 +56,15 @@ function tidypics_init() {
 	register_entity_type('object','image');
 	register_entity_type('object','album');
 
-	if (function_exists('add_group_tool_option')) {
-		add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true);
-	}
+	add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true);
 
 	if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled") {
 		register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override');
 	}
 
 	// Register for notifications
-	if (is_callable('register_notification_object')) {
-		register_notification_object('object', 'album', elgg_echo('tidypics:newalbum'));
-
-		register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message');
-	}
+	register_notification_object('object', 'album', elgg_echo('tidypics:newalbum'));
+	register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message');
 
 	// slideshow plugin hook
 	register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
-- 
cgit v1.2.3


From d77e8fd4cb76560ae2f1c180cc9ccbcde7e3942a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 30 Jul 2010 02:15:39 +0000
Subject: added methods for managing the order of photos in the album

---
 lib/album.php | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/lib/album.php b/lib/album.php
index 7cd27dcde..1eaabd3ba 100644
--- a/lib/album.php
+++ b/lib/album.php
@@ -16,4 +16,39 @@ class TidypicsAlbum extends ElggObject {
 	public function __construct($guid = null) {
 		parent::__construct($guid);
 	}
+
+	/**
+	 * Returns an order list of image guids
+	 * 
+	 * @return array
+	 */
+	public function getOrderedImageList() {
+		$listString = $this->orderedImages;
+		if (!$listString) {
+			return array();
+		}
+		$list = unserialize($listString);
+		return $list;
+	}
+
+	/**
+	 * Sets the album image order
+	 *
+	 * @param array $list An indexed array of image guids 
+	 */
+	public function setOrderedImageList($list) {
+		$listString = serialize($list);
+		$this->orderedImages = $listString;
+	}
+
+	/**
+	 * Add new images to the front of the image list
+	 *
+	 * @param array $list An indexed array of image guids
+	 */
+	public function prependOrderedImageList($list) {
+		$currentList = $this->getOrderedImageList();
+		$list = array_merge($list, $currentList);
+		$this->setOrderedImageList($list);
+	}
 }
-- 
cgit v1.2.3


From 28e545574f35f0d6349a395648a7857ee58989c9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 31 Jul 2010 17:17:43 +0000
Subject: cleaning up the admin pages

---
 languages/en.php                            |  1 +
 views/default/tidypics/admin/settings.php   | 27 ++++++++++-----------------
 views/default/tidypics/admin/thumbnails.php |  4 ++--
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 2ee3a6e5e..9587f3053 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -62,6 +62,7 @@ $english = array(
 			
 		//settings
 			'tidypics:settings' => 'Settings',
+			'tidypics:settings:server:analysis' => 'Run Server Analysis',
 			'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.',
 			'tidypics:settings:image_lib' => "Image Library",
 			'tidypics:settings:thumbnail' => "Thumbnail Creation",
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
index bc0befa16..60c34b64e 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -2,25 +2,18 @@
 
 echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:instructions")));
 
-global $CONFIG;  
-$system_url = $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php';
-$upgrade_url = $CONFIG->wwwroot . 'mod/tidypics/actions/upgrade.php';
-$upgrade_url = elgg_add_action_tokens_to_url($upgrade_url);
-
-$upgrade = false;
-if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) {
-	$upgrade = true;
-}
 ?>
 
      
-	
-	Upgrade
      
-		
-	Run Server Analysis
+wwwroot . 'mod/tidypics/pages/server_analysis.php';
+$text = elgg_echo('tidypics:settings:server:analysis');
+
+echo "$text";
+?>
 
      
 Overview
 
      
 This page allows you to create thumbnails for images when the thumbnail creation failed during upload. 
-You may experience problems with thumbnail creation if your image library in not configured properly or
+You may experience problems with thumbnail creation if your image library is not configured properly or
 if there is not enough memory for the GD library to load and resize an image. If your users have 
-experienced problems with thumbnail creation and you have modified your setup, you can try to redo the
+experienced problems with thumbnail creation and you have corrected your configuration, you can try to redo the
 thumbnails. Find the unique identifier of the photo (it is the number near the end of the url when viewing
 a photo) and enter it below. 
 
      
-- 
cgit v1.2.3


From a1f08342c8b8502197159a9fd78e48e6cead4ea0 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 31 Jul 2010 19:22:47 +0000
Subject: improved the upgrade system and moved albums to use an ordered list
 for images

---
 actions/admin/upgrade.php                 | 46 +++++++++++++++
 actions/upgrade.php                       | 39 -------------
 actions/upload.php                        |  4 ++
 lib/album.php                             | 97 +++++++++++++++++++++++++++++--
 start.php                                 |  1 +
 upgrades/2009082901.php                   | 29 +++++++++
 upgrades/2010073101.php                   | 22 +++++++
 version.php                               |  8 +++
 views/default/object/album.php            | 25 ++------
 views/default/object/image.php            | 30 +++-------
 views/default/tidypics/admin/settings.php |  3 +-
 views/default/tidypics/admin/upgrade.php  | 30 ++++++++++
 views/default/tidypics/forms/settings.php |  6 --
 13 files changed, 247 insertions(+), 93 deletions(-)
 create mode 100644 actions/admin/upgrade.php
 delete mode 100644 actions/upgrade.php
 create mode 100644 upgrades/2009082901.php
 create mode 100644 upgrades/2010073101.php
 create mode 100644 version.php
 create mode 100644 views/default/tidypics/admin/upgrade.php

diff --git a/actions/admin/upgrade.php b/actions/admin/upgrade.php
new file mode 100644
index 000000000..9c4aef1cf
--- /dev/null
+++ b/actions/admin/upgrade.php
@@ -0,0 +1,46 @@
+pluginspath}tidypics/version.php";
+
+$local_version = get_plugin_setting('version', 'tidypics');
+
+if ($version <= $local_version) {
+	register_error('No upgrade required');
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+$base_dir = $CONFIG->pluginspath . 'tidypics/upgrades';
+
+// taken from engine/lib/version.php
+if ($handle = opendir($base_dir)) {
+	$upgrades = array();
+
+	while ($updatefile = readdir($handle)) {
+		// Look for upgrades and add to upgrades list
+		if (!is_dir("$base_dir/$updatefile")) {
+			if (preg_match('/^([0-9]{10})\.(php)$/', $updatefile, $matches)) {
+				$plugin_version = (int) $matches[1];
+				if ($plugin_version > $local_version) {
+					$upgrades[] = "$base_dir/$updatefile";
+				}
+			}
+		}
+	}
+
+	// Sort and execute
+	asort($upgrades);
+
+	if (sizeof($upgrades) > 0) {
+		foreach ($upgrades as $upgrade) {
+			include($upgrade);
+		}
+	}
+}
+
+set_plugin_setting('version', $version, 'tidypics');
+
+system_message("Tidypics has been upgraded");
+
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/upgrade.php b/actions/upgrade.php
deleted file mode 100644
index 596b90a22..000000000
--- a/actions/upgrade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-dbprefix . 'entity_subtypes';
-	$result = update_data("UPDATE {$table} set class='TidypicsImage' where id={$id}");
-	if (!result) {
-		register_error(elgg_echo('tidypics:upgrade:failed'));
-		forward($_SERVER['HTTP_REFERER']);
-	}
-}
-
-// add album class
-$id = get_subtype_id("object", "album"); 
-if ($id != 0) {
-	$table = $CONFIG->dbprefix . 'entity_subtypes';
-	$result = update_data("UPDATE {$table} set class='TidypicsAlbum' where id={$id}");
-	if (!result) {
-		register_error(elgg_echo('tidypics:upgrade:failed'));
-		forward($_SERVER['HTTP_REFERER']);
-	}
-}
-
-system_message(elgg_echo('tidypics:upgrade:success'));
-
-forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/upload.php b/actions/upload.php
index b1eb4efe1..88b000706 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -244,6 +244,10 @@ if (count($uploaded_images) && $img_river_view == "1") {
 // update image repo size
 create_metadata($album->container_guid, "image_repo_size", $image_repo_size, 'integer', $album->container_guid);
 
+if (count($uploaded_images) > 0) {
+	$album->prependImageList($uploaded_images);
+}
+
 // plugins can register to be told when a Tidypics album has had images added
 trigger_elgg_event('upload', 'tp_album', $album);
 
diff --git a/lib/album.php b/lib/album.php
index 1eaabd3ba..87bb715f4 100644
--- a/lib/album.php
+++ b/lib/album.php
@@ -17,12 +17,61 @@ class TidypicsAlbum extends ElggObject {
 		parent::__construct($guid);
 	}
 
+	/**
+	 * Get an array of image objects
+	 *
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array
+	 */
+	public function getImages($limit, $offset=0) {
+		$imageList = $this->getImageList();
+		if ($offset > count($imageList)) {
+			return array();
+		}
+
+		$imageList = array_slice($imageList, $offset, $limit);
+		
+		$images = array();
+		foreach ($imageList as $guid) {
+			$images[] = get_entity($guid);
+		}
+		return $images;
+	}
+
+	/**
+	 * View a list of images
+	 *
+	 * @param int $limit
+	 * @param int $offset
+	 * @return string
+	 */
+	public function viewImages($limit, $offset=0) {
+		$images = $this->getImages($limit, $offset);
+		if (count($images) == 0) {
+			return '';
+		}
+
+		$count = $this->getSize();
+
+		return elgg_view_entity_list($images, $count, $offset, $limit, FALSE, FALSE, TRUE);
+	}
+
+	/**
+	 * Get the number of photos in the album
+	 *
+	 * @return int
+	 */
+	public function getSize() {
+		return count($this->getImageList());
+	}
+
 	/**
 	 * Returns an order list of image guids
 	 * 
 	 * @return array
 	 */
-	public function getOrderedImageList() {
+	public function getImageList() {
 		$listString = $this->orderedImages;
 		if (!$listString) {
 			return array();
@@ -36,7 +85,7 @@ class TidypicsAlbum extends ElggObject {
 	 *
 	 * @param array $list An indexed array of image guids 
 	 */
-	public function setOrderedImageList($list) {
+	public function setImageList($list) {
 		$listString = serialize($list);
 		$this->orderedImages = $listString;
 	}
@@ -46,9 +95,47 @@ class TidypicsAlbum extends ElggObject {
 	 *
 	 * @param array $list An indexed array of image guids
 	 */
-	public function prependOrderedImageList($list) {
-		$currentList = $this->getOrderedImageList();
+	public function prependImageList($list) {
+		$currentList = $this->getImageList();
 		$list = array_merge($list, $currentList);
-		$this->setOrderedImageList($list);
+		$this->setImageList($list);
+	}
+
+	/**
+	 * Get the GUID of the image before the current one
+	 *
+	 * @param int $currentGuid
+	 * @return int
+	 */
+	public function getPreviousImageGuid($currentGuid) {
+		$imageList = $this->getImageList();
+		$key = array_search($currentGuid, $imageList);
+		if ($key === FALSE) {
+			return 0;
+		}
+		$key--;
+		if ($key < 0) {
+			return 0;
+		}
+		return $imageList[$key];
+	}
+
+	/**
+	 * Get the GUID of the image after the current one
+	 *
+	 * @param int $currentGuid
+	 * @return int
+	 */
+	public function getNextImageGuid($currentGuid) {
+		$imageList = $this->getImageList();
+		$key = array_search($currentGuid, $imageList);
+		if ($key === FALSE) {
+			return 0;
+		}
+		$key++;
+		if ($key >= count($imageList)) {
+			return 0;
+		}
+		return $imageList[$key];
 	}
 }
diff --git a/start.php b/start.php
index 8589be9fb..52d56d77a 100644
--- a/start.php
+++ b/start.php
@@ -461,3 +461,4 @@ register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/ac
 register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
 register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
 register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");
+register_action("tidypics/admin/upgrade", true, $CONFIG->pluginspath . "tidypics/actions/admin/upgrade.php", true);
diff --git a/upgrades/2009082901.php b/upgrades/2009082901.php
new file mode 100644
index 000000000..dfbdf79f4
--- /dev/null
+++ b/upgrades/2009082901.php
@@ -0,0 +1,29 @@
+dbprefix . 'entity_subtypes';
+	$result = update_data("UPDATE {$table} set class='TidypicsImage' where id={$id}");
+	if (!$result) {
+		register_error('unable to update tidypics image class');
+	}
+}
+
+// add album class
+$id = get_subtype_id("object", "album");
+if ($id != 0) {
+	$table = $CONFIG->dbprefix . 'entity_subtypes';
+	$result = update_data("UPDATE {$table} set class='TidypicsAlbum' where id={$id}");
+	if (!$result) {
+		register_error('unable to update tidypics album class');
+	}
+}
diff --git a/upgrades/2010073101.php b/upgrades/2010073101.php
new file mode 100644
index 000000000..20fd33144
--- /dev/null
+++ b/upgrades/2010073101.php
@@ -0,0 +1,22 @@
+dbprefix}entities WHERE subtype = $album_subtype_id");
+while ($guid_obj = mysql_fetch_object($album_guids)) {
+	$DB_QUERY_CACHE = $DB_PROFILE = $ENTITY_CACHE = array();
+
+	$album = get_entity($guid_obj->guid);
+	$images = get_entities("object", "image", $album->guid, '', 9999);
+	$image_list = array();
+	foreach ($images as $image) {
+		$image_list[] = $image->guid;
+	}
+
+	$album->prependImageList($image_list);
+}
+
diff --git a/version.php b/version.php
new file mode 100644
index 000000000..557ea5d1c
--- /dev/null
+++ b/version.php
@@ -0,0 +1,8 @@
+' . autop($desc) . '';
 
-	$images = get_entities("object", "image", $album_guid, '', 999);
-
-	//build array for back | next links
-	$_SESSION['image_sort'] = array();
-
-	if (is_array($images)) {
-		foreach ($images as $image) {
-			array_push($_SESSION['image_sort'], $image->guid);
-		}
-
-		// display the simple image views. Uses 'object/image' view
-		echo list_entities("object", "image", $album_guid, 24, false);
-
-		$num_images = count($images);
-	} else {
-		echo '
      ' . elgg_echo('image:none') . '
      ';
-		$num_images = 0;
-	}
+	$offset = (int)get_input('offset', 0);
+	echo $album->viewImages(8, $offset);
+	//	echo '
      ' . elgg_echo('image:none') . '
      ';
+	//	$num_images = 0;
+	//}
 
 ?>
 	
      
@@ -137,7 +124,7 @@ if (get_context() == "search") {
 	}
 ?>
 	 name; ?>  
      
-	 
      
+	 getSize(); ?>
      
 container_guid);
+		$back_guid = $album->getPreviousImageGuid($image->guid);
+		$next_guid = $album->getNextImageGuid($image->guid);
 
-		$current = array_search($image_guid, $_SESSION['image_sort']);
-
-		if (!$current) {  // means we are no longer using the correct album array
-
-			//rebuild the array
-			$count = get_entities("object","image", $album->guid, '', 999);
-			$_SESSION['image_sort'] = array();
-
-			foreach ($count as $img) {
-				array_push($_SESSION['image_sort'], $img->guid);
-			}
-
-			if ($_SESSION['image_sort']) {
-				$current = array_search($image_guid, $_SESSION['image_sort']);
-			}
-		}
-
-		if ($current != 0) {
-			$back = '« ' . elgg_echo('image:back') . '';
+		if ($back_guid != 0) {
+			$text = elgg_echo('image:back');
+			$back = "« $text";
 		}
 
-		if (sizeof($_SESSION['image_sort']) > $current + 1) {
-			$next = '' . elgg_echo('image:next') . ' »';
+		if ($next_guid != 0) {
+			$text = elgg_echo('image:next');
+			$next = "$text »";
 		}
 
 ?>
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
index 60c34b64e..6dace1830 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -7,8 +7,7 @@ echo elgg_view('output/longtext', array('value' => elgg_echo("tidypics:admin:ins
 wwwroot . 'mod/tidypics/pages/server_analysis.php';
+$url = "{$vars['url']}mod/tidypics/pages/server_analysis.php";
 $text = elgg_echo('tidypics:settings:server:analysis');
 
 echo "$text";
diff --git a/views/default/tidypics/admin/upgrade.php b/views/default/tidypics/admin/upgrade.php
new file mode 100644
index 000000000..5a21aa136
--- /dev/null
+++ b/views/default/tidypics/admin/upgrade.php
@@ -0,0 +1,30 @@
+pluginspath}tidypics/version.php";
+
+$upgrade_url = "{$vars['url']}action/tidypics/admin/upgrade";
+//$upgrade_url = elgg_add_action_tokens_to_url($upgrade_url);
+
+// determine whether an upgrade is required
+$local_version = get_plugin_setting('version', 'tidypics');
+if ($local_version === FALSE) {
+	// no version set so either new install or really old one
+	if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) {
+		$local_version = 0;
+	} else {
+		set_plugin_setting('version', $local_version, 'tidypics');
+		$local_version = $version;
+	}
+} elseif ($local_version == '1.62') {
+	$local_version = 2010010101;
+	set_plugin_setting('version', $local_version, 'tidypics');
+}
+if ($local_version == $version) {
+	// no upgrade required
+	return TRUE;
+}
+
+echo elgg_view('output/url', array(	'text' => 'Upgrade',
+									'href' => $upgrade_url,
+									'is_action' => TRUE));
+echo '
      ';
\ No newline at end of file
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index e7d05adcc..c102b044e 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -10,12 +10,6 @@ $action = $vars['url'] . 'action/tidypics/settings';
 $plugin = find_plugin_settings('tidypics');
 
 
-// bootstrap the plugin version here for now
-if (!$plugin->version) {
-	set_plugin_setting('version', 1.62, 'tidypics');
-}
-
-
 // Main settings
 $form_body = '
      ' . elgg_echo('tidypics:settings:heading:main') . '
      ';
 
-- 
cgit v1.2.3


From 1d3b83e6791b1e9e3386bb79937ef58240ba94ba Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 31 Jul 2010 19:38:29 +0000
Subject: moved some actions into the admin directory

---
 actions/admin/create_thumbnails.php          | 60 ++++++++++++++++++++++
 actions/admin/flickrSetup.php                | 36 +++++++++++++
 actions/admin/imtest.php                     | 18 +++++++
 actions/admin/settings.php                   | 77 ++++++++++++++++++++++++++++
 actions/create_thumbnails.php                | 60 ----------------------
 actions/flickrSetup.php                      | 36 -------------
 actions/imtest.php                           | 18 -------
 actions/settings.php                         | 77 ----------------------------
 start.php                                    | 11 ++--
 views/default/tidypics/admin/imagelib.php    |  2 +-
 views/default/tidypics/admin/thumbnails.php  |  2 +-
 views/default/tidypics/forms/settings.php    |  2 +-
 views/default/tidypics/forms/setupFlickr.php |  2 +-
 13 files changed, 201 insertions(+), 200 deletions(-)
 create mode 100644 actions/admin/create_thumbnails.php
 create mode 100644 actions/admin/flickrSetup.php
 create mode 100644 actions/admin/imtest.php
 create mode 100644 actions/admin/settings.php
 delete mode 100644 actions/create_thumbnails.php
 delete mode 100644 actions/flickrSetup.php
 delete mode 100644 actions/imtest.php
 delete mode 100644 actions/settings.php

diff --git a/actions/admin/create_thumbnails.php b/actions/admin/create_thumbnails.php
new file mode 100644
index 000000000..18dae6b78
--- /dev/null
+++ b/actions/admin/create_thumbnails.php
@@ -0,0 +1,60 @@
+getFilename();
+$container_guid = $image->container_guid;
+if (!$filename || !$container_guid) {
+	echo "Error retrieving information about the image";
+	return;
+}
+
+$title = $image->title;
+$prefix = "image/$container_guid/";
+$filestorename = substr($filename, strlen($prefix));
+
+$image_lib = get_plugin_setting('image_lib', 'tidypics');
+if (!$image_lib) {
+	$image_lib = "GD";
+}
+
+if ($image_lib == 'ImageMagick') { // ImageMagick command line
+
+	if (tp_create_im_cmdline_thumbnails($image, $prefix, $filestorename) != true) {
+		trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
+		echo "Failed to create thumbnails";
+	}
+
+} else if ($image_lib == 'ImageMagickPHP') {  // imagick PHP extension
+
+	if (tp_create_imagick_thumbnails($image, $prefix, $filestorename) != true) {
+		trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
+		echo "Failed to create thumbnails";
+	}
+
+} else {
+
+	if (tp_create_gd_thumbnails($image, $prefix, $filestorename) != true) {
+		trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
+		echo "Failed to create thumbnails";
+	}
+
+} // end of image library selector
+
+echo "wwwroot}mod/tidypics/thumbnail.php?file_guid={$guid}&size=large\" alt=\"{$title}\" />";
diff --git a/actions/admin/flickrSetup.php b/actions/admin/flickrSetup.php
new file mode 100644
index 000000000..ee31b8c34
--- /dev/null
+++ b/actions/admin/flickrSetup.php
@@ -0,0 +1,36 @@
+people_findByUsername( $flickr_username );
+	if( !empty( $flickr_user["id"] )) {
+		create_metadata( $user->guid, "flickr_username", $flickr_username, "text", $user->guid, ACCESS_PUBLIC );
+		create_metadata( $user->guid, "flickr_id", $flickr_user["id"], "text", $user->guid, ACCESS_PUBLIC );
+		if( $album_id ) {
+			create_metadata( $user->guid, "flickr_album_id", $album_id, "text", $user->guid, ACCESS_PUBLIC );
+			$album = get_entity( $album_id );
+		}
+		
+		system_message( sprintf( elgg_echo( 'flickr:savedusername' ), $flickr_username ));
+		system_message( sprintf( elgg_echo( 'flickr:saveduserid' ), $flickr_user["id"] ));
+		system_message( sprintf( elgg_echo( 'flickr:savedalbum' ), $album->title ));
+	} else {
+		register_error( sprintf( elgg_echo( 'flickr:errorusername' ), $flickr_username ));
+	}
+}
+
+forward($_SERVER['HTTP_REFERER']);
+//echo "
      "; var_dump( array($flickr_username, $return_url )); echo "
      ";
diff --git a/actions/admin/imtest.php b/actions/admin/imtest.php
new file mode 100644
index 000000000..293a9b2e8
--- /dev/null
+++ b/actions/admin/imtest.php
@@ -0,0 +1,18 @@
+ $v) {
+	if (!set_plugin_setting($k, $v, 'tidypics')) {
+		register_error(sprintf(elgg_echo('plugins:settings:save:fail'), 'tidypics'));
+		forward($_SERVER['HTTP_REFERER']);
+	}
+}
+
+// check boxes
+if (is_array(get_input('download_link'))) { // this can be done due to way Elgg uses checkboxes
+	set_plugin_setting('download_link', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('download_link', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('tagging'))) {
+	set_plugin_setting('tagging', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('tagging', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('photo_ratings'))) {
+	set_plugin_setting('photo_ratings', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('photo_ratings', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('exif'))) {
+	set_plugin_setting('exif', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('exif', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('view_count'))) {
+	set_plugin_setting('view_count', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('view_count', 'disabled', 'tidypics');
+}
+
+if (is_array(get_input('grp_perm_override'))) {
+	set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('grp_perm_override', 'disabled', 'tidypics');
+}
+
+
+// image sizes
+$image_sizes = array();
+$image_sizes['large_image_width'] = get_input('large_thumb_width');
+$image_sizes['large_image_height'] = get_input('large_thumb_height');
+$image_sizes['small_image_width'] = get_input('small_thumb_width');
+//$image_sizes['small_image_height'] = get_input('small_thumb_height');
+$image_sizes['small_image_height'] = get_input('small_thumb_width');
+$image_sizes['thumb_image_width'] = get_input('thumb_width');
+//$image_sizes['thumb_image_height'] = get_input('thumb_height');
+$image_sizes['thumb_image_height'] = get_input('thumb_width');
+set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics');
+
+
+
+system_message(elgg_echo('tidypics:settings:save:ok'));
+
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/create_thumbnails.php b/actions/create_thumbnails.php
deleted file mode 100644
index 18dae6b78..000000000
--- a/actions/create_thumbnails.php
+++ /dev/null
@@ -1,60 +0,0 @@
-getFilename();
-$container_guid = $image->container_guid;
-if (!$filename || !$container_guid) {
-	echo "Error retrieving information about the image";
-	return;
-}
-
-$title = $image->title;
-$prefix = "image/$container_guid/";
-$filestorename = substr($filename, strlen($prefix));
-
-$image_lib = get_plugin_setting('image_lib', 'tidypics');
-if (!$image_lib) {
-	$image_lib = "GD";
-}
-
-if ($image_lib == 'ImageMagick') { // ImageMagick command line
-
-	if (tp_create_im_cmdline_thumbnails($image, $prefix, $filestorename) != true) {
-		trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
-		echo "Failed to create thumbnails";
-	}
-
-} else if ($image_lib == 'ImageMagickPHP') {  // imagick PHP extension
-
-	if (tp_create_imagick_thumbnails($image, $prefix, $filestorename) != true) {
-		trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
-		echo "Failed to create thumbnails";
-	}
-
-} else {
-
-	if (tp_create_gd_thumbnails($image, $prefix, $filestorename) != true) {
-		trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
-		echo "Failed to create thumbnails";
-	}
-
-} // end of image library selector
-
-echo "wwwroot}mod/tidypics/thumbnail.php?file_guid={$guid}&size=large\" alt=\"{$title}\" />";
diff --git a/actions/flickrSetup.php b/actions/flickrSetup.php
deleted file mode 100644
index ee31b8c34..000000000
--- a/actions/flickrSetup.php
+++ /dev/null
@@ -1,36 +0,0 @@
-people_findByUsername( $flickr_username );
-	if( !empty( $flickr_user["id"] )) {
-		create_metadata( $user->guid, "flickr_username", $flickr_username, "text", $user->guid, ACCESS_PUBLIC );
-		create_metadata( $user->guid, "flickr_id", $flickr_user["id"], "text", $user->guid, ACCESS_PUBLIC );
-		if( $album_id ) {
-			create_metadata( $user->guid, "flickr_album_id", $album_id, "text", $user->guid, ACCESS_PUBLIC );
-			$album = get_entity( $album_id );
-		}
-		
-		system_message( sprintf( elgg_echo( 'flickr:savedusername' ), $flickr_username ));
-		system_message( sprintf( elgg_echo( 'flickr:saveduserid' ), $flickr_user["id"] ));
-		system_message( sprintf( elgg_echo( 'flickr:savedalbum' ), $album->title ));
-	} else {
-		register_error( sprintf( elgg_echo( 'flickr:errorusername' ), $flickr_username ));
-	}
-}
-
-forward($_SERVER['HTTP_REFERER']);
-//echo "
      "; var_dump( array($flickr_username, $return_url )); echo "
      ";
diff --git a/actions/imtest.php b/actions/imtest.php
deleted file mode 100644
index 293a9b2e8..000000000
--- a/actions/imtest.php
+++ /dev/null
@@ -1,18 +0,0 @@
- $v) {
-	if (!set_plugin_setting($k, $v, 'tidypics')) {
-		register_error(sprintf(elgg_echo('plugins:settings:save:fail'), 'tidypics'));
-		forward($_SERVER['HTTP_REFERER']);
-	}
-}
-
-// check boxes
-if (is_array(get_input('download_link'))) { // this can be done due to way Elgg uses checkboxes
-	set_plugin_setting('download_link', 'enabled', 'tidypics');
-} else {
-	set_plugin_setting('download_link', 'disabled', 'tidypics');
-}
-
-if (is_array(get_input('tagging'))) {
-	set_plugin_setting('tagging', 'enabled', 'tidypics');
-} else {
-	set_plugin_setting('tagging', 'disabled', 'tidypics');
-}
-
-if (is_array(get_input('photo_ratings'))) {
-	set_plugin_setting('photo_ratings', 'enabled', 'tidypics');
-} else {
-	set_plugin_setting('photo_ratings', 'disabled', 'tidypics');
-}
-
-if (is_array(get_input('exif'))) {
-	set_plugin_setting('exif', 'enabled', 'tidypics');
-} else {
-	set_plugin_setting('exif', 'disabled', 'tidypics');
-}
-
-if (is_array(get_input('view_count'))) {
-	set_plugin_setting('view_count', 'enabled', 'tidypics');
-} else {
-	set_plugin_setting('view_count', 'disabled', 'tidypics');
-}
-
-if (is_array(get_input('grp_perm_override'))) {
-	set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
-} else {
-	set_plugin_setting('grp_perm_override', 'disabled', 'tidypics');
-}
-
-
-// image sizes
-$image_sizes = array();
-$image_sizes['large_image_width'] = get_input('large_thumb_width');
-$image_sizes['large_image_height'] = get_input('large_thumb_height');
-$image_sizes['small_image_width'] = get_input('small_thumb_width');
-//$image_sizes['small_image_height'] = get_input('small_thumb_height');
-$image_sizes['small_image_height'] = get_input('small_thumb_width');
-$image_sizes['thumb_image_width'] = get_input('thumb_width');
-//$image_sizes['thumb_image_height'] = get_input('thumb_height');
-$image_sizes['thumb_image_height'] = get_input('thumb_width');
-set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics');
-
-
-
-system_message(elgg_echo('tidypics:settings:save:ok'));
-
-forward($_SERVER['HTTP_REFERER']);
diff --git a/start.php b/start.php
index 52d56d77a..90269d67b 100644
--- a/start.php
+++ b/start.php
@@ -452,13 +452,14 @@ register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus');
 register_elgg_event_handler('pagesetup', 'system', 'tidypics_adminmenu');
 
 // Register actions
-register_action("tidypics/settings", false, $CONFIG->pluginspath . "tidypics/actions/settings.php");
 register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
 register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
 register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
 register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
 register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
-register_action("tidypics/addtag", true, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
-register_action("tidypics/deletetag", true, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
-register_action("tidypics/flickrSetup", true, $CONFIG->pluginspath . "tidypics/actions/flickrSetup.php");
-register_action("tidypics/admin/upgrade", true, $CONFIG->pluginspath . "tidypics/actions/admin/upgrade.php", true);
+register_action("tidypics/addtag", false, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
+register_action("tidypics/deletetag", false, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
+
+register_action("tidypics/admin/flickrSetup", false, $CONFIG->pluginspath . "tidypics/actions/admin/flickrSetup.php", true);
+register_action("tidypics/admin/settings", false, $CONFIG->pluginspath . "tidypics/actions/admin/settings.php", true);
+register_action("tidypics/admin/upgrade", false, $CONFIG->pluginspath . "tidypics/actions/admin/upgrade.php", true);
diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php
index a0d0c19e7..2b7a3a7b0 100644
--- a/views/default/tidypics/admin/imagelib.php
+++ b/views/default/tidypics/admin/imagelib.php
@@ -51,7 +51,7 @@ if (get_plugin_setting('tagging', 'tidypics') != "disabled")
 		$("#im_results").html("");
 		$.ajax({
 			type: "GET",
-			url: "wwwroot . 'mod/tidypics/actions/imtest.php'; ?>",
+			url: "wwwroot . 'mod/tidypics/actions/admin/imtest.php'; ?>",
 			data: {location: loc},
 			cache: false,
 			success: function(html){
diff --git a/views/default/tidypics/admin/thumbnails.php b/views/default/tidypics/admin/thumbnails.php
index 960028fb9..5884b9dc3 100644
--- a/views/default/tidypics/admin/thumbnails.php
+++ b/views/default/tidypics/admin/thumbnails.php
@@ -22,7 +22,7 @@ function TestThumbnailCreation()
 	$("#im_results").html("");
 	$.ajax({
 		type: "GET",
-		url: "wwwroot . 'mod/tidypics/actions/create_thumbnails.php'; ?>",
+		url: "wwwroot . 'mod/tidypics/actions/admin/create_thumbnails.php'; ?>",
 		data: {guid: image_id},
 		cache: false,
 		success: function(html){
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index c102b044e..dc5c02f15 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -5,7 +5,7 @@
 
 
 
-$action = $vars['url'] . 'action/tidypics/settings';
+$action = $vars['url'] . 'action/tidypics/admin/settings';
 
 $plugin = find_plugin_settings('tidypics');
 
diff --git a/views/default/tidypics/forms/setupFlickr.php b/views/default/tidypics/forms/setupFlickr.php
index 3a9c76d11..54f0a37d1 100644
--- a/views/default/tidypics/forms/setupFlickr.php
+++ b/views/default/tidypics/forms/setupFlickr.php
@@ -5,7 +5,7 @@ $user = get_loggedin_user();
 $flickr_username = get_metadata_byname( $user->guid, "flickr_username" );
 $flickr_album_id = get_metadata_byname( $user->guid, "flickr_album_id" );
 
-$action = $vars['url'] . 'action/tidypics/flickrSetup';
+$action = $vars['url'] . 'admin/action/tidypics/flickrSetup';
 
 $form_body = "
      ". elgg_echo( 'flickr:intro' ) . "
      ";
 $form_body .= elgg_echo( 'flickr:usernamesetup') . "  
      ";
-- 
cgit v1.2.3


From 3838caed15ac73f81827829b6c094aae3c3f3539 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 4 Aug 2010 23:09:57 +0000
Subject: fixed bug where latest photos widget was trying to display 4 photos
 across instead of three - need a better long term solution

---
 lib/tidypics.php                             | 4 ++--
 views/default/object/image.php               | 2 +-
 views/default/tidypics/gallery.php           | 8 ++++++--
 views/default/widgets/latest_photos/view.php | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/tidypics.php b/lib/tidypics.php
index 539db451a..20d3df81f 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -31,8 +31,8 @@
 
  * Good luck
  */
-function tp_get_latest_photos($num_images, $owner_guid = 0) {
-	$prev_context = set_context('front');
+function tp_get_latest_photos($num_images, $owner_guid = 0, $context = 'front') {
+	$prev_context = set_context($context);
 	$image_html = tp_list_entities('object', 'image', $owner_guid, null, $num_images, false, false, false);
 	set_context($prev_context);
 	return $image_html;
diff --git a/views/default/object/image.php b/views/default/object/image.php
index da3e257a1..8c1f23ec2 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -49,7 +49,7 @@ if (get_context() == "search") {
  * front page view 
  *
  ****************************************************************/
-} else if (get_context() == "front") {
+} else if (get_context() == "front" || get_context() == "widget") {
 	// the front page view is a clickable thumbnail of the image
 ?>
 
diff --git a/views/default/tidypics/gallery.php b/views/default/tidypics/gallery.php
index 74aa34500..ba6f7b11d 100644
--- a/views/default/tidypics/gallery.php
+++ b/views/default/tidypics/gallery.php
@@ -4,8 +4,12 @@
  *
  */
 
-// four albums across
-$num_wide = 4;
+if ($vars['context'] == 'widget') {
+	$num_wide = 3;
+} else {
+	// four albums across
+	$num_wide = 4;
+}
 
 $context = $vars['context'];
 $offset = $vars['offset'];
diff --git a/views/default/widgets/latest_photos/view.php b/views/default/widgets/latest_photos/view.php
index d6bc4a0df..108d070c9 100644
--- a/views/default/widgets/latest_photos/view.php
+++ b/views/default/widgets/latest_photos/view.php
@@ -9,7 +9,7 @@ if (!$number) {
 }
 
 echo '
      ';
-echo tp_get_latest_photos($number, page_owner());
+echo tp_get_latest_photos($number, page_owner(), 'widget');
 echo '
      ';
 
 ?>
-- 
cgit v1.2.3


From dfbe8230304558856ba38aa58f28a1a1524901e4 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 7 Aug 2010 19:54:53 +0000
Subject: fixed paths due to move to new directory

---
 actions/admin/create_thumbnails.php | 4 ++--
 actions/admin/flickrSetup.php       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/actions/admin/create_thumbnails.php b/actions/admin/create_thumbnails.php
index 18dae6b78..a09965f65 100644
--- a/actions/admin/create_thumbnails.php
+++ b/actions/admin/create_thumbnails.php
@@ -5,8 +5,8 @@
  *  Called through ajax
  */
 
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
-include dirname(dirname(__FILE__)) . "/lib/resize.php";
+include_once dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/engine/start.php";
+include dirname(dirname(dirname(__FILE__))) . "/lib/resize.php";
 
 global $CONFIG;
 
diff --git a/actions/admin/flickrSetup.php b/actions/admin/flickrSetup.php
index ee31b8c34..1eaf9a037 100644
--- a/actions/admin/flickrSetup.php
+++ b/actions/admin/flickrSetup.php
@@ -2,7 +2,7 @@
 /**
  * Setup the user's flickr username and store it
  */
-require_once dirname(dirname(__FILE__)) . "/lib/phpFlickr/phpFlickr.php";
+require_once dirname(dirname(dirname(__FILE__))) . "/lib/phpFlickr/phpFlickr.php";
 $f = new phpFlickr("26b2abba37182aca62fe0eb2c7782050");
 
 $flickr_username = get_input( "flickr_username" );
-- 
cgit v1.2.3


From d759c3b884af321de18de32cbe446a1e08c2adab Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 23 Oct 2010 11:58:52 +0000
Subject: do not need to override this anymore because Elgg core handles this

---
 views/default/annotation/annotate.php | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 views/default/annotation/annotate.php

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
deleted file mode 100644
index f81f2b55c..000000000
--- a/views/default/annotation/annotate.php
+++ /dev/null
@@ -1,20 +0,0 @@
-subject_guid);
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
-$subtype = get_subtype_from_id($object->subtype);
-$title = $object->title;
-if (!$title) {
-	$title = elgg_echo('untitled');
-}
-
-$url = "getURL()}\">{$performed_by->name}";
-$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
-$string .= elgg_echo("{$subtype}:river:annotate") . " getURL() . "\">" . $title . "";
-
-echo $string;
-- 
cgit v1.2.3


From b726392855f1137803f25b710441375c20d0f140 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 23 Oct 2010 12:06:27 +0000
Subject: a little clean up of upgrade view

---
 views/default/tidypics/admin/upgrade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/tidypics/admin/upgrade.php b/views/default/tidypics/admin/upgrade.php
index 5a21aa136..3450bd7db 100644
--- a/views/default/tidypics/admin/upgrade.php
+++ b/views/default/tidypics/admin/upgrade.php
@@ -3,7 +3,6 @@
 require_once "{$CONFIG->pluginspath}tidypics/version.php";
 
 $upgrade_url = "{$vars['url']}action/tidypics/admin/upgrade";
-//$upgrade_url = elgg_add_action_tokens_to_url($upgrade_url);
 
 // determine whether an upgrade is required
 $local_version = get_plugin_setting('version', 'tidypics');
@@ -16,6 +15,7 @@ if ($local_version === FALSE) {
 		$local_version = $version;
 	}
 } elseif ($local_version == '1.62') {
+	// special work around to handle old upgrade system
 	$local_version = 2010010101;
 	set_plugin_setting('version', $local_version, 'tidypics');
 }
-- 
cgit v1.2.3


From e8fafaca927a17a6badad86e9a0c6ad4c911b8f1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 23 Oct 2010 12:10:03 +0000
Subject: fixed widget bug

---
 lib/tidypics.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tidypics.php b/lib/tidypics.php
index 20d3df81f..67d69e0da 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -32,7 +32,8 @@
  * Good luck
  */
 function tp_get_latest_photos($num_images, $owner_guid = 0, $context = 'front') {
-	$prev_context = set_context($context);
+	$prev_context = get_context();
+	set_context($context);
 	$image_html = tp_list_entities('object', 'image', $owner_guid, null, $num_images, false, false, false);
 	set_context($prev_context);
 	return $image_html;
-- 
cgit v1.2.3


From cee2276dc0bd37f7981e885f9dd32cd0e113c1cc Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 23 Oct 2010 12:53:41 +0000
Subject: updating album image list when a photo is deleted

---
 actions/admin/upgrade.php |  2 ++
 actions/delete.php        | 21 +++++++++++----------
 lib/album.php             | 19 +++++++++++++++++++
 lib/image.php             | 13 +++++++++++++
 4 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/actions/admin/upgrade.php b/actions/admin/upgrade.php
index 9c4aef1cf..334e9588e 100644
--- a/actions/admin/upgrade.php
+++ b/actions/admin/upgrade.php
@@ -11,6 +11,8 @@ if ($version <= $local_version) {
 	forward($_SERVER['HTTP_REFERER']);
 }
 
+set_time_limit(0);
+
 $base_dir = $CONFIG->pluginspath . 'tidypics/upgrades';
 
 // taken from engine/lib/version.php
diff --git a/actions/delete.php b/actions/delete.php
index c1e0ed59e..9b8c6ac6f 100644
--- a/actions/delete.php
+++ b/actions/delete.php
@@ -53,7 +53,7 @@ $image_repo_size_md = get_metadata_byname($owner_guid, "image_repo_size");
 $image_repo_size = (int)$image_repo_size_md->value;
 
 //loop through all images and delete them
-foreach($images as $im) {
+foreach ($images as $im) {
 	$thumbnail = $im->thumbnail;
 	$smallthumb = $im->smallthumb;
 	$largethumb = $im->largethumb;
@@ -76,16 +76,17 @@ foreach($images as $im) {
 		$delfile->setFilename($largethumb);
 		$delfile->delete();
 	}
-	if ($im) { //delete actual image file
-		$delfile = new ElggFile($im->getGUID());
-		$delfile->owner_guid = $im->getOwner();
-		//$delfile->setFilename($im->originalfilename);
-		$image_repo_size -= $delfile->size();
+	if ($im) {
+		$image_repo_size -= $im->size();
 
-		if (!$delfile->delete()) {
-			if ($subtype=='image') register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
+		if (!$im->delete()) {
+			if ($subtype=='image') {
+				register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
+			}
 		} else {
-			if ($subtype=='image') system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
+			if ($subtype=='image') {
+				system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
+			}
 		}
 	} //end delete actual image file
 } //end looping through each image to delete it
@@ -107,7 +108,7 @@ if ($subtype == 'album') {
 		rmdir($albumdir);
 	}
 
-	//delete object from database
+	//delete album object from database
 	if (!$entity->delete()) {
 		register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
 	} else {
diff --git a/lib/album.php b/lib/album.php
index 87bb715f4..15450049a 100644
--- a/lib/album.php
+++ b/lib/album.php
@@ -138,4 +138,23 @@ class TidypicsAlbum extends ElggObject {
 		}
 		return $imageList[$key];
 	}
+
+	/**
+	 * Remove an image from the album list
+	 *
+	 * @param int $imageGuid
+	 * @return bool
+	 */
+	public function removeImage($imageGuid)  {
+		$imageList = $this->getImageList();
+		$key = array_search($imageGuid, $imageList);
+		if ($key === FALSE) {
+			return FALSE;
+		}
+		
+		unset($imageList[$key]);
+		$this->setImageList($imageList);
+
+		return TRUE;
+	}
 }
diff --git a/lib/image.php b/lib/image.php
index 4100f3f7b..c60eabfc0 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -17,6 +17,19 @@ class TidypicsImage extends ElggFile {
 		parent::__construct($guid);
 	}
 
+	/**
+	 * delete image
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+
+		$album = get_entity($this->container_guid);
+		$album->removeImage($this->guid);
+
+		return parent::delete();
+	}
+
 	/**
 	 * Has the photo been tagged with "in this photo" tags
 	 *
-- 
cgit v1.2.3


From c2f005477cce4312df1bd67a88bb4d644fb14790 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 23 Oct 2010 12:54:53 +0000
Subject: added some protection against a container that has already been
 deleted

---
 lib/image.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/image.php b/lib/image.php
index c60eabfc0..a22e1db1c 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -25,7 +25,9 @@ class TidypicsImage extends ElggFile {
 	public function delete() {
 
 		$album = get_entity($this->container_guid);
-		$album->removeImage($this->guid);
+		if ($album) {
+			$album->removeImage($this->guid);
+		}
 
 		return parent::delete();
 	}
-- 
cgit v1.2.3


From e0834b7d8b2b79ce230ca56601c7851aba4abe88 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 23 Oct 2010 13:18:57 +0000
Subject: better image deletion

---
 actions/delete.php | 71 ++++++++++++++++++------------------------------------
 lib/image.php      | 40 ++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/actions/delete.php b/actions/delete.php
index 9b8c6ac6f..d9a65ce5f 100644
--- a/actions/delete.php
+++ b/actions/delete.php
@@ -32,64 +32,41 @@ if ($subtype != 'image' && $subtype != 'album') { // how did we even get here?
 }
 
 $owner_guid = 0; // group or user
-if ($subtype == 'image') { //deleting an image
-	$album = get_entity($entity->container_guid);
-	$owner_guid = $album->container_guid;
-	$forward_url = $container->getURL(); //forward back to album after deleting pictures
-	$images = array($entity);
+if ($subtype == 'image') {
+	//forward back to album after deleting pictures
+	$forward_url = $container->getURL();
+
 	// plugins can register to be told when a Tidypics image has been deleted
 	trigger_elgg_event('delete', 'tp_image', $entity);
-} else { //deleting an album
+
+	if ($entity->delete()) {
+		system_message(elgg_echo("tidypics:deleted"));
+	} else {
+		register_error(elgg_echo("tidypics:deletefailed"));
+	}
+} else {
+	//deleting an album
 	$owner_guid = $entity->container_guid;
 	$forward_url = 'pg/photos/owned/' . $container->username;
 	//get all the images from this album as long as less than 999 images
 	$images = get_entities("object", "image", $guid, '', 999);
 	// plugins can register to be told when a Tidypics album has been deleted
 	trigger_elgg_event('delete', 'tp_album', $entity);
-}
+	//loop through all images and delete them
+	foreach ($images as $im) {
+		if ($im) {
 
-// make sure we decrease the repo size for the size quota
-$image_repo_size_md = get_metadata_byname($owner_guid, "image_repo_size");
-$image_repo_size = (int)$image_repo_size_md->value;
-
-//loop through all images and delete them
-foreach ($images as $im) {
-	$thumbnail = $im->thumbnail;
-	$smallthumb = $im->smallthumb;
-	$largethumb = $im->largethumb;
-
-	if ($thumbnail) { //delete standard thumbnail image
-		$delfile = new ElggFile();
-		$delfile->owner_guid = $im->getOwner();
-		$delfile->setFilename($thumbnail);
-		$delfile->delete();
-	}
-	if ($smallthumb) { //delete small thumbnail image
-		$delfile = new ElggFile();
-		$delfile->owner_guid = $im->getOwner();
-		$delfile->setFilename($smallthumb);
-		$delfile->delete();
-	}
-	if ($largethumb) { //delete large thumbnail image
-		$delfile = new ElggFile();
-		$delfile->owner_guid = $im->getOwner();
-		$delfile->setFilename($largethumb);
-		$delfile->delete();
-	}
-	if ($im) {
-		$image_repo_size -= $im->size();
 
-		if (!$im->delete()) {
-			if ($subtype=='image') {
+			if (!$im->delete()) {
 				register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
+			} else {
+				if ($subtype=='image') {
+					system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
+				}
 			}
-		} else {
-			if ($subtype=='image') {
-				system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
-			}
-		}
-	} //end delete actual image file
-} //end looping through each image to delete it
+		} //end delete actual image file
+	} //end looping through each image to delete it
+}
 
 //now that all images have been deleted, delete the album
 if ($subtype == 'album') {
@@ -116,6 +93,4 @@ if ($subtype == 'album') {
 	}
 } //end of delete album
 
-create_metadata($owner_guid, "image_repo_size", $image_repo_size, 'integer', $owner_guid);
-
 forward($forward_url);
diff --git a/lib/image.php b/lib/image.php
index a22e1db1c..7c7ef2d90 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -29,6 +29,12 @@ class TidypicsImage extends ElggFile {
 			$album->removeImage($this->guid);
 		}
 
+		$this->removeThumbnails();
+
+		// update quota
+		$owner = $this->getOwnerEntity();
+		$owner->image_repo_size = (int)$owner->image_repo_size - $this->size();
+
 		return parent::delete();
 	}
 
@@ -146,6 +152,40 @@ class TidypicsImage extends ElggFile {
 			create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC);
 		}
 	}
+
+	/**
+	 * Remove thumbnails - usually in preparation for deletion
+	 *
+	 * The thumbnails are not actually ElggObjects so we create
+	 * temporary objects to delete them.
+	 */
+	protected function removeThumbnails() {
+		$thumbnail = $this->thumbnail;
+		$smallthumb = $this->smallthumb;
+		$largethumb = $this->largethumb;
+
+		//delete standard thumbnail image
+		if ($thumbnail) {
+			$delfile = new ElggFile();
+			$delfile->owner_guid = $this->getOwner();
+			$delfile->setFilename($thumbnail);
+			$delfile->delete();
+		}
+		//delete small thumbnail image
+		if ($smallthumb) {
+			$delfile = new ElggFile();
+			$delfile->owner_guid = $this->getOwner();
+			$delfile->setFilename($smallthumb);
+			$delfile->delete();
+		}
+		//delete large thumbnail image
+		if ($largethumb) {
+			$delfile = new ElggFile();
+			$delfile->owner_guid = $this->getOwner();
+			$delfile->setFilename($largethumb);
+			$delfile->delete();
+		}
+	}
 }
 
 /**
-- 
cgit v1.2.3


From 18d83390fc4fe643a7747d212c491ab88418c1bb Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 23 Oct 2010 13:35:24 +0000
Subject: cleaned up album deletion

---
 actions/delete.php | 64 +++++++++++-------------------------------------------
 lib/album.php      | 40 ++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/actions/delete.php b/actions/delete.php
index d9a65ce5f..dfe910666 100644
--- a/actions/delete.php
+++ b/actions/delete.php
@@ -13,12 +13,14 @@ $forward_url = 'pg/photos/world'; // by default forward to world photos
 $guid = (int) get_input('guid');
 
 $entity = get_entity($guid);
-if (!$entity) { // unable to get Elgg entity
+if (!$entity) {
+	// unable to get Elgg entity
 	register_error(elgg_echo("tidypics:deletefailed"));
 	forward($forward_url);
 }
 
-if (!$entity->canEdit()) { // user doesn't have permissions
+if (!$entity->canEdit()) {
+	// user doesn't have permissions
 	register_error(elgg_echo("tidypics:deletefailed"));
 	forward($forward_url);
 }
@@ -26,71 +28,31 @@ if (!$entity->canEdit()) { // user doesn't have permissions
 $subtype = $entity->getSubtype();
 $container = get_entity($entity->container_guid);
 
-if ($subtype != 'image' && $subtype != 'album') { // how did we even get here?
+if ($subtype != 'image' && $subtype != 'album') {
+	// how did we even get here?
 	register_error(elgg_echo("tidypics:deletefailed"));
 	forward($forward_url);
 }
 
-$owner_guid = 0; // group or user
 if ($subtype == 'image') {
 	//forward back to album after deleting pictures
 	$forward_url = $container->getURL();
 
 	// plugins can register to be told when a Tidypics image has been deleted
 	trigger_elgg_event('delete', 'tp_image', $entity);
-
-	if ($entity->delete()) {
-		system_message(elgg_echo("tidypics:deleted"));
-	} else {
-		register_error(elgg_echo("tidypics:deletefailed"));
-	}
 } else {
-	//deleting an album
-	$owner_guid = $entity->container_guid;
+	// forward to this person's albums
 	$forward_url = 'pg/photos/owned/' . $container->username;
-	//get all the images from this album as long as less than 999 images
-	$images = get_entities("object", "image", $guid, '', 999);
+
 	// plugins can register to be told when a Tidypics album has been deleted
 	trigger_elgg_event('delete', 'tp_album', $entity);
-	//loop through all images and delete them
-	foreach ($images as $im) {
-		if ($im) {
-
-
-			if (!$im->delete()) {
-				register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
-			} else {
-				if ($subtype=='image') {
-					system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
-				}
-			}
-		} //end delete actual image file
-	} //end looping through each image to delete it
 }
 
-//now that all images have been deleted, delete the album
-if ($subtype == 'album') {
-	//delete the album's directory manually; first create a temp file to get the directory path
-	$tmpfile = new ElggFile();
-	$tmpfile->setFilename('image/' . $guid . '/._tmp_del_tidypics_album_');
-	$tmpfile->subtype = 'image';
-	$tmpfile->container_guid = $guid;
-	$tmpfile->open("write");
-	$tmpfile->write('');
-	$tmpfile->close();
-	$tmpfile->save();
-	$albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore());
-	$tmpfile->delete();
-	if (is_dir($albumdir)) {
-		rmdir($albumdir);
-	}
 
-	//delete album object from database
-	if (!$entity->delete()) {
-		register_error(elgg_echo("tidypics:deletefailed")); //unable to delete object
-	} else {
-		system_message(elgg_echo("tidypics:deleted")); //successfully deleted object
-	}
-} //end of delete album
+if ($entity->delete()) {
+	system_message(elgg_echo("tidypics:deleted"));
+} else {
+	register_error(elgg_echo("tidypics:deletefailed"));
+}
 
 forward($forward_url);
diff --git a/lib/album.php b/lib/album.php
index 15450049a..472bf69d8 100644
--- a/lib/album.php
+++ b/lib/album.php
@@ -17,6 +17,19 @@ class TidypicsAlbum extends ElggObject {
 		parent::__construct($guid);
 	}
 
+	/**
+	 * Delete album
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+
+		$this->deleteImages();
+		$this->deleteAlbumDir();
+		
+		return parent::delete();
+	}
+
 	/**
 	 * Get an array of image objects
 	 *
@@ -157,4 +170,31 @@ class TidypicsAlbum extends ElggObject {
 
 		return TRUE;
 	}
+
+	protected function deleteImages() {
+		// get all the images from this album as long as less than 999 images
+		$images = get_entities("object", "image", $this->guid, '', 999);
+		foreach ($images as $image) {
+			if ($image) {
+				$image->delete();
+			}
+		}
+	}
+
+	protected function deleteAlbumDir() {
+		$tmpfile = new ElggFile();
+		$tmpfile->setFilename('image/' . $this->guid . '/._tmp_del_tidypics_album_');
+		$tmpfile->subtype = 'image';
+		$tmpfile->owner_guid = $this->owner_guid;
+		$tmpfile->container_guid = $this->guid;
+		$tmpfile->open("write");
+		$tmpfile->write('');
+		$tmpfile->close();
+		$tmpfile->save();
+		$albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore());
+		$tmpfile->delete();
+		if (is_dir($albumdir)) {
+			rmdir($albumdir);
+		}
+	}
 }
-- 
cgit v1.2.3


From bff17c5857d0365038e6783c3c00b53204f4a10e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 23 Oct 2010 13:40:18 +0000
Subject: think about setting title based on image name before edit multi

---
 actions/upload.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/actions/upload.php b/actions/upload.php
index 88b000706..652ae16af 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -143,6 +143,7 @@ foreach($_FILES as $key => $sent_file) {
 	$file->subtype="image";
 	$file->simpletype="image";
 	$file->access_id = $access_id;
+	//$file->title = substr($file->originalfilename, 0, strrpos($file->originalfilename, '.'));
 	if ($container_guid) {
 		$file->container_guid = $container_guid;
 	}
-- 
cgit v1.2.3


From f1f08168b325605a489b5f21cfdfff96312d55f8 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 23 Oct 2010 15:01:00 +0000
Subject: moved cover code into album class

---
 actions/edit.php                            |  2 +-
 actions/edit_multi.php                      |  2 +-
 lib/album.php                               | 38 ++++++++++++++++++++++++++++-
 views/default/object/album.php              | 12 ++++-----
 views/default/river/object/album/create.php |  5 ++--
 views/default/river/object/image/create.php |  3 ---
 views/default/tidypics/albums.php           |  5 ++--
 views/default/tidypics/forms/edit.php       |  2 +-
 views/default/tidypics/forms/edit_multi.php |  2 +-
 views/rss/object/album.php                  |  6 ++---
 10 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/actions/edit.php b/actions/edit.php
index db6e26ab9..cca66941a 100644
--- a/actions/edit.php
+++ b/actions/edit.php
@@ -65,7 +65,7 @@ if (is_array($tagarray)) {
 //if cover meta is sent from image save as metadata
 if ($subtype == 'image' && $cover == elgg_echo('album:cover')) {
 	$album = get_entity($container_guid);
-	$album->cover = $entity->guid;
+	$album->setCoverImageGuid($entity->guid);
 }
 
 // Success message
diff --git a/actions/edit_multi.php b/actions/edit_multi.php
index c938e6065..1d0e537b0 100644
--- a/actions/edit_multi.php
+++ b/actions/edit_multi.php
@@ -49,7 +49,7 @@ foreach($image_guid_array as $key => $im) {
 
 		//if cover meta is sent from image save as metadata
 		if ($cover == $im) {
-			$album_entity->cover = $im;
+			$album_entity->setCoverImageGuid($im);
 		}
 	}
 }
diff --git a/lib/album.php b/lib/album.php
index 472bf69d8..916ccbc31 100644
--- a/lib/album.php
+++ b/lib/album.php
@@ -67,7 +67,43 @@ class TidypicsAlbum extends ElggObject {
 
 		$count = $this->getSize();
 
-		return elgg_view_entity_list($images, $count, $offset, $limit, FALSE, FALSE, TRUE);
+		return elgg_view_entity_list($images, $count, $offset, $limit, false, false, true);
+	}
+
+	/**
+	 * Get the GUID of the album cover
+	 * 
+	 * @return int
+	 */
+	public function getCoverImageGuid() {
+		if ($this->getSize() == 0) {
+			return 0;
+		}
+
+		$guid = $this->cover;
+		$imageList = $this->getImageList();
+		if (!in_array($guid, $imageList)) {
+			// select random photo to be cover
+			$index = array_rand($imageList, 1);
+			$guid = $imageList[$index];
+			$this->cover = $guid;
+		}
+		return $guid;
+	}
+
+	/**
+	 * Set the GUID for the album cover
+	 *
+	 * @param int $guid
+	 * @return bool
+	 */
+	public function setCoverImageGuid($guid) {
+		$imageList = $this->getImageList();
+		if (!in_array($guid, $imageList)) {
+			return false;
+		}
+		$this->cover = $guid;
+		return true;
 	}
 
 	/**
diff --git a/views/default/object/album.php b/views/default/object/album.php
index b87bef444..7c43c4e96 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -27,9 +27,9 @@ if (get_context() == "search") {
  *
  *****************************************************************************/
 
-		//get album cover if one was set
-		if ($album->cover) {
-			$album_cover = '' . $title . '';
+		$album_cover_guid = $album->getCoverImageGuid();
+		if ($album_cover_guid) {
+			$album_cover = '' . $title . '';
 		} else {
 			$album_cover = 'new album';
 		}
@@ -69,9 +69,9 @@ if (get_context() == "search") {
 		}
 		$info .= "
      ";
 
-		//get album cover if one was set
-		if ($album->cover) {
-			$icon = "getURL()}\">" . 'thumbnail';
+		$album_cover_guid = $album->getCoverImageGuid();
+		if ($album_cover_guid) {
+			$icon = "getURL()}\">" . 'thumbnail';
 		} else {
 			$icon = "getURL()}\">" . 'new album';
 		}
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index ef50f9988..47d20f3ae 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -20,8 +20,9 @@ if ($group_album) {
 $album_river_view = get_plugin_setting('album_river_view', 'tidypics');
 
 if ($album_river_view == "cover") {
-	if ($album->cover) {
-		$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
+	$album_cover_guid = $album->getCoverImageGuid();
+	if ($album_cover_guid) {
+		$string .= "
       wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album_cover_guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "
      ";
 	}
 } else {
 
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 188fc6ff1..8a0a8deff 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -18,9 +18,6 @@ $string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_li
 
 $string .= "
      ";
 
-/*	// this adds the album cover to the river display 
-	$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
-*/
 $string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
 $string .= "
      ";
 
diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php
index a4b2ee906..7e0cd2d6c 100644
--- a/views/default/tidypics/albums.php
+++ b/views/default/tidypics/albums.php
@@ -14,8 +14,9 @@ echo '
      ';
 if ($owner_albums) {
 	foreach ($owner_albums as $album) {
 
-		if ($album->cover) {
-			$album_cover = '' . $album->title . '';
+		$album_cover_guid = $album->getCoverImageGuid();
+		if ($album_cover_guid) {
+			$album_cover = '' . $album->title . '';
 		} else {
 			$album_cover = '' . $album->title . '';
 		}
diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
index 74d8e85ec..8e2bd9bcc 100644
--- a/views/default/tidypics/forms/edit.php
+++ b/views/default/tidypics/forms/edit.php
@@ -75,7 +75,7 @@ $container_guid = page_owner();
 			// determine if it is already the cover
 			$img_guid = $vars['entity']->guid;
 			$album = get_entity($container_guid);
-			$cover_guid = $album->cover;
+			$cover_guid = $album->getCoverImageGuid();
 
 			if ($cover_guid != $img_guid) {
 
diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php
index c16c8eea9..8c3e40242 100644
--- a/views/default/tidypics/forms/edit_multi.php
+++ b/views/default/tidypics/forms/edit_multi.php
@@ -11,7 +11,7 @@
 	
 	// make sure one of the images becomes the cover if there isn't one already
 	$album_entity = get_entity($vars['album_guid']);
-	if (!$album_entity->cover) {
+	if (!$album_entity->getCoverImageGuid()) {
 		$no_cover = true;
 	}
 	
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 34cf58395..8a8f97cc2 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -22,8 +22,8 @@ if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
 	// use fullsize image
 	$base_url_fullsize = $vars['url'] . 'pg/photos/download/';
 
-	// insert cover image if it exists image
-	if ($album->cover) {
+	$album_cover_guid = $album->getCoverImageGuid();
+	if ($album_cover_guid) {
 		// Set title
 		$vars['title'] = $album->title;
 		if (empty($vars['title'])) {
@@ -33,7 +33,7 @@ if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
 		} else {
 			$title = $vars['config']->sitename . ": " . $vars['title'];
 		}
-		$album_cover_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb';
+		$album_cover_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album_cover_guid . '&size=thumb';
 ?>		
 			
 			<![CDATA[<?php echo $title; ?>]]>
-- 
cgit v1.2.3


From c1913c4e6873aae185033d8cb82df1c6cee11480 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 24 Oct 2010 00:50:40 +0000
Subject: cleaned up add album action

---
 actions/addalbum.php | 67 ++++++++++++++++++++--------------------------------
 1 file 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);
-- 
cgit v1.2.3


From 5161b1c8fdc8ff69005f864a89127fc18db6d4ed Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 24 Oct 2010 01:53:21 +0000
Subject: started cleaning up the upload action

---
 actions/upload.php | 90 ++++++++++++------------------------------------------
 lib/image.php      | 66 +++++++++++++++++++++++++++++++++++++++
 lib/upload.php     | 38 +++++++++++++++++++++++
 3 files changed, 124 insertions(+), 70 deletions(-)
 create mode 100644 lib/upload.php

diff --git a/actions/upload.php b/actions/upload.php
index 652ae16af..2d7b311bb 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -5,8 +5,7 @@
  * This will upload up to 10 images at at time to an album
  */
 
-include dirname(dirname(__FILE__)) . "/lib/resize.php";
-include dirname(dirname(__FILE__)) . "/lib/exif.php";
+include_once dirname(dirname(__FILE__)) . "/lib/upload.php";
 
 // Get common variables
 $access_id = (int) get_input("access_id");
@@ -33,6 +32,9 @@ if (!$image_lib) {
 	$image_lib = "GD";
 }
 
+$img_river_view = get_plugin_setting('img_river_view', 'tidypics');
+
+
 // post limit exceeded
 if (count($_FILES) == 0) {
 	trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
@@ -57,17 +59,6 @@ $uploaded_images = array();
 $not_uploaded = array();
 $error_msgs = array();
 
-$img_river_view = get_plugin_setting('img_river_view', 'tidypics');
-
-$accepted_formats = array(
-		'image/jpeg',
-		'image/png',
-		'image/gif',
-		'image/pjpeg',
-		'image/x-png',
-);
-
-
 foreach($_FILES as $key => $sent_file) {
 
 	// skip empty entries
@@ -89,8 +80,8 @@ foreach($_FILES as $key => $sent_file) {
 		continue;
 	}
 
-	//make sure file is an image
-	if (!in_array($mime, $accepted_formats)) {
+	// must be an image
+	if (!tp_upload_check_format($mime)) {
 		array_push($not_uploaded, $sent_file['name']);
 		array_push($error_msgs, elgg_echo('tidypics:not_image'));
 		continue;
@@ -112,44 +103,25 @@ foreach($_FILES as $key => $sent_file) {
 		continue;
 	}
 
-	// make sure the in memory image size does not exceed memory available - GD only
+	// make sure the in memory image size does not exceed memory available
 	$imginfo = getimagesize($sent_file['tmp_name']);
-	$mem_avail = ini_get('memory_limit');
-	$mem_avail = rtrim($mem_avail, 'M');
-	$mem_avail = $mem_avail * 1024 * 1024;
-	if ($image_lib == 'GD') {
-		$mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);
-
-		$mem_used = memory_get_usage();
-
-		$mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer
-		if ($mem_required > $mem_avail) {
-			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
-			trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
-			continue;
-		}
-	} else if ($image_lib == 'ImageMagickPHP') {
-		// haven't been able to determine a limit like there is for GD
+	if (!tp_upload_memory_check($image_lib, $imginfo[0] * $imginfo[1])) {
+		array_push($not_uploaded, $sent_file['name']);
+		array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
+		trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
+		continue;
 	}
 
 	//this will save to users folder in /image/ and organize by photo album
-	$prefix = "image/" . $container_guid . "/";
-	$file = new ElggFile();
-	$filestorename = strtolower(time().$name);
-	$file->setFilename($prefix.$filestorename);
+	$file = new TidypicsImage();
+	$file->container_guid = $container_guid;
 	$file->setMimeType($mime);
-	$file->originalfilename = $name;
-	$file->subtype="image";
 	$file->simpletype="image";
 	$file->access_id = $access_id;
-	//$file->title = substr($file->originalfilename, 0, strrpos($file->originalfilename, '.'));
-	if ($container_guid) {
-		$file->container_guid = $container_guid;
-	}
-	$file->open("write");
-	$file->write(get_uploaded_file($key));
-	$file->close();
+	//$file->title = substr($name, 0, strrpos($name, '.'));
+
+	$file->setOriginalFilename($name);
+	$file->saveImageFile(get_uploaded_file($key));
 	$result = $file->save();
 
 	if (!$result) {
@@ -158,30 +130,8 @@ foreach($_FILES as $key => $sent_file) {
 		continue;
 	}
 
-	//get and store the exif data
-	td_get_exif($file);
-
-
-	// resize photos to create thumbnails
-	if ($image_lib == 'ImageMagick') { // ImageMagick command line
-
-		if (tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
-		}
-
-	} else if ($image_lib == 'ImageMagickPHP') {  // imagick php extension
-
-		if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
-		}
-
-	} else {
-
-		if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
-		}
-
-	} // end of image library selector
+	$file->extractExifData();
+	$file->saveThumbnails($image_lib);
 
 	//keep one file handy so we can add a notice to the river if single image option selected
 	if (!$file_for_river) {
diff --git a/lib/image.php b/lib/image.php
index 7c7ef2d90..51b31f6d7 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -38,6 +38,72 @@ class TidypicsImage extends ElggFile {
 		return parent::delete();
 	}
 
+	/**
+	 * Set the internal filenames
+	 * 
+	 * @warning container needs to be set first
+	 */
+	public function setOriginalFilename($originalName) {
+		$prefix = "image/" . $this->container_guid . "/";
+		$filestorename = strtolower(time() . $originalName);
+		$this->setFilename($prefix . $filestorename);
+		$this->originalfilename = $originalName;
+	}
+
+	/**
+	 * Save the uploaded image
+	 *
+	 * @warning filename needs to be set first
+	 * 
+	 * @param string $image
+	 */
+	public function saveImageFile($image) {
+		$this->open("write");
+		$this->write($image);
+		$this->close();
+	}
+
+	/**
+	 * Save the image thumbnails
+	 *
+	 * @warning container guid and filename must be set
+	 * 
+	 * @param string $imageLib
+	 */
+	public function saveThumbnails($imageLib) {
+		include_once dirname(__FILE__) . "/resize.php";
+		
+		$prefix = "image/" . $this->container_guid . "/";
+		$filename = $this->getFilename();
+		$filename = substr($filename, strrpos($filename, '/') + 1);
+		
+		if ($imageLib == 'ImageMagick') {
+			// ImageMagick command line
+			if (tp_create_im_cmdline_thumbnails($this, $prefix, $filename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
+			}
+		} else if ($imageLib == 'ImageMagickPHP') {
+			// imagick php extension
+			if (tp_create_imagick_thumbnails($this, $prefix, $filename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
+			}
+		} else {
+			if (tp_create_gd_thumbnails($this, $prefix, $filename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
+			}
+		}
+	}
+
+	/**
+	 * Extract EXIF Data from image
+	 *
+	 * @warning image file must be saved first
+	 */
+	public function extractExifData() {
+		include_once dirname(__FILE__) . "/exif.php";
+		td_get_exif($this);
+	}
+	
 	/**
 	 * Has the photo been tagged with "in this photo" tags
 	 *
diff --git a/lib/upload.php b/lib/upload.php
new file mode 100644
index 000000000..a7dd7611d
--- /dev/null
+++ b/lib/upload.php
@@ -0,0 +1,38 @@
+ $mem_avail) {
+		return false;
+	}
+
+	return true;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From da1493b95a2f0b5000a487ae373c9318c58d0b2d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 24 Oct 2010 21:08:27 +0000
Subject: partial implementation of flash uploader

---
 actions/ajax_upload.php                            |   47 +
 actions/upload.php                                 |   33 +-
 languages/en.php                                   |    1 +
 lib/image.php                                      |   20 +-
 lib/upload.php                                     |   78 +
 pages/upload.php                                   |    2 +-
 start.php                                          |    1 +
 vendors/uploadify/Uploadify v2.1.0 Manual.pdf      |  Bin 0 -> 556466 bytes
 vendors/uploadify/cancel.png                       |  Bin 0 -> 603 bytes
 vendors/uploadify/check.php                        |   35 +
 .../uploadify/com/adobe/air/logging/FileTarget.as  |   98 +
 vendors/uploadify/com/adobe/crypto/HMAC.as         |  127 +
 vendors/uploadify/com/adobe/crypto/MD5.as          |  281 +++
 vendors/uploadify/com/adobe/crypto/MD5Stream.as    |  402 ++++
 vendors/uploadify/com/adobe/crypto/SHA1.as         |  271 +++
 vendors/uploadify/com/adobe/crypto/SHA224.as       |  257 ++
 vendors/uploadify/com/adobe/crypto/SHA256.as       |  261 +++
 .../com/adobe/crypto/WSSEUsernameToken.as          |  114 +
 .../com/adobe/errors/IllegalStateError.as          |   63 +
 .../com/adobe/fileformats/vcard/Address.as         |   47 +
 .../uploadify/com/adobe/fileformats/vcard/Email.as |   39 +
 .../uploadify/com/adobe/fileformats/vcard/Phone.as |   39 +
 .../uploadify/com/adobe/fileformats/vcard/VCard.as |   54 +
 .../com/adobe/fileformats/vcard/VCardParser.as     |  246 ++
 vendors/uploadify/com/adobe/images/BitString.as    |   39 +
 vendors/uploadify/com/adobe/images/JPGEncoder.as   |  648 +++++
 vendors/uploadify/com/adobe/images/PNGEncoder.as   |  141 ++
 .../uploadify/com/adobe/net/DynamicURLLoader.as    |   55 +
 vendors/uploadify/com/adobe/net/IURIResolver.as    |   76 +
 vendors/uploadify/com/adobe/net/MimeTypeMap.as     |  196 ++
 vendors/uploadify/com/adobe/net/URI.as             | 2466 ++++++++++++++++++++
 .../uploadify/com/adobe/net/URIEncodingBitmap.as   |  139 ++
 .../com/adobe/net/proxies/RFC2817Socket.as         |  198 ++
 .../uploadify/com/adobe/protocols/dict/Database.as |   34 +
 .../com/adobe/protocols/dict/Definition.as         |   39 +
 vendors/uploadify/com/adobe/protocols/dict/Dict.as |  328 +++
 .../com/adobe/protocols/dict/DictionaryServer.as   |   28 +
 .../com/adobe/protocols/dict/MatchStrategy.as      |   34 +
 .../uploadify/com/adobe/protocols/dict/Response.as |   39 +
 .../adobe/protocols/dict/events/ConnectedEvent.as  |   14 +
 .../adobe/protocols/dict/events/DatabaseEvent.as   |   26 +
 .../adobe/protocols/dict/events/DefinitionEvent.as |   27 +
 .../protocols/dict/events/DefinitionHeaderEvent.as |   26 +
 .../protocols/dict/events/DictionaryServerEvent.as |   26 +
 .../protocols/dict/events/DisconnectedEvent.as     |   14 +
 .../com/adobe/protocols/dict/events/ErrorEvent.as  |   37 +
 .../com/adobe/protocols/dict/events/MatchEvent.as  |   26 +
 .../protocols/dict/events/MatchStrategiesEvent.as  |   26 +
 .../adobe/protocols/dict/events/NoMatchEvent.as    |   14 +
 .../protocols/dict/util/CompleteResponseEvent.as   |   25 +
 .../com/adobe/protocols/dict/util/SocketHelper.as  |   49 +
 .../uploadify/com/adobe/serialization/json/JSON.as |   85 +
 .../com/adobe/serialization/json/JSONDecoder.as    |  221 ++
 .../com/adobe/serialization/json/JSONEncoder.as    |  299 +++
 .../com/adobe/serialization/json/JSONParseError.as |   87 +
 .../com/adobe/serialization/json/JSONToken.as      |  104 +
 .../com/adobe/serialization/json/JSONTokenType.as  |   67 +
 .../com/adobe/serialization/json/JSONTokenizer.as  |  583 +++++
 vendors/uploadify/com/adobe/utils/ArrayUtil.as     |  187 ++
 vendors/uploadify/com/adobe/utils/DateUtil.as      |  699 ++++++
 .../uploadify/com/adobe/utils/DictionaryUtil.as    |   87 +
 vendors/uploadify/com/adobe/utils/IntUtil.as       |   99 +
 .../uploadify/com/adobe/utils/NumberFormatter.as   |   74 +
 vendors/uploadify/com/adobe/utils/StringUtil.as    |  270 +++
 vendors/uploadify/com/adobe/utils/XMLUtil.as       |  168 ++
 vendors/uploadify/com/adobe/webapis/ServiceBase.as |   48 +
 .../uploadify/com/adobe/webapis/URLLoaderBase.as   |  108 +
 .../com/adobe/webapis/events/ServiceEvent.as       |   75 +
 vendors/uploadify/example/_notes/dwsync.xml        |    5 +
 vendors/uploadify/example/cancel.png               |  Bin 0 -> 603 bytes
 vendors/uploadify/example/css/_notes/dwsync.xml    |    5 +
 vendors/uploadify/example/css/default.css          |   10 +
 vendors/uploadify/example/css/uploadify.css        |   53 +
 vendors/uploadify/example/index.php                |   31 +
 .../uploadify/example/scripts/_notes/dwsync.xml    |   10 +
 vendors/uploadify/example/scripts/check.php        |   35 +
 .../uploadify/example/scripts/expressInstall.swf   |  Bin 0 -> 727 bytes
 .../uploadify/example/scripts/jquery-1.3.2.min.js  |   19 +
 .../example/scripts/jquery.uploadify.v2.1.0.min.js |   26 +
 vendors/uploadify/example/scripts/swfobject.js     |    4 +
 vendors/uploadify/example/scripts/uploadify.php    |   46 +
 vendors/uploadify/example/scripts/uploadify.swf    |  Bin 0 -> 23119 bytes
 vendors/uploadify/expressInstall.swf               |  Bin 0 -> 727 bytes
 vendors/uploadify/jquery-1.3.2.min.js              |   19 +
 vendors/uploadify/jquery.uploadify.v2.1.0.js       |  258 ++
 vendors/uploadify/jquery.uploadify.v2.1.0.min.js   |   26 +
 vendors/uploadify/swfobject.js                     |    4 +
 vendors/uploadify/uploadify.allglyphs.swf          |  Bin 0 -> 239838 bytes
 vendors/uploadify/uploadify.css                    |   53 +
 vendors/uploadify/uploadify.fla                    |  Bin 0 -> 125952 bytes
 vendors/uploadify/uploadify.php                    |   46 +
 vendors/uploadify/uploadify.swf                    |  Bin 0 -> 23118 bytes
 views/default/tidypics/css.php                     |   24 +
 views/default/tidypics/forms/ajax_upload.php       |   64 +
 views/default/tidypics/js/uploader.php             |    4 +
 95 files changed, 11257 insertions(+), 32 deletions(-)
 create mode 100644 actions/ajax_upload.php
 create mode 100644 vendors/uploadify/Uploadify v2.1.0 Manual.pdf
 create mode 100644 vendors/uploadify/cancel.png
 create mode 100644 vendors/uploadify/check.php
 create mode 100644 vendors/uploadify/com/adobe/air/logging/FileTarget.as
 create mode 100644 vendors/uploadify/com/adobe/crypto/HMAC.as
 create mode 100644 vendors/uploadify/com/adobe/crypto/MD5.as
 create mode 100644 vendors/uploadify/com/adobe/crypto/MD5Stream.as
 create mode 100644 vendors/uploadify/com/adobe/crypto/SHA1.as
 create mode 100644 vendors/uploadify/com/adobe/crypto/SHA224.as
 create mode 100644 vendors/uploadify/com/adobe/crypto/SHA256.as
 create mode 100644 vendors/uploadify/com/adobe/crypto/WSSEUsernameToken.as
 create mode 100644 vendors/uploadify/com/adobe/errors/IllegalStateError.as
 create mode 100644 vendors/uploadify/com/adobe/fileformats/vcard/Address.as
 create mode 100644 vendors/uploadify/com/adobe/fileformats/vcard/Email.as
 create mode 100644 vendors/uploadify/com/adobe/fileformats/vcard/Phone.as
 create mode 100644 vendors/uploadify/com/adobe/fileformats/vcard/VCard.as
 create mode 100644 vendors/uploadify/com/adobe/fileformats/vcard/VCardParser.as
 create mode 100644 vendors/uploadify/com/adobe/images/BitString.as
 create mode 100644 vendors/uploadify/com/adobe/images/JPGEncoder.as
 create mode 100644 vendors/uploadify/com/adobe/images/PNGEncoder.as
 create mode 100644 vendors/uploadify/com/adobe/net/DynamicURLLoader.as
 create mode 100644 vendors/uploadify/com/adobe/net/IURIResolver.as
 create mode 100644 vendors/uploadify/com/adobe/net/MimeTypeMap.as
 create mode 100644 vendors/uploadify/com/adobe/net/URI.as
 create mode 100644 vendors/uploadify/com/adobe/net/URIEncodingBitmap.as
 create mode 100644 vendors/uploadify/com/adobe/net/proxies/RFC2817Socket.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/Database.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/Definition.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/Dict.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/DictionaryServer.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/MatchStrategy.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/Response.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/ConnectedEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/DatabaseEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/DefinitionEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/DefinitionHeaderEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/DictionaryServerEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/DisconnectedEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/ErrorEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/MatchEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/MatchStrategiesEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/events/NoMatchEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/util/CompleteResponseEvent.as
 create mode 100644 vendors/uploadify/com/adobe/protocols/dict/util/SocketHelper.as
 create mode 100644 vendors/uploadify/com/adobe/serialization/json/JSON.as
 create mode 100644 vendors/uploadify/com/adobe/serialization/json/JSONDecoder.as
 create mode 100644 vendors/uploadify/com/adobe/serialization/json/JSONEncoder.as
 create mode 100644 vendors/uploadify/com/adobe/serialization/json/JSONParseError.as
 create mode 100644 vendors/uploadify/com/adobe/serialization/json/JSONToken.as
 create mode 100644 vendors/uploadify/com/adobe/serialization/json/JSONTokenType.as
 create mode 100644 vendors/uploadify/com/adobe/serialization/json/JSONTokenizer.as
 create mode 100644 vendors/uploadify/com/adobe/utils/ArrayUtil.as
 create mode 100644 vendors/uploadify/com/adobe/utils/DateUtil.as
 create mode 100644 vendors/uploadify/com/adobe/utils/DictionaryUtil.as
 create mode 100644 vendors/uploadify/com/adobe/utils/IntUtil.as
 create mode 100644 vendors/uploadify/com/adobe/utils/NumberFormatter.as
 create mode 100644 vendors/uploadify/com/adobe/utils/StringUtil.as
 create mode 100644 vendors/uploadify/com/adobe/utils/XMLUtil.as
 create mode 100644 vendors/uploadify/com/adobe/webapis/ServiceBase.as
 create mode 100644 vendors/uploadify/com/adobe/webapis/URLLoaderBase.as
 create mode 100644 vendors/uploadify/com/adobe/webapis/events/ServiceEvent.as
 create mode 100644 vendors/uploadify/example/_notes/dwsync.xml
 create mode 100644 vendors/uploadify/example/cancel.png
 create mode 100644 vendors/uploadify/example/css/_notes/dwsync.xml
 create mode 100644 vendors/uploadify/example/css/default.css
 create mode 100644 vendors/uploadify/example/css/uploadify.css
 create mode 100644 vendors/uploadify/example/index.php
 create mode 100644 vendors/uploadify/example/scripts/_notes/dwsync.xml
 create mode 100644 vendors/uploadify/example/scripts/check.php
 create mode 100644 vendors/uploadify/example/scripts/expressInstall.swf
 create mode 100644 vendors/uploadify/example/scripts/jquery-1.3.2.min.js
 create mode 100644 vendors/uploadify/example/scripts/jquery.uploadify.v2.1.0.min.js
 create mode 100644 vendors/uploadify/example/scripts/swfobject.js
 create mode 100644 vendors/uploadify/example/scripts/uploadify.php
 create mode 100644 vendors/uploadify/example/scripts/uploadify.swf
 create mode 100644 vendors/uploadify/expressInstall.swf
 create mode 100644 vendors/uploadify/jquery-1.3.2.min.js
 create mode 100644 vendors/uploadify/jquery.uploadify.v2.1.0.js
 create mode 100644 vendors/uploadify/jquery.uploadify.v2.1.0.min.js
 create mode 100644 vendors/uploadify/swfobject.js
 create mode 100644 vendors/uploadify/uploadify.allglyphs.swf
 create mode 100644 vendors/uploadify/uploadify.css
 create mode 100644 vendors/uploadify/uploadify.fla
 create mode 100644 vendors/uploadify/uploadify.php
 create mode 100644 vendors/uploadify/uploadify.swf
 create mode 100644 views/default/tidypics/forms/ajax_upload.php
 create mode 100644 views/default/tidypics/js/uploader.php

diff --git a/actions/ajax_upload.php b/actions/ajax_upload.php
new file mode 100644
index 000000000..3d44df199
--- /dev/null
+++ b/actions/ajax_upload.php
@@ -0,0 +1,47 @@
+container_guid = $album_guid;
+$image->setMimeType(tp_upload_get_mimetype($name));
+$image->simpletype = "image";
+$image->access_id = $album->access_id;
+$image->title = substr($name, 0, strrpos($name, '.'));
+$image_guid = $image->save();
+
+$image->setOriginalFilename($name);
+$image->saveImageFile($temp_file, $file_size);
+
+$image->extractExifData();
+$image->saveThumbnails($image_lib);
+
+$album->prependImageList(array($image->guid));
+
+echo "1";
+exit;
\ No newline at end of file
diff --git a/actions/upload.php b/actions/upload.php
index 2d7b311bb..8dae85277 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -16,17 +16,6 @@ if (!$album) {
 	forward($_SERVER['HTTP_REFERER']);
 }
 
-$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); 
-if (!$maxfilesize) {
-	$maxfilesize = 5; // default to 5 MB if not set
-}
-$maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs
-
-$quota = get_plugin_setting('quota','tidypics');
-$quota = 1024 * 1024 * $quota;
-$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
-$image_repo_size = (int)$image_repo_size_md->value;
-
 $image_lib = get_plugin_setting('image_lib', 'tidypics');
 if (!$image_lib) {
 	$image_lib = "GD";
@@ -88,16 +77,14 @@ foreach($_FILES as $key => $sent_file) {
 	}
 
 	// check quota
-	if ($quota) {
-		if ($image_repo_size + $sent_file['size'] > $quota) {
-			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
-			continue;
-		}
+	if (!tp_upload_check_quota($sent_file['size'], get_loggedin_userid())) {
+		array_push($not_uploaded, $sent_file['name']);
+		array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
+		continue;
 	}
 
 	// make sure file does not exceed memory limit
-	if ($sent_file['size'] > $maxfilesize) {
+	if (!tp_upload_check_max_size($sent_file['size'])) {
 		array_push($not_uploaded, $sent_file['name']);
 		array_push($error_msgs, elgg_echo('tidypics:image_mem'));
 		continue;
@@ -120,8 +107,6 @@ foreach($_FILES as $key => $sent_file) {
 	$file->access_id = $access_id;
 	//$file->title = substr($name, 0, strrpos($name, '.'));
 
-	$file->setOriginalFilename($name);
-	$file->saveImageFile(get_uploaded_file($key));
 	$result = $file->save();
 
 	if (!$result) {
@@ -130,6 +115,8 @@ foreach($_FILES as $key => $sent_file) {
 		continue;
 	}
 
+	$file->setOriginalFilename($name);
+	$file->saveImageFile($sent_file['tmp_name'], $sent_file['size']);
 	$file->extractExifData();
 	$file->saveThumbnails($image_lib);
 
@@ -140,9 +127,6 @@ foreach($_FILES as $key => $sent_file) {
 
 	array_push($uploaded_images, $file->guid);
 
-	// update user/group size for checking quota
-	$image_repo_size += $sent_file['size'];
-
 	// plugins can register to be told when a new image has been uploaded
 	trigger_elgg_event('upload', 'tp_image', $file);
 
@@ -192,9 +176,6 @@ if (count($uploaded_images) && $img_river_view == "1") {
 	add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
 }
 
-// update image repo size
-create_metadata($album->container_guid, "image_repo_size", $image_repo_size, 'integer', $album->container_guid);
-
 if (count($uploaded_images) > 0) {
 	$album->prependImageList($uploaded_images);
 }
diff --git a/languages/en.php b/languages/en.php
index 9587f3053..2a4c63e87 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -109,6 +109,7 @@ $english = array(
 			'album:tags' => "Tags",
 			'album:cover' => "Make image album cover?",
 			'tidypics:quota' => "Quota usage:",
+			'tidypics:upload:filedesc' => 'Image files (jpeg, png, gif)',
 
 		//views
 
diff --git a/lib/image.php b/lib/image.php
index 51b31f6d7..c68560df6 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -55,12 +55,22 @@ class TidypicsImage extends ElggFile {
 	 *
 	 * @warning filename needs to be set first
 	 * 
-	 * @param string $image
+	 * @param string $uploadedFilename name of the uploaded file
+	 * @param int $size
 	 */
-	public function saveImageFile($image) {
-		$this->open("write");
-		$this->write($image);
-		$this->close();
+	public function saveImageFile($uploadedFilename, $size) {
+
+		$filename = $this->getFilenameOnFilestore();
+
+		$result = move_uploaded_file($uploadedFilename, $filename);
+		if (!$result) {
+			return false;
+		}
+
+		$owner = $this->getOwnerEntity();
+		$owner->image_repo_size = (int)$owner->image_repo_size + $size;
+
+		return true;
 	}
 
 	/**
diff --git a/lib/upload.php b/lib/upload.php
index a7dd7611d..ac926403d 100644
--- a/lib/upload.php
+++ b/lib/upload.php
@@ -3,6 +3,34 @@
  * Helper library for working with uploads
  */
 
+/**
+ * Guess on the mimetype based on file extension
+ *
+ * @param string $originalName
+ * @return string
+ */
+function tp_upload_get_mimetype($originalName) {
+	$extension = substr(strrchr($originalName, '.'), 1);
+	switch ($extension) {
+		case 'png':
+			return 'image/png';
+			break;
+		case 'gif':
+			return 'image/gif';
+			break;
+		case 'jpg':
+		default:
+			return 'image/jpeg';
+			break;
+	}
+}
+
+/**
+ * Check if this is an image
+ * 
+ * @param string $mime
+ * @return bool false = not image
+ */
 function tp_upload_check_format($mime) {
 	$accepted_formats = array(
 		'image/jpeg',
@@ -18,6 +46,13 @@ function tp_upload_check_format($mime) {
 	return true;
 }
 
+/**
+ * Check if there is enough memory to process this image
+ * 
+ * @param string $image_lib
+ * @param int $num_pixels
+ * @return bool false = not enough memory
+ */
 function tp_upload_memory_check($image_lib, $num_pixels) {
 	if ($image_lib !== 'GD') {
 		return true;
@@ -35,4 +70,47 @@ function tp_upload_memory_check($image_lib, $num_pixels) {
 	}
 
 	return true;
+}
+
+/**
+ * Check if image is within limits
+ *
+ * @param int $image_size
+ * @return bool false = too large
+ */
+function tp_upload_check_max_size($image_size) {
+	$max_file_size = (float) get_plugin_setting('maxfilesize','tidypics');
+	if (!$max_file_size) {
+		// default to 5 MB if not set
+		$max_file_size = 5;
+	}
+	// convert to bytes from MBs
+	$max_file_size = 1024 * 1024 * $max_file_size;
+	return $image_size <= $max_file_size;
+}
+
+/**
+ * Check if this image pushes user over quota
+ *
+ * @param int $image_size
+ * @param int $owner_guid
+ * @return bool false = exceed quota
+ */
+function tp_upload_check_quota($image_size, $owner_guid) {
+	static $quota;
+	
+	if (!isset($quota)) {
+		$quota = get_plugin_setting('quota','tidypics');
+		$quota = 1024 * 1024 * $quota;
+	}
+
+	if ($quota == 0) {
+		// no quota
+		return true;
+	}
+	
+	$image_repo_size_md = get_metadata_byname($owner_guid, "image_repo_size");
+	$image_repo_size = (int)$image_repo_size_md->value;
+	
+	return ($image_repo_size + $image_size) < $quota;
 }
\ No newline at end of file
diff --git a/pages/upload.php b/pages/upload.php
index 6f8db288d..8e15dd612 100644
--- a/pages/upload.php
+++ b/pages/upload.php
@@ -37,7 +37,7 @@ $title = elgg_echo('album:addpix') . ': ' . $album->title;
 $area2 .= elgg_view_title($title);
 
 $area2 .= elgg_view("tidypics/forms/upload", array('album' => $album_guid ) );
-//	$area2 .= elgg_view("tidypics/forms/flash_upload", array('album' => $album_guid ) );
+//$area2 .= elgg_view("tidypics/forms/ajax_upload", array('album' => $album_guid ) );
 
 $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 
diff --git a/start.php b/start.php
index 90269d67b..9b3dab08f 100644
--- a/start.php
+++ b/start.php
@@ -453,6 +453,7 @@ register_elgg_event_handler('pagesetup', 'system', 'tidypics_adminmenu');
 
 // Register actions
 register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
+register_action("tidypics/ajax_upload", true, $CONFIG->pluginspath . "tidypics/actions/ajax_upload.php");
 register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
 register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
 register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
diff --git a/vendors/uploadify/Uploadify v2.1.0 Manual.pdf b/vendors/uploadify/Uploadify v2.1.0 Manual.pdf
new file mode 100644
index 000000000..c8b2565b5
Binary files /dev/null and b/vendors/uploadify/Uploadify v2.1.0 Manual.pdf differ
diff --git a/vendors/uploadify/cancel.png b/vendors/uploadify/cancel.png
new file mode 100644
index 000000000..1c062ae5d
Binary files /dev/null and b/vendors/uploadify/cancel.png differ
diff --git a/vendors/uploadify/check.php b/vendors/uploadify/check.php
new file mode 100644
index 000000000..d7dc57177
--- /dev/null
+++ b/vendors/uploadify/check.php
@@ -0,0 +1,35 @@
+ $value) {
+	if ($key != 'folder') {
+		if (file_exists($_SERVER['DOCUMENT_ROOT'] . $_POST['folder'] . '/' . $value)) {
+			$fileArray[$key] = $value;
+		}
+	}
+}
+echo json_encode($fileArray);
+?>
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/air/logging/FileTarget.as b/vendors/uploadify/com/adobe/air/logging/FileTarget.as
new file mode 100644
index 000000000..0dda3eb18
--- /dev/null
+++ b/vendors/uploadify/com/adobe/air/logging/FileTarget.as
@@ -0,0 +1,98 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.air.logging
+{
+	import mx.logging.AbstractTarget;
+	import flash.filesystem.File;
+	import flash.filesystem.FileStream;
+	import flash.filesystem.FileMode;
+	import mx.logging.LogEvent;
+	import flash.system.System;
+	import flash.system.Capabilities;
+	import mx.logging.targets.LineFormattedTarget;
+	import mx.core.mx_internal;
+	
+	use namespace mx_internal;
+
+	/**
+	 * An Adobe AIR only class that provides a log target for the Flex logging
+	 * framework, that logs files to a file on the user's system.
+	 * 
+	 * This class will only work when running within Adobe AIR>
+	 */
+	public class FileTarget extends LineFormattedTarget
+	{
+		private const DEFAULT_LOG_PATH:String = "app-storage:/application.log";
+		
+		private var log:File;
+		
+		public function FileTarget(logFile:File = null)
+		{
+			if(logFile != null)
+			{
+				log = logFile;
+			}
+			else
+			{
+				log = new File(DEFAULT_LOG_PATH);
+			}
+		}
+		
+		public function get logURI():String
+		{
+			return log.url;
+		}
+		
+		mx_internal override function internalLog(message:String):void
+	    {
+			write(message);
+	    }		
+		
+		private function write(msg:String):void
+		{		
+			var fs:FileStream = new FileStream();
+				fs.open(log, FileMode.APPEND);
+				fs.writeUTFBytes(msg + "\n");
+				fs.close();
+		}	
+		
+		public function clear():void
+		{
+			var fs:FileStream = new FileStream();
+				fs.open(log, FileMode.WRITE);
+				fs.writeUTFBytes("");
+				fs.close();			
+		}
+		
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/crypto/HMAC.as b/vendors/uploadify/com/adobe/crypto/HMAC.as
new file mode 100644
index 000000000..72f9bffc9
--- /dev/null
+++ b/vendors/uploadify/com/adobe/crypto/HMAC.as
@@ -0,0 +1,127 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.crypto {
+	import flash.utils.ByteArray;
+	import flash.utils.Endian;
+	import flash.utils.describeType;
+	/**
+	 * Keyed-Hashing for Message Authentication
+	 * Implementation based on algorithm description at 
+	 * http://www.faqs.org/rfcs/rfc2104.html
+	 */
+	public class HMAC 
+	{
+		/**
+		 * Performs the HMAC hash algorithm using byte arrays.
+		 *
+		 * @param secret The secret key
+		 * @param message The message to hash
+		 * @param algorithm Hash object to use
+		 * @return A string containing the hash value of message
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 8.5
+		 * @tiptext
+		 */
+		public static function hash( secret:String, message:String, algorithm:Object = null ):String
+		{
+			var text:ByteArray = new ByteArray();
+			var k_secret:ByteArray = new ByteArray();
+			
+			text.writeUTFBytes(message);
+			k_secret.writeUTFBytes(secret);
+			
+			return hashBytes(k_secret, text, algorithm);
+		}
+		
+		/**
+		 * Performs the HMAC hash algorithm using string.
+		 *
+		 * @param secret The secret key
+		 * @param message The message to hash
+		 * @param algorithm Hash object to use
+		 * @return A string containing the hash value of message
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 8.5
+		 * @tiptext
+		 */
+		public static function hashBytes( secret:ByteArray, message:ByteArray, algorithm:Object = null ):String
+		{
+			var ipad:ByteArray = new ByteArray();
+			var opad:ByteArray = new ByteArray();
+			var endian:String = Endian.BIG_ENDIAN;
+			
+			if(algorithm == null){
+				algorithm = MD5;
+			}
+			
+			if ( describeType(algorithm).@name.toString() == "com.adobe.crypto::MD5" ) {
+				endian = Endian.LITTLE_ENDIAN;
+			}
+			
+			if ( secret.length > 64 ) {
+				algorithm.hashBytes(secret);
+				secret = new ByteArray();
+				secret.endian = endian;
+				
+				while ( algorithm.digest.bytesAvailable != 0 ) {
+					secret.writeInt(algorithm.digest.readInt());
+				}
+			}
+
+			secret.length = 64
+			secret.position = 0;
+			for ( var x:int = 0; x < 64; x++ ) {
+				var byte:int = secret.readByte();
+				ipad.writeByte(0x36 ^ byte);
+				opad.writeByte(0x5c ^ byte);
+			}
+			
+			ipad.writeBytes(message);
+			algorithm.hashBytes(ipad);
+			var tmp:ByteArray = new ByteArray();
+			tmp.endian = endian;	
+			
+			while ( algorithm.digest.bytesAvailable != 0 ) {
+				tmp.writeInt(algorithm.digest.readInt());
+			}
+			tmp.position = 0;
+			
+			while ( tmp.bytesAvailable != 0 ) {
+				opad.writeByte(tmp.readUnsignedByte());
+			}
+			return algorithm.hashBytes( opad );
+		}
+		
+	}
+	
+}
diff --git a/vendors/uploadify/com/adobe/crypto/MD5.as b/vendors/uploadify/com/adobe/crypto/MD5.as
new file mode 100644
index 000000000..da533cc44
--- /dev/null
+++ b/vendors/uploadify/com/adobe/crypto/MD5.as
@@ -0,0 +1,281 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.crypto {
+	
+	import com.adobe.utils.IntUtil;
+	import flash.utils.ByteArray;	
+	/**
+	 * The MD5 Message-Digest Algorithm
+	 *
+	 * Implementation based on algorithm description at 
+	 * http://www.faqs.org/rfcs/rfc1321.html
+	 */
+	public class MD5 {
+		
+		public static var digest:ByteArray;
+		/**
+		 * Performs the MD5 hash algorithm on a string.
+		 *
+		 * @param s The string to hash
+		 * @return A string containing the hash value of s
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 8.5
+		 * @tiptext
+		 */
+		 
+		public static function hash(s:String) :String{
+			//Convert to byteArray and send through hashBinary function
+			// so as to only have complex code in one location
+			var ba:ByteArray = new ByteArray();
+			ba.writeUTFBytes(s);	
+			return hashBinary(ba);
+		}
+		
+		public static function hashBytes(s:ByteArray) :String{	
+			return hashBinary(s);
+		}
+		
+		/**
+		 * Performs the MD5 hash algorithm on a ByteArray.
+		 *
+		 * @param s The string to hash
+		 * @return A string containing the hash value of s
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 8.5
+		 * @tiptext
+		 */	 
+		public static function hashBinary( s:ByteArray ):String {
+			// initialize the md buffers
+			var a:int = 1732584193;
+			var b:int = -271733879;
+			var c:int = -1732584194;
+			var d:int = 271733878;
+			
+			// variables to store previous values
+			var aa:int;
+			var bb:int;
+			var cc:int;
+			var dd:int;
+			
+			// create the blocks from the string and
+			// save the length as a local var to reduce
+			// lookup in the loop below
+			var x:Array = createBlocks( s );
+			var len:int = x.length;
+			
+			// loop over all of the blocks
+			for ( var i:int = 0; i < len; i += 16) {
+				// save previous values
+				aa = a;
+				bb = b;
+				cc = c;
+				dd = d;				
+				
+				// Round 1
+				a = ff( a, b, c, d, x[int(i+ 0)],  7, -680876936 ); 	// 1
+				d = ff( d, a, b, c, x[int(i+ 1)], 12, -389564586 );	// 2
+				c = ff( c, d, a, b, x[int(i+ 2)], 17, 606105819 ); 	// 3
+				b = ff( b, c, d, a, x[int(i+ 3)], 22, -1044525330 );	// 4
+				a = ff( a, b, c, d, x[int(i+ 4)],  7, -176418897 ); 	// 5
+				d = ff( d, a, b, c, x[int(i+ 5)], 12, 1200080426 ); 	// 6
+				c = ff( c, d, a, b, x[int(i+ 6)], 17, -1473231341 );	// 7
+				b = ff( b, c, d, a, x[int(i+ 7)], 22, -45705983 ); 	// 8
+				a = ff( a, b, c, d, x[int(i+ 8)],  7, 1770035416 ); 	// 9
+				d = ff( d, a, b, c, x[int(i+ 9)], 12, -1958414417 );	// 10
+				c = ff( c, d, a, b, x[int(i+10)], 17, -42063 ); 		// 11
+				b = ff( b, c, d, a, x[int(i+11)], 22, -1990404162 );	// 12
+				a = ff( a, b, c, d, x[int(i+12)],  7, 1804603682 ); 	// 13
+				d = ff( d, a, b, c, x[int(i+13)], 12, -40341101 ); 	// 14
+				c = ff( c, d, a, b, x[int(i+14)], 17, -1502002290 );	// 15
+				b = ff( b, c, d, a, x[int(i+15)], 22, 1236535329 ); 	// 16
+				
+				// Round 2
+				a = gg( a, b, c, d, x[int(i+ 1)],  5, -165796510 ); 	// 17
+				d = gg( d, a, b, c, x[int(i+ 6)],  9, -1069501632 );	// 18
+				c = gg( c, d, a, b, x[int(i+11)], 14, 643717713 ); 	// 19
+				b = gg( b, c, d, a, x[int(i+ 0)], 20, -373897302 ); 	// 20
+				a = gg( a, b, c, d, x[int(i+ 5)],  5, -701558691 ); 	// 21
+				d = gg( d, a, b, c, x[int(i+10)],  9, 38016083 ); 	// 22
+				c = gg( c, d, a, b, x[int(i+15)], 14, -660478335 ); 	// 23
+				b = gg( b, c, d, a, x[int(i+ 4)], 20, -405537848 ); 	// 24
+				a = gg( a, b, c, d, x[int(i+ 9)],  5, 568446438 ); 	// 25
+				d = gg( d, a, b, c, x[int(i+14)],  9, -1019803690 );	// 26
+				c = gg( c, d, a, b, x[int(i+ 3)], 14, -187363961 ); 	// 27
+				b = gg( b, c, d, a, x[int(i+ 8)], 20, 1163531501 ); 	// 28
+				a = gg( a, b, c, d, x[int(i+13)],  5, -1444681467 );	// 29
+				d = gg( d, a, b, c, x[int(i+ 2)],  9, -51403784 ); 	// 30
+				c = gg( c, d, a, b, x[int(i+ 7)], 14, 1735328473 ); 	// 31
+				b = gg( b, c, d, a, x[int(i+12)], 20, -1926607734 );	// 32
+				
+				// Round 3
+				a = hh( a, b, c, d, x[int(i+ 5)],  4, -378558 ); 	// 33
+				d = hh( d, a, b, c, x[int(i+ 8)], 11, -2022574463 );	// 34
+				c = hh( c, d, a, b, x[int(i+11)], 16, 1839030562 ); 	// 35
+				b = hh( b, c, d, a, x[int(i+14)], 23, -35309556 ); 	// 36
+				a = hh( a, b, c, d, x[int(i+ 1)],  4, -1530992060 );	// 37
+				d = hh( d, a, b, c, x[int(i+ 4)], 11, 1272893353 ); 	// 38
+				c = hh( c, d, a, b, x[int(i+ 7)], 16, -155497632 ); 	// 39
+				b = hh( b, c, d, a, x[int(i+10)], 23, -1094730640 );	// 40
+				a = hh( a, b, c, d, x[int(i+13)],  4, 681279174 ); 	// 41
+				d = hh( d, a, b, c, x[int(i+ 0)], 11, -358537222 ); 	// 42
+				c = hh( c, d, a, b, x[int(i+ 3)], 16, -722521979 ); 	// 43
+				b = hh( b, c, d, a, x[int(i+ 6)], 23, 76029189 ); 	// 44
+				a = hh( a, b, c, d, x[int(i+ 9)],  4, -640364487 ); 	// 45
+				d = hh( d, a, b, c, x[int(i+12)], 11, -421815835 ); 	// 46
+				c = hh( c, d, a, b, x[int(i+15)], 16, 530742520 ); 	// 47
+				b = hh( b, c, d, a, x[int(i+ 2)], 23, -995338651 ); 	// 48
+				
+				// Round 4
+				a = ii( a, b, c, d, x[int(i+ 0)],  6, -198630844 ); 	// 49
+				d = ii( d, a, b, c, x[int(i+ 7)], 10, 1126891415 ); 	// 50
+				c = ii( c, d, a, b, x[int(i+14)], 15, -1416354905 );	// 51
+				b = ii( b, c, d, a, x[int(i+ 5)], 21, -57434055 ); 	// 52
+				a = ii( a, b, c, d, x[int(i+12)],  6, 1700485571 ); 	// 53
+				d = ii( d, a, b, c, x[int(i+ 3)], 10, -1894986606 );	// 54
+				c = ii( c, d, a, b, x[int(i+10)], 15, -1051523 ); 	// 55
+				b = ii( b, c, d, a, x[int(i+ 1)], 21, -2054922799 );	// 56
+				a = ii( a, b, c, d, x[int(i+ 8)],  6, 1873313359 ); 	// 57
+				d = ii( d, a, b, c, x[int(i+15)], 10, -30611744 ); 	// 58
+				c = ii( c, d, a, b, x[int(i+ 6)], 15, -1560198380 );	// 59
+				b = ii( b, c, d, a, x[int(i+13)], 21, 1309151649 ); 	// 60
+				a = ii( a, b, c, d, x[int(i+ 4)],  6, -145523070 ); 	// 61
+				d = ii( d, a, b, c, x[int(i+11)], 10, -1120210379 );	// 62
+				c = ii( c, d, a, b, x[int(i+ 2)], 15, 718787259 ); 	// 63
+				b = ii( b, c, d, a, x[int(i+ 9)], 21, -343485551 ); 	// 64
+
+				a += aa;
+				b += bb;
+				c += cc;
+				d += dd;
+			}
+			digest = new ByteArray()
+			digest.writeInt(a);
+			digest.writeInt(b);
+			digest.writeInt(c);
+			digest.writeInt(d);
+			digest.position = 0;
+			// Finish up by concatening the buffers with their hex output
+			return IntUtil.toHex( a ) + IntUtil.toHex( b ) + IntUtil.toHex( c ) + IntUtil.toHex( d );
+		}
+		
+		/**
+		 * Auxiliary function f as defined in RFC
+		 */
+		private static function f( x:int, y:int, z:int ):int {
+			return ( x & y ) | ( (~x) & z );
+		}
+		
+		/**
+		 * Auxiliary function g as defined in RFC
+		 */
+		private static function g( x:int, y:int, z:int ):int {
+			return ( x & z ) | ( y & (~z) );
+		}
+		
+		/**
+		 * Auxiliary function h as defined in RFC
+		 */
+		private static function h( x:int, y:int, z:int ):int {
+			return x ^ y ^ z;
+		}
+		
+		/**
+		 * Auxiliary function i as defined in RFC
+		 */
+		private static function i( x:int, y:int, z:int ):int {
+			return y ^ ( x | (~z) );
+		}
+		
+		/**
+		 * A generic transformation function.  The logic of ff, gg, hh, and
+		 * ii are all the same, minus the function used, so pull that logic
+		 * out and simplify the method bodies for the transoformation functions.
+		 */
+		private static function transform( func:Function, a:int, b:int, c:int, d:int, x:int, s:int, t:int):int {
+			var tmp:int = a + int( func( b, c, d ) ) + x + t;
+			return IntUtil.rol( tmp, s ) +  b;
+		}
+		
+		/**
+		 * ff transformation function
+		 */
+		private static function ff ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+			return transform( f, a, b, c, d, x, s, t );
+		}
+		
+		/**
+		 * gg transformation function
+		 */
+		private static function gg ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+			return transform( g, a, b, c, d, x, s, t );
+		}
+		
+		/**
+		 * hh transformation function
+		 */
+		private static function hh ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+			return transform( h, a, b, c, d, x, s, t );
+		}
+		
+		/**
+		 * ii transformation function
+		 */
+		private static function ii ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+			return transform( i, a, b, c, d, x, s, t );
+		}
+		
+		/**
+		 * Converts a string to a sequence of 16-word blocks
+		 * that we'll do the processing on.  Appends padding
+		 * and length in the process.
+		 *
+		 * @param s The string to split into blocks
+		 * @return An array containing the blocks that s was
+		 *			split into.
+		 */
+		private static function createBlocks( s:ByteArray ):Array {
+			var blocks:Array = new Array();
+			var len:int = s.length * 8;
+			var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
+			for( var i:int = 0; i < len; i += 8 ) {
+				blocks[ int(i >> 5) ] |= ( s[ i / 8 ] & mask ) << ( i % 32 );
+			}
+			
+			// append padding and length
+			blocks[ int(len >> 5) ] |= 0x80 << ( len % 32 );
+			blocks[ int(( ( ( len + 64 ) >>> 9 ) << 4 ) + 14) ] = len;
+			return blocks;
+		}
+		
+	}
+}
diff --git a/vendors/uploadify/com/adobe/crypto/MD5Stream.as b/vendors/uploadify/com/adobe/crypto/MD5Stream.as
new file mode 100644
index 000000000..6e5eed0d8
--- /dev/null
+++ b/vendors/uploadify/com/adobe/crypto/MD5Stream.as
@@ -0,0 +1,402 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.crypto
+{
+    import com.adobe.utils.IntUtil;   
+    import flash.utils.ByteArray;
+
+    /**
+     * Perform MD5 hash of an input stream in chunks. This class is
+     * based on com.adobe.crypto.MD5 and can process data in
+     * chunks. Both block creation and hash computation are done
+     * together for whatever input is available so that the memory
+     * overhead at a time is always fixed. Memory usage is governed by
+     * two parameters: one is the amount of data passed in to update()
+     * and the other is memoryBlockSize. The latter comes into play
+     * only when the memory window exceeds the pre allocated memory
+     * window of flash player. Usage: create an instance, call
+     * update(data) repeatedly for all chunks and finally complete()
+     * which will return the md5 hash.
+     */      
+    public class MD5Stream
+    {
+        private static var mask:int = 0xFF;
+
+        private var arr:Array = [];
+
+        /* running count of length */
+        private var arrLen:int;
+        
+        // initialize the md buffers
+        private var a:int = 1732584193;
+        private var b:int = -271733879;
+        private var c:int = -1732584194;
+        private var d:int = 271733878;
+        
+        // variables to store previous values
+        private var aa:int;
+        private var bb:int;
+        private var cc:int;
+        private var dd:int;
+
+        /* index for data read */
+        private var arrIndexLen:int = 0;
+        /* index for hash computation */
+        private var arrProcessIndex:int = 0;
+        /* index for removing stale arr values */
+        private var cleanIndex:int = 0;
+        
+        /** 
+         * Change this value from the default (16384) in the range of
+         * MBs to actually affect GC as GC allocates in pools of
+         * memory */
+        public var memoryBlockSize:int = 16384;
+        
+        
+        public function MD5Stream()
+        {
+            
+        }
+               
+        
+        /**
+         * Pass in chunks of the input data with update(), call
+         * complete() with an optional chunk which will return the
+         * final hash. Equivalent to the way
+         * java.security.MessageDigest works.
+         *
+         * @param input The optional bytearray chunk which is the final part of the input
+         * @return A string containing the hash value
+         * @langversion ActionScript 3.0
+         * @playerversion Flash 8.5
+         * @tiptext
+         */
+        public function complete(input:ByteArray=null):String
+        {
+            if ( arr.length == 0 )
+            {
+                if ( input == null )
+                {
+                    throw new Error("null input to complete without prior call to update. At least an empty bytearray must be passed.");
+                }		 		
+            }
+            
+            if ( input != null )
+            {
+                readIntoArray(input);
+            }
+
+            //pad, append length
+            padArray(arrLen);
+
+            hashRemainingChunks(false);
+            
+            var res:String = IntUtil.toHex( a ) + IntUtil.toHex( b ) + 
+            				 IntUtil.toHex( c ) + IntUtil.toHex( d );
+            resetFields();
+            
+            return res;
+        }
+
+        /**
+         * Pass in chunks of the input data with update(), call
+         * complete() with an optional chunk which will return the
+         * final hash. Equivalent to the way
+         * java.security.MessageDigest works.
+         *
+         * @param input The bytearray chunk to perform the hash on
+         * @langversion ActionScript 3.0
+         * @playerversion Flash 8.5
+         * @tiptext
+         */        
+        public function update(input:ByteArray):void
+        {
+            readIntoArray(input);
+            hashRemainingChunks();
+        }
+
+        /**
+         * Re-initialize this instance for use to perform hashing on
+         * another input stream. This is called automatically by
+         * complete().
+         *
+         * @langversion ActionScript 3.0
+         * @playerversion Flash 8.5
+         * @tiptext
+         */               
+        public function resetFields():void
+        {
+            //truncate array
+            arr.length = 0;
+            arrLen = 0;
+            
+            // initialize the md buffers
+            a = 1732584193;
+            b = -271733879;
+            c = -1732584194;
+            d = 271733878;
+            
+            // variables to store previous values
+            aa = 0;
+            bb = 0;
+            cc = 0;
+            dd = 0;
+            
+            arrIndexLen = 0;            
+            arrProcessIndex = 0;
+            cleanIndex = 0;
+        }
+        
+        /** read into arr and free up used blocks of arr */
+        private function readIntoArray(input:ByteArray):void
+        {
+            var closestChunkLen:int = input.length * 8;
+            arrLen += closestChunkLen;
+            
+            /* clean up memory. if there are entries in the array that
+             * are already processed and the amount is greater than
+             * memoryBlockSize, create a new array, copy the last
+             * block into it and let the old one get picked up by
+             * GC. */
+            if ( arrProcessIndex - cleanIndex > memoryBlockSize )
+            {
+                var newarr:Array= new Array();
+                
+                /* AS Arrays in sparse arrays. arr[2002] can exist 
+                 * without values for arr[0] - arr[2001] */
+                for ( var j:int = arrProcessIndex; j < arr.length; j++ )
+                {						
+                    newarr[j] = arr[j];
+                }
+                
+                cleanIndex = arrProcessIndex;
+                arr = null;
+                arr = newarr;
+            }
+            
+            for ( var k:int = 0; k < closestChunkLen; k+=8 )
+            {
+                //discard high bytes (convert to uint)
+                arr[ int(arrIndexLen >> 5) ] |= ( input[ k / 8 ] & mask ) << ( arrIndexLen % 32 );
+                arrIndexLen += 8;
+            }
+            
+            
+        }
+        
+        private function hashRemainingChunks(bUpdate:Boolean=true):void
+        {
+            var len:int = arr.length;
+
+            /* leave a 16 word block untouched if we are called from
+             * update. This is because, padArray() can modify the last
+             * block and this modification has to happen before we
+             * compute the hash.  */
+            if ( bUpdate )
+            {
+                len -= 16;
+            }
+
+            /* don't do anything if don't have a 16 word block. */
+            if ( arrProcessIndex >= len || len - arrProcessIndex < 15 )
+            {
+                return;
+            }
+
+            
+            for ( var i:int = arrProcessIndex; i < len ; i += 16, arrProcessIndex += 16) 
+            {            	
+                // save previous values
+                aa = a;
+                bb = b;
+                cc = c;
+                dd = d;                         
+                
+                // Round 1
+                a = ff( a, b, c, d, arr[int(i+ 0)],  7, -680876936 );     // 1
+                d = ff( d, a, b, c, arr[int(i+ 1)], 12, -389564586 );     // 2
+                c = ff( c, d, a, b, arr[int(i+ 2)], 17, 606105819 );      // 3
+                b = ff( b, c, d, a, arr[int(i+ 3)], 22, -1044525330 );    // 4
+                a = ff( a, b, c, d, arr[int(i+ 4)],  7, -176418897 );     // 5
+                d = ff( d, a, b, c, arr[int(i+ 5)], 12, 1200080426 );     // 6
+                c = ff( c, d, a, b, arr[int(i+ 6)], 17, -1473231341 );    // 7
+                b = ff( b, c, d, a, arr[int(i+ 7)], 22, -45705983 );      // 8
+                a = ff( a, b, c, d, arr[int(i+ 8)],  7, 1770035416 );     // 9
+                d = ff( d, a, b, c, arr[int(i+ 9)], 12, -1958414417 );    // 10
+                c = ff( c, d, a, b, arr[int(i+10)], 17, -42063 );                 // 11
+                b = ff( b, c, d, a, arr[int(i+11)], 22, -1990404162 );    // 12
+                a = ff( a, b, c, d, arr[int(i+12)],  7, 1804603682 );     // 13
+                d = ff( d, a, b, c, arr[int(i+13)], 12, -40341101 );      // 14
+                c = ff( c, d, a, b, arr[int(i+14)], 17, -1502002290 );    // 15
+                b = ff( b, c, d, a, arr[int(i+15)], 22, 1236535329 );     // 16
+                
+                // Round 2
+                a = gg( a, b, c, d, arr[int(i+ 1)],  5, -165796510 );     // 17
+                d = gg( d, a, b, c, arr[int(i+ 6)],  9, -1069501632 );    // 18
+                c = gg( c, d, a, b, arr[int(i+11)], 14, 643717713 );      // 19
+                b = gg( b, c, d, a, arr[int(i+ 0)], 20, -373897302 );     // 20
+                a = gg( a, b, c, d, arr[int(i+ 5)],  5, -701558691 );     // 21
+                d = gg( d, a, b, c, arr[int(i+10)],  9, 38016083 );       // 22
+                c = gg( c, d, a, b, arr[int(i+15)], 14, -660478335 );     // 23
+                b = gg( b, c, d, a, arr[int(i+ 4)], 20, -405537848 );     // 24
+                a = gg( a, b, c, d, arr[int(i+ 9)],  5, 568446438 );      // 25
+                d = gg( d, a, b, c, arr[int(i+14)],  9, -1019803690 );    // 26
+                c = gg( c, d, a, b, arr[int(i+ 3)], 14, -187363961 );     // 27
+                b = gg( b, c, d, a, arr[int(i+ 8)], 20, 1163531501 );     // 28
+                a = gg( a, b, c, d, arr[int(i+13)],  5, -1444681467 );    // 29
+                d = gg( d, a, b, c, arr[int(i+ 2)],  9, -51403784 );      // 30
+                c = gg( c, d, a, b, arr[int(i+ 7)], 14, 1735328473 );     // 31
+                b = gg( b, c, d, a, arr[int(i+12)], 20, -1926607734 );    // 32
+                
+                // Round 3
+                a = hh( a, b, c, d, arr[int(i+ 5)],  4, -378558 );        // 33
+                d = hh( d, a, b, c, arr[int(i+ 8)], 11, -2022574463 );    // 34
+                c = hh( c, d, a, b, arr[int(i+11)], 16, 1839030562 );     // 35
+                b = hh( b, c, d, a, arr[int(i+14)], 23, -35309556 );      // 36
+                a = hh( a, b, c, d, arr[int(i+ 1)],  4, -1530992060 );    // 37
+                d = hh( d, a, b, c, arr[int(i+ 4)], 11, 1272893353 );     // 38
+                c = hh( c, d, a, b, arr[int(i+ 7)], 16, -155497632 );     // 39
+                b = hh( b, c, d, a, arr[int(i+10)], 23, -1094730640 );    // 40
+                a = hh( a, b, c, d, arr[int(i+13)],  4, 681279174 );      // 41
+                d = hh( d, a, b, c, arr[int(i+ 0)], 11, -358537222 );     // 42
+                c = hh( c, d, a, b, arr[int(i+ 3)], 16, -722521979 );     // 43
+                b = hh( b, c, d, a, arr[int(i+ 6)], 23, 76029189 );       // 44
+                a = hh( a, b, c, d, arr[int(i+ 9)],  4, -640364487 );     // 45
+                d = hh( d, a, b, c, arr[int(i+12)], 11, -421815835 );     // 46
+                c = hh( c, d, a, b, arr[int(i+15)], 16, 530742520 );      // 47
+                b = hh( b, c, d, a, arr[int(i+ 2)], 23, -995338651 );     // 48
+                
+                // Round 4
+                a = ii( a, b, c, d, arr[int(i+ 0)],  6, -198630844 );     // 49
+                d = ii( d, a, b, c, arr[int(i+ 7)], 10, 1126891415 );     // 50
+                c = ii( c, d, a, b, arr[int(i+14)], 15, -1416354905 );    // 51
+                b = ii( b, c, d, a, arr[int(i+ 5)], 21, -57434055 );      // 52
+                a = ii( a, b, c, d, arr[int(i+12)],  6, 1700485571 );     // 53
+                d = ii( d, a, b, c, arr[int(i+ 3)], 10, -1894986606 );    // 54
+                c = ii( c, d, a, b, arr[int(i+10)], 15, -1051523 );       // 55
+                b = ii( b, c, d, a, arr[int(i+ 1)], 21, -2054922799 );    // 56
+                a = ii( a, b, c, d, arr[int(i+ 8)],  6, 1873313359 );     // 57
+                d = ii( d, a, b, c, arr[int(i+15)], 10, -30611744 );      // 58
+                c = ii( c, d, a, b, arr[int(i+ 6)], 15, -1560198380 );    // 59
+                b = ii( b, c, d, a, arr[int(i+13)], 21, 1309151649 );     // 60
+                a = ii( a, b, c, d, arr[int(i+ 4)],  6, -145523070 );     // 61
+                d = ii( d, a, b, c, arr[int(i+11)], 10, -1120210379 );    // 62
+                c = ii( c, d, a, b, arr[int(i+ 2)], 15, 718787259 );      // 63
+                b = ii( b, c, d, a, arr[int(i+ 9)], 21, -343485551 );     // 64
+                
+                a += aa;
+                b += bb;
+                c += cc;
+                d += dd;
+                
+            }
+            
+        }
+        
+        private function padArray(len:int):void
+        {	 		
+            arr[ int(len >> 5) ] |= 0x80 << ( len % 32 );
+            arr[ int(( ( ( len + 64 ) >>> 9 ) << 4 ) + 14) ] = len;
+            arrLen = arr.length;
+        }  
+        
+        /* Code below same as com.adobe.crypto.MD5 */ 
+        
+        /**
+         * Auxiliary function f as defined in RFC
+         */
+        private static function f( x:int, y:int, z:int ):int {
+            return ( x & y ) | ( (~x) & z );
+        }
+        
+        /**
+         * Auxiliary function g as defined in RFC
+         */
+        private static function g( x:int, y:int, z:int ):int {
+            return ( x & z ) | ( y & (~z) );
+        }
+        
+        /**
+         * Auxiliary function h as defined in RFC
+         */
+        private static function h( x:int, y:int, z:int ):int {
+            return x ^ y ^ z;
+        }
+        
+        /**
+         * Auxiliary function i as defined in RFC
+         */
+        private static function i( x:int, y:int, z:int ):int {
+            return y ^ ( x | (~z) );
+        }
+        
+        /**
+         * A generic transformation function.  The logic of ff, gg, hh, and
+         * ii are all the same, minus the function used, so pull that logic
+         * out and simplify the method bodies for the transoformation functions.
+         */
+        private static function transform( func:Function, a:int, b:int, c:int, d:int, x:int, s:int, t:int):int {
+            var tmp:int = a + int( func( b, c, d ) ) + x + t;
+            return IntUtil.rol( tmp, s ) +  b;
+        }
+        
+        /**
+         * ff transformation function
+         */
+        private static function ff ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+            return transform( f, a, b, c, d, x, s, t );
+        }
+        
+        /**
+         * gg transformation function
+         */
+        private static function gg ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+            return transform( g, a, b, c, d, x, s, t );
+        }
+        
+        /**
+         * hh transformation function
+         */
+        private static function hh ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+            return transform( h, a, b, c, d, x, s, t );
+        }
+        
+        /**
+         * ii transformation function
+         */
+        private static function ii ( a:int, b:int, c:int, d:int, x:int, s:int, t:int ):int {
+            return transform( i, a, b, c, d, x, s, t );
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/crypto/SHA1.as b/vendors/uploadify/com/adobe/crypto/SHA1.as
new file mode 100644
index 000000000..952f3c70f
--- /dev/null
+++ b/vendors/uploadify/com/adobe/crypto/SHA1.as
@@ -0,0 +1,271 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.crypto
+{
+	import com.adobe.utils.IntUtil;
+	import flash.utils.ByteArray;
+	import mx.utils.Base64Encoder;
+	
+	/**
+	 *  US Secure Hash Algorithm 1 (SHA1)
+	 *
+	 *  Implementation based on algorithm description at 
+	 *  http://www.faqs.org/rfcs/rfc3174.html
+	 */
+	public class SHA1
+	{
+		public static var digest:ByteArray;
+		
+		/**
+		 *  Performs the SHA1 hash algorithm on a string.
+		 *
+		 *  @param s		The string to hash
+		 *  @return			A string containing the hash value of s
+		 *  @langversion	ActionScript 3.0
+		 *  @playerversion	9.0
+		 *  @tiptext
+		 */
+		public static function hash( s:String ):String
+		{
+			var blocks:Array = createBlocksFromString( s );
+			var byteArray:ByteArray = hashBlocks( blocks );
+			
+			return IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true );
+		}
+		
+		/**
+		 *  Performs the SHA1 hash algorithm on a ByteArray.
+		 *
+		 *  @param data		The ByteArray data to hash
+		 *  @return			A string containing the hash value of data
+		 *  @langversion	ActionScript 3.0
+		 *  @playerversion	9.0
+		 */
+		public static function hashBytes( data:ByteArray ):String
+		{
+			var blocks:Array = SHA1.createBlocksFromByteArray( data );
+			var byteArray:ByteArray = hashBlocks(blocks);
+			
+			return IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true );
+		}
+		
+		/**
+		 *  Performs the SHA1 hash algorithm on a string, then does
+		 *  Base64 encoding on the result.
+		 *
+		 *  @param s		The string to hash
+		 *  @return			The base64 encoded hash value of s
+		 *  @langversion	ActionScript 3.0
+		 *  @playerversion	9.0
+		 *  @tiptext
+		 */
+		public static function hashToBase64( s:String ):String
+		{
+			var blocks:Array = SHA1.createBlocksFromString( s );
+			var byteArray:ByteArray = hashBlocks(blocks);
+
+			// ByteArray.toString() returns the contents as a UTF-8 string,
+			// which we can't use because certain byte sequences might trigger
+			// a UTF-8 conversion.  Instead, we convert the bytes to characters
+			// one by one.
+			var charsInByteArray:String = "";
+			byteArray.position = 0;
+			for (var j:int = 0; j < byteArray.length; j++)
+			{
+				var byte:uint = byteArray.readUnsignedByte();
+				charsInByteArray += String.fromCharCode(byte);
+			}
+
+			var encoder:Base64Encoder = new Base64Encoder();
+			encoder.encode(charsInByteArray);
+			return encoder.flush();
+		}
+		
+		private static function hashBlocks( blocks:Array ):ByteArray
+		{
+			// initialize the h's
+			var h0:int = 0x67452301;
+			var h1:int = 0xefcdab89;
+			var h2:int = 0x98badcfe;
+			var h3:int = 0x10325476;
+			var h4:int = 0xc3d2e1f0;
+			
+			var len:int = blocks.length;
+			var w:Array = new Array( 80 );
+			
+			// loop over all of the blocks
+			for ( var i:int = 0; i < len; i += 16 ) {
+			
+				// 6.1.c
+				var a:int = h0;
+				var b:int = h1;
+				var c:int = h2;
+				var d:int = h3;
+				var e:int = h4;
+				
+				// 80 steps to process each block
+				// TODO: unroll for faster execution, or 4 loops of
+				// 20 each to avoid the k and f function calls
+				for ( var t:int = 0; t < 80; t++ ) {
+					
+					if ( t < 16 ) {
+						// 6.1.a
+						w[ t ] = blocks[ i + t ];
+					} else {
+						// 6.1.b
+						w[ t ] = IntUtil.rol( w[ t - 3 ] ^ w[ t - 8 ] ^ w[ t - 14 ] ^ w[ t - 16 ], 1 );
+					}
+					
+					// 6.1.d
+					var temp:int = IntUtil.rol( a, 5 ) + f( t, b, c, d ) + e + int( w[ t ] ) + k( t );
+					
+					e = d;
+					d = c;
+					c = IntUtil.rol( b, 30 );
+					b = a;
+					a = temp;
+				}
+				
+				// 6.1.e
+				h0 += a;
+				h1 += b;
+				h2 += c;
+				h3 += d;
+				h4 += e;		
+			}
+			
+			var byteArray:ByteArray = new ByteArray();
+			byteArray.writeInt(h0);
+			byteArray.writeInt(h1);
+			byteArray.writeInt(h2);
+			byteArray.writeInt(h3);
+			byteArray.writeInt(h4);
+			byteArray.position = 0;
+			
+			digest = new ByteArray();
+			digest.writeBytes(byteArray);
+			digest.position = 0;
+			return byteArray;
+		}
+
+		/**
+		 *  Performs the logical function based on t
+		 */
+		private static function f( t:int, b:int, c:int, d:int ):int {
+			if ( t < 20 ) {
+				return ( b & c ) | ( ~b & d );
+			} else if ( t < 40 ) {
+				return b ^ c ^ d;
+			} else if ( t < 60 ) {
+				return ( b & c ) | ( b & d ) | ( c & d );
+			}
+			return b ^ c ^ d;
+		}
+		
+		/**
+		 *  Determines the constant value based on t
+		 */
+		private static function k( t:int ):int {
+			if ( t < 20 ) {
+				return 0x5a827999;
+			} else if ( t < 40 ) {
+				return 0x6ed9eba1;
+			} else if ( t < 60 ) {
+				return 0x8f1bbcdc;
+			}
+			return 0xca62c1d6;
+		}
+					
+		/**
+		 *  Converts a ByteArray to a sequence of 16-word blocks
+		 *  that we'll do the processing on.  Appends padding
+		 *  and length in the process.
+		 *
+		 *  @param data		The data to split into blocks
+		 *  @return			An array containing the blocks into which data was split
+		 */
+		private static function createBlocksFromByteArray( data:ByteArray ):Array
+		{
+			var oldPosition:int = data.position;
+			data.position = 0;
+			
+			var blocks:Array = new Array();
+			var len:int = data.length * 8;
+			var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
+			for( var i:int = 0; i < len; i += 8 )
+			{
+				blocks[ i >> 5 ] |= ( data.readByte() & mask ) << ( 24 - i % 32 );
+			}
+			
+			// append padding and length
+			blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
+			blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
+			
+			data.position = oldPosition;
+			
+			return blocks;
+		}
+					
+		/**
+		 *  Converts a string to a sequence of 16-word blocks
+		 *  that we'll do the processing on.  Appends padding
+		 *  and length in the process.
+		 *
+		 *  @param s	The string to split into blocks
+		 *  @return		An array containing the blocks that s was split into.
+		 */
+		private static function createBlocksFromString( s:String ):Array
+		{
+			var blocks:Array = new Array();
+			var len:int = s.length * 8;
+			var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
+			for( var i:int = 0; i < len; i += 8 ) {
+				blocks[ i >> 5 ] |= ( s.charCodeAt( i / 8 ) & mask ) << ( 24 - i % 32 );
+			}
+			
+			// append padding and length
+			blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
+			blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
+			return blocks;
+		}
+		
+	}
+}
diff --git a/vendors/uploadify/com/adobe/crypto/SHA224.as b/vendors/uploadify/com/adobe/crypto/SHA224.as
new file mode 100644
index 000000000..ee1545373
--- /dev/null
+++ b/vendors/uploadify/com/adobe/crypto/SHA224.as
@@ -0,0 +1,257 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.crypto
+{
+	import com.adobe.utils.IntUtil;
+	import flash.utils.ByteArray;
+	import mx.utils.Base64Encoder;
+	
+	/**
+	 * The SHA-224 algorithm
+	 * 
+	 * @see http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
+	 */
+	public class SHA224
+	{
+		public static var digest:ByteArray;
+		
+		/**
+		 *  Performs the SHA224 hash algorithm on a string.
+		 *
+		 *  @param s		The string to hash
+		 *  @return			A string containing the hash value of s
+		 *  @langversion	ActionScript 3.0
+		 *  @playerversion	9.0
+		 *  @tiptext
+		 */
+		public static function hash( s:String ):String {
+			var blocks:Array = createBlocksFromString( s );
+			var byteArray:ByteArray = hashBlocks( blocks );
+			return IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true );
+		}
+		
+		/**
+		 *  Performs the SHA224 hash algorithm on a ByteArray.
+		 *
+		 *  @param data		The ByteArray data to hash
+		 *  @return			A string containing the hash value of data
+		 *  @langversion	ActionScript 3.0
+		 *  @playerversion	9.0
+		 */
+		public static function hashBytes( data:ByteArray ):String
+		{
+			var blocks:Array = createBlocksFromByteArray( data );
+			var byteArray:ByteArray = hashBlocks(blocks);
+			return IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true );
+		}
+		
+		/**
+		 *  Performs the SHA224 hash algorithm on a string, then does
+		 *  Base64 encoding on the result.
+		 *
+		 *  @param s		The string to hash
+		 *  @return			The base64 encoded hash value of s
+		 *  @langversion	ActionScript 3.0
+		 *  @playerversion	9.0
+		 *  @tiptext
+		 */
+		public static function hashToBase64( s:String ):String
+		{
+			var blocks:Array = createBlocksFromString( s );
+			var byteArray:ByteArray = hashBlocks(blocks);
+
+			// ByteArray.toString() returns the contents as a UTF-8 string,
+			// which we can't use because certain byte sequences might trigger
+			// a UTF-8 conversion.  Instead, we convert the bytes to characters
+			// one by one.
+			var charsInByteArray:String = "";
+			byteArray.position = 0;
+			for (var j:int = 0; j < byteArray.length; j++)
+			{
+				var byte:uint = byteArray.readUnsignedByte();
+				charsInByteArray += String.fromCharCode(byte);
+			}
+
+			var encoder:Base64Encoder = new Base64Encoder();
+			encoder.encode(charsInByteArray);
+			return encoder.flush();
+		}
+		
+		private static function hashBlocks( blocks:Array ):ByteArray {
+			var h0:int = 0xc1059ed8;
+			var h1:int = 0x367cd507;
+			var h2:int = 0x3070dd17;
+			var h3:int = 0xf70e5939;
+			var h4:int = 0xffc00b31;
+			var h5:int = 0x68581511;
+			var h6:int = 0x64f98fa7;
+			var h7:int = 0xbefa4fa4;
+			
+			var k:Array = new Array(0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2);
+			
+			var len:int = blocks.length;
+			var w:Array = new Array();
+			
+			// loop over all of the blocks
+			for ( var i:int = 0; i < len; i += 16 ) {
+				
+				var a:int = h0;
+				var b:int = h1;
+				var c:int = h2;
+				var d:int = h3;
+				var e:int = h4;
+				var f:int = h5;
+				var g:int = h6;
+				var h:int = h7;
+				
+				for(var t:int = 0; t < 64; t++) {
+					
+					if ( t < 16 ) {
+						w[t] = blocks[ i + t ];
+						if(isNaN(w[t])) { w[t] = 0; }
+					} else {
+						var ws0:int = IntUtil.ror(w[t-15], 7) ^ IntUtil.ror(w[t-15], 18) ^ (w[t-15] >>> 3);
+						var ws1:int = IntUtil.ror(w[t-2], 17) ^ IntUtil.ror(w[t-2], 19) ^ (w[t-2] >>> 10);
+						w[t] = w[t-16] + ws0 + w[t-7] + ws1;
+					}
+					
+					var s0:int = IntUtil.ror(a, 2) ^ IntUtil.ror(a, 13) ^ IntUtil.ror(a, 22);
+					var maj:int = (a & b) ^ (a & c) ^ (b & c);
+					var t2:int = s0 + maj;
+					var s1:int = IntUtil.ror(e, 6) ^ IntUtil.ror(e, 11) ^ IntUtil.ror(e, 25);
+					var ch:int = (e & f) ^ ((~e) & g);
+					var t1:int = h + s1 + ch + k[t] + w[t];
+					
+					h = g;
+					g = f;
+					f = e;
+					e = d + t1;
+					d = c;
+					c = b;
+					b = a;
+					a = t1 + t2;
+				}
+					
+				//Add this chunk's hash to result so far:
+				h0 += a;
+				h1 += b;
+				h2 += c;
+				h3 += d;
+				h4 += e;
+				h5 += f;
+				h6 += g;
+				h7 += h;
+			}
+			
+			var byteArray:ByteArray = new ByteArray();
+			byteArray.writeInt(h0);
+			byteArray.writeInt(h1);
+			byteArray.writeInt(h2);
+			byteArray.writeInt(h3);
+			byteArray.writeInt(h4);
+			byteArray.writeInt(h5);
+			byteArray.writeInt(h6);
+			byteArray.position = 0;
+			
+			digest = new ByteArray();
+			digest.writeBytes(byteArray);
+			digest.position = 0;
+			return byteArray;
+		}
+		
+		/**
+		 *  Converts a ByteArray to a sequence of 16-word blocks
+		 *  that we'll do the processing on.  Appends padding
+		 *  and length in the process.
+		 *
+		 *  @param data		The data to split into blocks
+		 *  @return			An array containing the blocks into which data was split
+		 */
+		private static function createBlocksFromByteArray( data:ByteArray ):Array
+		{
+			var oldPosition:int = data.position;
+			data.position = 0;
+			
+			var blocks:Array = new Array();
+			var len:int = data.length * 8;
+			var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
+			for( var i:int = 0; i < len; i += 8 )
+			{
+				blocks[ i >> 5 ] |= ( data.readByte() & mask ) << ( 24 - i % 32 );
+			}
+			
+			// append padding and length
+			blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
+			blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
+			
+			data.position = oldPosition;
+			
+			return blocks;
+		}
+					
+		/**
+		 *  Converts a string to a sequence of 16-word blocks
+		 *  that we'll do the processing on.  Appends padding
+		 *  and length in the process.
+		 *
+		 *  @param s	The string to split into blocks
+		 *  @return		An array containing the blocks that s was split into.
+		 */
+		private static function createBlocksFromString( s:String ):Array
+		{
+			var blocks:Array = new Array();
+			var len:int = s.length * 8;
+			var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
+			for( var i:int = 0; i < len; i += 8 ) {
+				blocks[ i >> 5 ] |= ( s.charCodeAt( i / 8 ) & mask ) << ( 24 - i % 32 );
+			}
+			
+			// append padding and length
+			blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
+			blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
+			return blocks;
+		}
+	}
+}
diff --git a/vendors/uploadify/com/adobe/crypto/SHA256.as b/vendors/uploadify/com/adobe/crypto/SHA256.as
new file mode 100644
index 000000000..09a2ba23d
--- /dev/null
+++ b/vendors/uploadify/com/adobe/crypto/SHA256.as
@@ -0,0 +1,261 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.crypto
+{
+	import com.adobe.utils.IntUtil;
+	import flash.utils.ByteArray;
+	import mx.utils.Base64Encoder;
+	
+	/**
+	 * The SHA-256 algorithm
+	 * 
+	 * @see http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
+	 */
+	public class SHA256
+	{
+		public static var digest:ByteArray;
+		/**
+		 *  Performs the SHA256 hash algorithm on a string.
+		 *
+		 *  @param s		The string to hash
+		 *  @return			A string containing the hash value of s
+		 *  @langversion	ActionScript 3.0
+		 *  @playerversion	9.0
+		 *  @tiptext
+		 */
+		public static function hash( s:String ):String {
+			var blocks:Array = createBlocksFromString( s );
+			var byteArray:ByteArray = hashBlocks( blocks );
+			
+			return IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true );
+		}
+		
+		/**
+		 *  Performs the SHA256 hash algorithm on a ByteArray.
+		 *
+		 *  @param data		The ByteArray data to hash
+		 *  @return			A string containing the hash value of data
+		 *  @langversion	ActionScript 3.0
+		 *  @playerversion	9.0
+		 */
+		public static function hashBytes( data:ByteArray ):String
+		{
+			var blocks:Array = createBlocksFromByteArray( data );
+			var byteArray:ByteArray = hashBlocks(blocks);
+			
+			return IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true )
+					+ IntUtil.toHex( byteArray.readInt(), true );
+		}
+		
+		/**
+		 *  Performs the SHA256 hash algorithm on a string, then does
+		 *  Base64 encoding on the result.
+		 *
+		 *  @param s		The string to hash
+		 *  @return			The base64 encoded hash value of s
+		 *  @langversion	ActionScript 3.0
+		 *  @playerversion	9.0
+		 *  @tiptext
+		 */
+		public static function hashToBase64( s:String ):String
+		{
+			var blocks:Array = createBlocksFromString( s );
+			var byteArray:ByteArray = hashBlocks(blocks);
+
+			// ByteArray.toString() returns the contents as a UTF-8 string,
+			// which we can't use because certain byte sequences might trigger
+			// a UTF-8 conversion.  Instead, we convert the bytes to characters
+			// one by one.
+			var charsInByteArray:String = "";
+			byteArray.position = 0;
+			for (var j:int = 0; j < byteArray.length; j++)
+			{
+				var byte:uint = byteArray.readUnsignedByte();
+				charsInByteArray += String.fromCharCode(byte);
+			}
+
+			var encoder:Base64Encoder = new Base64Encoder();
+			encoder.encode(charsInByteArray);
+			return encoder.flush();
+		}
+		
+		private static function hashBlocks( blocks:Array ):ByteArray {
+			var h0:int = 0x6a09e667;
+			var h1:int = 0xbb67ae85;
+			var h2:int = 0x3c6ef372;
+			var h3:int = 0xa54ff53a;
+			var h4:int = 0x510e527f;
+			var h5:int = 0x9b05688c;
+			var h6:int = 0x1f83d9ab;
+			var h7:int = 0x5be0cd19;
+			
+			var k:Array = new Array(0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2);
+			
+			var len:int = blocks.length;
+			var w:Array = new Array( 64 );
+			
+			// loop over all of the blocks
+			for ( var i:int = 0; i < len; i += 16 ) {
+				
+				var a:int = h0;
+				var b:int = h1;
+				var c:int = h2;
+				var d:int = h3;
+				var e:int = h4;
+				var f:int = h5;
+				var g:int = h6;
+				var h:int = h7;
+				
+				for(var t:int = 0; t < 64; t++) {
+					
+					if ( t < 16 ) {
+						w[t] = blocks[ i + t ];
+						if(isNaN(w[t])) { w[t] = 0; }
+					} else {
+						var ws0:int = IntUtil.ror(w[t-15], 7) ^ IntUtil.ror(w[t-15], 18) ^ (w[t-15] >>> 3);
+						var ws1:int = IntUtil.ror(w[t-2], 17) ^ IntUtil.ror(w[t-2], 19) ^ (w[t-2] >>> 10);
+						w[t] = w[t-16] + ws0 + w[t-7] + ws1;
+					}
+					
+					var s0:int = IntUtil.ror(a, 2) ^ IntUtil.ror(a, 13) ^ IntUtil.ror(a, 22);
+					var maj:int = (a & b) ^ (a & c) ^ (b & c);
+					var t2:int = s0 + maj;
+					var s1:int = IntUtil.ror(e, 6) ^ IntUtil.ror(e, 11) ^ IntUtil.ror(e, 25);
+					var ch:int = (e & f) ^ ((~e) & g);
+					var t1:int = h + s1 + ch + k[t] + w[t];
+					
+					h = g;
+					g = f;
+					f = e;
+					e = d + t1;
+					d = c;
+					c = b;
+					b = a;
+					a = t1 + t2;
+				}
+					
+				//Add this chunk's hash to result so far:
+				h0 += a;
+				h1 += b;
+				h2 += c;
+				h3 += d;
+				h4 += e;
+				h5 += f;
+				h6 += g;
+				h7 += h;
+			}
+			
+			var byteArray:ByteArray = new ByteArray();
+			byteArray.writeInt(h0);
+			byteArray.writeInt(h1);
+			byteArray.writeInt(h2);
+			byteArray.writeInt(h3);
+			byteArray.writeInt(h4);
+			byteArray.writeInt(h5);
+			byteArray.writeInt(h6);
+			byteArray.writeInt(h7);
+			byteArray.position = 0;
+			
+			digest = new ByteArray();
+			digest.writeBytes(byteArray);
+			digest.position = 0;
+			return byteArray;
+		}
+		
+		/**
+		 *  Converts a ByteArray to a sequence of 16-word blocks
+		 *  that we'll do the processing on.  Appends padding
+		 *  and length in the process.
+		 *
+		 *  @param data		The data to split into blocks
+		 *  @return			An array containing the blocks into which data was split
+		 */
+		private static function createBlocksFromByteArray( data:ByteArray ):Array
+		{
+			var oldPosition:int = data.position;
+			data.position = 0;
+			
+			var blocks:Array = new Array();
+			var len:int = data.length * 8;
+			var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
+			for( var i:int = 0; i < len; i += 8 )
+			{
+				blocks[ i >> 5 ] |= ( data.readByte() & mask ) << ( 24 - i % 32 );
+			}
+			
+			// append padding and length
+			blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
+			blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
+			
+			data.position = oldPosition;
+			
+			return blocks;
+		}
+					
+		/**
+		 *  Converts a string to a sequence of 16-word blocks
+		 *  that we'll do the processing on.  Appends padding
+		 *  and length in the process.
+		 *
+		 *  @param s	The string to split into blocks
+		 *  @return		An array containing the blocks that s was split into.
+		 */
+		private static function createBlocksFromString( s:String ):Array
+		{
+			var blocks:Array = new Array();
+			var len:int = s.length * 8;
+			var mask:int = 0xFF; // ignore hi byte of characters > 0xFF
+			for( var i:int = 0; i < len; i += 8 ) {
+				blocks[ i >> 5 ] |= ( s.charCodeAt( i / 8 ) & mask ) << ( 24 - i % 32 );
+			}
+			
+			// append padding and length
+			blocks[ len >> 5 ] |= 0x80 << ( 24 - len % 32 );
+			blocks[ ( ( ( len + 64 ) >> 9 ) << 4 ) + 15 ] = len;
+			return blocks;
+		}
+	}
+}
diff --git a/vendors/uploadify/com/adobe/crypto/WSSEUsernameToken.as b/vendors/uploadify/com/adobe/crypto/WSSEUsernameToken.as
new file mode 100644
index 000000000..92bbba6dc
--- /dev/null
+++ b/vendors/uploadify/com/adobe/crypto/WSSEUsernameToken.as
@@ -0,0 +1,114 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.crypto
+{
+	import mx.formatters.DateFormatter;
+	import mx.utils.Base64Encoder;
+	
+	/**
+	 * Web Services Security Username Token
+	 *
+	 * Implementation based on algorithm description at 
+	 * http://www.oasis-open.org/committees/wss/documents/WSS-Username-02-0223-merged.pdf
+	 */
+	public class WSSEUsernameToken
+	{
+		/**
+		 * Generates a WSSE Username Token.
+		 *
+		 * @param username The username
+		 * @param password The password
+		 * @param nonce A cryptographically random nonce (if null, the nonce
+		 * will be generated)
+		 * @param timestamp The time at which the token is generated (if null,
+		 * the time will be set to the moment of execution)
+		 * @return The generated token
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function getUsernameToken(username:String, password:String, nonce:String=null, timestamp:Date=null):String
+		{
+			if (nonce == null)
+			{
+				nonce = generateNonce();
+			}
+			nonce = base64Encode(nonce);
+		
+			var created:String = generateTimestamp(timestamp);
+		
+			var password64:String = getBase64Digest(nonce,
+				created,
+				password);
+		
+			var token:String = new String("UsernameToken Username=\"");
+			token += username + "\", " +
+					 "PasswordDigest=\"" + password64 + "\", " +
+					 "Nonce=\"" + nonce + "\", " +
+					 "Created=\"" + created + "\"";
+			return token;
+		}
+		
+		private static function generateNonce():String
+		{
+			// Math.random returns a Number between 0 and 1.  We don't want our
+			// nonce to contain invalid characters (e.g. the period) so we
+			// strip them out before returning the result.
+			var s:String =  Math.random().toString();
+			return s.replace(".", "");
+		}
+		
+		internal static function base64Encode(s:String):String
+		{
+			var encoder:Base64Encoder = new Base64Encoder();
+			encoder.encode(s);
+			return encoder.flush();
+		}
+		
+		internal static function generateTimestamp(timestamp:Date):String
+		{
+			if (timestamp == null)
+			{
+				timestamp = new Date();
+			}
+			var dateFormatter:DateFormatter = new DateFormatter();
+			dateFormatter.formatString = "YYYY-MM-DDTJJ:NN:SS"
+			return dateFormatter.format(timestamp) + "Z";
+		}
+		
+		internal static function getBase64Digest(nonce:String, created:String, password:String):String
+		{
+			return SHA1.hashToBase64(nonce + created + password);
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/errors/IllegalStateError.as b/vendors/uploadify/com/adobe/errors/IllegalStateError.as
new file mode 100644
index 000000000..fa16191d5
--- /dev/null
+++ b/vendors/uploadify/com/adobe/errors/IllegalStateError.as
@@ -0,0 +1,63 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.errors
+{
+	/**
+	* This class represents an Error that is thrown when a method is called when
+	* the receiving instance is in an invalid state.
+	*
+	* For example, this may occur if a method has been called, and other properties
+	* in the instance have not been initialized properly.
+	*
+	* @langversion ActionScript 3.0
+	* @playerversion Flash 9.0
+	* @tiptext
+	*
+	*/
+	public class IllegalStateError extends Error
+	{
+		/**
+		*	Constructor
+		*
+		*	@param message A message describing the error in detail.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/
+		public function IllegalStateError(message:String)
+		{
+			super(message);
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/fileformats/vcard/Address.as b/vendors/uploadify/com/adobe/fileformats/vcard/Address.as
new file mode 100644
index 000000000..a368ffb06
--- /dev/null
+++ b/vendors/uploadify/com/adobe/fileformats/vcard/Address.as
@@ -0,0 +1,47 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.fileformats.vcard
+{
+	public class Address
+	{
+		public var type:String;
+		public var street:String;
+		public var city:String;
+		public var state:String;
+		public var postalCode:String;
+		
+		public function toString():String
+		{
+			return (street + " " + city + ", " + state + " " + postalCode);
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/fileformats/vcard/Email.as b/vendors/uploadify/com/adobe/fileformats/vcard/Email.as
new file mode 100644
index 000000000..071c39edf
--- /dev/null
+++ b/vendors/uploadify/com/adobe/fileformats/vcard/Email.as
@@ -0,0 +1,39 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.fileformats.vcard
+{
+	public class Email
+	{
+		public var type:String;
+		public var address:String;
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/fileformats/vcard/Phone.as b/vendors/uploadify/com/adobe/fileformats/vcard/Phone.as
new file mode 100644
index 000000000..27f98e4ed
--- /dev/null
+++ b/vendors/uploadify/com/adobe/fileformats/vcard/Phone.as
@@ -0,0 +1,39 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.fileformats.vcard
+{
+	public class Phone
+	{
+		public var type:String;
+		public var number:String;
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/fileformats/vcard/VCard.as b/vendors/uploadify/com/adobe/fileformats/vcard/VCard.as
new file mode 100644
index 000000000..d6bc28322
--- /dev/null
+++ b/vendors/uploadify/com/adobe/fileformats/vcard/VCard.as
@@ -0,0 +1,54 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.fileformats.vcard
+{
+	import flash.utils.ByteArray;
+
+	public class VCard
+	{
+		public var fullName:String;
+		public var orgs:Array;
+		public var title:String;
+		public var image:ByteArray;
+		public var phones:Array;
+		public var emails:Array;
+		public var addresses:Array;
+		
+		public function VCard()
+		{
+			orgs = new Array();
+			phones = new Array();
+			emails = new Array();
+			addresses = new Array();
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/fileformats/vcard/VCardParser.as b/vendors/uploadify/com/adobe/fileformats/vcard/VCardParser.as
new file mode 100644
index 000000000..45c954aa9
--- /dev/null
+++ b/vendors/uploadify/com/adobe/fileformats/vcard/VCardParser.as
@@ -0,0 +1,246 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.fileformats.vcard
+{
+	import mx.utils.Base64Decoder;
+	import mx.utils.StringUtil;
+	
+	public class VCardParser
+	{
+		public static function parse(vcardStr:String):Array
+		{
+			var vcards:Array = new Array();
+			var lines:Array = vcardStr.split(/\r\n/);
+			var vcard:VCard;
+			var type:String;
+			var typeTmp:String;
+			var line:String;
+
+			for (var i:uint = 0; i < lines.length; ++i)
+			{
+				line = lines[i];
+				if (line == "BEGIN:VCARD")
+				{
+					vcard = new VCard();
+				}
+				else if (line == "END:VCARD")
+				{
+					if (vcard != null)
+					{
+						vcards.push(vcard);
+					}
+				}
+				else if(line.search(/^ORG/i) != -1)
+				{
+					var org:String = line.substring(4, line.length);
+					var orgArray:Array = org.split(";");
+					for each (var orgToken:String in orgArray)
+					{
+						if (StringUtil.trim(orgToken).length > 0)
+						{
+							vcard.orgs.push(orgToken);
+						}
+					}
+				}
+				else if(line.search(/^TITLE/i) != -1)
+				{
+					var title:String = line.substring(6, line.length);
+					vcard.title = title;
+				}
+				else if (line.search(/^FN:/i) != -1)
+				{
+					var fullName:String = line.substring(3, line.length);
+					vcard.fullName = fullName;
+				}
+				else if (line.search(/^TEL/i) != -1)
+				{
+					type = new String();
+					typeTmp = new String();
+					var phone:Phone = new Phone();
+					var number:String;
+					var phoneTokens:Array = line.split(";");
+					for each (var phoneToken:String in phoneTokens)
+					{
+						if (phoneToken.search(/^TYPE=/i) != -1)
+						{
+							if (phoneToken.indexOf(":") != -1)
+							{
+								typeTmp = phoneToken.substring(5, phoneToken.indexOf(":"));
+								number = phoneToken.substring(phoneToken.indexOf(":")+1, phoneToken.length);
+							}
+							else
+							{									
+								typeTmp = phoneToken.substring(5, phoneToken.length);
+							}
+
+							typeTmp = typeTmp.toLocaleLowerCase();
+
+							if (typeTmp == "pref")
+							{
+								continue;
+							}
+							if (type.length != 0)
+							{
+								type += (" ");
+							}
+							type += typeTmp;
+						}
+					}
+					if (type.length > 0 && number != null)
+					{
+						phone.type = type;
+						phone.number = number;
+					}
+					vcard.phones.push(phone);
+				}
+				else if (line.search(/^EMAIL/i) != -1)
+				{
+					type = new String();
+					typeTmp = new String();
+					var email:Email = new Email();
+					var emailAddress:String;
+					var emailTokens:Array = line.split(";");
+					for each (var emailToken:String in emailTokens)
+					{
+						if (emailToken.search(/^TYPE=/i) != -1)
+						{
+							if (emailToken.indexOf(":") != -1)
+							{
+								typeTmp = emailToken.substring(5, emailToken.indexOf(":"));
+								emailAddress = emailToken.substring(emailToken.indexOf(":")+1, emailToken.length);
+							}
+							else
+							{									
+								typeTmp = emailToken.substring(5, emailToken.length);
+							}
+
+							typeTmp = typeTmp.toLocaleLowerCase();
+
+							if (typeTmp == "pref" || typeTmp == "internet")
+							{
+								continue;
+							}
+							if (type.length != 0)
+							{
+								type += (" ");
+							}
+							type += typeTmp;
+						}
+					}
+					if (type.length > 0 && emailAddress != null)
+					{
+						email.type = type;
+						email.address = emailAddress;
+					}
+					vcard.emails.push(email);
+				}
+				else if (line.indexOf("ADR;") != -1)
+				{
+					var addressTokens:Array = line.split(";");
+					var address:Address = new Address();
+					for (var j:uint = 0; j < addressTokens.length; ++j)
+					{
+						var addressToken:String = addressTokens[j];
+						if (addressToken.search(/^home:+$/i) != -1) // For Outlook, which uses non-standard vCards.
+						{
+							address.type = "home";
+						}
+						else if (addressToken.search(/^work:+$/i) != -1) // For Outlook, which uses non-standard vCards.
+						{
+							address.type = "work";
+						}
+						if (addressToken.search(/^type=/i) != -1)  // The "type" parameter is the standard way (which Address Book uses)
+						{
+							// First, remove the optional ":" character.
+							addressToken = addressToken.replace(/:/,"");
+							var addressType:String = addressToken.substring(5, addressToken.length).toLowerCase();
+							if (addressType == "pref") // Not interested in which one is preferred.
+							{
+								continue;
+							}
+							else if (addressType.indexOf("home") != -1) // home
+							{
+								addressType = "home";
+							}
+							else if (addressType.indexOf("work") != -1) // work
+							{
+								addressType = "work";
+							}
+							else if (addressType.indexOf(",") != -1) // if the comma technique is used, just use the first one
+							{
+								var typeTokens:Array = addressType.split(",");
+								for each (var typeToken:String in typeTokens)
+								{
+									if (typeToken != "pref")
+									{
+										addressType = typeToken;
+										break;
+									}
+								}
+							}
+							address.type = addressType;
+						}
+						else if (addressToken.search(/^\d/) != -1 && address.street == null)
+						{
+							address.street = addressToken.replace(/\\n/, "");
+							address.city = addressTokens[j+1];
+							address.state = addressTokens[j+2];
+							address.postalCode = addressTokens[j+3];
+						}
+					}
+					if (address.type != null && address.street != null)
+					{
+						vcard.addresses.push(address);
+					}
+
+				}
+				else if (line.search(/^PHOTO;BASE64/i) != -1)
+				{
+					var imageStr:String = new String();
+					for (var k:uint = i+1; k < lines.length; ++k)
+					{
+						imageStr += lines[k];
+						//if (lines[k].search(/.+\=$/) != -1) // Very slow in Mac due to RegEx bug
+						if (lines[k].indexOf('=') != -1)
+						{
+							var decoder:Base64Decoder = new Base64Decoder();
+							decoder.decode(imageStr);
+							vcard.image = decoder.flush();
+							break;
+						}
+					}
+				}
+			}
+			return vcards;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/images/BitString.as b/vendors/uploadify/com/adobe/images/BitString.as
new file mode 100644
index 000000000..b5c2b8410
--- /dev/null
+++ b/vendors/uploadify/com/adobe/images/BitString.as
@@ -0,0 +1,39 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.images
+{
+	public class BitString
+	{
+		public var len:int = 0;
+		public var val:int = 0;
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/images/JPGEncoder.as b/vendors/uploadify/com/adobe/images/JPGEncoder.as
new file mode 100644
index 000000000..100d7e968
--- /dev/null
+++ b/vendors/uploadify/com/adobe/images/JPGEncoder.as
@@ -0,0 +1,648 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.images
+{
+	import flash.geom.*;
+	import flash.display.*;
+	import flash.utils.*;
+	
+	/**
+	 * Class that converts BitmapData into a valid JPEG
+	 */		
+	public class JPGEncoder
+	{
+
+		// Static table initialization
+	
+		private var ZigZag:Array = [
+			 0, 1, 5, 6,14,15,27,28,
+			 2, 4, 7,13,16,26,29,42,
+			 3, 8,12,17,25,30,41,43,
+			 9,11,18,24,31,40,44,53,
+			10,19,23,32,39,45,52,54,
+			20,22,33,38,46,51,55,60,
+			21,34,37,47,50,56,59,61,
+			35,36,48,49,57,58,62,63
+		];
+	
+		private var YTable:Array = new Array(64);
+		private var UVTable:Array = new Array(64);
+		private var fdtbl_Y:Array = new Array(64);
+		private var fdtbl_UV:Array = new Array(64);
+	
+		private function initQuantTables(sf:int):void
+		{
+			var i:int;
+			var t:Number;
+			var YQT:Array = [
+				16, 11, 10, 16, 24, 40, 51, 61,
+				12, 12, 14, 19, 26, 58, 60, 55,
+				14, 13, 16, 24, 40, 57, 69, 56,
+				14, 17, 22, 29, 51, 87, 80, 62,
+				18, 22, 37, 56, 68,109,103, 77,
+				24, 35, 55, 64, 81,104,113, 92,
+				49, 64, 78, 87,103,121,120,101,
+				72, 92, 95, 98,112,100,103, 99
+			];
+			for (i = 0; i < 64; i++) {
+				t = Math.floor((YQT[i]*sf+50)/100);
+				if (t < 1) {
+					t = 1;
+				} else if (t > 255) {
+					t = 255;
+				}
+				YTable[ZigZag[i]] = t;
+			}
+			var UVQT:Array = [
+				17, 18, 24, 47, 99, 99, 99, 99,
+				18, 21, 26, 66, 99, 99, 99, 99,
+				24, 26, 56, 99, 99, 99, 99, 99,
+				47, 66, 99, 99, 99, 99, 99, 99,
+				99, 99, 99, 99, 99, 99, 99, 99,
+				99, 99, 99, 99, 99, 99, 99, 99,
+				99, 99, 99, 99, 99, 99, 99, 99,
+				99, 99, 99, 99, 99, 99, 99, 99
+			];
+			for (i = 0; i < 64; i++) {
+				t = Math.floor((UVQT[i]*sf+50)/100);
+				if (t < 1) {
+					t = 1;
+				} else if (t > 255) {
+					t = 255;
+				}
+				UVTable[ZigZag[i]] = t;
+			}
+			var aasf:Array = [
+				1.0, 1.387039845, 1.306562965, 1.175875602,
+				1.0, 0.785694958, 0.541196100, 0.275899379
+			];
+			i = 0;
+			for (var row:int = 0; row < 8; row++)
+			{
+				for (var col:int = 0; col < 8; col++)
+				{
+					fdtbl_Y[i]  = (1.0 / (YTable [ZigZag[i]] * aasf[row] * aasf[col] * 8.0));
+					fdtbl_UV[i] = (1.0 / (UVTable[ZigZag[i]] * aasf[row] * aasf[col] * 8.0));
+					i++;
+				}
+			}
+		}
+	
+		private var YDC_HT:Array;
+		private var UVDC_HT:Array;
+		private var YAC_HT:Array;
+		private var UVAC_HT:Array;
+	
+		private function computeHuffmanTbl(nrcodes:Array, std_table:Array):Array
+		{
+			var codevalue:int = 0;
+			var pos_in_table:int = 0;
+			var HT:Array = new Array();
+			for (var k:int=1; k<=16; k++) {
+				for (var j:int=1; j<=nrcodes[k]; j++) {
+					HT[std_table[pos_in_table]] = new BitString();
+					HT[std_table[pos_in_table]].val = codevalue;
+					HT[std_table[pos_in_table]].len = k;
+					pos_in_table++;
+					codevalue++;
+				}
+				codevalue*=2;
+			}
+			return HT;
+		}
+	
+		private var std_dc_luminance_nrcodes:Array = [0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0];
+		private var std_dc_luminance_values:Array = [0,1,2,3,4,5,6,7,8,9,10,11];
+		private var std_ac_luminance_nrcodes:Array = [0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d];
+		private var std_ac_luminance_values:Array = [
+			0x01,0x02,0x03,0x00,0x04,0x11,0x05,0x12,
+			0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,
+			0x22,0x71,0x14,0x32,0x81,0x91,0xa1,0x08,
+			0x23,0x42,0xb1,0xc1,0x15,0x52,0xd1,0xf0,
+			0x24,0x33,0x62,0x72,0x82,0x09,0x0a,0x16,
+			0x17,0x18,0x19,0x1a,0x25,0x26,0x27,0x28,
+			0x29,0x2a,0x34,0x35,0x36,0x37,0x38,0x39,
+			0x3a,0x43,0x44,0x45,0x46,0x47,0x48,0x49,
+			0x4a,0x53,0x54,0x55,0x56,0x57,0x58,0x59,
+			0x5a,0x63,0x64,0x65,0x66,0x67,0x68,0x69,
+			0x6a,0x73,0x74,0x75,0x76,0x77,0x78,0x79,
+			0x7a,0x83,0x84,0x85,0x86,0x87,0x88,0x89,
+			0x8a,0x92,0x93,0x94,0x95,0x96,0x97,0x98,
+			0x99,0x9a,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,
+			0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,0xb5,0xb6,
+			0xb7,0xb8,0xb9,0xba,0xc2,0xc3,0xc4,0xc5,
+			0xc6,0xc7,0xc8,0xc9,0xca,0xd2,0xd3,0xd4,
+			0xd5,0xd6,0xd7,0xd8,0xd9,0xda,0xe1,0xe2,
+			0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,
+			0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
+			0xf9,0xfa
+		];
+	
+		private var std_dc_chrominance_nrcodes:Array = [0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0];
+		private var std_dc_chrominance_values:Array = [0,1,2,3,4,5,6,7,8,9,10,11];
+		private var std_ac_chrominance_nrcodes:Array = [0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77];
+		private var std_ac_chrominance_values:Array = [
+			0x00,0x01,0x02,0x03,0x11,0x04,0x05,0x21,
+			0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,
+			0x13,0x22,0x32,0x81,0x08,0x14,0x42,0x91,
+			0xa1,0xb1,0xc1,0x09,0x23,0x33,0x52,0xf0,
+			0x15,0x62,0x72,0xd1,0x0a,0x16,0x24,0x34,
+			0xe1,0x25,0xf1,0x17,0x18,0x19,0x1a,0x26,
+			0x27,0x28,0x29,0x2a,0x35,0x36,0x37,0x38,
+			0x39,0x3a,0x43,0x44,0x45,0x46,0x47,0x48,
+			0x49,0x4a,0x53,0x54,0x55,0x56,0x57,0x58,
+			0x59,0x5a,0x63,0x64,0x65,0x66,0x67,0x68,
+			0x69,0x6a,0x73,0x74,0x75,0x76,0x77,0x78,
+			0x79,0x7a,0x82,0x83,0x84,0x85,0x86,0x87,
+			0x88,0x89,0x8a,0x92,0x93,0x94,0x95,0x96,
+			0x97,0x98,0x99,0x9a,0xa2,0xa3,0xa4,0xa5,
+			0xa6,0xa7,0xa8,0xa9,0xaa,0xb2,0xb3,0xb4,
+			0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xc2,0xc3,
+			0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xd2,
+			0xd3,0xd4,0xd5,0xd6,0xd7,0xd8,0xd9,0xda,
+			0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,
+			0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,
+			0xf9,0xfa
+		];
+	
+		private function initHuffmanTbl():void
+		{
+			YDC_HT = computeHuffmanTbl(std_dc_luminance_nrcodes,std_dc_luminance_values);
+			UVDC_HT = computeHuffmanTbl(std_dc_chrominance_nrcodes,std_dc_chrominance_values);
+			YAC_HT = computeHuffmanTbl(std_ac_luminance_nrcodes,std_ac_luminance_values);
+			UVAC_HT = computeHuffmanTbl(std_ac_chrominance_nrcodes,std_ac_chrominance_values);
+		}
+	
+		private var bitcode:Array = new Array(65535);
+		private var category:Array = new Array(65535);
+	
+		private function initCategoryNumber():void
+		{
+			var nrlower:int = 1;
+			var nrupper:int = 2;
+			var nr:int;
+			for (var cat:int=1; cat<=15; cat++) {
+				//Positive numbers
+				for (nr=nrlower; nr= 0 ) {
+				if (value & uint(1 << posval) ) {
+					bytenew |= uint(1 << bytepos);
+				}
+				posval--;
+				bytepos--;
+				if (bytepos < 0) {
+					if (bytenew == 0xFF) {
+						writeByte(0xFF);
+						writeByte(0);
+					}
+					else {
+						writeByte(bytenew);
+					}
+					bytepos=7;
+					bytenew=0;
+				}
+			}
+		}
+	
+		private function writeByte(value:int):void
+		{
+			byteout.writeByte(value);
+		}
+	
+		private function writeWord(value:int):void
+		{
+			writeByte((value>>8)&0xFF);
+			writeByte((value   )&0xFF);
+		}
+	
+		// DCT & quantization core
+	
+		private function fDCTQuant(data:Array, fdtbl:Array):Array
+		{
+			var tmp0:Number, tmp1:Number, tmp2:Number, tmp3:Number, tmp4:Number, tmp5:Number, tmp6:Number, tmp7:Number;
+			var tmp10:Number, tmp11:Number, tmp12:Number, tmp13:Number;
+			var z1:Number, z2:Number, z3:Number, z4:Number, z5:Number, z11:Number, z13:Number;
+			var i:int;
+			/* Pass 1: process rows. */
+			var dataOff:int=0;
+			for (i=0; i<8; i++) {
+				tmp0 = data[dataOff+0] + data[dataOff+7];
+				tmp7 = data[dataOff+0] - data[dataOff+7];
+				tmp1 = data[dataOff+1] + data[dataOff+6];
+				tmp6 = data[dataOff+1] - data[dataOff+6];
+				tmp2 = data[dataOff+2] + data[dataOff+5];
+				tmp5 = data[dataOff+2] - data[dataOff+5];
+				tmp3 = data[dataOff+3] + data[dataOff+4];
+				tmp4 = data[dataOff+3] - data[dataOff+4];
+	
+				/* Even part */
+				tmp10 = tmp0 + tmp3;	/* phase 2 */
+				tmp13 = tmp0 - tmp3;
+				tmp11 = tmp1 + tmp2;
+				tmp12 = tmp1 - tmp2;
+	
+				data[dataOff+0] = tmp10 + tmp11; /* phase 3 */
+				data[dataOff+4] = tmp10 - tmp11;
+	
+				z1 = (tmp12 + tmp13) * 0.707106781; /* c4 */
+				data[dataOff+2] = tmp13 + z1; /* phase 5 */
+				data[dataOff+6] = tmp13 - z1;
+	
+				/* Odd part */
+				tmp10 = tmp4 + tmp5; /* phase 2 */
+				tmp11 = tmp5 + tmp6;
+				tmp12 = tmp6 + tmp7;
+	
+				/* The rotator is modified from fig 4-8 to avoid extra negations. */
+				z5 = (tmp10 - tmp12) * 0.382683433; /* c6 */
+				z2 = 0.541196100 * tmp10 + z5; /* c2-c6 */
+				z4 = 1.306562965 * tmp12 + z5; /* c2+c6 */
+				z3 = tmp11 * 0.707106781; /* c4 */
+	
+				z11 = tmp7 + z3;	/* phase 5 */
+				z13 = tmp7 - z3;
+	
+				data[dataOff+5] = z13 + z2;	/* phase 6 */
+				data[dataOff+3] = z13 - z2;
+				data[dataOff+1] = z11 + z4;
+				data[dataOff+7] = z11 - z4;
+	
+				dataOff += 8; /* advance pointer to next row */
+			}
+	
+			/* Pass 2: process columns. */
+			dataOff = 0;
+			for (i=0; i<8; i++) {
+				tmp0 = data[dataOff+ 0] + data[dataOff+56];
+				tmp7 = data[dataOff+ 0] - data[dataOff+56];
+				tmp1 = data[dataOff+ 8] + data[dataOff+48];
+				tmp6 = data[dataOff+ 8] - data[dataOff+48];
+				tmp2 = data[dataOff+16] + data[dataOff+40];
+				tmp5 = data[dataOff+16] - data[dataOff+40];
+				tmp3 = data[dataOff+24] + data[dataOff+32];
+				tmp4 = data[dataOff+24] - data[dataOff+32];
+	
+				/* Even part */
+				tmp10 = tmp0 + tmp3;	/* phase 2 */
+				tmp13 = tmp0 - tmp3;
+				tmp11 = tmp1 + tmp2;
+				tmp12 = tmp1 - tmp2;
+	
+				data[dataOff+ 0] = tmp10 + tmp11; /* phase 3 */
+				data[dataOff+32] = tmp10 - tmp11;
+	
+				z1 = (tmp12 + tmp13) * 0.707106781; /* c4 */
+				data[dataOff+16] = tmp13 + z1; /* phase 5 */
+				data[dataOff+48] = tmp13 - z1;
+	
+				/* Odd part */
+				tmp10 = tmp4 + tmp5; /* phase 2 */
+				tmp11 = tmp5 + tmp6;
+				tmp12 = tmp6 + tmp7;
+	
+				/* The rotator is modified from fig 4-8 to avoid extra negations. */
+				z5 = (tmp10 - tmp12) * 0.382683433; /* c6 */
+				z2 = 0.541196100 * tmp10 + z5; /* c2-c6 */
+				z4 = 1.306562965 * tmp12 + z5; /* c2+c6 */
+				z3 = tmp11 * 0.707106781; /* c4 */
+	
+				z11 = tmp7 + z3;	/* phase 5 */
+				z13 = tmp7 - z3;
+	
+				data[dataOff+40] = z13 + z2; /* phase 6 */
+				data[dataOff+24] = z13 - z2;
+				data[dataOff+ 8] = z11 + z4;
+				data[dataOff+56] = z11 - z4;
+	
+				dataOff++; /* advance pointer to next column */
+			}
+	
+			// Quantize/descale the coefficients
+			for (i=0; i<64; i++) {
+				// Apply the quantization and scaling factor & Round to nearest integer
+				data[i] = Math.round((data[i]*fdtbl[i]));
+			}
+			return data;
+		}
+	
+		// Chunk writing
+	
+		private function writeAPP0():void
+		{
+			writeWord(0xFFE0); // marker
+			writeWord(16); // length
+			writeByte(0x4A); // J
+			writeByte(0x46); // F
+			writeByte(0x49); // I
+			writeByte(0x46); // F
+			writeByte(0); // = "JFIF",'\0'
+			writeByte(1); // versionhi
+			writeByte(1); // versionlo
+			writeByte(0); // xyunits
+			writeWord(1); // xdensity
+			writeWord(1); // ydensity
+			writeByte(0); // thumbnwidth
+			writeByte(0); // thumbnheight
+		}
+	
+		private function writeSOF0(width:int, height:int):void
+		{
+			writeWord(0xFFC0); // marker
+			writeWord(17);   // length, truecolor YUV JPG
+			writeByte(8);    // precision
+			writeWord(height);
+			writeWord(width);
+			writeByte(3);    // nrofcomponents
+			writeByte(1);    // IdY
+			writeByte(0x11); // HVY
+			writeByte(0);    // QTY
+			writeByte(2);    // IdU
+			writeByte(0x11); // HVU
+			writeByte(1);    // QTU
+			writeByte(3);    // IdV
+			writeByte(0x11); // HVV
+			writeByte(1);    // QTV
+		}
+	
+		private function writeDQT():void
+		{
+			writeWord(0xFFDB); // marker
+			writeWord(132);	   // length
+			writeByte(0);
+			var i:int;
+			for (i=0; i<64; i++) {
+				writeByte(YTable[i]);
+			}
+			writeByte(1);
+			for (i=0; i<64; i++) {
+				writeByte(UVTable[i]);
+			}
+		}
+	
+		private function writeDHT():void
+		{
+			writeWord(0xFFC4); // marker
+			writeWord(0x01A2); // length
+			var i:int;
+	
+			writeByte(0); // HTYDCinfo
+			for (i=0; i<16; i++) {
+				writeByte(std_dc_luminance_nrcodes[i+1]);
+			}
+			for (i=0; i<=11; i++) {
+				writeByte(std_dc_luminance_values[i]);
+			}
+	
+			writeByte(0x10); // HTYACinfo
+			for (i=0; i<16; i++) {
+				writeByte(std_ac_luminance_nrcodes[i+1]);
+			}
+			for (i=0; i<=161; i++) {
+				writeByte(std_ac_luminance_values[i]);
+			}
+	
+			writeByte(1); // HTUDCinfo
+			for (i=0; i<16; i++) {
+				writeByte(std_dc_chrominance_nrcodes[i+1]);
+			}
+			for (i=0; i<=11; i++) {
+				writeByte(std_dc_chrominance_values[i]);
+			}
+	
+			writeByte(0x11); // HTUACinfo
+			for (i=0; i<16; i++) {
+				writeByte(std_ac_chrominance_nrcodes[i+1]);
+			}
+			for (i=0; i<=161; i++) {
+				writeByte(std_ac_chrominance_values[i]);
+			}
+		}
+	
+		private function writeSOS():void
+		{
+			writeWord(0xFFDA); // marker
+			writeWord(12); // length
+			writeByte(3); // nrofcomponents
+			writeByte(1); // IdY
+			writeByte(0); // HTY
+			writeByte(2); // IdU
+			writeByte(0x11); // HTU
+			writeByte(3); // IdV
+			writeByte(0x11); // HTV
+			writeByte(0); // Ss
+			writeByte(0x3f); // Se
+			writeByte(0); // Bf
+		}
+	
+		// Core processing
+		private var DU:Array = new Array(64);
+	
+		private function processDU(CDU:Array, fdtbl:Array, DC:Number, HTDC:Array, HTAC:Array):Number
+		{
+			var EOB:BitString = HTAC[0x00];
+			var M16zeroes:BitString = HTAC[0xF0];
+			var i:int;
+	
+			var DU_DCT:Array = fDCTQuant(CDU, fdtbl);
+			//ZigZag reorder
+			for (i=0;i<64;i++) {
+				DU[ZigZag[i]]=DU_DCT[i];
+			}
+			var Diff:int = DU[0] - DC; DC = DU[0];
+			//Encode DC
+			if (Diff==0) {
+				writeBits(HTDC[0]); // Diff might be 0
+			} else {
+				writeBits(HTDC[category[32767+Diff]]);
+				writeBits(bitcode[32767+Diff]);
+			}
+			//Encode ACs
+			var end0pos:int = 63;
+			for (; (end0pos>0)&&(DU[end0pos]==0); end0pos--) {
+			};
+			//end0pos = first element in reverse order !=0
+			if ( end0pos == 0) {
+				writeBits(EOB);
+				return DC;
+			}
+			i = 1;
+			while ( i <= end0pos ) {
+				var startpos:int = i;
+				for (; (DU[i]==0) && (i<=end0pos); i++) {
+				}
+				var nrzeroes:int = i-startpos;
+				if ( nrzeroes >= 16 ) {
+					for (var nrmarker:int=1; nrmarker <= nrzeroes/16; nrmarker++) {
+						writeBits(M16zeroes);
+					}
+					nrzeroes = int(nrzeroes&0xF);
+				}
+				writeBits(HTAC[nrzeroes*16+category[32767+DU[i]]]);
+				writeBits(bitcode[32767+DU[i]]);
+				i++;
+			}
+			if ( end0pos != 63 ) {
+				writeBits(EOB);
+			}
+			return DC;
+		}
+	
+		private var YDU:Array = new Array(64);
+		private var UDU:Array = new Array(64);
+		private var VDU:Array = new Array(64);
+	
+		private function RGB2YUV(img:BitmapData, xpos:int, ypos:int):void
+		{
+			var pos:int=0;
+			for (var y:int=0; y<8; y++) {
+				for (var x:int=0; x<8; x++) {
+					var P:uint = img.getPixel32(xpos+x,ypos+y);
+					var R:Number = Number((P>>16)&0xFF);
+					var G:Number = Number((P>> 8)&0xFF);
+					var B:Number = Number((P    )&0xFF);
+					YDU[pos]=((( 0.29900)*R+( 0.58700)*G+( 0.11400)*B))-128;
+					UDU[pos]=(((-0.16874)*R+(-0.33126)*G+( 0.50000)*B));
+					VDU[pos]=((( 0.50000)*R+(-0.41869)*G+(-0.08131)*B));
+					pos++;
+				}
+			}
+		}
+	
+		/**
+		 * Constructor for JPEGEncoder class
+		 *
+		 * @param quality The quality level between 1 and 100 that detrmines the
+		 * level of compression used in the generated JPEG
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */		
+		public function JPGEncoder(quality:Number = 50)
+		{
+			if (quality <= 0) {
+				quality = 1;
+			}
+			if (quality > 100) {
+				quality = 100;
+			}
+			var sf:int = 0;
+			if (quality < 50) {
+				sf = int(5000 / quality);
+			} else {
+				sf = int(200 - quality*2);
+			}
+			// Create tables
+			initHuffmanTbl();
+			initCategoryNumber();
+			initQuantTables(sf);
+		}
+	
+		/**
+		 * Created a JPEG image from the specified BitmapData
+		 *
+		 * @param image The BitmapData that will be converted into the JPEG format.
+		 * @return a ByteArray representing the JPEG encoded image data.
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */	
+		public function encode(image:BitmapData):ByteArray
+		{
+			// Initialize bit writer
+			byteout = new ByteArray();
+			bytenew=0;
+			bytepos=7;
+	
+			// Add JPEG headers
+			writeWord(0xFFD8); // SOI
+			writeAPP0();
+			writeDQT();
+			writeSOF0(image.width,image.height);
+			writeDHT();
+			writeSOS();
+
+	
+			// Encode 8x8 macroblocks
+			var DCY:Number=0;
+			var DCU:Number=0;
+			var DCV:Number=0;
+			bytenew=0;
+			bytepos=7;
+			for (var ypos:int=0; ypos= 0 ) {
+				var fillbits:BitString = new BitString();
+				fillbits.len = bytepos+1;
+				fillbits.val = (1<<(bytepos+1))-1;
+				writeBits(fillbits);
+			}
+	
+			writeWord(0xFFD9); //EOI
+			return byteout;
+		}
+	}
+}
diff --git a/vendors/uploadify/com/adobe/images/PNGEncoder.as b/vendors/uploadify/com/adobe/images/PNGEncoder.as
new file mode 100644
index 000000000..83c95f629
--- /dev/null
+++ b/vendors/uploadify/com/adobe/images/PNGEncoder.as
@@ -0,0 +1,141 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.images
+{
+	import flash.geom.*;
+	import flash.display.Bitmap;
+	import flash.display.BitmapData;
+	import flash.utils.ByteArray;
+
+	/**
+	 * Class that converts BitmapData into a valid PNG
+	 */	
+	public class PNGEncoder
+	{
+		/**
+		 * Created a PNG image from the specified BitmapData
+		 *
+		 * @param image The BitmapData that will be converted into the PNG format.
+		 * @return a ByteArray representing the PNG encoded image data.
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */			
+	    public static function encode(img:BitmapData):ByteArray {
+	        // Create output byte array
+	        var png:ByteArray = new ByteArray();
+	        // Write PNG signature
+	        png.writeUnsignedInt(0x89504e47);
+	        png.writeUnsignedInt(0x0D0A1A0A);
+	        // Build IHDR chunk
+	        var IHDR:ByteArray = new ByteArray();
+	        IHDR.writeInt(img.width);
+	        IHDR.writeInt(img.height);
+	        IHDR.writeUnsignedInt(0x08060000); // 32bit RGBA
+	        IHDR.writeByte(0);
+	        writeChunk(png,0x49484452,IHDR);
+	        // Build IDAT chunk
+	        var IDAT:ByteArray= new ByteArray();
+	        for(var i:int=0;i < img.height;i++) {
+	            // no filter
+	            IDAT.writeByte(0);
+	            var p:uint;
+	            var j:int;
+	            if ( !img.transparent ) {
+	                for(j=0;j < img.width;j++) {
+	                    p = img.getPixel(j,i);
+	                    IDAT.writeUnsignedInt(
+	                        uint(((p&0xFFFFFF) << 8)|0xFF));
+	                }
+	            } else {
+	                for(j=0;j < img.width;j++) {
+	                    p = img.getPixel32(j,i);
+	                    IDAT.writeUnsignedInt(
+	                        uint(((p&0xFFFFFF) << 8)|
+	                        (p>>>24)));
+	                }
+	            }
+	        }
+	        IDAT.compress();
+	        writeChunk(png,0x49444154,IDAT);
+	        // Build IEND chunk
+	        writeChunk(png,0x49454E44,null);
+	        // return PNG
+	        return png;
+	    }
+	
+	    private static var crcTable:Array;
+	    private static var crcTableComputed:Boolean = false;
+	
+	    private static function writeChunk(png:ByteArray, 
+	            type:uint, data:ByteArray):void {
+	        if (!crcTableComputed) {
+	            crcTableComputed = true;
+	            crcTable = [];
+	            var c:uint;
+	            for (var n:uint = 0; n < 256; n++) {
+	                c = n;
+	                for (var k:uint = 0; k < 8; k++) {
+	                    if (c & 1) {
+	                        c = uint(uint(0xedb88320) ^ 
+	                            uint(c >>> 1));
+	                    } else {
+	                        c = uint(c >>> 1);
+	                    }
+	                }
+	                crcTable[n] = c;
+	            }
+	        }
+	        var len:uint = 0;
+	        if (data != null) {
+	            len = data.length;
+	        }
+	        png.writeUnsignedInt(len);
+	        var p:uint = png.position;
+	        png.writeUnsignedInt(type);
+	        if ( data != null ) {
+	            png.writeBytes(data);
+	        }
+	        var e:uint = png.position;
+	        png.position = p;
+	        c = 0xffffffff;
+	        for (var i:int = 0; i < (e-p); i++) {
+	            c = uint(crcTable[
+	                (c ^ png.readUnsignedByte()) & 
+	                uint(0xff)] ^ uint(c >>> 8));
+	        }
+	        c = uint(c^uint(0xffffffff));
+	        png.position = e;
+	        png.writeUnsignedInt(c);
+	    }
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/net/DynamicURLLoader.as b/vendors/uploadify/com/adobe/net/DynamicURLLoader.as
new file mode 100644
index 000000000..2a9eea1c3
--- /dev/null
+++ b/vendors/uploadify/com/adobe/net/DynamicURLLoader.as
@@ -0,0 +1,55 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.net
+{
+	import flash.net.URLLoader;
+
+	/**
+	* 	Class that provides a dynamic implimentation of the URLLoader class.
+	* 
+	* 	This class provides no API implimentations. However, since the class is
+	* 	declared as dynamic, it can be used in place of URLLoader, and allow
+	* 	you to dynamically attach properties to it (which URLLoader does not allow).
+	* 
+	* 	@langversion ActionScript 3.0
+	*	@playerversion Flash 9.0
+	*	@tiptext
+	*/	
+	public dynamic class DynamicURLLoader extends URLLoader 
+	{
+		public function DynamicURLLoader()
+		{
+			super();
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/net/IURIResolver.as b/vendors/uploadify/com/adobe/net/IURIResolver.as
new file mode 100644
index 000000000..3610cc2a4
--- /dev/null
+++ b/vendors/uploadify/com/adobe/net/IURIResolver.as
@@ -0,0 +1,76 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.net
+{
+	/**
+	 * The URI class cannot know about DNS aliases, virtual hosts, or
+	 * symbolic links that may be involved.  The application can provide
+	 * an implementation of this interface to resolve the URI before the
+	 * URI class makes any comparisons.  For example, a web host has
+	 * two aliases:
+	 * 
+	 * 
      
+	 *    http://www.site.com/
+	 *    http://www.site.net/
+	 * 
      
+	 * 
+	 * 
      The application can provide an implementation that automatically
+	 * resolves site.net to site.com before URI compares two URI objects.
+	 * Only the application can know and understand the context in which
+	 * the URI's are being used.
      
+	 * 
+	 * 
      Use the URI.resolver accessor to assign a custom resolver to
+	 * the URI class.  Any resolver specified is global to all instances
+	 * of URI.
      
+	 * 
+	 * 
      URI will call this before performing URI comparisons in the
+	 * URI.getRelation() and URI.getCommonParent() functions.
+	 * 
+	 * @see URI.getRelation
+	 * @see URI.getCommonParent
+	 * 
+	 * @langversion ActionScript 3.0
+	 * @playerversion Flash 9.0
+	 */
+	public interface IURIResolver
+	{
+		/**
+		 * Implement this method to provide custom URI resolution for
+		 * your application.
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */
+		function resolve(uri:URI) : URI;
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/net/MimeTypeMap.as b/vendors/uploadify/com/adobe/net/MimeTypeMap.as
new file mode 100644
index 000000000..32e40a4dc
--- /dev/null
+++ b/vendors/uploadify/com/adobe/net/MimeTypeMap.as
@@ -0,0 +1,196 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.net
+{
+	public class MimeTypeMap
+	{
+		private var types:Array = 
+			[["application/andrew-inset","ez"],
+			["application/atom+xml","atom"],
+			["application/mac-binhex40","hqx"],
+			["application/mac-compactpro","cpt"],
+			["application/mathml+xml","mathml"],
+			["application/msword","doc"],
+			["application/octet-stream","bin","dms","lha","lzh","exe","class","so","dll","dmg"],
+			["application/oda","oda"],
+			["application/ogg","ogg"],
+			["application/pdf","pdf"],
+			["application/postscript","ai","eps","ps"],
+			["application/rdf+xml","rdf"],
+			["application/smil","smi","smil"],
+			["application/srgs","gram"],
+			["application/srgs+xml","grxml"],
+			["application/vnd.adobe.apollo-application-installer-package+zip","air"],
+			["application/vnd.mif","mif"],
+			["application/vnd.mozilla.xul+xml","xul"],
+			["application/vnd.ms-excel","xls"],
+			["application/vnd.ms-powerpoint","ppt"],
+			["application/vnd.rn-realmedia","rm"],
+			["application/vnd.wap.wbxml","wbxml"],
+			["application/vnd.wap.wmlc","wmlc"],
+			["application/vnd.wap.wmlscriptc","wmlsc"],
+			["application/voicexml+xml","vxml"],
+			["application/x-bcpio","bcpio"],
+			["application/x-cdlink","vcd"],
+			["application/x-chess-pgn","pgn"],
+			["application/x-cpio","cpio"],
+			["application/x-csh","csh"],
+			["application/x-director","dcr","dir","dxr"],
+			["application/x-dvi","dvi"],
+			["application/x-futuresplash","spl"],
+			["application/x-gtar","gtar"],
+			["application/x-hdf","hdf"],
+			["application/x-javascript","js"],
+			["application/x-koan","skp","skd","skt","skm"],
+			["application/x-latex","latex"],
+			["application/x-netcdf","nc","cdf"],
+			["application/x-sh","sh"],
+			["application/x-shar","shar"],
+			["application/x-shockwave-flash","swf"],
+			["application/x-stuffit","sit"],
+			["application/x-sv4cpio","sv4cpio"],
+			["application/x-sv4crc","sv4crc"],
+			["application/x-tar","tar"],
+			["application/x-tcl","tcl"],
+			["application/x-tex","tex"],
+			["application/x-texinfo","texinfo","texi"],
+			["application/x-troff","t","tr","roff"],
+			["application/x-troff-man","man"],
+			["application/x-troff-me","me"],
+			["application/x-troff-ms","ms"],
+			["application/x-ustar","ustar"],
+			["application/x-wais-source","src"],
+			["application/xhtml+xml","xhtml","xht"],
+			["application/xml","xml","xsl"],
+			["application/xml-dtd","dtd"],
+			["application/xslt+xml","xslt"],
+			["application/zip","zip"],
+			["audio/basic","au","snd"],
+			["audio/midi","mid","midi","kar"],
+			["audio/mpeg","mp3","mpga","mp2"],
+			["audio/x-aiff","aif","aiff","aifc"],
+			["audio/x-mpegurl","m3u"],
+			["audio/x-pn-realaudio","ram","ra"],
+			["audio/x-wav","wav"],
+			["chemical/x-pdb","pdb"],
+			["chemical/x-xyz","xyz"],
+			["image/bmp","bmp"],
+			["image/cgm","cgm"],
+			["image/gif","gif"],
+			["image/ief","ief"],
+			["image/jpeg","jpg","jpeg","jpe"],
+			["image/png","png"],
+			["image/svg+xml","svg"],
+			["image/tiff","tiff","tif"],
+			["image/vnd.djvu","djvu","djv"],
+			["image/vnd.wap.wbmp","wbmp"],
+			["image/x-cmu-raster","ras"],
+			["image/x-icon","ico"],
+			["image/x-portable-anymap","pnm"],
+			["image/x-portable-bitmap","pbm"],
+			["image/x-portable-graymap","pgm"],
+			["image/x-portable-pixmap","ppm"],
+			["image/x-rgb","rgb"],
+			["image/x-xbitmap","xbm"],
+			["image/x-xpixmap","xpm"],
+			["image/x-xwindowdump","xwd"],
+			["model/iges","igs","iges"],
+			["model/mesh","msh","mesh","silo"],
+			["model/vrml","wrl","vrml"],
+			["text/calendar","ics","ifb"],
+			["text/css","css"],
+			["text/html","html","htm"],
+			["text/plain","txt","asc"],
+			["text/richtext","rtx"],
+			["text/rtf","rtf"],
+			["text/sgml","sgml","sgm"],
+			["text/tab-separated-values","tsv"],
+			["text/vnd.wap.wml","wml"],
+			["text/vnd.wap.wmlscript","wmls"],
+			["text/x-setext","etx"],
+			["video/mpeg","mpg","mpeg","mpe"],
+			["video/quicktime","mov","qt"],
+			["video/vnd.mpegurl","m4u","mxu"],
+			["video/x-flv","flv"],
+			["video/x-msvideo","avi"],
+			["video/x-sgi-movie","movie"],
+			["x-conference/x-cooltalk","ice"]];
+		
+		/**
+		 * Returns the mimetype for the given extension.
+		 */
+		public function getMimeType(extension:String):String
+		{
+			extension = extension.toLocaleLowerCase();
+			for each (var a:Array in types)
+			{
+				for each (var b:String in a)
+				{
+					if (b == extension)
+					{
+						return a[0];
+					}
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * Returns the prefered extension for the given mimetype.
+		 */
+		public function getExtension(mimetype:String):String
+		{
+			mimetype = mimetype.toLocaleLowerCase();
+			for each (var a:Array in types)
+			{
+				if (a[0] == mimetype)
+				{
+					return a[1];
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * Adds a mimetype to the map. The order of the extensions matters. The most preferred should come first.
+		 */
+		public function addMimeType(mimetype:String, extensions:Array):void
+		{
+			var newType:Array = [mimetype];
+			for each (var a:String in extensions)
+			{
+				newType.push(a);
+			}
+			types.push(newType);
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/net/URI.as b/vendors/uploadify/com/adobe/net/URI.as
new file mode 100644
index 000000000..d43ce9fa2
--- /dev/null
+++ b/vendors/uploadify/com/adobe/net/URI.as
@@ -0,0 +1,2466 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.net
+{
+	import flash.utils.ByteArray;
+	
+	/**
+	 * This class implements functions and utilities for working with URI's
+	 * (Universal Resource Identifiers).  For technical description of the
+	 * URI syntax, please see RFC 3986 at http://www.ietf.org/rfc/rfc3986.txt
+	 * or do a web search for "rfc 3986".
+	 * 
+	 * 
      The most important aspect of URI's to understand is that URI's
+	 * and URL's are not strings.  URI's are complex data structures that
+	 * encapsulate many pieces of information.  The string version of a
+	 * URI is the serialized representation of that data structure.  This
+	 * string serialization is used to provide a human readable
+	 * representation and a means to transport the data over the network
+	 * where it can then be parsed back into its' component parts.
      
+	 * 
+	 * 
      URI's fall into one of three categories:
+	 * 
        
+	 *  
      • <scheme>:<scheme-specific-part>#<fragment>		(non-hierarchical)
        • 
+	 *  
      • <scheme>:
+	 *  
      • <path>?<query>#<fragment>						(relative hierarchical)
        • 
+	 * 
      
+	 * 
+	 * 
      The query and fragment parts are optional.
      
+	 * 
+	 * 
      This class supports both non-hierarchical and hierarchical URI's
      
+	 * 
+	 * 
      This class is intended to be used "as-is" for the vast majority
+	 * of common URI's.  However, if your application requires a custom
+	 * URI syntax (e.g. custom query syntax or special handling of
+	 * non-hierarchical URI's), this class can be fully subclassed.  If you
+	 * intended to subclass URI, please see the source code for complete
+	 * documation on protected members and protected fuctions.
      
+	 * 
+	 * @langversion ActionScript 3.0
+	 * @playerversion Flash 9.0 
+	 */
+	public class URI
+	{	
+		// Here we define which characters must be escaped for each
+		// URI part.  The characters that must be escaped for each
+		// part differ depending on what would cause ambiguous parsing.
+		// RFC 3986 sec. 2.4 states that characters should only be
+		// encoded when they would conflict with subcomponent delimiters.
+		// We don't want to over-do the escaping.  We only want to escape
+		// the minimum needed to prevent parsing problems.
+		
+		// space and % must be escaped in all cases.  '%' is the delimiter
+		// for escaped characters.
+		public static const URImustEscape:String =	" %";
+		
+		// Baseline of what characters must be escaped
+		public static const URIbaselineEscape:String = URImustEscape + ":?#/@";
+		
+		// Characters that must be escaped in the part part.
+		public static const URIpathEscape:String = URImustEscape + "?#";
+		
+		// Characters that must be escaped in the query part, if setting
+		// the query as a whole string.  If the query is set by
+		// name/value, URIqueryPartEscape is used instead.
+		public static const URIqueryEscape:String = URImustEscape + "#";
+		
+		// This is what each name/value pair must escape "&=" as well
+		// so they don't conflict with the "param=value¶m2=value2"
+		// syntax.
+		public static const URIqueryPartEscape:String = URImustEscape + "#&=";
+		
+		// Non-hierarchical URI's can have query and fragment parts, but
+		// we also want to prevent '/' otherwise it might end up looking
+		// like a hierarchical URI to the parser.
+		public static const URInonHierEscape:String = 	URImustEscape + "?#/";
+		
+		// Baseline uninitialized setting for the URI scheme.
+		public static const UNKNOWN_SCHEME:String = "unknown";
+		
+		// The following bitmaps are used for performance enhanced
+		// character escaping.
+		
+		// Baseline characters that need to be escaped.  Many parts use
+		// this.
+		protected static const URIbaselineExcludedBitmap:URIEncodingBitmap =
+			new URIEncodingBitmap(URIbaselineEscape);
+		
+		// Scheme escaping bitmap
+		protected static const URIschemeExcludedBitmap:URIEncodingBitmap = 
+			URIbaselineExcludedBitmap;
+		
+		// User/pass escaping bitmap
+		protected static const URIuserpassExcludedBitmap:URIEncodingBitmap =
+			URIbaselineExcludedBitmap;
+		
+		// Authority escaping bitmap
+		protected static const URIauthorityExcludedBitmap:URIEncodingBitmap =
+			URIbaselineExcludedBitmap;
+			
+		// Port escaping bitmap
+		protected static const URIportExludedBitmap:URIEncodingBitmap = 
+			URIbaselineExcludedBitmap;
+		
+		// Path escaping bitmap
+		protected static const URIpathExcludedBitmap:URIEncodingBitmap =
+		 	new URIEncodingBitmap(URIpathEscape);
+			
+		// Query (whole) escaping bitmap
+		protected static const URIqueryExcludedBitmap:URIEncodingBitmap =
+			new URIEncodingBitmap(URIqueryEscape);
+			
+		// Query (individual parts) escaping bitmap
+		protected static const URIqueryPartExcludedBitmap:URIEncodingBitmap =
+			new URIEncodingBitmap(URIqueryPartEscape);
+			
+		// Fragments are the last part in the URI.  They only need to
+		// escape space, '#', and '%'.  Turns out that is what query
+		// uses too.
+		protected static const URIfragmentExcludedBitmap:URIEncodingBitmap =
+			URIqueryExcludedBitmap;
+			
+		// Characters that need to be escaped in the non-hierarchical part
+		protected static const URInonHierexcludedBitmap:URIEncodingBitmap =
+			new URIEncodingBitmap(URInonHierEscape);
+			
+		// Values used by getRelation()
+		public static const NOT_RELATED:int = 0;
+		public static const CHILD:int = 1;
+		public static const EQUAL:int = 2;
+		public static const PARENT:int = 3;
+
+		//-------------------------------------------------------------------
+		// protected class members
+		//-------------------------------------------------------------------
+		protected var _valid:Boolean = false;
+		protected var _relative:Boolean = false;
+		protected var _scheme:String = "";
+		protected var _authority:String = "";
+		protected var _username:String = "";
+		protected var _password:String = "";
+		protected var _port:String = "";
+		protected var _path:String = "";
+		protected var _query:String = "";
+		protected var _fragment:String = "";
+		protected var _nonHierarchical:String = "";
+		protected static var _resolver:IURIResolver = null;
+
+
+		/**
+		 *  URI Constructor.  If no string is given, this will initialize
+		 *  this URI object to a blank URI.
+		 */
+		public function URI(uri:String = null) : void	
+		{
+			if (uri == null)
+				initialize();
+			else
+				constructURI(uri);
+		}
+
+		
+		/**
+		 * @private
+		 * Method that loads the URI from the given string.
+		 */
+		protected function constructURI(uri:String) : Boolean
+		{
+			if (!parseURI(uri))
+				_valid = false;
+				
+			return isValid();
+		}
+		
+		
+		/**
+		 * @private Private initializiation.
+		 */
+		protected function initialize() : void
+		{
+			_valid = false;
+			_relative = false;
+		
+			_scheme = UNKNOWN_SCHEME;
+			_authority = "";
+			_username = "";
+			_password = "";
+			_port = "";
+			_path = "";
+			_query = "";
+			_fragment = "";
+		
+			_nonHierarchical = "";
+		}	
+		
+		/**
+		 * @private Accessor to explicitly set/get the hierarchical
+		 * state of the URI.
+		 */
+		protected function set hierState(state:Boolean) : void
+		{
+			if (state)
+			{
+				// Clear the non-hierarchical data
+				_nonHierarchical = "";
+		
+				// Also set the state vars while we are at it
+				if (_scheme == "" || _scheme == UNKNOWN_SCHEME)
+					_relative = true;
+				else
+					_relative = false;
+		
+				if (_authority.length == 0 && _path.length == 0)
+					_valid = false;
+				else
+					_valid = true;
+			}
+			else
+			{
+				// Clear the hierarchical data
+				_authority = "";
+				_username = "";
+				_password = "";
+				_port = "";
+				_path = "";
+		
+				_relative = false;
+		
+				if (_scheme == "" || _scheme == UNKNOWN_SCHEME)
+					_valid = false;
+				else
+					_valid = true;
+			}
+		}
+		protected function get hierState() : Boolean
+		{
+			return (_nonHierarchical.length == 0);
+		}
+		
+		
+		/**
+		 * @private Functions that performs some basic consistency validation.
+		 */
+		protected function validateURI() : Boolean
+		{
+			// Check the scheme
+			if (isAbsolute())
+			{
+				if (_scheme.length <= 1 || _scheme == UNKNOWN_SCHEME)
+				{
+					// we probably parsed a C:\ type path or no scheme
+					return false;
+				}
+				else if (verifyAlpha(_scheme) == false)
+					return false;  // Scheme contains bad characters
+			}
+			
+			if (hierState)
+			{
+				if (_path.search('\\') != -1)
+					return false;  // local path
+				else if (isRelative() == false && _scheme == UNKNOWN_SCHEME)
+					return false;  // It's an absolute URI, but it has a bad scheme
+			}
+			else
+			{
+				if (_nonHierarchical.search('\\') != -1)
+					return false;  // some kind of local path
+			}
+		
+			// Looks like it's ok.
+			return true;
+		}
+		
+		
+		/**
+		 * @private
+		 *
+		 * Given a URI in string format, parse that sucker into its basic
+		 * components and assign them to this object.  A URI is of the form:
+		 *    :?#
+		 *
+		 * For simplicity, we parse the URI in the following order:
+		 * 		
+		 *		1. Fragment (anchors)
+		 * 		2. Query	(CGI stuff)
+		 * 		3. Scheme	("http")
+		 * 		4. Authority (host name)
+		 * 		5. Username/Password (if any)
+		 * 		6. Port		(server port if any)
+		 *		7. Path		(/homepages/mypage.html)
+		 *
+		 * The reason for this order is to minimize any parsing ambiguities.
+		 * Fragments and queries can contain almost anything (they are parts
+		 * that can contain custom data with their own syntax).  Parsing
+		 * them out first removes a large chance of parsing errors.  This
+		 * method expects well formed URI's, but performing the parse in
+		 * this order makes us a little more tolerant of user error.
+		 * 
+		 * REGEXP
+		 * Why doesn't this use regular expressions to parse the URI?  We
+		 * have found that in a real world scenario, URI's are not always
+		 * well formed.  Sometimes characters that should have been escaped
+		 * are not, and those situations would break a regexp pattern.  This
+		 * function attempts to be smart about what it is parsing based on
+		 * location of characters relative to eachother.  This function has
+		 * been proven through real-world use to parse the vast majority
+		 * of URI's correctly.
+		 *
+		 * NOTE
+		 * It is assumed that the string in URI form is escaped.  This function
+		 * does not escape anything.  If you constructed the URI string by
+		 * hand, and used this to parse in the URI and still need it escaped,
+		 * call forceEscape() on your URI object.
+		 *
+		 * Parsing Assumptions
+		 * This routine assumes that the URI being passed is well formed.
+		 * Passing things like local paths, malformed URI's, and the such
+		 * will result in parsing errors.  This function can handle
+		 * 	 - absolute hierarchical (e.g. "http://something.com/index.html),
+		 *   - relative hierarchical (e.g. "../images/flower.gif"), or
+		 *   - non-hierarchical URIs (e.g. "mailto:jsmith@fungoo.com").
+		 * 
+		 * Anything else will probably result in a parsing error, or a bogus
+		 * URI object.
+		 * 
+		 * Note that non-hierarchical URIs *MUST* have a scheme, otherwise
+		 * they will be mistaken for relative URI's.
+		 * 
+		 * If you are not sure what is being passed to you (like manually
+		 * entered text from UI), you can construct a blank URI object and
+		 * call unknownToURI() passing in the unknown string.
+		 * 
+		 * @return	true if successful, false if there was some kind of
+		 * parsing error
+		 */
+		protected function parseURI(uri:String) : Boolean
+		{
+			var baseURI:String = uri;
+			var index:int, index2:int;
+		
+			// Make sure this object is clean before we start.  If it was used
+			// before and we are now parsing a new URI, we don't want any stale
+			// info lying around.
+			initialize();
+		
+			// Remove any fragments (anchors) from the URI
+			index = baseURI.indexOf("#");
+			if (index != -1)
+			{
+				// Store the fragment piece if any
+				if (baseURI.length > (index + 1)) // +1 is to skip the '#'
+					_fragment = baseURI.substr(index + 1, baseURI.length - (index + 1)); 
+		
+				// Trim off the fragment
+				baseURI = baseURI.substr(0, index);
+			}
+		
+			// We need to strip off any CGI parameters (eg '?param=bob')
+			index = baseURI.indexOf("?");
+			if (index != -1)
+			{
+				if (baseURI.length > (index + 1))
+					_query = baseURI.substr(index + 1, baseURI.length - (index + 1)); // +1 is to skip the '?'
+		
+				// Trim off the query
+				baseURI = baseURI.substr(0, index);
+			}
+		
+			// Now try to find the scheme part
+			index = baseURI.search(':');
+			index2 = baseURI.search('/');
+		
+			var containsColon:Boolean = (index != -1);
+			var containsSlash:Boolean = (index2 != -1);
+		
+			// This value is indeterminate if "containsColon" is false.
+			// (if there is no colon, does the slash come before or
+			// after said non-existing colon?)
+			var colonBeforeSlash:Boolean = (!containsSlash || index < index2);
+		
+			// If it has a colon and it's before the first slash, we will treat
+			// it as a scheme.  If a slash is before a colon, there must be a
+			// stray colon in a path or something.  In which case, the colon is
+			// not the separator for the scheme.  Technically, we could consider
+			// this an error, but since this is not an ambiguous state (we know
+			// 100% that this has no scheme), we will keep going.
+			if (containsColon && colonBeforeSlash)
+			{
+				// We found a scheme
+				_scheme = baseURI.substr(0, index);
+				
+				// Normalize the scheme
+				_scheme = _scheme.toLowerCase();
+		
+				baseURI = baseURI.substr(index + 1);
+		
+				if (baseURI.substr(0, 2) == "//")
+				{
+					// This is a hierarchical URI
+					_nonHierarchical = "";
+		
+					// Trim off the "//"
+					baseURI = baseURI.substr(2, baseURI.length - 2);
+				}
+				else
+				{
+					// This is a non-hierarchical URI like "mailto:bob@mail.com"
+					_nonHierarchical = baseURI;
+		
+					if ((_valid = validateURI()) == false)
+						initialize();  // Bad URI.  Clear it.
+		
+					// No more parsing to do for this case
+					return isValid();
+				}
+			}
+			else
+			{
+				// No scheme.  We will consider this a relative URI
+				_scheme = "";
+				_relative = true;
+				_nonHierarchical = "";
+			}
+		
+			// Ok, what we have left is everything after the ://
+		
+			// Now that we have stripped off any query and fragment parts, we
+			// need to split the authority from the path
+		
+			if (isRelative())
+			{
+				// Don't bother looking for the authority.  It's a relative URI
+				_authority = "";
+				_port = "";
+				_path = baseURI;
+			}
+			else
+			{
+				// Check for malformed UNC style file://///server/type/path/
+				// By the time we get here, we have already trimmed the "file://"
+				// so baseURI will be ///server/type/path.  If baseURI only
+				// has one slash, we leave it alone because that is valid (that
+				// is the case of "file:///path/to/file.txt" where there is no
+				// server - implicit "localhost").
+				if (baseURI.substr(0, 2) == "//")
+				{
+					// Trim all leading slashes
+					while(baseURI.charAt(0) == "/")
+						baseURI = baseURI.substr(1, baseURI.length - 1);
+				}
+		
+				index = baseURI.search('/');
+				if (index == -1)
+				{
+					// No path.  We must have passed something like "http://something.com"
+					_authority = baseURI;
+					_path = "";
+				}
+				else
+				{
+					_authority = baseURI.substr(0, index);
+					_path = baseURI.substr(index, baseURI.length - index);
+				}
+		
+				// Check to see if the URI has any username or password information.
+				// For example:  ftp://username:password@server.com
+				index = _authority.search('@');
+				if (index != -1)
+				{
+					// We have a username and possibly a password
+					_username = _authority.substr(0, index);
+		
+					// Remove the username/password from the authority
+					_authority = _authority.substr(index + 1);  // Skip the '@'
+		
+					// Now check to see if the username also has a password
+					index = _username.search(':');
+					if (index != -1)
+					{
+						_password = _username.substring(index + 1, _username.length);
+						_username = _username.substr(0, index);
+					}
+					else
+						_password = "";
+				}
+				else
+				{
+					_username = "";
+					_password = "";
+				}
+		
+				// Lastly, check to see if the authorty has a port number.
+				// This is parsed after the username/password to avoid conflicting
+				// with the ':' in the 'username:password' if one exists.
+				index = _authority.search(':');
+				if (index != -1)
+				{
+					_port = _authority.substring(index + 1, _authority.length);  // skip the ':'
+					_authority = _authority.substr(0, index);
+				}
+				else
+				{
+					_port = "";
+				}
+				
+				// Lastly, normalize the authority.  Domain names
+				// are case insensitive.
+				_authority = _authority.toLowerCase();
+			}
+		
+			if ((_valid = validateURI()) == false)
+				initialize();  // Bad URI.  Clear it
+		
+			return isValid();
+		}
+		
+		
+		/********************************************************************
+		 * Copy function.
+		 */
+		public function copyURI(uri:URI) : void
+		{
+			this._scheme = uri._scheme;
+			this._authority = uri._authority;
+			this._username = uri._username;
+			this._password = uri._password;
+			this._port = uri._port;
+			this._path = uri._path;
+			this._query = uri._query;
+			this._fragment = uri._fragment;
+			this._nonHierarchical = uri._nonHierarchical;
+		
+			this._valid = uri._valid;
+			this._relative = uri._relative;
+		}
+		
+		
+		/**
+		 * @private
+		 * Checks if the given string only contains a-z or A-Z.
+		 */
+		protected function verifyAlpha(str:String) : Boolean
+		{
+			var pattern:RegExp = /[^a-z]/;
+			var index:int;
+			
+			str = str.toLowerCase();
+			index = str.search(pattern);
+			
+			if (index == -1)
+				return true;
+			else
+				return false;
+		}
+		
+		/**
+		 * Is this a valid URI?
+		 * 
+		 * @return true if this object represents a valid URI, false
+		 * otherwise.
+		 */
+		public function isValid() : Boolean
+		{ 
+			return this._valid;
+		}
+		
+		
+		/**
+		 * Is this URI an absolute URI?  An absolute URI is a complete, fully
+		 * qualified reference to a resource.  e.g. http://site.com/index.htm
+		 * Non-hierarchical URI's are always absolute.
+		 */
+		public function isAbsolute() : Boolean
+		{ 
+			return !this._relative;
+		}
+		
+		
+		/**
+		 * Is this URI a relative URI?  Relative URI's do not have a scheme
+		 * and only contain a relative path with optional anchor and query
+		 * parts.  e.g. "../reports/index.htm".  Non-hierarchical URI's
+		 * will never be relative.
+		 */
+		public function isRelative() : Boolean
+		{ 
+			return this._relative;
+		}
+		
+		
+		/**
+		 * Does this URI point to a resource that is a directory/folder?
+		 * The URI specification dictates that any path that ends in a slash
+		 * is a directory.  This is needed to be able to perform correct path
+		 * logic when combining relative URI's with absolute URI's to
+		 * obtain the correct absolute URI to a resource.
+		 * 
+		 * @see URI.chdir
+		 * 
+		 * @return true if this URI represents a directory resource, false
+		 * if this URI represents a file resource.
+		 */
+		public function isDirectory() : Boolean
+		{
+			if (_path.length == 0)
+				return false;
+		
+			return (_path.charAt(path.length - 1) == '/');
+		}
+		
+		
+		/**
+		 * Is this URI a hierarchical URI? URI's can be  
+		 */
+		public function isHierarchical() : Boolean
+		{ 
+			return hierState;
+		}
+				
+		
+		/**
+		 * The scheme of the URI.
+		 */
+		public function get scheme() : String
+		{ 
+			return URI.unescapeChars(_scheme);
+		}
+		public function set scheme(schemeStr:String) : void
+		{
+			// Normalize the scheme
+			var normalized:String = schemeStr.toLowerCase();
+			_scheme = URI.fastEscapeChars(normalized, URI.URIschemeExcludedBitmap);
+		}
+		
+		
+		/**
+		 * The authority (host) of the URI.  Only valid for
+		 * hierarchical URI's.  If the URI is relative, this will
+		 * be an empty string. When setting this value, the string
+		 * given is assumed to be unescaped.  When retrieving this
+		 * value, the resulting string is unescaped.
+		 */
+		public function get authority() : String
+		{ 
+			return URI.unescapeChars(_authority);
+		}
+		public function set authority(authorityStr:String) : void
+		{
+			// Normalize the authority
+			authorityStr = authorityStr.toLowerCase();
+			
+			_authority = URI.fastEscapeChars(authorityStr,
+				URI.URIauthorityExcludedBitmap);
+			
+			// Only hierarchical URI's can have an authority, make
+			// sure this URI is of the proper format.
+			this.hierState = true;
+		}
+		
+		
+		/**
+		 * The username of the URI.  Only valid for hierarchical
+		 * URI's.  If the URI is relative, this will be an empty
+		 * string.
+		 * 
+		 * 
      The URI specification allows for authentication
+		 * credentials to be embedded in the URI as such:
      
+		 * 
+		 * 
      http://user:passwd@host/path/to/file.htm
      
+		 * 
+		 * 
      When setting this value, the string
+		 * given is assumed to be unescaped.  When retrieving this
+		 * value, the resulting string is unescaped.
      
+		 */
+		public function get username() : String
+		{
+			return URI.unescapeChars(_username);
+		}
+		public function set username(usernameStr:String) : void
+		{
+			_username = URI.fastEscapeChars(usernameStr, URI.URIuserpassExcludedBitmap);
+			
+			// Only hierarchical URI's can have a username.
+			this.hierState = true;
+		}
+		
+		
+		/**
+		 * The password of the URI.  Similar to username.
+		 * @see URI.username
+		 */
+		public function get password() : String
+		{
+			return URI.unescapeChars(_password);
+		}
+		public function set password(passwordStr:String) : void
+		{
+			_password = URI.fastEscapeChars(passwordStr,
+				URI.URIuserpassExcludedBitmap);
+			
+			// Only hierarchical URI's can have a password.
+			this.hierState = true;
+		}
+		
+		
+		/**
+		 * The host port number.  Only valid for hierarchical URI's.  If
+		 * the URI is relative, this will be an empty string. URI's can
+		 * contain the port number of the remote host:
+		 * 
+		 * 
      http://site.com:8080/index.htm
      
+		 */
+		public function get port() : String
+		{ 
+			return URI.unescapeChars(_port);
+		}
+		public function set port(portStr:String) : void
+		{
+			_port = URI.escapeChars(portStr);
+			
+			// Only hierarchical URI's can have a port.
+			this.hierState = true;
+		}
+		
+		
+		/**
+		 * The path portion of the URI.  Only valid for hierarchical
+		 * URI's.  When setting this value, the string
+		 * given is assumed to be unescaped.  When retrieving this
+		 * value, the resulting string is unescaped.
+		 * 
+		 * 
      The path portion can be in one of two formats. 1) an absolute
+		 * path, or 2) a relative path.  An absolute path starts with a
+		 * slash ('/'), a relative path does not.
      
+		 * 
+		 * 
      An absolute path may look like:
      
+		 * /full/path/to/my/file.htm
+		 * 
+		 * 
      A relative path may look like:
      
+		 * +		 * path/to/my/file.htm
+		 * ../images/logo.gif
+		 * ../../reports/index.htm
+		 * 
+		 * 
+		 * 
      Paths can be absolute or relative.  Note that this not the same as
+		 * an absolute or relative URI.  An absolute URI can only have absolute
+		 * paths.  For example:
      
+		 * 
+		 * http:/site.com/path/to/file.htm
+		 * 
+		 * 
      This absolute URI has an absolute path of "/path/to/file.htm".
      
+		 * 
+		 * 
      Relative URI's can have either absolute paths or relative paths.
+		 * All of the following relative URI's are valid:
      
+		 * 
+		 * +		 * /absolute/path/to/file.htm
+		 * path/to/file.htm
+		 * ../path/to/file.htm
+		 * 
+		 */
+		public function get path() : String
+		{ 
+			return URI.unescapeChars(_path);
+		}
+		public function set path(pathStr:String) : void
+		{	
+			this._path = URI.fastEscapeChars(pathStr, URI.URIpathExcludedBitmap);
+		
+			if (this._scheme == UNKNOWN_SCHEME)
+			{
+				// We set the path.  This is a valid URI now.
+				this._scheme = "";
+			}
+		
+			// Only hierarchical URI's can have a path.
+			hierState = true;
+		}
+		
+		
+		/**
+		 * The query (CGI) portion of the URI.  This part is valid for
+		 * both hierarchical and non-hierarchical URI's.
+		 * 
+		 * 
      This accessor should only be used if a custom query syntax
+		 * is used.  This URI class supports the common "param=value"
+		 * style query syntax via the get/setQueryValue() and
+		 * get/setQueryByMap() functions.  Those functions should be used
+		 * instead if the common syntax is being used.
+		 * 
+		 * 
      The URI RFC does not specify any particular
+		 * syntax for the query part of a URI.  It is intended to allow
+		 * any format that can be agreed upon by the two communicating hosts.
+		 * However, most systems have standardized on the typical CGI
+		 * format:
      
+		 * 
+		 * http://site.com/script.php?param1=value1¶m2=value2
+		 * 
+		 * 
      This class has specific support for this query syntax
      
+		 * 
+		 * 
      This common query format is an array of name/value
+		 * pairs with its own syntax that is different from the overall URI
+		 * syntax.  The query has its own escaping logic.  For a query part
+		 * to be properly escaped and unescaped, it must be split into its
+		 * component parts.  This accessor escapes/unescapes the entire query
+		 * part without regard for it's component parts.  This has the
+		 * possibliity of leaving the query string in an ambiguious state in
+		 * regards to its syntax.  If the contents of the query part are
+		 * important, it is recommended that get/setQueryValue() or
+		 * get/setQueryByMap() are used instead.
      
+		 * 
+		 * If a different query syntax is being used, a subclass of URI
+		 * can be created to handle that specific syntax.
+		 *  
+		 * @see URI.getQueryValue, URI.getQueryByMap
+		 */
+		public function get query() : String
+		{ 
+			return URI.unescapeChars(_query);
+		}
+		public function set query(queryStr:String) : void
+		{
+			_query = URI.fastEscapeChars(queryStr, URI.URIqueryExcludedBitmap);
+			
+			// both hierarchical and non-hierarchical URI's can
+			// have a query.  Do not set the hierState.
+		}
+		
+		/**
+		 * Accessor to the raw query data.  If you are using a custom query
+		 * syntax, this accessor can be used to get and set the query part
+		 * directly with no escaping/unescaping.  This should ONLY be used
+		 * if your application logic is handling custom query logic and
+		 * handling the proper escaping of the query part.
+		 */
+		public function get queryRaw() : String
+		{
+			return _query;
+		}
+		public function set queryRaw(queryStr:String) : void
+		{
+			_query = queryStr;
+		}
+
+
+		/**
+		 * The fragment (anchor) portion of the URI.  This is valid for
+		 * both hierarchical and non-hierarchical URI's.
+		 */
+		public function get fragment() : String
+		{ 
+			return URI.unescapeChars(_fragment);
+		}
+		public function set fragment(fragmentStr:String) : void
+		{
+			_fragment = URI.fastEscapeChars(fragmentStr, URIfragmentExcludedBitmap);
+
+			// both hierarchical and non-hierarchical URI's can
+			// have a fragment.  Do not set the hierState.
+		}
+		
+		
+		/**
+		 * The non-hierarchical part of the URI.  For example, if
+		 * this URI object represents "mailto:somebody@company.com",
+		 * this will contain "somebody@company.com".  This is valid only
+		 * for non-hierarchical URI's.  
+		 */
+		public function get nonHierarchical() : String
+		{ 
+			return URI.unescapeChars(_nonHierarchical);
+		}
+		public function set nonHierarchical(nonHier:String) : void
+		{
+			_nonHierarchical = URI.fastEscapeChars(nonHier, URInonHierexcludedBitmap);
+			
+			// This is a non-hierarchical URI.
+			this.hierState = false;
+		}
+		
+		
+		/**
+		 * Quick shorthand accessor to set the parts of this URI.
+		 * The given parts are assumed to be in unescaped form.  If
+		 * the URI is non-hierarchical (e.g. mailto:) you will need
+		 * to call SetScheme() and SetNonHierarchical().
+		 */
+		public function setParts(schemeStr:String, authorityStr:String,
+				portStr:String, pathStr:String, queryStr:String,
+				fragmentStr:String) : void
+		{
+			this.scheme = schemeStr;
+			this.authority = authorityStr;
+			this.port = portStr;
+			this.path = pathStr;
+			this.query = queryStr;
+			this.fragment = fragmentStr;
+
+			hierState = true;
+		}
+		
+		
+		/**
+		 * URI escapes the given character string.  This is similar in function
+		 * to the global encodeURIComponent() function in ActionScript, but is
+		 * slightly different in regards to which characters get escaped.  This
+		 * escapes the characters specified in the URIbaselineExluded set (see class
+		 * static members).  This is needed for this class to work properly.
+		 * 
+		 * 
      If a different set of characters need to be used for the escaping,
+		 * you may use fastEscapeChars() and specify a custom URIEncodingBitmap
+		 * that contains the characters your application needs escaped.
      
+		 * 
+		 * 
      Never pass a full URI to this function.  A URI can only be properly
+		 * escaped/unescaped when split into its component parts (see RFC 3986
+		 * section 2.4).  This is due to the fact that the URI component separators
+		 * could be characters that would normally need to be escaped.
      
+		 * 
+		 * @param unescaped character string to be escaped.
+		 * 
+		 * @return	escaped character string
+		 * 
+		 * @see encodeURIComponent
+		 * @see fastEscapeChars
+		 */
+		static public function escapeChars(unescaped:String) : String
+		{
+			// This uses the excluded set by default.
+			return fastEscapeChars(unescaped, URI.URIbaselineExcludedBitmap);
+		}
+		
+
+		/**
+		 * Unescape any URI escaped characters in the given character
+		 * string.
+		 * 
+		 * 
      Never pass a full URI to this function.  A URI can only be properly
+		 * escaped/unescaped when split into its component parts (see RFC 3986
+		 * section 2.4).  This is due to the fact that the URI component separators
+		 * could be characters that would normally need to be escaped.
      
+		 * 
+		 * @param escaped the escaped string to be unescaped.
+		 * 
+		 * @return	unescaped string.
+		 */
+		static public function unescapeChars(escaped:String /*, onlyHighASCII:Boolean = false*/) : String
+		{
+			// We can just use the default AS function.  It seems to
+			// decode everything correctly
+			var unescaped:String;
+			unescaped = decodeURIComponent(escaped);
+			return unescaped;
+		}
+		
+		/**
+		 * Performance focused function that escapes the given character
+		 * string using the given URIEncodingBitmap as the rule for what
+		 * characters need to be escaped.  This function is used by this
+		 * class and can be used externally to this class to perform
+		 * escaping on custom character sets.
+		 * 
+		 * 
      Never pass a full URI to this function.  A URI can only be properly
+		 * escaped/unescaped when split into its component parts (see RFC 3986
+		 * section 2.4).  This is due to the fact that the URI component separators
+		 * could be characters that would normally need to be escaped.
      
+		 * 
+		 * @param unescaped		the unescaped string to be escaped
+		 * @param bitmap		the set of characters that need to be escaped
+		 * 
+		 * @return	the escaped string.
+		 */
+		static public function fastEscapeChars(unescaped:String, bitmap:URIEncodingBitmap) : String
+		{
+			var escaped:String = "";
+			var c:String;
+			var x:int, i:int;
+			
+			for (i = 0; i < unescaped.length; i++)
+			{
+				c = unescaped.charAt(i);
+				
+				x = bitmap.ShouldEscape(c);
+				if (x)
+				{
+					c = x.toString(16);
+					if (c.length == 1)
+						c = "0" + c;
+						
+					c = "%" + c;
+					c = c.toUpperCase();
+				}
+				
+				escaped += c;
+			}
+			
+			return escaped;
+		}
+
+		
+		/**
+		 * Is this URI of a particular scheme type?  For example,
+		 * passing "http" to a URI object that represents the URI
+		 * "http://site.com/" would return true.
+		 * 
+		 * @param scheme	scheme to check for
+		 * 
+		 * @return true if this URI object is of the given type, false
+		 * otherwise.
+		 */
+		public function isOfType(scheme:String) : Boolean
+		{
+			// Schemes are never case sensitive.  Ignore case.
+			scheme = scheme.toLowerCase();
+			return (this._scheme == scheme);
+		}
+
+
+		/**
+		 * Get the value for the specified named in the query part.  This
+		 * assumes the query part of the URI is in the common
+		 * "name1=value1&name2=value2" syntax.  Do not call this function
+		 * if you are using a custom query syntax.
+		 * 
+		 * @param name	name of the query value to get.
+		 * 
+		 * @return the value of the query name, empty string if the
+		 * query name does not exist.
+		 */
+		public function getQueryValue(name:String) : String
+		{
+			var map:Object;
+			var item:String;
+			var value:String;
+		
+			map = getQueryByMap();
+		
+			for (item in map)
+			{
+				if (item == name)
+				{
+					value = map[item];
+					return value;
+				}
+			}
+		
+			// Didn't find the specified key
+			return new String("");
+		}
+		
+
+		/**
+		 * Set the given value on the given query name.  If the given name
+		 * does not exist, it will automatically add this name/value pair
+		 * to the query.  If null is passed as the value, it will remove
+		 * the given item from the query.
+		 * 
+		 * 
      This automatically escapes any characters that may conflict with
+		 * the query syntax so that they are "safe" within the query.  The
+		 * strings passed are assumed to be literal unescaped name and value.
      
+		 * 
+		 * @param name	name of the query value to set
+		 * @param value	value of the query item to set.  If null, this will
+		 * force the removal of this item from the query.
+		 */
+		public function setQueryValue(name:String, value:String) : void
+		{
+			var map:Object;
+
+			map = getQueryByMap();
+		
+			// If the key doesn't exist yet, this will create a new pair in
+			// the map.  If it does exist, this will overwrite the previous
+			// value, which is what we want.
+			map[name] = value;
+		
+			setQueryByMap(map);
+		}
+
+		
+		/**
+		 * Get the query of the URI in an Object class that allows for easy
+		 * access to the query data via Object accessors.  For example:
+		 * 
+		 * +		 * var query:Object = uri.getQueryByMap();
+		 * var value:String = query["param"];    // get a value
+		 * query["param2"] = "foo";   // set a new value
+		 * 
+		 * 
+		 * @return Object that contains the name/value pairs of the query.
+		 * 
+		 * @see #setQueryByMap
+		 * @see #getQueryValue
+		 * @see #setQueryValue
+		 */
+		public function getQueryByMap() : Object
+		{
+			var queryStr:String;
+			var pair:String;
+			var pairs:Array;
+			var item:Array;
+			var name:String, value:String;
+			var index:int;
+			var map:Object = new Object();
+		
+		
+			// We need the raw query string, no unescaping.
+			queryStr = this._query;
+			
+			pairs = queryStr.split('&');
+			for each (pair in pairs)
+			{
+				if (pair.length == 0)
+				  continue;
+				  
+				item = pair.split('=');
+				
+				if (item.length > 0)
+					name = item[0];
+				else
+					continue;  // empty array
+				
+				if (item.length > 1)
+					value = item[1];
+				else
+					value = "";
+					
+				name = queryPartUnescape(name);
+				value = queryPartUnescape(value);
+				
+				map[name] = value;
+			}
+	
+			return map;
+		}
+		
+
+		/**
+		 * Set the query part of this URI using the given object as the
+		 * content source.  Any member of the object that has a value of
+		 * null will not be in the resulting query.
+		 * 
+		 * @param map	object that contains the name/value pairs as
+		 *    members of that object.
+		 * 
+		 * @see #getQueryByMap
+		 * @see #getQueryValue
+		 * @see #setQueryValue
+		 */
+		public function setQueryByMap(map:Object) : void
+		{
+			var item:String;
+			var name:String, value:String;
+			var queryStr:String = "";
+			var tmpPair:String;
+			var foo:String;
+		
+			for (item in map)
+			{
+				name = item;
+				value = map[item];
+		
+				if (value == null)
+					value = "";
+				
+				// Need to escape the name/value pair so that they
+				// don't conflict with the query syntax (specifically
+				// '=', '&', and ).
+				name = queryPartEscape(name);
+				value = queryPartEscape(value);
+				
+				tmpPair = name;
+				
+				if (value.length > 0)
+				{
+					tmpPair += "=";
+					tmpPair += value;
+				}
+
+				if (queryStr.length != 0)
+					queryStr += '&';  // Add the separator
+		
+				queryStr += tmpPair;
+			}
+		
+			// We don't want to escape.  We already escaped the
+			// individual name/value pairs.  If we escaped the
+			// query string again by assigning it to "query",
+			// we would have double escaping.
+			_query = queryStr;
+		}
+		
+		
+		/**
+		 * Similar to Escape(), except this also escapes characters that
+		 * would conflict with the name/value pair query syntax.  This is
+		 * intended to be called on each individual "name" and "value"
+		 * in the query making sure that nothing in the name or value
+		 * strings contain characters that would conflict with the query
+		 * syntax (e.g. '=' and '&').
+		 * 
+		 * @param unescaped		unescaped string that is to be escaped.
+		 * 
+		 * @return escaped string.
+		 * 
+		 * @see #queryUnescape
+		 */
+		static public function queryPartEscape(unescaped:String) : String
+		{
+			var escaped:String = unescaped;
+			escaped = URI.fastEscapeChars(unescaped, URI.URIqueryPartExcludedBitmap);
+			return escaped;
+		}
+		
+
+		/**
+		 * Unescape the individual name/value string pairs.
+		 * 
+		 * @param escaped	escaped string to be unescaped
+		 * 
+		 * @return unescaped string
+		 * 
+		 * @see #queryEscape
+		 */
+		static public function queryPartUnescape(escaped:String) : String
+		{
+			var unescaped:String = escaped;
+			unescaped = unescapeChars(unescaped);
+			return unescaped;
+		}
+		
+		/**
+		 * Output this URI as a string.  The resulting string is properly
+		 * escaped and well formed for machine processing.
+		 */
+		public function toString() : String
+		{
+			if (this == null)
+				return "";
+			else
+				return toStringInternal(false);
+		}
+		
+		/**
+		 * Output the URI as a string that is easily readable by a human.
+		 * This outputs the URI with all escape sequences unescaped to
+		 * their character representation.  This makes the URI easier for
+		 * a human to read, but the URI could be completely invalid
+		 * because some unescaped characters may now cause ambiguous parsing.
+		 * This function should only be used if you want to display a URI to
+		 * a user.  This function should never be used outside that specific
+		 * case.
+		 * 
+		 * @return the URI in string format with all escape sequences
+		 * unescaped.
+		 * 
+		 * @see #toString
+		 */
+		public function toDisplayString() : String
+		{
+			return toStringInternal(true);
+		}
+		
+		
+		/**
+		 * @private
+		 * 
+		 * The guts of toString()
+		 */
+		protected function toStringInternal(forDisplay:Boolean) : String
+		{
+			var uri:String = "";
+			var part:String = "";
+		
+			if (isHierarchical() == false)
+			{
+				// non-hierarchical URI
+		
+				uri += (forDisplay ? this.scheme : _scheme);
+				uri += ":";
+				uri += (forDisplay ? this.nonHierarchical : _nonHierarchical);
+			}
+			else
+			{
+				// Hierarchical URI
+		
+				if (isRelative() == false)
+				{
+					// If it is not a relative URI, then we want the scheme and
+					// authority parts in the string.  If it is relative, we
+					// do NOT want this stuff.
+		
+					if (_scheme.length != 0)
+					{
+						part = (forDisplay ? this.scheme : _scheme);
+						uri += part + ":";
+					}
+		
+					if (_authority.length != 0 || isOfType("file"))
+					{
+						uri += "//";
+		
+						// Add on any username/password associated with this
+						// authority
+						if (_username.length != 0)
+						{
+							part = (forDisplay ? this.username : _username);
+							uri += part;
+		
+							if (_password.length != 0)
+							{
+								part = (forDisplay ? this.password : _password);
+								uri += ":" + part;
+							}
+		
+							uri += "@";
+						}
+		
+						// add the authority
+						part = (forDisplay ? this.authority : _authority);
+						uri += part;
+		
+						// Tack on the port number, if any
+						if (port.length != 0)
+							uri += ":" + port;
+					}
+				}
+		
+				// Tack on the path
+				part = (forDisplay ? this.path : _path);
+				uri += part;
+		
+			} // end hierarchical part
+		
+			// Both non-hier and hierarchical have query and fragment parts
+		
+			// Add on the query and fragment parts
+			if (_query.length != 0)
+			{
+				part = (forDisplay ? this.query : _query);
+				uri += "?" + part;
+			}
+		
+			if (fragment.length != 0)
+			{
+				part = (forDisplay ? this.fragment : _fragment);
+				uri += "#" + part;
+			}
+		
+			return uri;
+		}
+	
+		/**
+		 * Forcefully ensure that this URI is properly escaped.
+		 * 
+		 * 
      Sometimes URI's are constructed by hand using strings outside
+		 * this class.  In those cases, it is unlikely the URI has been
+		 * properly escaped.  This function forcefully escapes this URI
+		 * by unescaping each part and then re-escaping it.  If the URI
+		 * did not have any escaping, the first unescape will do nothing
+		 * and then the re-escape will properly escape everything.  If
+		 * the URI was already escaped, the unescape and re-escape will
+		 * essentally be a no-op.  This provides a safe way to make sure
+		 * a URI is in the proper escaped form.
      
+		 */
+		public function forceEscape() : void
+		{
+			// The accessors for each of the members will unescape
+			// and then re-escape as we get and assign them.
+			
+			// Handle the parts that are common for both hierarchical
+			// and non-hierarchical URI's
+			this.scheme = this.scheme;
+			this.setQueryByMap(this.getQueryByMap());
+			this.fragment = this.fragment;
+			
+			if (isHierarchical())
+			{
+				this.authority = this.authority;
+				this.path = this.path;
+				this.port = this.port;
+				this.username = this.username;
+				this.password = this.password;
+			}
+			else
+			{
+				this.nonHierarchical = this.nonHierarchical;
+			}
+		}
+		
+		
+		/**
+		 * Does this URI point to a resource of the given file type?
+		 * Given a file extension (or just a file name, this will strip the
+		 * extension), check to see if this URI points to a file of that
+		 * type.
+		 * 
+		 * @param extension 	string that contains a file extension with or
+		 * without a dot ("html" and ".html" are both valid), or a file
+		 * name with an extension (e.g. "index.html").
+		 * 
+		 * @return true if this URI points to a resource with the same file
+		 * file extension as the extension provided, false otherwise.
+		 */
+		public function isOfFileType(extension:String) : Boolean
+		{
+			var thisExtension:String;
+			var index:int;
+		
+			index = extension.lastIndexOf(".");
+			if (index != -1)
+			{
+				// Strip the extension
+				extension = extension.substr(index + 1);
+			}
+			else
+			{
+				// The caller passed something without a dot in it.  We
+				// will assume that it is just a plain extension (e.g. "html").
+				// What they passed is exactly what we want
+			}
+		
+			thisExtension = getExtension(true);
+		
+			if (thisExtension == "")
+				return false;
+		
+			// Compare the extensions ignoring case
+			if (compareStr(thisExtension, extension, false) == 0)
+				return true;
+			else
+				return false;
+		}
+		
+		
+		/**
+		 * Get the ".xyz" file extension from the filename in the URI.
+		 * For example, if we have the following URI:
+		 * 
+		 * http://something.com/path/to/my/page.html?form=yes&name=bob#anchor
+		 * 
+		 * 
      This will return ".html".
      
+		 * 
+		 * @param minusDot   If true, this will strip the dot from the extension.
+		 * If true, the above example would have returned "html".
+		 * 
+		 * @return  the file extension
+		 */
+		public function getExtension(minusDot:Boolean = false) : String
+		{
+			var filename:String = getFilename();
+			var extension:String;
+			var index:int;
+		
+			if (filename == "")
+				return String("");
+		
+			index = filename.lastIndexOf(".");
+		
+			// If it doesn't have an extension, or if it is a "hidden" file,
+			// it doesn't have an extension.  Hidden files on unix start with
+			// a dot (e.g. ".login").
+			if (index == -1 || index == 0)
+				return String("");
+		
+			extension = filename.substr(index);
+		
+			// If the caller does not want the dot, remove it.
+			if (minusDot && extension.charAt(0) == ".")
+				extension = extension.substr(1);
+		
+			return extension;
+		}
+		
+		/**
+		 * Quick function to retrieve the file name off the end of a URI.
+		 * 
+		 * 
      For example, if the URI is:
      
+		 * http://something.com/some/path/to/my/file.html
+		 * 
      this function will return "file.html".
      
+		 * 
+		 * @param minusExtension true if the file extension should be stripped
+		 * 
+		 * @return the file name.  If this URI is a directory, the return
+		 * value will be empty string.
+		 */
+		public function getFilename(minusExtension:Boolean = false) : String
+		{
+			if (isDirectory())
+				return String("");
+		
+			var pathStr:String = this.path;
+			var filename:String;
+			var index:int;
+		
+			// Find the last path separator.
+			index = pathStr.lastIndexOf("/");
+		
+			if (index != -1)
+				filename = pathStr.substr(index + 1);
+			else
+				filename = pathStr;
+		
+			if (minusExtension)
+			{
+				// The caller has requested that the extension be removed
+				index = filename.lastIndexOf(".");
+		
+				if (index != -1)
+					filename = filename.substr(0, index);
+			}
+		
+			return filename;
+		}
+		
+		
+		/**
+		 * @private
+		 * Helper function to compare strings.
+		 * 
+		 * @return true if the two strings are identical, false otherwise.
+		 */
+		static protected function compareStr(str1:String, str2:String,
+			sensitive:Boolean = true) : Boolean
+		{
+			if (sensitive == false)
+			{
+				str1 = str1.toLowerCase();
+				str2 = str2.toLowerCase();
+			}
+			
+			return (str1 == str2)
+		}
+		
+		/**
+		 * Based on the type of this URI (http, ftp, etc.) get
+		 * the default port used for that protocol.  This is
+		 * just intended to be a helper function for the most
+		 * common cases.
+		 */
+		public function getDefaultPort() : String
+		{
+			if (_scheme == "http")
+				return String("80");
+			else if (_scheme == "ftp")
+				return String("21");
+			else if (_scheme == "file")
+				return String("");
+			else if (_scheme == "sftp")
+				return String("22"); // ssh standard port
+			else
+			{
+				// Don't know the port for this URI type
+				return String("");
+			}
+		}
+		
+		/**
+		 * @private
+		 * 
+		 * This resolves the given URI if the application has a
+		 * resolver interface defined.  This function does not
+		 * modify the passed in URI and returns a new URI.
+		 */
+		static protected function resolve(uri:URI) : URI
+		{
+			var copy:URI = new URI();
+			copy.copyURI(uri);
+			
+			if (_resolver != null)
+			{
+				// A resolver class has been registered.  Call it.
+				return _resolver.resolve(copy);
+			}
+			else
+			{
+				// No resolver.  Nothing to do, but we don't
+				// want to reuse the one passed in.
+				return copy;
+			}
+		}
+		
+		/**
+		 * Accessor to set and get the resolver object used by all URI
+		 * objects to dynamically resolve URI's before comparison.
+		 */
+		static public function set resolver(resolver:IURIResolver) : void
+		{
+			_resolver = resolver;
+		}
+		static public function get resolver() : IURIResolver
+		{
+			return _resolver;
+		}
+		
+		/**
+		 * Given another URI, return this URI object's relation to the one given.
+		 * URI's can have 1 of 4 possible relationships.  They can be unrelated,
+		 * equal, parent, or a child of the given URI.
+		 * 
+		 * @param uri	URI to compare this URI object to.
+		 * @param caseSensitive  true if the URI comparison should be done
+		 * taking case into account, false if the comparison should be
+		 * performed case insensitive.
+		 * 
+		 * @return URI.NOT_RELATED, URI.CHILD, URI.PARENT, or URI.EQUAL
+		 */
+		public function getRelation(uri:URI, caseSensitive:Boolean = true) : int
+		{
+			// Give the app a chance to resolve these URI's before we compare them.
+			var thisURI:URI = URI.resolve(this);
+			var thatURI:URI = URI.resolve(uri);
+			
+			if (thisURI.isRelative() || thatURI.isRelative())
+			{
+				// You cannot compare relative URI's due to their lack of context.
+				// You could have two relative URI's that look like:
+				//		../../images/
+				//		../../images/marketing/logo.gif
+				// These may appear related, but you have no overall context
+				// from which to make the comparison.  The first URI could be
+				// from one site and the other URI could be from another site.
+				return URI.NOT_RELATED;
+			}
+			else if (thisURI.isHierarchical() == false || thatURI.isHierarchical() == false)
+			{
+				// One or both of the URI's are non-hierarchical.
+				if (((thisURI.isHierarchical() == false) && (thatURI.isHierarchical() == true)) ||
+					((thisURI.isHierarchical() == true) && (thatURI.isHierarchical() == false)))
+				{
+					// XOR.  One is hierarchical and the other is
+					// non-hierarchical.  They cannot be compared.
+					return URI.NOT_RELATED;
+				}
+				else
+				{
+					// They are both non-hierarchical
+					if (thisURI.scheme != thatURI.scheme)
+						return URI.NOT_RELATED;
+		
+					if (thisURI.nonHierarchical != thatURI.nonHierarchical)
+						return URI.NOT_RELATED;
+						
+					// The two non-hierarcical URI's are equal.
+					return URI.EQUAL;
+				}
+			}
+			
+			// Ok, this URI and the one we are being compared to are both
+			// absolute hierarchical URI's.
+		
+			if (thisURI.scheme != thatURI.scheme)
+				return URI.NOT_RELATED;
+		
+			if (thisURI.authority != thatURI.authority)
+				return URI.NOT_RELATED;
+		
+			var thisPort:String = thisURI.port;
+			var thatPort:String = thatURI.port;
+			
+			// Different ports are considered completely different servers.
+			if (thisPort == "")
+				thisPort = thisURI.getDefaultPort();
+			if (thatPort == "")
+				thatPort = thatURI.getDefaultPort();
+		
+			// Check to see if the port is the default port.
+			if (thisPort != thatPort)
+				return URI.NOT_RELATED;
+		
+			if (compareStr(thisURI.path, thatURI.path, caseSensitive))
+				return URI.EQUAL;
+		
+			// Special case check.  If we are here, the scheme, authority,
+			// and port match, and it is not a relative path, but the
+			// paths did not match.  There is a special case where we
+			// could have:
+			//		http://something.com/
+			//		http://something.com
+			// Technically, these are equal.  So lets, check for this case.
+			var thisPath:String = thisURI.path;
+			var thatPath:String = thatURI.path;
+		
+			if ( (thisPath == "/" || thatPath == "/") &&
+				 (thisPath == "" || thatPath == "") )
+			{
+				// We hit the special case.  These two are equal.
+				return URI.EQUAL;
+			}
+		
+			// Ok, the paths do not match, but one path may be a parent/child
+			// of the other.  For example, we may have:
+			//		http://something.com/path/to/homepage/
+			//		http://something.com/path/to/homepage/images/logo.gif
+			// In this case, the first is a parent of the second (or the second
+			// is a child of the first, depending on which you compare to the
+			// other).  To make this comparison, we must split the path into
+			// its component parts (split the string on the '/' path delimiter).
+			// We then compare the 
+			var thisParts:Array, thatParts:Array;
+			var thisPart:String, thatPart:String;
+			var i:int;
+		
+			thisParts = thisPath.split("/");
+			thatParts = thatPath.split("/");
+		
+			if (thisParts.length > thatParts.length)
+			{
+				thatPart = thatParts[thatParts.length - 1];
+				if (thatPart.length > 0)
+				{
+					// if the last part is not empty, the passed URI is
+					// not a directory.  There is no way the passed URI
+					// can be a parent.
+					return URI.NOT_RELATED;
+				}
+				else
+				{
+					// Remove the empty trailing part
+					thatParts.pop();
+				}
+				
+				// This may be a child of the one passed in
+				for (i = 0; i < thatParts.length; i++)
+				{
+					thisPart = thisParts[i];
+					thatPart = thatParts[i];
+						
+					if (compareStr(thisPart, thatPart, caseSensitive) == false)
+						return URI.NOT_RELATED;
+				}
+		
+				return URI.CHILD;
+			}
+			else if (thisParts.length < thatParts.length)
+			{
+				thisPart = thisParts[thisParts.length - 1];
+				if (thisPart.length > 0)
+				{
+					// if the last part is not empty, this URI is not a
+					// directory.  There is no way this object can be
+					// a parent.
+					return URI.NOT_RELATED;
+				}
+				else
+				{
+					// Remove the empty trailing part
+					thisParts.pop();
+				}
+				
+				// This may be the parent of the one passed in
+				for (i = 0; i < thisParts.length; i++)
+				{
+					thisPart = thisParts[i];
+					thatPart = thatParts[i];
+		
+					if (compareStr(thisPart, thatPart, caseSensitive) == false)
+						return URI.NOT_RELATED;
+				}
+				
+				return URI.PARENT;
+			}
+			else
+			{
+				// Both URI's have the same number of path components, but
+				// it failed the equivelence check above.  This means that
+				// the two URI's are not related.
+				return URI.NOT_RELATED;
+			}
+			
+			// If we got here, the scheme and authority are the same,
+			// but the paths pointed to two different locations that
+			// were in different parts of the file system tree
+			return URI.NOT_RELATED;
+		}
+		
+		/**
+		 * Given another URI, return the common parent between this one
+		 * and the provided URI.
+		 * 
+		 * @param uri the other URI from which to find a common parent
+		 * @para caseSensitive true if this operation should be done
+		 * with case sensitive comparisons.
+		 * 
+		 * @return the parent URI if successful, null otherwise.
+		 */
+		public function getCommonParent(uri:URI, caseSensitive:Boolean = true) : URI
+		{
+			var thisURI:URI = URI.resolve(this);
+			var thatURI:URI = URI.resolve(uri);
+		
+			if(!thisURI.isAbsolute() || !thatURI.isAbsolute() ||
+				thisURI.isHierarchical() == false ||
+				thatURI.isHierarchical() == false)
+			{
+				// Both URI's must be absolute hierarchical for this to
+				// make sense.
+				return null;
+			}
+			
+			var relation:int = thisURI.getRelation(thatURI);
+			if (relation == URI.NOT_RELATED)
+			{
+				// The given URI is not related to this one.  No
+				// common parent.
+				return null;
+			}
+		
+			thisURI.chdir(".");
+			thatURI.chdir(".");
+			
+			var strBefore:String, strAfter:String;
+			do
+			{
+				relation = thisURI.getRelation(thatURI, caseSensitive);
+				if(relation == URI.EQUAL || relation == URI.PARENT)
+					break;
+		
+				// If strBefore and strAfter end up being the same,
+				// we know we are at the root of the path because
+				// chdir("..") is doing nothing.
+				strBefore = thisURI.toString();
+				thisURI.chdir("..");
+				strAfter = thisURI.toString();
+			}
+			while(strBefore != strAfter);
+		
+			return thisURI;
+		}
+		
+		
+		/**
+		 * This function is used to move around in a URI in a way similar
+		 * to the 'cd' or 'chdir' commands on Unix.  These operations are
+		 * completely string based, using the context of the URI to
+		 * determine the position within the path.  The heuristics used
+		 * to determine the action are based off Appendix C in RFC 2396.
+		 * 
+		 * 
      URI paths that end in '/' are considered paths that point to
+		 * directories, while paths that do not end in '/' are files.  For
+		 * example, if you execute chdir("d") on the following URI's:
      
+		 *    1.  http://something.com/a/b/c/  (directory)
      
+		 *    2.  http://something.com/a/b/c  (not directory)
      
+		 * you will get:
      
+		 *    1.  http://something.com/a/b/c/d
      
+		 *    2.  http://something.com/a/b/d
      
+		 * 
+		 * 
      See RFC 2396, Appendix C for more info.
      
+		 * 
+		 * @param reference	the URI or path to "cd" to.
+		 * @param escape true if the passed reference string should be URI
+		 * escaped before using it.
+		 * 
+		 * @return true if the chdir was successful, false otherwise.
+		 */
+		public function chdir(reference:String, escape:Boolean = false) : Boolean
+		{
+			var uriReference:URI;
+			var ref:String = reference;
+		
+			if (escape)
+				ref = URI.escapeChars(reference);
+		
+			if (ref == "")
+			{
+				// NOOP
+				return true;
+			}
+			else if (ref.substr(0, 2) == "//")
+			{
+				// Special case.  This is an absolute URI but without the scheme.
+				// Take the scheme from this URI and tack it on.  This is
+				// intended to make working with chdir() a little more
+				// tolerant.
+				var final:String = this.scheme + ":" + ref;
+				
+				return constructURI(final);
+			}
+			else if (ref.charAt(0) == "?")
+			{
+				// A relative URI that is just a query part is essentially
+				// a "./?query".  We tack on the "./" here to make the rest
+				// of our logic work.
+				ref = "./" + ref;
+			}
+		
+			// Parse the reference passed in as a URI.  This way we
+			// get any query and fragments parsed out as well.
+			uriReference = new URI(ref);
+		
+			if (uriReference.isAbsolute() ||
+				uriReference.isHierarchical() == false)
+			{
+				// If the URI given is a full URI, it replaces this one.
+				copyURI(uriReference);
+				return true;
+			}
+		
+		
+			var thisPath:String, thatPath:String;
+			var thisParts:Array, thatParts:Array;
+			var thisIsDir:Boolean = false, thatIsDir:Boolean = false;
+			var thisIsAbs:Boolean = false, thatIsAbs:Boolean = false;
+			var lastIsDotOperation:Boolean = false;
+			var curDir:String;
+			var i:int;
+		
+			thisPath = this.path;
+			thatPath = uriReference.path;
+		
+			if (thisPath.length > 0)
+				thisParts = thisPath.split("/");
+			else
+				thisParts = new Array();
+				
+			if (thatPath.length > 0)
+				thatParts = thatPath.split("/");
+			else
+				thatParts = new Array();
+			
+			if (thisParts.length > 0 && thisParts[0] == "")
+			{
+				thisIsAbs = true;
+				thisParts.shift(); // pop the first one off the array
+			}
+			if (thisParts.length > 0 && thisParts[thisParts.length - 1] == "")
+			{
+				thisIsDir = true;
+				thisParts.pop();  // pop the last one off the array
+			}
+				
+			if (thatParts.length > 0 && thatParts[0] == "")
+			{
+				thatIsAbs = true;
+				thatParts.shift(); // pop the first one off the array
+			}
+			if (thatParts.length > 0 && thatParts[thatParts.length - 1] == "")
+			{
+				thatIsDir = true;
+				thatParts.pop();  // pop the last one off the array
+			}
+				
+			if (thatIsAbs)
+			{
+				// The reference is an absolute path (starts with a slash).
+				// It replaces this path wholesale.
+				this.path = uriReference.path;
+		
+				// And it inherits the query and fragment
+				this.queryRaw = uriReference.queryRaw;
+				this.fragment = uriReference.fragment;
+		
+				return true;
+			}
+			else if (thatParts.length == 0 && uriReference.query == "")
+			{
+				// The reference must have only been a fragment.  Fragments just
+				// get appended to whatever the current path is.  We don't want
+				// to overwrite any query that may already exist, so this case
+				// only takes on the new fragment.
+				this.fragment = uriReference.fragment;
+				return true;
+			}
+			else if (thisIsDir == false && thisParts.length > 0)
+			{
+				// This path ends in a file.  It goes away no matter what.
+				thisParts.pop();
+			}
+		
+			// By default, this assumes the query and fragment of the reference
+			this.queryRaw = uriReference.queryRaw;
+			this.fragment = uriReference.fragment;
+		
+			// Append the parts of the path from the passed in reference
+			// to this object's path.
+			thisParts = thisParts.concat(thatParts);
+					
+			for(i = 0; i < thisParts.length; i++)
+			{
+				curDir = thisParts[i];
+				lastIsDotOperation = false;
+		
+				if (curDir == ".")
+				{
+					thisParts.splice(i, 1);
+					i = i - 1;  // account for removing this item
+					lastIsDotOperation = true;
+				}
+				else if (curDir == "..")
+				{
+					if (i >= 1)
+					{
+						if (thisParts[i - 1] == "..")
+						{
+							// If the previous is a "..", we must have skipped
+							// it due to this URI being relative.  We can't
+							// collapse leading ".."s in a relative URI, so
+							// do nothing.
+						}
+						else
+						{
+							thisParts.splice(i - 1, 2);
+							i = i - 2;  // move back to account for the 2 we removed
+						}
+					}
+					else
+					{
+						// This is the first thing in the path.
+		
+						if (isRelative())
+						{
+							// We can't collapse leading ".."s in a relative
+							// path.  Do noting.
+						}
+						else
+						{
+							// This is an abnormal case.  We have dot-dotted up
+							// past the base of our "file system".  This is a
+							// case where we had a /path/like/this.htm and were
+							// given a path to chdir to like this:
+							// ../../../../../../mydir
+							// Obviously, it has too many ".." and will take us
+							// up beyond the top of the URI.  However, according
+							// RFC 2396 Appendix C.2, we should try to handle
+							// these abnormal cases appropriately.  In this case,
+							// we will do what UNIX command lines do if you are
+							// at the root (/) of the filesystem and execute:
+							// # cd ../../../../../bin
+							// Which will put you in /bin.  Essentially, the extra
+							// ".."'s will just get eaten.
+		
+							thisParts.splice(i, 1);
+							i = i - 1;  // account for the ".." we just removed
+						}
+					}
+		
+					lastIsDotOperation = true;
+				}
+			}
+			
+			var finalPath:String = "";
+		
+			// If the last thing in the path was a "." or "..", then this thing is a
+			// directory.  If the last thing isn't a dot-op, then we don't want to 
+			// blow away any information about the directory (hence the "|=" binary
+			// assignment).
+			thatIsDir = thatIsDir || lastIsDotOperation;
+		
+			// Reconstruct the path with the abs/dir info we have
+			finalPath = joinPath(thisParts, thisIsAbs, thatIsDir);
+		
+			// Set the path (automatically escaping it)
+			this.path = finalPath;
+		
+			return true;
+		}
+		
+		/**
+		 * @private
+		 * Join an array of path parts back into a URI style path string.
+		 * This is used by the various path logic functions to recombine
+		 * a path.  This is different than the standard Array.join()
+		 * function because we need to take into account the starting and
+		 * ending path delimiters if this is an absolute path or a
+		 * directory.
+		 * 
+		 * @param parts	the Array that contains strings of each path part.
+		 * @param isAbs		true if the given path is absolute
+		 * @param isDir		true if the given path is a directory
+		 * 
+		 * @return the combined path string.
+		 */
+		protected function joinPath(parts:Array, isAbs:Boolean, isDir:Boolean) : String
+		{
+			var pathStr:String = "";
+			var i:int;
+		
+			for (i = 0; i < parts.length; i++)
+			{
+				if (pathStr.length > 0)
+					pathStr += "/";
+		
+				pathStr += parts[i];
+			}
+		
+			// If this path is a directory, tack on the directory delimiter,
+			// but only if the path contains something.  Adding this to an
+			// empty path would make it "/", which is an absolute path that
+			// starts at the root.
+			if (isDir && pathStr.length > 0)
+				pathStr += "/";
+		
+			if (isAbs)
+				pathStr = "/" + pathStr;
+		
+			return pathStr;
+		}
+		
+		/**
+		 * Given an absolute URI, make this relative URI absolute using
+		 * the given URI as a base.  This URI instance must be relative
+		 * and the base_uri must be absolute.
+		 * 
+		 * @param base_uri	URI to use as the base from which to make
+		 * this relative URI into an absolute URI.
+		 * 
+		 * @return true if successful, false otherwise.
+		 */
+		public function makeAbsoluteURI(base_uri:URI) : Boolean
+		{
+			if (isAbsolute() || base_uri.isRelative())
+			{
+				// This URI needs to be relative, and the base needs to be
+				// absolute otherwise we won't know what to do!
+				return false;
+			}
+		
+			// Make a copy of the base URI.  We don't want to modify
+			// the passed URI.
+			var base:URI = new URI();
+			base.copyURI(base_uri);
+		
+			// ChDir on the base URI.  This will preserve any query
+			// and fragment we have.
+			if (base.chdir(toString()) == false)
+				return false;
+		
+			// It worked, so copy the base into this one
+			copyURI(base);
+		
+			return true;
+		}
+		
+		
+		/**
+		 * Given a URI to use as a base from which this object should be
+		 * relative to, convert this object into a relative URI.  For example,
+		 * if you have:
+		 * 
+		 * +		 * var uri1:URI = new URI("http://something.com/path/to/some/file.html");
+		 * var uri2:URI = new URI("http://something.com/path/to/another/file.html");
+		 * 
+		 * uri1.MakeRelativePath(uri2);
+		 * 
+		 * 
      uri1 will have a final value of "../some/file.html"
      
+		 * 
+		 * 
      Note! This function is brute force.  If you have two URI's
+		 * that are completely unrelated, this will still attempt to make
+		 * the relative URI.  In that case, you will most likely get a
+		 * relative path that looks something like:
      
+		 * 
+		 * 
      ../../../../../../some/path/to/my/file.html
      
+		 * 
+		 * @param base_uri the URI from which to make this URI relative
+		 * 
+		 * @return true if successful, false if the base_uri and this URI
+		 * are not related, of if error.
+		 */
+		public function makeRelativeURI(base_uri:URI, caseSensitive:Boolean = true) : Boolean
+		{
+			var base:URI = new URI();
+			base.copyURI(base_uri);
+			
+			var thisParts:Array, thatParts:Array;
+			var finalParts:Array = new Array();
+			var thisPart:String, thatPart:String, finalPath:String;
+			var pathStr:String = this.path;
+			var queryStr:String = this.queryRaw;
+			var fragmentStr:String = this.fragment;
+			var i:int;
+			var diff:Boolean = false;
+			var isDir:Boolean = false;
+		
+			if (isRelative())
+			{
+				// We're already relative.
+				return true;
+			}
+		
+			if (base.isRelative())
+			{
+				// The base is relative.  A relative base doesn't make sense.
+				return false;
+			}
+		
+		
+			if ( (isOfType(base_uri.scheme) == false) ||
+				(this.authority != base_uri.authority) )
+			{
+				// The schemes and/or authorities are different.  We can't
+				// make a relative path to something that is completely
+				// unrelated.
+				return false;
+			}
+		
+			// Record the state of this URI
+			isDir = isDirectory();
+		
+			// We are based of the directory of the given URI.  We need to
+			// make sure the URI is pointing to a directory.  Changing
+			// directory to "." will remove any file name if the base is
+			// not a directory.
+			base.chdir(".");
+		
+			thisParts = pathStr.split("/");
+			thatParts = base.path.split("/");
+			
+			if (thisParts.length > 0 && thisParts[0] == "")
+				thisParts.shift();
+			
+			if (thisParts.length > 0 && thisParts[thisParts.length - 1] == "")
+			{
+				isDir = true;
+				thisParts.pop();
+			}
+			
+			if (thatParts.length > 0 && thatParts[0] == "")
+				thatParts.shift();
+			if (thatParts.length > 0 && thatParts[thatParts.length - 1] == "")
+				thatParts.pop();
+		
+		
+			// Now that we have the paths split into an array of directories,
+			// we can compare the two paths.  We start from the left of side
+			// of the path and start comparing.  When we either run out of
+			// directories (one path is longer than the other), or we find
+			// a directory that is different, we stop.  The remaining parts
+			// of each path is then used to determine the relative path.  For
+			// example, lets say we have:
+			//    path we want to make relative: /a/b/c/d/e.txt
+			//    path to use as base for relative: /a/b/f/
+			//
+			// This loop will start at the left, and remove directories
+			// until we get a mismatch or run off the end of one of them.
+			// In this example, the result will be:
+			//    c/d/e.txt
+			//    f
+			//
+			// For every part left over in the base path, we prepend a ".."
+			// to the relative to get the final path:
+			//   ../c/d/e.txt
+			while(thatParts.length > 0)
+			{
+				if (thisParts.length == 0)
+				{
+					// we matched all there is to match, we are done.
+					// This is the case where "this" object is a parent
+					// path of the given URI.  eg:
+					//   this.path = /a/b/				(thisParts)
+					//   base.path = /a/b/c/d/e/		(thatParts)
+					break;
+				}
+		
+				thisPart = thisParts[0];
+				thatPart = thatParts[0];
+		
+				if (compareStr(thisPart, thatPart, caseSensitive))
+				{
+					thisParts.shift();
+					thatParts.shift();
+				}
+				else
+					break;
+			}
+		
+			// If there are any path info left from the base URI, that means
+			// **this** object is above the given URI in the file tree.  For
+			// each part left over in the given URI, we need to move up one
+			// directory to get where we are.
+			var dotdot:String = "..";
+			for (i = 0; i < thatParts.length; i++)
+			{
+				finalParts.push(dotdot);
+			}
+		
+			// Append the parts of this URI to any dot-dot's we have
+			finalParts = finalParts.concat(thisParts);
+		
+			// Join the parts back into a path
+			finalPath = joinPath(finalParts, false /* not absolute */, isDir);
+		
+			if (finalPath.length == 0)
+			{
+				// The two URI's are exactly the same.  The proper relative
+				// path is:
+				finalPath = "./";
+			}
+		
+			// Set the parts of the URI, preserving the original query and
+			// fragment parts.
+			setParts("", "", "", finalPath, queryStr, fragmentStr);
+		
+			return true;
+		}
+		
+		/**
+		 * Given a string, convert it to a URI.  The string could be a
+		 * full URI that is improperly escaped, a malformed URI (e.g.
+		 * missing a protocol like "www.something.com"), a relative URI,
+		 * or any variation there of.
+		 * 
+		 * 
      The intention of this function is to take anything that a
+		 * user might manually enter as a URI/URL and try to determine what
+		 * they mean.  This function differs from the URI constructor in
+		 * that it makes some assumptions to make it easy to import user
+		 * entered URI data.
      
+		 * 
+		 * 
      This function is intended to be a helper function.
+		 * It is not all-knowning and will probably make mistakes
+		 * when attempting to parse a string of unknown origin.  If
+		 * your applicaiton is receiving input from the user, your
+		 * application should already have a good idea what the user
+		 * should  be entering, and your application should be
+		 * pre-processing the user's input to make sure it is well formed
+		 * before passing it to this function.
      
+		 * 
+		 * 
      It is assumed that the string given to this function is
+		 * something the user may have manually entered.  Given this,
+		 * the URI string is probably unescaped or improperly escaped.
+		 * This function will attempt to properly escape the URI by
+		 * using forceEscape().  The result is that a toString() call
+		 * on a URI that was created from unknownToURI() may not match
+		 * the input string due to the difference in escaping.
      
+		 *
+		 * @param unknown	a potental URI string that should be parsed
+		 * and loaded into this object.
+		 * @param defaultScheme	if it is determined that the passed string
+		 * looks like a URI, but it is missing the scheme part, this
+		 * string will be used as the missing scheme.
+		 * 
+		 * @return	true if the given string was successfully parsed into
+		 * a valid URI object, false otherwise.
+		 */
+		public function unknownToURI(unknown:String, defaultScheme:String = "http") : Boolean
+		{
+			var temp:String;
+			
+			if (unknown.length == 0)
+			{
+				this.initialize();
+				return false;
+			}
+			
+			// Some users love the backslash key.  Fix it.
+			unknown = unknown.replace(/\\/g, "/");
+			
+			// Check for any obviously missing scheme.
+			if (unknown.length >= 2)
+			{
+				temp = unknown.substr(0, 2);
+				if (temp == "//")
+					unknown = defaultScheme + ":" + unknown;
+			}
+			
+			if (unknown.length >= 3)
+			{
+				temp = unknown.substr(0, 3);
+				if (temp == "://")
+					unknown = defaultScheme + unknown;
+			}
+
+			// Try parsing it as a normal URI
+			var uri:URI = new URI(unknown);
+		
+			if (uri.isHierarchical() == false)
+			{
+				if (uri.scheme == UNKNOWN_SCHEME)
+				{
+					this.initialize();
+					return false;
+				}
+		
+				// It's a non-hierarchical URI
+				copyURI(uri);
+				forceEscape();
+				return true;
+			}
+			else if ((uri.scheme != UNKNOWN_SCHEME) &&
+				(uri.scheme.length > 0))
+			{
+				if ( (uri.authority.length > 0) ||
+					(uri.scheme == "file") )
+				{
+					// file://... URI
+					copyURI(uri);
+					forceEscape();  // ensure proper escaping
+					return true;
+				}
+				else if (uri.authority.length == 0 && uri.path.length == 0)
+				{
+					// It's is an incomplete URI (eg "http://")
+					
+					setParts(uri.scheme, "", "", "", "", "");
+					return false;
+				}
+			}
+			else
+			{
+				// Possible relative URI.  We can only detect relative URI's
+				// that start with "." or "..".  If it starts with something
+				// else, the parsing is ambiguous.
+				var path:String = uri.path;
+		
+				if (path == ".." || path == "." || 
+					(path.length >= 3 && path.substr(0, 3) == "../") ||
+					(path.length >= 2 && path.substr(0, 2) == "./") )
+				{
+					// This is a relative URI.
+					copyURI(uri);
+					forceEscape();
+					return true;
+				}
+			}
+		
+			// Ok, it looks like we are just a normal URI missing the scheme.  Tack
+			// on the scheme.
+			uri = new URI(defaultScheme + "://" + unknown);
+		
+			// Check to see if we are good now
+			if (uri.scheme.length > 0 && uri.authority.length > 0)
+			{
+				// It was just missing the scheme.
+				copyURI(uri);
+				forceEscape();  // Make sure we are properly encoded.
+				return true;
+			}
+		
+			// don't know what this is
+			this.initialize();
+			return false;
+		}
+		
+	} // end URI class
+} // end package
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/net/URIEncodingBitmap.as b/vendors/uploadify/com/adobe/net/URIEncodingBitmap.as
new file mode 100644
index 000000000..d786b33fa
--- /dev/null
+++ b/vendors/uploadify/com/adobe/net/URIEncodingBitmap.as
@@ -0,0 +1,139 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.net
+{
+	import flash.utils.ByteArray;
+	
+	/**
+	 * This class implements an efficient lookup table for URI
+	 * character escaping.  This class is only needed if you
+	 * create a derived class of URI to handle custom URI
+	 * syntax.  This class is used internally by URI.
+	 * 
+	 * @langversion ActionScript 3.0
+	 * @playerversion Flash 9.0* 
+	 */
+	public class URIEncodingBitmap extends ByteArray
+	{
+		/**
+		 * Constructor.  Creates an encoding bitmap using the given
+		 * string of characters as the set of characters that need
+		 * to be URI escaped.
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */
+		public function URIEncodingBitmap(charsToEscape:String) : void
+		{
+			var i:int;
+			var data:ByteArray = new ByteArray();
+			
+			// Initialize our 128 bits (16 bytes) to zero
+			for (i = 0; i < 16; i++)
+				this.writeByte(0);
+				
+			data.writeUTFBytes(charsToEscape);
+			data.position = 0;
+			
+			while (data.bytesAvailable)
+			{
+				var c:int = data.readByte();
+				
+				if (c > 0x7f)
+					continue;  // only escape low bytes
+					
+				var enc:int;
+				this.position = (c >> 3);
+				enc = this.readByte();
+				enc |= 1 << (c & 0x7);
+				this.position = (c >> 3);
+				this.writeByte(enc);
+			}
+		}
+		
+		/**
+		 * Based on the data table contained in this object, check
+		 * if the given character should be escaped.
+		 * 
+		 * @param char	the character to be escaped.  Only the first
+		 * character in the string is used.  Any other characters
+		 * are ignored.
+		 * 
+		 * @return	the integer value of the raw UTF8 character.  For
+		 * example, if '%' is given, the return value is 37 (0x25).
+		 * If the character given does not need to be escaped, the
+		 * return value is zero.
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0 
+		 */
+		public function ShouldEscape(char:String) : int
+		{
+			var data:ByteArray = new ByteArray();
+			var c:int, mask:int;
+			
+			// write the character into a ByteArray so
+			// we can pull it out as a raw byte value.
+			data.writeUTFBytes(char);
+			data.position = 0;
+			c = data.readByte();
+			
+			if (c & 0x80)
+			{
+				// don't escape high byte characters.  It can make international
+				// URI's unreadable.  We just want to escape characters that would
+				// make URI syntax ambiguous.
+				return 0;
+			}
+			else if ((c < 0x1f) || (c == 0x7f))
+			{
+				// control characters must be escaped.
+				return c;
+			}
+			
+			this.position = (c >> 3);
+			mask = this.readByte();
+			
+			if (mask & (1 << (c & 0x7)))
+			{
+				// we need to escape this, return the numeric value
+				// of the character
+				return c;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/net/proxies/RFC2817Socket.as b/vendors/uploadify/com/adobe/net/proxies/RFC2817Socket.as
new file mode 100644
index 000000000..e73e9e7df
--- /dev/null
+++ b/vendors/uploadify/com/adobe/net/proxies/RFC2817Socket.as
@@ -0,0 +1,198 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.net.proxies
+{
+	import flash.events.Event;
+	import flash.events.IOErrorEvent;
+	import flash.events.ProgressEvent;
+	import flash.net.Socket;
+
+	/**
+	 * This class allows TCP socket connections through HTTP proxies in accordance with
+	 * RFC 2817:
+	 * 
+	 * ftp://ftp.rfc-editor.org/in-notes/rfc2817.txt
+	 * 
+	 * It can also be used to make direct connections to a destination, as well. If you
+	 * pass the host and port into the constructor, no proxy will be used. You can also
+	 * call connect, passing in the host and the port, and if you didn't set the proxy
+	 * info, a direct connection will be made. A proxy is only used after you have called
+	 * the setProxyInfo function.
+	 * 
+	 * The connection to and negotiation with the proxy is completely hidden. All the
+	 * same events are thrown whether you are using a proxy or not, and the data you
+	 * receive from the target server will look exact as it would if you were connected
+	 * to it directly rather than through a proxy.
+	 * 
+	 * @author Christian Cantrell
+	 * 
+	 **/
+	public class RFC2817Socket
+		extends Socket
+	{
+		private var proxyHost:String = null;
+		private var host:String = null;
+		private var proxyPort:int = 0;
+		private var port:int = 0;
+		private var deferredEventHandlers:Object = new Object();
+		private var buffer:String = new String();
+
+		/**
+		 * Construct a new RFC2817Socket object. If you pass in the host and the port,
+		 * no proxy will be used. If you want to use a proxy, instantiate with no
+		 * arguments, call setProxyInfo, then call connect.
+		 **/
+		public function RFC2817Socket(host:String = null, port:int = 0)
+		{
+			super(host, port);
+		}
+		
+		/**
+		 * Set the proxy host and port number. Your connection will only proxied if
+		 * this function has been called.
+		 **/
+		public function setProxyInfo(host:String, port:int):void
+		{
+			this.proxyHost = host;
+			this.proxyPort = port;
+
+			var deferredSocketDataHandler:Object = this.deferredEventHandlers[ProgressEvent.SOCKET_DATA];
+			var deferredConnectHandler:Object = this.deferredEventHandlers[Event.CONNECT];
+
+			if (deferredSocketDataHandler != null)
+			{
+				super.removeEventListener(ProgressEvent.SOCKET_DATA, deferredSocketDataHandler.listener, deferredSocketDataHandler.useCapture);
+			}
+
+			if (deferredConnectHandler != null)
+			{
+				super.removeEventListener(Event.CONNECT, deferredConnectHandler.listener, deferredConnectHandler.useCapture);
+			}
+		}
+		
+		/**
+		 * Connect to the specified host over the specified port. If you want your
+		 * connection proxied, call the setProxyInfo function first.
+		 **/
+		public override function connect(host:String, port:int):void
+		{
+			if (this.proxyHost == null)
+			{
+				this.redirectConnectEvent();
+				this.redirectSocketDataEvent();
+				super.connect(host, port);
+			}
+			else
+			{
+				this.host = host;
+				this.port = port;
+				super.addEventListener(Event.CONNECT, this.onConnect);
+				super.addEventListener(ProgressEvent.SOCKET_DATA, this.onSocketData);
+				super.connect(this.proxyHost, this.proxyPort);
+			}
+		}
+
+		private function onConnect(event:Event):void
+		{
+			this.writeUTFBytes("CONNECT "+this.host+":"+this.port+" HTTP/1.1\n\n");
+			this.flush();
+			this.redirectConnectEvent();
+		}
+		
+		private function onSocketData(event:ProgressEvent):void
+		{
+			while (this.bytesAvailable != 0)
+			{
+				this.buffer += this.readUTFBytes(1);
+				if (this.buffer.search(/\r?\n\r?\n$/) != -1)
+				{
+					this.checkResponse(event);
+					break;
+				}
+			}
+		}
+		
+		private function checkResponse(event:ProgressEvent):void
+		{
+			var responseCode:String = this.buffer.substr(this.buffer.indexOf(" ")+1, 3);
+
+			if (responseCode.search(/^2/) == -1)
+			{
+				var ioError:IOErrorEvent = new IOErrorEvent(IOErrorEvent.IO_ERROR);
+				ioError.text = "Error connecting to the proxy ["+this.proxyHost+"] on port ["+this.proxyPort+"]: " + this.buffer;
+				this.dispatchEvent(ioError);
+			}
+			else
+			{
+				this.redirectSocketDataEvent();
+				this.dispatchEvent(new Event(Event.CONNECT));
+				if (this.bytesAvailable > 0)
+				{
+					this.dispatchEvent(event);
+				}
+			}
+			this.buffer = null;
+		}
+		
+		private function redirectConnectEvent():void
+		{
+			super.removeEventListener(Event.CONNECT, onConnect);
+			var deferredEventHandler:Object = this.deferredEventHandlers[Event.CONNECT];
+			if (deferredEventHandler != null)
+			{
+				super.addEventListener(Event.CONNECT, deferredEventHandler.listener, deferredEventHandler.useCapture, deferredEventHandler.priority, deferredEventHandler.useWeakReference);			
+			}
+		}
+		
+		private function redirectSocketDataEvent():void
+		{
+			super.removeEventListener(ProgressEvent.SOCKET_DATA, onSocketData);
+			var deferredEventHandler:Object = this.deferredEventHandlers[ProgressEvent.SOCKET_DATA];
+			if (deferredEventHandler != null)
+			{
+				super.addEventListener(ProgressEvent.SOCKET_DATA, deferredEventHandler.listener, deferredEventHandler.useCapture, deferredEventHandler.priority, deferredEventHandler.useWeakReference);			
+			}
+		}
+		
+		public override function addEventListener(type:String, listener:Function, useCapture:Boolean = false, priority:int=0.0, useWeakReference:Boolean=false):void
+		{
+			if (type == Event.CONNECT || type == ProgressEvent.SOCKET_DATA)
+			{
+				this.deferredEventHandlers[type] = {listener:listener,useCapture:useCapture, priority:priority, useWeakReference:useWeakReference};
+			}
+			else
+			{
+				super.addEventListener(type, listener, useCapture, priority, useWeakReference);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/Database.as b/vendors/uploadify/com/adobe/protocols/dict/Database.as
new file mode 100644
index 000000000..0ddeef53c
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/Database.as
@@ -0,0 +1,34 @@
+package com.adobe.protocols.dict
+{
+	public class Database
+	{
+		private var _name:String;
+		private var _description:String;
+
+		public function Database(name:String, description:String)
+		{
+			this._name = name;
+			this._description = description;
+		}
+
+		public function set name(name:String):void
+		{
+			this._name = name;
+		}
+
+		public function get name():String
+		{
+			return this._name;
+		}
+
+		public function set description(description:String):void
+		{
+			this._description = description;
+		}
+
+		public function get description():String
+		{
+			return this._description;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/Definition.as b/vendors/uploadify/com/adobe/protocols/dict/Definition.as
new file mode 100644
index 000000000..934a330e8
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/Definition.as
@@ -0,0 +1,39 @@
+package com.adobe.protocols.dict
+{
+	public class Definition
+	{
+		private var _definition:String;
+		private var _database:String;
+		private var _term:String;
+		
+		public function set definition(definition:String):void
+		{
+			this._definition = definition;
+		}
+		
+		public function get definition():String
+		{
+			return this._definition;
+		}
+
+		public function set database(database:String):void
+		{
+			this._database = database;
+		}
+		
+		public function get database():String
+		{
+			return this._database;
+		}
+
+		public function set term(term:String):void
+		{
+			this._term = term;
+		}
+		
+		public function get term():String
+		{
+			return this._term;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/Dict.as b/vendors/uploadify/com/adobe/protocols/dict/Dict.as
new file mode 100644
index 000000000..07d2530cf
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/Dict.as
@@ -0,0 +1,328 @@
+package com.adobe.protocols.dict
+{
+	import com.adobe.protocols.dict.events.*;
+	import com.adobe.protocols.dict.util.*;
+	
+	import flash.events.Event;
+	import flash.events.EventDispatcher;
+	import flash.events.IOErrorEvent;
+	import flash.events.ProgressEvent;
+	import flash.events.SecurityErrorEvent;
+	import flash.net.Socket;
+	import mx.rpc.http.HTTPService;
+	import mx.rpc.events.ResultEvent;
+	import mx.rpc.events.FaultEvent;
+	import flash.xml.XMLNode;
+	import mx.utils.StringUtil;
+
+	public class Dict
+		extends EventDispatcher
+	{
+		// Event type names.
+		public static var CONNECTED:String = "connected";
+		public static var DISCONNECTED:String = "disconnected";
+		public static var IO_ERROR:String = IOErrorEvent.IO_ERROR;
+		public static var ERROR:String = "error";
+		public static var SERVERS:String = "servers";
+		public static var DATABASES:String = "databases";
+		public static var MATCH_STRATEGIES:String = "matchStrategies";
+		public static var DEFINITION:String = "definition";
+		public static var DEFINITION_HEADER:String = "definitionHeader";
+		public static var MATCH:String = "match";
+		public static var NO_MATCH:String = "noMatch";
+
+		public static var FIRST_MATCH:uint = 0;
+		public static var ALL_DATABASES:uint = 1;
+
+		private var socket:SocketHelper;
+		
+		private var dbShortList:Boolean;
+
+		public function Dict()
+		{
+			this.socket = new SocketHelper();
+			this.socket.addEventListener(Event.CONNECT, connected);
+			this.socket.addEventListener(Event.CLOSE, disconnected);
+			this.socket.addEventListener(SocketHelper.COMPLETE_RESPONSE, incomingData);
+			this.socket.addEventListener(IOErrorEvent.IO_ERROR, ioError);
+			this.socket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityError);
+		}
+
+		public function connect(server:String, port:uint = 2628):void
+		{
+			if (this.socket.connected)
+			{
+				this.socket.close();
+			}
+			this.socket.connect(server, port);
+		}
+
+		public function connectThroughProxy(proxyServer:String,
+											proxyPort:int,
+											server:String,
+											port:uint = 2628):void
+		{
+			if (this.socket.connected)
+			{
+				this.socket.close();
+			}
+			this.socket.setProxyInfo(proxyServer, proxyPort);
+			this.socket.connect(server, port);
+		}
+
+		public function disconnect():void
+		{
+			this.socket.close();
+			this.disconnected(null);
+		}
+
+		public function getServers():void
+		{
+			var http:HTTPService = new HTTPService();
+			http.url = "http://luetzschena-stahmeln.de/dictd/xmllist.php";
+			http.addEventListener(ResultEvent.RESULT, incomingServerXML);
+			http.addEventListener(FaultEvent.FAULT, httpError);
+			http.resultFormat = HTTPService.RESULT_FORMAT_E4X;
+			http.send();
+		}
+
+		public function getDatabases(shortList:Boolean=true):void
+		{
+			this.dbShortList = shortList;
+			this.socket.writeUTFBytes("show db\r\n");
+			this.socket.flush();
+		}
+
+		public function getMatchStrategies():void
+		{
+			this.socket.writeUTFBytes("show strat\r\n");
+			this.socket.flush();
+		}
+
+		public function match(database:String, term:String, scope:String="prefix"):void
+		{
+			this.socket.writeUTFBytes("match " + database + " " + scope + " \"" + term + "\"\r\n");
+			this.socket.flush();
+		}
+
+		public function define(database:String, term:String):void
+		{
+			this.socket.writeUTFBytes("define " + database + " \"" + term + "\"\r\n");
+			this.socket.flush();
+		}
+
+		public function lookup(term:String, scope:uint):void
+		{
+			var flag:String;
+			if (scope == Dict.ALL_DATABASES)
+			{
+				flag = "*";
+			}
+			else if (scope == Dict.FIRST_MATCH)
+			{
+				flag = "!";
+			}
+			this.socket.writeUTFBytes("define " + flag + " \"" + term + "\"\r\n");
+			this.socket.flush();
+		}
+
+		//// Private functions ////
+
+		private function connected(event:Event):void
+		{
+        	// Wait to dispatch an event until we get the 220 response.
+    	}
+
+		private function disconnected(event:Event):void
+		{
+        	dispatchEvent(new DisconnectedEvent());
+    	}
+
+		private function incomingServerXML(event:ResultEvent):void
+		{
+			var dictd:Namespace = new Namespace("http://www.luetzschena-stahmeln.de/dictd/");
+			var result:XML = event.result as XML;
+			var server:String, description:String;
+			var servers:Array = new Array();
+			for each (var serverNode:XML in result.dictd::server)
+			{
+				server = serverNode.dictd::dictdurl;
+				description = serverNode.dictd::description;
+				if (StringUtil.trim(server).length != 0 &&
+					StringUtil.trim(description).length != 0)
+				{
+					var dServer:DictionaryServer = new DictionaryServer();
+					dServer.server = server.replace("dict://", "");
+					dServer.description = description;
+					servers.push(dServer);
+				}
+			}
+			var dEvent:DictionaryServerEvent = new DictionaryServerEvent();
+			dEvent.servers = servers;
+			dispatchEvent(dEvent);
+		}
+
+		private function incomingData(event:CompleteResponseEvent):void
+		{			
+			var rawResponse:String = event.response;
+			var response:Response = this.parseRawResponse(rawResponse);
+			var responseCode:uint = response.code;
+			if (responseCode == 552) // no matches
+			{
+				throwNoMatchEvent(response);
+			}
+			else if (responseCode >= 400 && responseCode <= 599) // error
+			{
+				throwErrorEvent(response);
+			}
+			else if (responseCode == 220) // successful connection
+			{
+				dispatchEvent(new ConnectedEvent());
+			}
+			else if (responseCode == 110) // databases are being returned
+			{
+				throwDatabasesEvent(response);				
+			}
+			else if (responseCode == 111) // matches strategies
+			{
+				throwMatchStrategiesEvent(response);
+			}
+			else if (responseCode == 152) // matches
+			{
+				throwMatchEvent(response);
+			}
+			else if (responseCode == 150)
+			{
+				throwDefinitionHeaderEvent(response);
+			}
+			else if (responseCode == 151)
+			{
+				throwDefinitionEvent(response);
+			}
+    	}
+
+    	private function ioError(event:IOErrorEvent):void
+    	{
+			dispatchEvent(event);
+    	}
+
+    	private function httpError(event:FaultEvent):void
+    	{
+    		trace("httpError!");
+    	}
+
+    	private function securityError(event:SecurityErrorEvent):void
+    	{
+    		trace("security error!");
+    		trace(event.text);
+    	}
+
+    	// Dispatch new events.
+
+    	private function throwDatabasesEvent(response:Response):void
+    	{
+			var databases:Array = new Array();
+			var responseArray:Array = response.body.split("\r\n");
+    		for each (var line:String in responseArray)
+    		{
+    			var name:String = line.substring(0, line.indexOf(" "));
+    			if (name == "--exit--")
+    			{
+    				if (this.dbShortList)
+    				{
+    					break;
+    				}
+    				continue;
+    			}
+    			var description:String = line.substring(line.indexOf(" ")+1, line.length).replace(/\"/g,"");
+    			databases.push(new Database(name, description));
+    		}
+    		var event:DatabaseEvent = new DatabaseEvent();
+    		event.databases = databases;
+    		dispatchEvent(event);
+    	}
+
+    	private function throwMatchStrategiesEvent(response:Response):void
+    	{
+			var strategies:Array = new Array();
+			var responseArray:Array = response.body.split("\r\n");
+    		for each (var line:String in responseArray)
+    		{
+    			var name:String = line.substring(0, line.indexOf(" "));
+    			var description:String = line.substring(line.indexOf(" ")+1, line.length).replace(/\"/g,"");
+    			strategies.push(new MatchStrategy(name, description));
+    		}
+    		var event:MatchStrategiesEvent = new MatchStrategiesEvent();
+    		event.strategies = strategies;
+    		dispatchEvent(event);
+    	}
+
+    	private function throwMatchEvent(response:Response):void
+    	{
+			var matches:Array = new Array();
+			var responseArray:Array = response.body.split("\r\n");
+    		for each (var line:String in responseArray)
+    		{
+    			var match:String = line.substring(line.indexOf(" ")+1, line.length).replace(/\"/g,"");
+    			matches.push(match);
+    		}
+    		var event:MatchEvent = new MatchEvent();
+    		event.matches = matches;
+    		dispatchEvent(event);
+    	}
+
+    	private function throwErrorEvent(response:Response):void
+    	{
+    		var event:ErrorEvent = new ErrorEvent();
+    		event.code = response.code;
+    		event.message = response.headerText;
+			dispatchEvent(event);
+    	}
+
+    	private function throwNoMatchEvent(response:Response):void
+    	{
+			dispatchEvent(new NoMatchEvent());
+    	}
+
+    	private function throwDefinitionHeaderEvent(response:Response):void
+    	{
+			var event:DefinitionHeaderEvent = new DefinitionHeaderEvent();
+			event.definitionCount = uint(response.headerText.substring(0, response.headerText.indexOf(" ")));
+			dispatchEvent(event);
+    	}
+
+    	private function throwDefinitionEvent(response:Response):void
+    	{
+    		var event:DefinitionEvent = new DefinitionEvent();
+    		var def:Definition = new Definition();
+    		var headerText:String = response.headerText;
+    		var tokens:Array = headerText.match(/"[^"]+"/g);
+    		def.term = String(tokens[0]).replace(/"/g, "");
+    		def.database = String(tokens[1]).replace(/"/g, "");
+    		def.definition = response.body;
+    		event.definition = def;
+			dispatchEvent(event);
+    	}
+
+    	private function parseRawResponse(rawResponse:String):Response
+    	{
+    		var response:Response = new Response();
+    		var fullHeader:String;
+    		if (rawResponse.indexOf("\r\n") != -1)
+    		{
+	    		fullHeader = rawResponse.substring(0, rawResponse.indexOf("\r\n"));
+    		}
+    		else
+    		{
+    			fullHeader = rawResponse;
+    		}
+      		var responseCodeMatch:Array = fullHeader.match(/^\d{3}/);
+    		response.code = uint(responseCodeMatch[0]);
+    		response.headerText = fullHeader.substring(fullHeader.indexOf(" ")+1, fullHeader.length);
+			var body:String = rawResponse.substring(rawResponse.indexOf("\r\n")+2, rawResponse.length);
+			body = body.replace(/\r\n\.\./, "\r\n.");
+			response.body = body;
+    		return response;
+    	}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/DictionaryServer.as b/vendors/uploadify/com/adobe/protocols/dict/DictionaryServer.as
new file mode 100644
index 000000000..422b603e0
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/DictionaryServer.as
@@ -0,0 +1,28 @@
+package com.adobe.protocols.dict
+{
+	public class DictionaryServer
+	{
+		private var _server:String;
+		private var _description:String;
+
+		public function set server(server:String):void
+		{
+			this._server = server;
+		}
+		
+		public function get server():String
+		{
+			return this._server;
+		}
+
+		public function set description(description:String):void
+		{
+			this._description = description;
+		}
+		
+		public function get description():String
+		{
+			return this._description;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/MatchStrategy.as b/vendors/uploadify/com/adobe/protocols/dict/MatchStrategy.as
new file mode 100644
index 000000000..1e17da32e
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/MatchStrategy.as
@@ -0,0 +1,34 @@
+package com.adobe.protocols.dict
+{
+	public class MatchStrategy
+	{
+		private var _name:String;
+		private var _description:String;
+
+		public function MatchStrategy(name:String, description:String)
+		{
+			this._name = name;
+			this._description = description;
+		}
+
+		public function set name(name:String):void
+		{
+			this._name = name;
+		}
+
+		public function get name():String
+		{
+			return this._name;
+		}
+
+		public function set description(description:String):void
+		{
+			this._description = description;
+		}
+
+		public function get description():String
+		{
+			return this._description;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/Response.as b/vendors/uploadify/com/adobe/protocols/dict/Response.as
new file mode 100644
index 000000000..619a8e903
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/Response.as
@@ -0,0 +1,39 @@
+package com.adobe.protocols.dict
+{
+	public class Response
+	{
+		private var _code:uint;
+		private var _headerText:String;
+		private var _body:String;
+
+		public function set code(code:uint):void
+		{
+			this._code = code;
+		}
+
+		public function set headerText(headerText:String):void
+		{
+			this._headerText = headerText;
+		}
+
+		public function set body(body:String):void
+		{
+			this._body = body;
+		}
+
+		public function get code():uint
+		{
+			return this._code;
+		}
+
+		public function get headerText():String
+		{
+			return this._headerText;
+		}
+
+		public function get body():String
+		{
+			return this._body;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/ConnectedEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/ConnectedEvent.as
new file mode 100644
index 000000000..c4a414521
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/ConnectedEvent.as
@@ -0,0 +1,14 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+
+	public class ConnectedEvent extends Event
+	{
+		public function ConnectedEvent()
+		{
+			super(Dict.CONNECTED);
+		}
+		
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/DatabaseEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/DatabaseEvent.as
new file mode 100644
index 000000000..fdd2cc1eb
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/DatabaseEvent.as
@@ -0,0 +1,26 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+
+	public class DatabaseEvent
+		extends Event
+	{
+		private var _databases:Array;
+		
+		public function DatabaseEvent()
+		{
+			super(Dict.DATABASES);
+		}
+		
+		public function set databases(databases:Array):void
+		{
+			this._databases = databases;
+		}
+		
+		public function get databases():Array
+		{
+			return this._databases;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/DefinitionEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/DefinitionEvent.as
new file mode 100644
index 000000000..8107173e6
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/DefinitionEvent.as
@@ -0,0 +1,27 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+	import com.adobe.protocols.dict.Definition;
+
+	public class DefinitionEvent
+		extends Event
+	{
+		private var _definition:Definition;
+		
+		public function DefinitionEvent()
+		{
+			super(Dict.DEFINITION);
+		}
+		
+		public function set definition(definition:Definition):void
+		{
+			this._definition = definition;
+		}
+		
+		public function get definition():Definition
+		{
+			return this._definition;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/DefinitionHeaderEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/DefinitionHeaderEvent.as
new file mode 100644
index 000000000..e77c402ae
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/DefinitionHeaderEvent.as
@@ -0,0 +1,26 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+
+	public class DefinitionHeaderEvent
+		extends Event
+	{
+		private var _definitionCount:uint;
+		
+		public function DefinitionHeaderEvent()
+		{
+			super(Dict.DEFINITION_HEADER);
+		}
+		
+		public function set definitionCount(definitionCount:uint):void
+		{
+			this._definitionCount = definitionCount;
+		}
+		
+		public function get definitionCount():uint
+		{
+			return this._definitionCount;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/DictionaryServerEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/DictionaryServerEvent.as
new file mode 100644
index 000000000..9b406e95c
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/DictionaryServerEvent.as
@@ -0,0 +1,26 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+
+	public class DictionaryServerEvent
+		extends Event
+	{
+		private var _servers:Array;
+		
+		public function DictionaryServerEvent()
+		{
+			super(Dict.SERVERS);
+		}
+		
+		public function set servers(servers:Array):void
+		{
+			this._servers = servers;
+		}
+		
+		public function get servers():Array
+		{
+			return this._servers;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/DisconnectedEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/DisconnectedEvent.as
new file mode 100644
index 000000000..485b3edac
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/DisconnectedEvent.as
@@ -0,0 +1,14 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+
+	public class DisconnectedEvent extends Event
+	{
+		public function DisconnectedEvent()
+		{
+			super(Dict.DISCONNECTED);
+		}
+		
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/ErrorEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/ErrorEvent.as
new file mode 100644
index 000000000..9e5fc7ad2
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/ErrorEvent.as
@@ -0,0 +1,37 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+	
+	public class ErrorEvent
+		extends Event
+	{
+		private var _code:uint;
+		private var _message:String;
+		
+		public function ErrorEvent()
+		{
+			super(Dict.ERROR);
+		}
+
+		public function set code(code:uint):void
+		{
+			this._code = code;
+		}
+
+		public function set message(message:String):void
+		{
+			this._message = message;
+		}
+
+		public function get code():uint
+		{
+			return this._code;
+		}
+
+		public function get message():String
+		{
+			return this._message;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/MatchEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/MatchEvent.as
new file mode 100644
index 000000000..65b868851
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/MatchEvent.as
@@ -0,0 +1,26 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+
+	public class MatchEvent
+		extends Event
+	{
+		private var _matches:Array;
+		
+		public function MatchEvent()
+		{
+			super(Dict.MATCH);
+		}
+		
+		public function set matches(matches:Array):void
+		{
+			this._matches = matches;
+		}
+		
+		public function get matches():Array
+		{
+			return this._matches;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/MatchStrategiesEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/MatchStrategiesEvent.as
new file mode 100644
index 000000000..75b76f889
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/MatchStrategiesEvent.as
@@ -0,0 +1,26 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+
+	public class MatchStrategiesEvent
+		extends Event
+	{
+		private var _strategies:Array;
+		
+		public function MatchStrategiesEvent()
+		{
+			super(Dict.MATCH_STRATEGIES);
+		}
+		
+		public function set strategies(strategies:Array):void
+		{
+			this._strategies = strategies;
+		}
+		
+		public function get strategies():Array
+		{
+			return this._strategies;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/events/NoMatchEvent.as b/vendors/uploadify/com/adobe/protocols/dict/events/NoMatchEvent.as
new file mode 100644
index 000000000..894d1ae2c
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/events/NoMatchEvent.as
@@ -0,0 +1,14 @@
+package com.adobe.protocols.dict.events
+{
+	import flash.events.Event;
+	import com.adobe.protocols.dict.Dict;
+
+	public class NoMatchEvent
+		extends Event
+	{
+		public function NoMatchEvent()
+		{
+			super(Dict.NO_MATCH);
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/util/CompleteResponseEvent.as b/vendors/uploadify/com/adobe/protocols/dict/util/CompleteResponseEvent.as
new file mode 100644
index 000000000..fc552f1b3
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/util/CompleteResponseEvent.as
@@ -0,0 +1,25 @@
+package com.adobe.protocols.dict.util
+{
+	import flash.events.Event;
+
+	public class CompleteResponseEvent
+		extends Event
+	{
+		private var _response:String;
+
+		public function CompleteResponseEvent()
+		{
+			super(SocketHelper.COMPLETE_RESPONSE);
+		}
+
+		public function set response(response:String):void
+		{
+			this._response = response;
+		}
+		
+		public function get response():String
+		{
+			return this._response;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/protocols/dict/util/SocketHelper.as b/vendors/uploadify/com/adobe/protocols/dict/util/SocketHelper.as
new file mode 100644
index 000000000..feb494b31
--- /dev/null
+++ b/vendors/uploadify/com/adobe/protocols/dict/util/SocketHelper.as
@@ -0,0 +1,49 @@
+package com.adobe.protocols.dict.util
+{
+	import com.adobe.net.proxies.RFC2817Socket;
+	import flash.events.ProgressEvent;
+
+	public class SocketHelper
+		extends RFC2817Socket
+	{
+		private var terminator:String = "\r\n.\r\n";
+		private var buffer:String;
+		public static var COMPLETE_RESPONSE:String = "completeResponse";
+
+		public function SocketHelper()
+		{
+			super();
+			buffer = new String();
+			addEventListener(ProgressEvent.SOCKET_DATA, incomingData);
+		}
+
+		private function incomingData(event:ProgressEvent):void
+		{
+			buffer += readUTFBytes(bytesAvailable);
+			buffer = buffer.replace(/250[^\r\n]+\r\n/, ""); // Get rid of all 250s. Don't need them.
+			var codeStr:String = buffer.substring(0, 3);
+			if (!isNaN(parseInt(codeStr)))
+			{
+				var code:uint = uint(codeStr);
+				if (code == 150 || code >= 200)
+				{
+					buffer = buffer.replace("\r\n", this.terminator);
+				}
+			}
+
+			while (buffer.indexOf(this.terminator) != -1)
+			{
+				var chunk:String = buffer.substring(0, buffer.indexOf(this.terminator));
+				buffer = buffer.substring(chunk.length + this.terminator.length, buffer.length);
+				throwResponseEvent(chunk);
+			}
+		}
+		
+		private function throwResponseEvent(response:String):void
+		{
+			var responseEvent:CompleteResponseEvent = new CompleteResponseEvent();
+			responseEvent.response = response;
+			dispatchEvent(responseEvent);			
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/serialization/json/JSON.as b/vendors/uploadify/com/adobe/serialization/json/JSON.as
new file mode 100644
index 000000000..bfee6d90c
--- /dev/null
+++ b/vendors/uploadify/com/adobe/serialization/json/JSON.as
@@ -0,0 +1,85 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	/**
+	 * This class provides encoding and decoding of the JSON format.
+	 *
+	 * Example usage:
+	 * 
+	 * 		// create a JSON string from an internal object
+	 * 		JSON.encode( myObject );
+	 *
+	 *		// read a JSON string into an internal object
+	 *		var myObject:Object = JSON.decode( jsonString );
+	 *	
+	 */
+	public class JSON {
+	
+	
+		/**
+		 * Encodes a object into a JSON string.
+		 *
+		 * @param o The object to create a JSON string for
+		 * @return the JSON string representing o
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function encode( o:Object ):String {
+			
+			var encoder:JSONEncoder = new JSONEncoder( o );
+			return encoder.getString();
+		
+		}
+		
+		/**
+		 * Decodes a JSON string into a native object.
+		 * 
+		 * @param s The JSON string representing the object
+		 * @return A native object as specified by s
+		 * @throw JSONParseError
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function decode( s:String ):* {
+			
+			var decoder:JSONDecoder = new JSONDecoder( s )
+			return decoder.getValue();
+			
+		}
+	
+	}
+
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/serialization/json/JSONDecoder.as b/vendors/uploadify/com/adobe/serialization/json/JSONDecoder.as
new file mode 100644
index 000000000..82ade196a
--- /dev/null
+++ b/vendors/uploadify/com/adobe/serialization/json/JSONDecoder.as
@@ -0,0 +1,221 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	public class JSONDecoder {
+		
+		/** The value that will get parsed from the JSON string */
+		private var value:*;
+		
+		/** The tokenizer designated to read the JSON string */
+		private var tokenizer:JSONTokenizer;
+		
+		/** The current token from the tokenizer */
+		private var token:JSONToken;
+		
+		/**
+		 * Constructs a new JSONDecoder to parse a JSON string 
+		 * into a native object.
+		 *
+		 * @param s The JSON string to be converted
+		 *		into a native object
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONDecoder( s:String ) {
+			
+			tokenizer = new JSONTokenizer( s );
+			
+			nextToken();
+			value = parseValue();
+		}
+		
+		/**
+		 * Gets the internal object that was created by parsing
+		 * the JSON string passed to the constructor.
+		 *
+		 * @return The internal object representation of the JSON
+		 * 		string that was passed to the constructor
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function getValue():* {
+			return value;
+		}
+		
+		/**
+		 * Returns the next token from the tokenzier reading
+		 * the JSON string
+		 */
+		private function nextToken():JSONToken {
+			return token = tokenizer.getNextToken();
+		}
+		
+		/**
+		 * Attempt to parse an array
+		 */
+		private function parseArray():Array {
+			// create an array internally that we're going to attempt
+			// to parse from the tokenizer
+			var a:Array = new Array();
+			
+			// grab the next token from the tokenizer to move
+			// past the opening [
+			nextToken();
+			
+			// check to see if we have an empty array
+			if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
+				// we're done reading the array, so return it
+				return a;
+			}
+			
+			// deal with elements of the array, and use an "infinite"
+			// loop because we could have any amount of elements
+			while ( true ) {
+				// read in the value and add it to the array
+				a.push ( parseValue() );
+			
+				// after the value there should be a ] or a ,
+				nextToken();
+				
+				if ( token.type == JSONTokenType.RIGHT_BRACKET ) {
+					// we're done reading the array, so return it
+					return a;
+				} else if ( token.type == JSONTokenType.COMMA ) {
+					// move past the comma and read another value
+					nextToken();
+				} else {
+					tokenizer.parseError( "Expecting ] or , but found " + token.value );
+				}
+			}
+            return null;
+		}
+		
+		/**
+		 * Attempt to parse an object
+		 */
+		private function parseObject():Object {
+			// create the object internally that we're going to
+			// attempt to parse from the tokenizer
+			var o:Object = new Object();
+						
+			// store the string part of an object member so
+			// that we can assign it a value in the object
+			var key:String
+			
+			// grab the next token from the tokenizer
+			nextToken();
+			
+			// check to see if we have an empty object
+			if ( token.type == JSONTokenType.RIGHT_BRACE ) {
+				// we're done reading the object, so return it
+				return o;
+			}
+			
+			// deal with members of the object, and use an "infinite"
+			// loop because we could have any amount of members
+			while ( true ) {
+			
+				if ( token.type == JSONTokenType.STRING ) {
+					// the string value we read is the key for the object
+					key = String( token.value );
+					
+					// move past the string to see what's next
+					nextToken();
+					
+					// after the string there should be a :
+					if ( token.type == JSONTokenType.COLON ) {
+						
+						// move past the : and read/assign a value for the key
+						nextToken();
+						o[key] = parseValue();	
+						
+						// move past the value to see what's next
+						nextToken();
+						
+						// after the value there's either a } or a ,
+						if ( token.type == JSONTokenType.RIGHT_BRACE ) {
+							// // we're done reading the object, so return it
+							return o;
+							
+						} else if ( token.type == JSONTokenType.COMMA ) {
+							// skip past the comma and read another member
+							nextToken();
+						} else {
+							tokenizer.parseError( "Expecting } or , but found " + token.value );
+						}
+					} else {
+						tokenizer.parseError( "Expecting : but found " + token.value );
+					}
+				} else {
+					tokenizer.parseError( "Expecting string but found " + token.value );
+				}
+			}
+            return null;
+		}
+		
+		/**
+		 * Attempt to parse a value
+		 */
+		private function parseValue():Object
+		{
+			// Catch errors when the input stream ends abruptly
+			if ( token == null )
+			{
+				tokenizer.parseError( "Unexpected end of input" );
+			}
+					
+			switch ( token.type ) {
+				case JSONTokenType.LEFT_BRACE:
+					return parseObject();
+					
+				case JSONTokenType.LEFT_BRACKET:
+					return parseArray();
+					
+				case JSONTokenType.STRING:
+				case JSONTokenType.NUMBER:
+				case JSONTokenType.TRUE:
+				case JSONTokenType.FALSE:
+				case JSONTokenType.NULL:
+					return token.value;
+
+				default:
+					tokenizer.parseError( "Unexpected " + token.value );
+					
+			}
+            return null;
+		}
+	}
+}
diff --git a/vendors/uploadify/com/adobe/serialization/json/JSONEncoder.as b/vendors/uploadify/com/adobe/serialization/json/JSONEncoder.as
new file mode 100644
index 000000000..44469d053
--- /dev/null
+++ b/vendors/uploadify/com/adobe/serialization/json/JSONEncoder.as
@@ -0,0 +1,299 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json 
+{
+
+	import flash.utils.describeType;
+
+	public class JSONEncoder {
+	
+		/** The string that is going to represent the object we're encoding */
+		private var jsonString:String;
+		
+		/**
+		 * Creates a new JSONEncoder.
+		 *
+		 * @param o The object to encode as a JSON string
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONEncoder( value:* ) {
+			jsonString = convertToString( value );
+		
+		}
+		
+		/**
+		 * Gets the JSON string from the encoder.
+		 *
+		 * @return The JSON string representation of the object
+		 * 		that was passed to the constructor
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function getString():String {
+			return jsonString;
+		}
+		
+		/**
+		 * Converts a value to it's JSON string equivalent.
+		 *
+		 * @param value The value to convert.  Could be any 
+		 *		type (object, number, array, etc)
+		 */
+		private function convertToString( value:* ):String {
+			
+			// determine what value is and convert it based on it's type
+			if ( value is String ) {
+				
+				// escape the string so it's formatted correctly
+				return escapeString( value as String );
+				
+			} else if ( value is Number ) {
+				
+				// only encode numbers that finate
+				return isFinite( value as Number) ? value.toString() : "null";
+
+			} else if ( value is Boolean ) {
+				
+				// convert boolean to string easily
+				return value ? "true" : "false";
+
+			} else if ( value is Array ) {
+			
+				// call the helper method to convert an array
+				return arrayToString( value as Array );
+			
+			} else if ( value is Object && value != null ) {
+			
+				// call the helper method to convert an object
+				return objectToString( value );
+			}
+            return "null";
+		}
+		
+		/**
+		 * Escapes a string accoding to the JSON specification.
+		 *
+		 * @param str The string to be escaped
+		 * @return The string with escaped special characters
+		 * 		according to the JSON specification
+		 */
+		private function escapeString( str:String ):String {
+			// create a string to store the string's jsonstring value
+			var s:String = "";
+			// current character in the string we're processing
+			var ch:String;
+			// store the length in a local variable to reduce lookups
+			var len:Number = str.length;
+			
+			// loop over all of the characters in the string
+			for ( var i:int = 0; i < len; i++ ) {
+			
+				// examine the character to determine if we have to escape it
+				ch = str.charAt( i );
+				switch ( ch ) {
+				
+					case '"':	// quotation mark
+						s += "\\\"";
+						break;
+						
+					//case '/':	// solidus
+					//	s += "\\/";
+					//	break;
+						
+					case '\\':	// reverse solidus
+						s += "\\\\";
+						break;
+						
+					case '\b':	// bell
+						s += "\\b";
+						break;
+						
+					case '\f':	// form feed
+						s += "\\f";
+						break;
+						
+					case '\n':	// newline
+						s += "\\n";
+						break;
+						
+					case '\r':	// carriage return
+						s += "\\r";
+						break;
+						
+					case '\t':	// horizontal tab
+						s += "\\t";
+						break;
+						
+					default:	// everything else
+						
+						// check for a control character and escape as unicode
+						if ( ch < ' ' ) {
+							// get the hex digit(s) of the character (either 1 or 2 digits)
+							var hexCode:String = ch.charCodeAt( 0 ).toString( 16 );
+							
+							// ensure that there are 4 digits by adjusting
+							// the # of zeros accordingly.
+							var zeroPad:String = hexCode.length == 2 ? "00" : "000";
+							
+							// create the unicode escape sequence with 4 hex digits
+							s += "\\u" + zeroPad + hexCode;
+						} else {
+						
+							// no need to do any special encoding, just pass-through
+							s += ch;
+							
+						}
+				}	// end switch
+				
+			}	// end for loop
+						
+			return "\"" + s + "\"";
+		}
+		
+		/**
+		 * Converts an array to it's JSON string equivalent
+		 *
+		 * @param a The array to convert
+		 * @return The JSON string representation of a
+		 */
+		private function arrayToString( a:Array ):String {
+			// create a string to store the array's jsonstring value
+			var s:String = "";
+			
+			// loop over the elements in the array and add their converted
+			// values to the string
+			for ( var i:int = 0; i < a.length; i++ ) {
+				// when the length is 0 we're adding the first element so
+				// no comma is necessary
+				if ( s.length > 0 ) {
+					// we've already added an element, so add the comma separator
+					s += ","
+				}
+				
+				// convert the value to a string
+				s += convertToString( a[i] );	
+			}
+			
+			// KNOWN ISSUE:  In ActionScript, Arrays can also be associative
+			// objects and you can put anything in them, ie:
+			//		myArray["foo"] = "bar";
+			//
+			// These properties aren't picked up in the for loop above because
+			// the properties don't correspond to indexes.  However, we're
+			// sort of out luck because the JSON specification doesn't allow
+			// these types of array properties.
+			//
+			// So, if the array was also used as an associative object, there
+			// may be some values in the array that don't get properly encoded.
+			//
+			// A possible solution is to instead encode the Array as an Object
+			// but then it won't get decoded correctly (and won't be an
+			// Array instance)
+						
+			// close the array and return it's string value
+			return "[" + s + "]";
+		}
+		
+		/**
+		 * Converts an object to it's JSON string equivalent
+		 *
+		 * @param o The object to convert
+		 * @return The JSON string representation of o
+		 */
+		private function objectToString( o:Object ):String
+		{
+			// create a string to store the object's jsonstring value
+			var s:String = "";
+			
+			// determine if o is a class instance or a plain object
+			var classInfo:XML = describeType( o );
+			if ( classInfo.@name.toString() == "Object" )
+			{
+				// the value of o[key] in the loop below - store this 
+				// as a variable so we don't have to keep looking up o[key]
+				// when testing for valid values to convert
+				var value:Object;
+				
+				// loop over the keys in the object and add their converted
+				// values to the string
+				for ( var key:String in o )
+				{
+					// assign value to a variable for quick lookup
+					value = o[key];
+					
+					// don't add function's to the JSON string
+					if ( value is Function )
+					{
+						// skip this key and try another
+						continue;
+					}
+					
+					// when the length is 0 we're adding the first item so
+					// no comma is necessary
+					if ( s.length > 0 ) {
+						// we've already added an item, so add the comma separator
+						s += ","
+					}
+					
+					s += escapeString( key ) + ":" + convertToString( value );
+				}
+			}
+			else // o is a class instance
+			{
+				// Loop over all of the variables and accessors in the class and 
+				// serialize them along with their values.
+				for each ( var v:XML in classInfo..*.( name() == "variable" || name() == "accessor" ) )
+				{
+					// When the length is 0 we're adding the first item so
+					// no comma is necessary
+					if ( s.length > 0 ) {
+						// We've already added an item, so add the comma separator
+						s += ","
+					}
+					
+					s += escapeString( v.@name.toString() ) + ":" 
+							+ convertToString( o[ v.@name ] );
+				}
+				
+			}
+			
+			return "{" + s + "}";
+		}
+
+		
+	}
+	
+}
diff --git a/vendors/uploadify/com/adobe/serialization/json/JSONParseError.as b/vendors/uploadify/com/adobe/serialization/json/JSONParseError.as
new file mode 100644
index 000000000..5aec1e3b0
--- /dev/null
+++ b/vendors/uploadify/com/adobe/serialization/json/JSONParseError.as
@@ -0,0 +1,87 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	/**
+	 *
+	 *
+	 */
+	public class JSONParseError extends Error 	{
+	
+		/** The location in the string where the error occurred */
+		private var _location:int;
+		
+		/** The string in which the parse error occurred */
+		private var _text:String;
+	
+		/**
+		 * Constructs a new JSONParseError.
+		 *
+		 * @param message The error message that occured during parsing
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONParseError( message:String = "", location:int = 0, text:String = "") {
+			super( message );
+			name = "JSONParseError";
+			_location = location;
+			_text = text;
+		}
+
+		/**
+		 * Provides read-only access to the location variable.
+		 *
+		 * @return The location in the string where the error occurred
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get location():int {
+			return _location;
+		}
+		
+		/**
+		 * Provides read-only access to the text variable.
+		 *
+		 * @return The string in which the error occurred
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get text():String {
+			return _text;
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/serialization/json/JSONToken.as b/vendors/uploadify/com/adobe/serialization/json/JSONToken.as
new file mode 100644
index 000000000..258d63c8a
--- /dev/null
+++ b/vendors/uploadify/com/adobe/serialization/json/JSONToken.as
@@ -0,0 +1,104 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	public class JSONToken {
+	
+		private var _type:int;
+		private var _value:Object;
+		
+		/**
+		 * Creates a new JSONToken with a specific token type and value.
+		 *
+		 * @param type The JSONTokenType of the token
+		 * @param value The value of the token
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function JSONToken( type:int = -1 /* JSONTokenType.UNKNOWN */, value:Object = null ) {
+			_type = type;
+			_value = value;
+		}
+		
+		/**
+		 * Returns the type of the token.
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get type():int {
+			return _type;	
+		}
+		
+		/**
+		 * Sets the type of the token.
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function set type( value:int ):void {
+			_type = value;	
+		}
+		
+		/**
+		 * Gets the value of the token
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function get value():Object {
+			return _value;	
+		}
+		
+		/**
+		 * Sets the value of the token
+		 *
+		 * @see com.adobe.serialization.json.JSONTokenType
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public function set value ( v:Object ):void {
+			_value = v;	
+		}
+
+	}
+	
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/serialization/json/JSONTokenType.as b/vendors/uploadify/com/adobe/serialization/json/JSONTokenType.as
new file mode 100644
index 000000000..fceb3f030
--- /dev/null
+++ b/vendors/uploadify/com/adobe/serialization/json/JSONTokenType.as
@@ -0,0 +1,67 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	/**
+	 * Class containing constant values for the different types
+	 * of tokens in a JSON encoded string.
+	 */
+	public class JSONTokenType {
+	
+		public static const UNKNOWN:int = -1;
+		
+		public static const COMMA:int = 0;
+		
+		public static const LEFT_BRACE:int = 1;
+		
+		public static const RIGHT_BRACE:int = 2;
+		
+		public static const LEFT_BRACKET:int = 3;
+		
+		public static const RIGHT_BRACKET:int = 4;
+		
+		public static const COLON:int = 6;
+		
+		public static const TRUE:int = 7;
+		
+		public static const FALSE:int = 8;
+		
+		public static const NULL:int = 9;
+		
+		public static const STRING:int = 10;
+		
+		public static const NUMBER:int = 11;
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/serialization/json/JSONTokenizer.as b/vendors/uploadify/com/adobe/serialization/json/JSONTokenizer.as
new file mode 100644
index 000000000..dc36bfcdd
--- /dev/null
+++ b/vendors/uploadify/com/adobe/serialization/json/JSONTokenizer.as
@@ -0,0 +1,583 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.serialization.json {
+
+	public class JSONTokenizer {
+	
+		/** The object that will get parsed from the JSON string */
+		private var obj:Object;
+		
+		/** The JSON string to be parsed */
+		private var jsonString:String;
+		
+		/** The current parsing location in the JSON string */
+		private var loc:int;
+		
+		/** The current character in the JSON string during parsing */
+		private var ch:String;
+		
+		/**
+		 * Constructs a new JSONDecoder to parse a JSON string 
+		 * into a native object.
+		 *
+		 * @param s The JSON string to be converted
+		 *		into a native object
+		 */
+		public function JSONTokenizer( s:String ) {
+			jsonString = s;
+			loc = 0;
+			
+			// prime the pump by getting the first character
+			nextChar();
+		}
+		
+		/**
+		 * Gets the next token in the input sting and advances
+		* the character to the next character after the token
+		 */
+		public function getNextToken():JSONToken {
+			var token:JSONToken = new JSONToken();
+			
+			// skip any whitespace / comments since the last 
+			// token was read
+			skipIgnored();
+						
+			// examine the new character and see what we have...
+			switch ( ch ) {
+				
+				case '{':
+					token.type = JSONTokenType.LEFT_BRACE;
+					token.value = '{';
+					nextChar();
+					break
+					
+				case '}':
+					token.type = JSONTokenType.RIGHT_BRACE;
+					token.value = '}';
+					nextChar();
+					break
+					
+				case '[':
+					token.type = JSONTokenType.LEFT_BRACKET;
+					token.value = '[';
+					nextChar();
+					break
+					
+				case ']':
+					token.type = JSONTokenType.RIGHT_BRACKET;
+					token.value = ']';
+					nextChar();
+					break
+				
+				case ',':
+					token.type = JSONTokenType.COMMA;
+					token.value = ',';
+					nextChar();
+					break
+					
+				case ':':
+					token.type = JSONTokenType.COLON;
+					token.value = ':';
+					nextChar();
+					break;
+					
+				case 't': // attempt to read true
+					var possibleTrue:String = "t" + nextChar() + nextChar() + nextChar();
+					
+					if ( possibleTrue == "true" ) {
+						token.type = JSONTokenType.TRUE;
+						token.value = true;
+						nextChar();
+					} else {
+						parseError( "Expecting 'true' but found " + possibleTrue );
+					}
+					
+					break;
+					
+				case 'f': // attempt to read false
+					var possibleFalse:String = "f" + nextChar() + nextChar() + nextChar() + nextChar();
+					
+					if ( possibleFalse == "false" ) {
+						token.type = JSONTokenType.FALSE;
+						token.value = false;
+						nextChar();
+					} else {
+						parseError( "Expecting 'false' but found " + possibleFalse );
+					}
+					
+					break;
+					
+				case 'n': // attempt to read null
+				
+					var possibleNull:String = "n" + nextChar() + nextChar() + nextChar();
+					
+					if ( possibleNull == "null" ) {
+						token.type = JSONTokenType.NULL;
+						token.value = null;
+						nextChar();
+					} else {
+						parseError( "Expecting 'null' but found " + possibleNull );
+					}
+					
+					break;
+					
+				case '"': // the start of a string
+					token = readString();
+					break;
+					
+				default: 
+					// see if we can read a number
+					if ( isDigit( ch ) || ch == '-' ) {
+						token = readNumber();
+					} else if ( ch == '' ) {
+						// check for reading past the end of the string
+						return null;
+					} else {						
+						// not sure what was in the input string - it's not
+						// anything we expected
+						parseError( "Unexpected " + ch + " encountered" );
+					}
+			}
+			
+			return token;
+		}
+		
+		/**
+		 * Attempts to read a string from the input string.  Places
+		 * the character location at the first character after the
+		 * string.  It is assumed that ch is " before this method is called.
+		 *
+		 * @return the JSONToken with the string value if a string could
+		 *		be read.  Throws an error otherwise.
+		 */
+		private function readString():JSONToken {
+			// the token for the string we'll try to read
+			var token:JSONToken = new JSONToken();
+			token.type = JSONTokenType.STRING;
+			
+			// the string to store the string we'll try to read
+			var string:String = "";
+			
+			// advance past the first "
+			nextChar();
+			
+			while ( ch != '"' && ch != '' ) {
+								
+				// unescape the escape sequences in the string
+				if ( ch == '\\' ) {
+					
+					// get the next character so we know what
+					// to unescape
+					nextChar();
+					
+					switch ( ch ) {
+						
+						case '"': // quotation mark
+							string += '"';
+							break;
+						
+						case '/':	// solidus
+							string += "/";
+							break;
+							
+						case '\\':	// reverse solidus
+							string += '\\';
+							break;
+							
+						case 'b':	// bell
+							string += '\b';
+							break;
+							
+						case 'f':	// form feed
+							string += '\f';
+							break;
+							
+						case 'n':	// newline
+							string += '\n';
+							break;
+							
+						case 'r':	// carriage return
+							string += '\r';
+							break;
+							
+						case 't':	// horizontal tab
+							string += '\t'
+							break;
+						
+						case 'u':
+							// convert a unicode escape sequence
+							// to it's character value - expecting
+							// 4 hex digits
+							
+							// save the characters as a string we'll convert to an int
+							var hexValue:String = "";
+							
+							// try to find 4 hex characters
+							for ( var i:int = 0; i < 4; i++ ) {
+								// get the next character and determine
+								// if it's a valid hex digit or not
+								if ( !isHexDigit( nextChar() ) ) {
+									parseError( " Excepted a hex digit, but found: " + ch );
+								}
+								// valid, add it to the value
+								hexValue += ch;
+							}
+							
+							// convert hexValue to an integer, and use that
+							// integrer value to create a character to add
+							// to our string.
+							string += String.fromCharCode( parseInt( hexValue, 16 ) );
+							
+							break;
+					
+						default:
+							// couldn't unescape the sequence, so just
+							// pass it through
+							string += '\\' + ch;
+						
+					}
+					
+				} else {
+					// didn't have to unescape, so add the character to the string
+					string += ch;
+					
+				}
+				
+				// move to the next character
+				nextChar();
+				
+			}
+			
+			// we read past the end of the string without closing it, which
+			// is a parse error
+			if ( ch == '' ) {
+				parseError( "Unterminated string literal" );
+			}
+			
+			// move past the closing " in the input string
+			nextChar();
+			
+			// attach to the string to the token so we can return it
+			token.value = string;
+			
+			return token;
+		}
+		
+		/**
+		 * Attempts to read a number from the input string.  Places
+		 * the character location at the first character after the
+		 * number.
+		 * 
+		 * @return The JSONToken with the number value if a number could
+		 * 		be read.  Throws an error otherwise.
+		 */
+		private function readNumber():JSONToken {
+			// the token for the number we'll try to read
+			var token:JSONToken = new JSONToken();
+			token.type = JSONTokenType.NUMBER;
+			
+			// the string to accumulate the number characters
+			// into that we'll convert to a number at the end
+			var input:String = "";
+			
+			// check for a negative number
+			if ( ch == '-' ) {
+				input += '-';
+				nextChar();
+			}
+			
+			// the number must start with a digit
+			if ( !isDigit( ch ) )
+			{
+				parseError( "Expecting a digit" );
+			}
+			
+			// 0 can only be the first digit if it
+			// is followed by a decimal point
+			if ( ch == '0' )
+			{
+				input += ch;
+				nextChar();
+				
+				// make sure no other digits come after 0
+				if ( isDigit( ch ) )
+				{
+					parseError( "A digit cannot immediately follow 0" );
+				}
+// Commented out - this should only be available when "strict" is false
+//				// unless we have 0x which starts a hex number\
+//				else if ( ch == 'x' )
+//				{
+//					// include the x in the input
+//					input += ch;
+//					nextChar();
+//					
+//					// need at least one hex digit after 0x to
+//					// be valid
+//					if ( isHexDigit( ch ) )
+//					{
+//						input += ch;
+//						nextChar();
+//					}
+//					else
+//					{
+//						parseError( "Number in hex format require at least one hex digit after \"0x\"" );	
+//					}
+//					
+//					// consume all of the hex values
+//					while ( isHexDigit( ch ) )
+//					{
+//						input += ch;
+//						nextChar();
+//					}
+//				}
+			}
+			else
+			{
+				// read numbers while we can
+				while ( isDigit( ch ) ) {
+					input += ch;
+					nextChar();
+				}
+			}
+			
+			// check for a decimal value
+			if ( ch == '.' ) {
+				input += '.';
+				nextChar();
+				
+				// after the decimal there has to be a digit
+				if ( !isDigit( ch ) )
+				{
+					parseError( "Expecting a digit" );
+				}
+				
+				// read more numbers to get the decimal value
+				while ( isDigit( ch ) ) {
+					input += ch;
+					nextChar();
+				}
+			}
+			
+			// check for scientific notation
+			if ( ch == 'e' || ch == 'E' )
+			{
+				input += "e"
+				nextChar();
+				// check for sign
+				if ( ch == '+' || ch == '-' )
+				{
+					input += ch;
+					nextChar();
+				}
+				
+				// require at least one number for the exponent
+				// in this case
+				if ( !isDigit( ch ) )
+				{
+					parseError( "Scientific notation number needs exponent value" );
+				}
+							
+				// read in the exponent
+				while ( isDigit( ch ) )
+				{
+					input += ch;
+					nextChar();
+				}
+			}
+			
+			// convert the string to a number value
+			var num:Number = Number( input );
+			
+			if ( isFinite( num ) && !isNaN( num ) ) {
+				token.value = num;
+				return token;
+			} else {
+				parseError( "Number " + num + " is not valid!" );
+			}
+            return null;
+		}
+
+		/**
+		 * Reads the next character in the input
+		 * string and advances the character location.
+		 *
+		 * @return The next character in the input string, or
+		 *		null if we've read past the end.
+		 */
+		private function nextChar():String {
+			return ch = jsonString.charAt( loc++ );
+		}
+		
+		/**
+		 * Advances the character location past any
+		 * sort of white space and comments
+		 */
+		private function skipIgnored():void
+		{
+			var originalLoc:int;
+			
+			// keep trying to skip whitespace and comments as long
+			// as we keep advancing past the original location 
+			do
+			{
+				originalLoc = loc;
+				skipWhite();
+				skipComments();
+			}
+			while ( originalLoc != loc );
+		}
+		
+		/**
+		 * Skips comments in the input string, either
+		 * single-line or multi-line.  Advances the character
+		 * to the first position after the end of the comment.
+		 */
+		private function skipComments():void {
+			if ( ch == '/' ) {
+				// Advance past the first / to find out what type of comment
+				nextChar();
+				switch ( ch ) {
+					case '/': // single-line comment, read through end of line
+						
+						// Loop over the characters until we find
+						// a newline or until there's no more characters left
+						do {
+							nextChar();
+						} while ( ch != '\n' && ch != '' )
+						
+						// move past the \n
+						nextChar();
+						
+						break;
+					
+					case '*': // multi-line comment, read until closing */
+
+						// move past the opening *
+						nextChar();
+						
+						// try to find a trailing */
+						while ( true ) {
+							if ( ch == '*' ) {
+								// check to see if we have a closing /
+								nextChar();
+								if ( ch == '/') {
+									// move past the end of the closing */
+									nextChar();
+									break;
+								}
+							} else {
+								// move along, looking if the next character is a *
+								nextChar();
+							}
+							
+							// when we're here we've read past the end of 
+							// the string without finding a closing */, so error
+							if ( ch == '' ) {
+								parseError( "Multi-line comment not closed" );
+							}
+						}
+
+						break;
+					
+					// Can't match a comment after a /, so it's a parsing error
+					default:
+						parseError( "Unexpected " + ch + " encountered (expecting '/' or '*' )" );
+				}
+			}
+			
+		}
+		
+		
+		/**
+		 * Skip any whitespace in the input string and advances
+		 * the character to the first character after any possible
+		 * whitespace.
+		 */
+		private function skipWhite():void {
+			
+			// As long as there are spaces in the input 
+			// stream, advance the current location pointer
+			// past them
+			while ( isWhiteSpace( ch ) ) {
+				nextChar();
+			}
+			
+		}
+		
+		/**
+		 * Determines if a character is whitespace or not.
+		 *
+		 * @return True if the character passed in is a whitespace
+		 *	character
+		 */
+		private function isWhiteSpace( ch:String ):Boolean {
+			return ( ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r' );
+		}
+		
+		/**
+		 * Determines if a character is a digit [0-9].
+		 *
+		 * @return True if the character passed in is a digit
+		 */
+		private function isDigit( ch:String ):Boolean {
+			return ( ch >= '0' && ch <= '9' );
+		}
+		
+		/**
+		 * Determines if a character is a digit [0-9].
+		 *
+		 * @return True if the character passed in is a digit
+		 */
+		private function isHexDigit( ch:String ):Boolean {
+			// get the uppercase value of ch so we only have
+			// to compare the value between 'A' and 'F'
+			var uc:String = ch.toUpperCase();
+			
+			// a hex digit is a digit of A-F, inclusive ( using
+			// our uppercase constraint )
+			return ( isDigit( ch ) || ( uc >= 'A' && uc <= 'F' ) );
+		}
+	
+		/**
+		 * Raises a parsing error with a specified message, tacking
+		 * on the error location and the original string.
+		 *
+		 * @param message The message indicating why the error occurred
+		 */
+		public function parseError( message:String ):void {
+			throw new JSONParseError( message, loc, jsonString );
+		}
+	}
+	
+}
diff --git a/vendors/uploadify/com/adobe/utils/ArrayUtil.as b/vendors/uploadify/com/adobe/utils/ArrayUtil.as
new file mode 100644
index 000000000..e65612004
--- /dev/null
+++ b/vendors/uploadify/com/adobe/utils/ArrayUtil.as
@@ -0,0 +1,187 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.utils
+{
+	
+	/**
+	* 	Class that contains static utility methods for manipulating and working
+	*	with Arrays.
+	* 
+	*	Note that all APIs assume that they are working with well formed arrays.
+	*	i.e. they will only manipulate indexed values.  
+	* 
+	* 	@langversion ActionScript 3.0
+	*	@playerversion Flash 9.0
+	*	@tiptext
+	*/		
+	public class ArrayUtil
+	{
+				
+		/**
+		*	Determines whether the specified array contains the specified value.	
+		* 
+		* 	@param arr The array that will be checked for the specified value.
+		*
+		*	@param value The object which will be searched for within the array
+		* 
+		* 	@return True if the array contains the value, False if it does not.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/			
+		public static function arrayContainsValue(arr:Array, value:Object):Boolean
+		{
+			return (arr.indexOf(value) != -1);
+		}	
+		
+		/**
+		*	Remove all instances of the specified value from the array,
+		* 
+		* 	@param arr The array from which the value will be removed
+		*
+		*	@param value The object that will be removed from the array.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/		
+		public static function removeValueFromArray(arr:Array, value:Object):void
+		{
+			var len:uint = arr.length;
+			
+			for(var i:Number = len; i > -1; i--)
+			{
+				if(arr[i] === value)
+				{
+					arr.splice(i, 1);
+				}
+			}					
+		}
+
+		/**
+		*	Create a new array that only contains unique instances of objects
+		*	in the specified array.
+		*
+		*	Basically, this can be used to remove duplication object instances
+		*	from an array
+		* 
+		* 	@param arr The array which contains the values that will be used to
+		*	create the new array that contains no duplicate values.
+		*
+		*	@return A new array which only contains unique items from the specified
+		*	array.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function createUniqueCopy(a:Array):Array
+		{
+			var newArray:Array = new Array();
+			
+			var len:Number = a.length;
+			var item:Object;
+			
+			for (var i:uint = 0; i < len; ++i)
+			{
+				item = a[i];
+				
+				if(ArrayUtil.arrayContainsValue(newArray, item))
+				{
+					continue;
+				}
+				
+				newArray.push(item);
+			}
+			
+			return newArray;
+		}
+		
+		/**
+		*	Creates a copy of the specified array.
+		*
+		*	Note that the array returned is a new array but the items within the
+		*	array are not copies of the items in the original array (but rather 
+		*	references to the same items)
+		* 
+		* 	@param arr The array that will be copies
+		*
+		*	@return A new array which contains the same items as the array passed
+		*	in.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/			
+		public static function copyArray(arr:Array):Array
+		{	
+			return arr.slice();
+		}
+		
+		/**
+		*	Compares two arrays and returns a boolean indicating whether the arrays
+		*	contain the same values at the same indexes.
+		* 
+		* 	@param arr1 The first array that will be compared to the second.
+		*
+		* 	@param arr2 The second array that will be compared to the first.
+		*
+		*	@return True if the arrays contains the same values at the same indexes.
+			False if they do not.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/		
+		public static function arraysAreEqual(arr1:Array, arr2:Array):Boolean
+		{
+			if(arr1.length != arr2.length)
+			{
+				return false;
+			}
+			
+			var len:Number = arr1.length;
+			
+			for(var i:Number = 0; i < len; i++)
+			{
+				if(arr1[i] !== arr2[i])
+				{
+					return false;
+				}
+			}
+			
+			return true;
+		}
+	}
+}
diff --git a/vendors/uploadify/com/adobe/utils/DateUtil.as b/vendors/uploadify/com/adobe/utils/DateUtil.as
new file mode 100644
index 000000000..a49fe433e
--- /dev/null
+++ b/vendors/uploadify/com/adobe/utils/DateUtil.as
@@ -0,0 +1,699 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.utils
+{
+	import mx.formatters.DateBase;
+
+	/**
+	* 	Class that contains static utility methods for manipulating and working
+	*	with Dates.
+	* 
+	* 	@langversion ActionScript 3.0
+	*	@playerversion Flash 9.0
+	*	@tiptext
+	*/	
+	public class DateUtil
+	{
+	
+		/**
+		*	Returns the English Short Month name (3 letters) for the Month that
+		*	the Date represents.  	
+		* 
+		* 	@param d The Date instance whose month will be used to retrieve the
+		*	short month name.
+		* 
+		* 	@return An English 3 Letter Month abbreviation.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*
+		*	@see SHORT_MONTH
+		*/	
+		public static function getShortMonthName(d:Date):String
+		{
+			return DateBase.monthNamesShort[d.getMonth()];
+		}
+
+		/**
+		*	Returns the index of the month that the short month name string
+		*	represents. 	
+		* 
+		* 	@param m The 3 letter abbreviation representing a short month name.
+		*
+		*	@param Optional parameter indicating whether the search should be case
+		*	sensitive
+		* 
+		* 	@return A int that represents that month represented by the specifed
+		*	short name.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*
+		*	@see SHORT_MONTH
+		*/	
+		public static function getShortMonthIndex(m:String):int
+		{
+			return DateBase.monthNamesShort.indexOf(m);
+		}
+		
+		/**
+		*	Returns the English full Month name for the Month that
+		*	the Date represents.  	
+		* 
+		* 	@param d The Date instance whose month will be used to retrieve the
+		*	full month name.
+		* 
+		* 	@return An English full month name.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*
+		*	@see FULL_MONTH
+		*/	
+		public static function getFullMonthName(d:Date):String
+		{
+			return DateBase.monthNamesLong[d.getMonth()];	
+		}
+
+		/**
+		*	Returns the index of the month that the full month name string
+		*	represents. 	
+		* 
+		* 	@param m A full month name.
+		* 
+		* 	@return A int that represents that month represented by the specifed
+		*	full month name.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*
+		*	@see FULL_MONTH
+		*/	
+		public static function getFullMonthIndex(m:String):int
+		{
+			return DateBase.monthNamesLong.indexOf(m);
+		}
+
+		/**
+		*	Returns the English Short Day name (3 letters) for the day that
+		*	the Date represents.  	
+		* 
+		* 	@param d The Date instance whose day will be used to retrieve the
+		*	short day name.
+		* 
+		* 	@return An English 3 Letter day abbreviation.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*
+		*	@see SHORT_DAY
+		*/	
+		public static function getShortDayName(d:Date):String
+		{
+			return DateBase.dayNamesShort[d.getDay()];	
+		}
+		
+		/**
+		*	Returns the index of the day that the short day name string
+		*	represents. 	
+		* 
+		* 	@param m A short day name.
+		* 
+		* 	@return A int that represents that short day represented by the specifed
+		*	full month name.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*
+		*	@see SHORT_DAY
+		*/			
+		public static function getShortDayIndex(d:String):int
+		{
+			return DateBase.dayNamesShort.indexOf(d);
+		}
+
+		/**
+		*	Returns the English full day name for the day that
+		*	the Date represents.  	
+		* 
+		* 	@param d The Date instance whose day will be used to retrieve the
+		*	full day name.
+		* 
+		* 	@return An English full day name.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*
+		*	@see FULL_DAY
+		*/	
+		public static function getFullDayName(d:Date):String
+		{
+			return DateBase.dayNamesLong[d.getDay()];	
+		}		
+
+		/**
+		*	Returns the index of the day that the full day name string
+		*	represents. 	
+		* 
+		* 	@param m A full day name.
+		* 
+		* 	@return A int that represents that full day represented by the specifed
+		*	full month name.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*
+		*	@see FULL_DAY
+		*/		
+		public static function getFullDayIndex(d:String):int
+		{
+			return DateBase.dayNamesLong.indexOf(d);
+		}
+
+		/**
+		*	Returns a two digit representation of the year represented by the 
+		*	specified date.
+		* 
+		* 	@param d The Date instance whose year will be used to generate a two
+		*	digit string representation of the year.
+		* 
+		* 	@return A string that contains a 2 digit representation of the year.
+		*	Single digits will be padded with 0.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function getShortYear(d:Date):String
+		{
+			var dStr:String = String(d.getFullYear());
+			
+			if(dStr.length < 3)
+			{
+				return dStr;
+			}
+
+			return (dStr.substr(dStr.length - 2));
+		}
+
+		/**
+		*	Compares two dates and returns an integer depending on their relationship.
+		*
+		*	Returns -1 if d1 is greater than d2.
+		*	Returns 1 if d2 is greater than d1.
+		*	Returns 0 if both dates are equal.
+		* 
+		* 	@param d1 The date that will be compared to the second date.
+		*	@param d2 The date that will be compared to the first date.
+		* 
+		* 	@return An int indicating how the two dates compare.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function compareDates(d1:Date, d2:Date):int
+		{
+			var d1ms:Number = d1.getTime();
+			var d2ms:Number = d2.getTime();
+			
+			if(d1ms > d2ms)
+			{
+				return -1;
+			}
+			else if(d1ms < d2ms)
+			{
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+
+		/**
+		*	Returns a short hour (0 - 12) represented by the specified date.
+		*
+		*	If the hour is less than 12 (0 - 11 AM) then the hour will be returned.
+		*
+		*	If the hour is greater than 12 (12 - 23 PM) then the hour minus 12
+		*	will be returned.
+		* 
+		* 	@param d1 The Date from which to generate the short hour
+		* 
+		* 	@return An int between 0 and 13 ( 1 - 12 ) representing the short hour.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function getShortHour(d:Date):int
+		{
+			var h:int = d.hours;
+			
+			if(h == 0 || h == 12)
+			{
+				return 12;
+			}
+			else if(h > 12)
+			{
+				return h - 12;
+			}
+			else
+			{
+				return h;
+			}
+		}
+		
+		/**
+		*	Returns a string indicating whether the date represents a time in the
+		*	ante meridiem (AM) or post meridiem (PM).
+		*
+		*	If the hour is less than 12 then "AM" will be returned.
+		*
+		*	If the hour is greater than 12 then "PM" will be returned.
+		* 
+		* 	@param d1 The Date from which to generate the 12 hour clock indicator.
+		* 
+		* 	@return A String ("AM" or "PM") indicating which half of the day the 
+		*	hour represents.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function getAMPM(d:Date):String
+		{
+			return (d.hours > 11)? "PM" : "AM";
+		}
+
+		/**
+		* Parses dates that conform to RFC822 into Date objects. This method also
+		* supports four-digit years (not supported in RFC822), but two-digit years
+		* (referring to the 20th century) are fine, too.
+		*
+		* This function is useful for parsing RSS .91, .92, and 2.0 dates.
+		*
+		* @param str
+		*
+		* @returns
+		*
+		* @langversion ActionScript 3.0
+		* @playerversion Flash 9.0
+		* @tiptext
+		*
+		* @see http://asg.web.cmu.edu/rfc/rfc822.html
+		*/		
+		public static function parseRFC822(str:String):Date
+		{
+            var finalDate:Date;
+			try
+			{
+				var dateParts:Array = str.split(" ");
+				var day:String = null;
+				
+				if (dateParts[0].search(/\d/) == -1)
+				{
+					day = dateParts.shift().replace(/\W/, "");
+				}
+				
+				var date:Number = Number(dateParts.shift());
+				var month:Number = Number(DateUtil.getShortMonthIndex(dateParts.shift()));
+				var year:Number = Number(dateParts.shift());
+				var timeParts:Array = dateParts.shift().split(":");
+				var hour:Number = int(timeParts.shift());
+				var minute:Number = int(timeParts.shift());
+				var second:Number = (timeParts.length > 0) ? int(timeParts.shift()): 0;
+	
+				var milliseconds:Number = Date.UTC(year, month, date, hour, minute, second, 0);
+	
+				var timezone:String = dateParts.shift();
+				var offset:Number = 0;
+
+				if (timezone.search(/\d/) == -1)
+				{
+					switch(timezone)
+					{
+						case "UT":
+							offset = 0;
+							break;
+						case "UTC":
+							offset = 0;
+							break;
+						case "GMT":
+							offset = 0;
+							break;
+						case "EST":
+							offset = (-5 * 3600000);
+							break;
+						case "EDT":
+							offset = (-4 * 3600000);
+							break;
+						case "CST":
+							offset = (-6 * 3600000);
+							break;
+						case "CDT":
+							offset = (-5 * 3600000);
+							break;
+						case "MST":
+							offset = (-7 * 3600000);
+							break;
+						case "MDT":
+							offset = (-6 * 3600000);
+							break;
+						case "PST":
+							offset = (-8 * 3600000);
+							break;
+						case "PDT":
+							offset = (-7 * 3600000);
+							break;
+						case "Z":
+							offset = 0;
+							break;
+						case "A":
+							offset = (-1 * 3600000);
+							break;
+						case "M":
+							offset = (-12 * 3600000);
+							break;
+						case "N":
+							offset = (1 * 3600000);
+							break;
+						case "Y":
+							offset = (12 * 3600000);
+							break;
+						default:
+							offset = 0;
+					}
+				}
+				else
+				{
+					var multiplier:Number = 1;
+					var oHours:Number = 0;
+					var oMinutes:Number = 0;
+					if (timezone.length != 4)
+					{
+						if (timezone.charAt(0) == "-")
+						{
+							multiplier = -1;
+						}
+						timezone = timezone.substr(1, 4);
+					}
+					oHours = Number(timezone.substr(0, 2));
+					oMinutes = Number(timezone.substr(2, 2));
+					offset = (((oHours * 3600000) + (oMinutes * 60000)) * multiplier);
+				}
+
+				finalDate = new Date(milliseconds - offset);
+
+				if (finalDate.toString() == "Invalid Date")
+				{
+					throw new Error("This date does not conform to RFC822.");
+				}
+			}
+			catch (e:Error)
+			{
+				var eStr:String = "Unable to parse the string [" +str+ "] into a date. ";
+				eStr += "The internal error was: " + e.toString();
+				throw new Error(eStr);
+			}
+            return finalDate;
+		}
+	     
+		/**
+		* Returns a date string formatted according to RFC822.
+		*
+		* @param d
+		*
+		* @returns
+		*
+		* @langversion ActionScript 3.0
+		* @playerversion Flash 9.0
+		* @tiptext
+		*
+		* @see http://asg.web.cmu.edu/rfc/rfc822.html
+		*/	
+		public static function toRFC822(d:Date):String
+		{
+			var date:Number = d.getUTCDate();
+			var hours:Number = d.getUTCHours();
+			var minutes:Number = d.getUTCMinutes();
+			var seconds:Number = d.getUTCSeconds();
+			var sb:String = new String();
+			sb += DateBase.dayNamesShort[d.getUTCDay()];
+			sb += ", ";
+			
+			if (date < 10)
+			{
+				sb += "0";
+			}
+			sb += date;
+			sb += " ";
+			//sb += DateUtil.SHORT_MONTH[d.getUTCMonth()];
+			sb += DateBase.monthNamesShort[d.getUTCMonth()];
+			sb += " ";
+			sb += d.getUTCFullYear();
+			sb += " ";
+			if (hours < 10)
+			{			
+				sb += "0";
+			}
+			sb += hours;
+			sb += ":";
+			if (minutes < 10)
+			{			
+				sb += "0";
+			}
+			sb += minutes;
+			sb += ":";
+			if (seconds < 10)
+			{			
+				sb += "0";
+			}
+			sb += seconds;
+			sb += " GMT";
+			return sb;
+		}
+	     
+		/**
+		* Parses dates that conform to the W3C Date-time Format into Date objects.
+		*
+		* This function is useful for parsing RSS 1.0 and Atom 1.0 dates.
+		*
+		* @param str
+		*
+		* @returns
+		*
+		* @langversion ActionScript 3.0
+		* @playerversion Flash 9.0
+		* @tiptext
+		*
+		* @see http://www.w3.org/TR/NOTE-datetime
+		*/		     
+		public static function parseW3CDTF(str:String):Date
+		{
+            var finalDate:Date;
+			try
+			{
+				var dateStr:String = str.substring(0, str.indexOf("T"));
+				var timeStr:String = str.substring(str.indexOf("T")+1, str.length);
+				var dateArr:Array = dateStr.split("-");
+				var year:Number = Number(dateArr.shift());
+				var month:Number = Number(dateArr.shift());
+				var date:Number = Number(dateArr.shift());
+				
+				var multiplier:Number;
+				var offsetHours:Number;
+				var offsetMinutes:Number;
+				var offsetStr:String;
+				
+				if (timeStr.indexOf("Z") != -1)
+				{
+					multiplier = 1;
+					offsetHours = 0;
+					offsetMinutes = 0;
+					timeStr = timeStr.replace("Z", "");
+				}
+				else if (timeStr.indexOf("+") != -1)
+				{
+					multiplier = 1;
+					offsetStr = timeStr.substring(timeStr.indexOf("+")+1, timeStr.length);
+					offsetHours = Number(offsetStr.substring(0, offsetStr.indexOf(":")));
+					offsetMinutes = Number(offsetStr.substring(offsetStr.indexOf(":")+1, offsetStr.length));
+					timeStr = timeStr.substring(0, timeStr.indexOf("+"));
+				}
+				else // offset is -
+				{
+					multiplier = -1;
+					offsetStr = timeStr.substring(timeStr.indexOf("-")+1, timeStr.length);
+					offsetHours = Number(offsetStr.substring(0, offsetStr.indexOf(":")));
+					offsetMinutes = Number(offsetStr.substring(offsetStr.indexOf(":")+1, offsetStr.length));
+					timeStr = timeStr.substring(0, timeStr.indexOf("-"));
+				}
+				var timeArr:Array = timeStr.split(":");
+				var hour:Number = Number(timeArr.shift());
+				var minutes:Number = Number(timeArr.shift());
+				var secondsArr:Array = (timeArr.length > 0) ? String(timeArr.shift()).split(".") : null;
+				var seconds:Number = (secondsArr != null && secondsArr.length > 0) ? Number(secondsArr.shift()) : 0;
+				var milliseconds:Number = (secondsArr != null && secondsArr.length > 0) ? Number(secondsArr.shift()) : 0;
+				var utc:Number = Date.UTC(year, month-1, date, hour, minutes, seconds, milliseconds);
+				var offset:Number = (((offsetHours * 3600000) + (offsetMinutes * 60000)) * multiplier);
+				finalDate = new Date(utc - offset);
+	
+				if (finalDate.toString() == "Invalid Date")
+				{
+					throw new Error("This date does not conform to W3CDTF.");
+				}
+			}
+			catch (e:Error)
+			{
+				var eStr:String = "Unable to parse the string [" +str+ "] into a date. ";
+				eStr += "The internal error was: " + e.toString();
+				throw new Error(eStr);
+			}
+            return finalDate;
+		}
+	     
+		/**
+		* Returns a date string formatted according to W3CDTF.
+		*
+		* @param d
+		* @param includeMilliseconds Determines whether to include the
+		* milliseconds value (if any) in the formatted string.
+		*
+		* @returns
+		*
+		* @langversion ActionScript 3.0
+		* @playerversion Flash 9.0
+		* @tiptext
+		*
+		* @see http://www.w3.org/TR/NOTE-datetime
+		*/		     
+		public static function toW3CDTF(d:Date,includeMilliseconds:Boolean=false):String
+		{
+			var date:Number = d.getUTCDate();
+			var month:Number = d.getUTCMonth();
+			var hours:Number = d.getUTCHours();
+			var minutes:Number = d.getUTCMinutes();
+			var seconds:Number = d.getUTCSeconds();
+			var milliseconds:Number = d.getUTCMilliseconds();
+			var sb:String = new String();
+			
+			sb += d.getUTCFullYear();
+			sb += "-";
+			
+			//thanks to "dom" who sent in a fix for the line below
+			if (month + 1 < 10)
+			{
+				sb += "0";
+			}
+			sb += month + 1;
+			sb += "-";
+			if (date < 10)
+			{
+				sb += "0";
+			}
+			sb += date;
+			sb += "T";
+			if (hours < 10)
+			{
+				sb += "0";
+			}
+			sb += hours;
+			sb += ":";
+			if (minutes < 10)
+			{
+				sb += "0";
+			}
+			sb += minutes;
+			sb += ":";
+			if (seconds < 10)
+			{
+				sb += "0";
+			}
+			sb += seconds;
+			if (includeMilliseconds && milliseconds > 0)
+			{
+				sb += ".";
+				sb += milliseconds;
+			}
+			sb += "-00:00";
+			return sb;
+		}
+		
+		/**
+		 * Converts a date into just after midnight.
+		 */
+		public static function makeMorning(d:Date):Date
+		{
+			var d:Date = new Date(d.time);
+			d.hours = 0;
+            d.minutes = 0;
+            d.seconds = 0;
+            d.milliseconds = 0;
+            return d;
+		}
+		
+		/**
+		 * Converts a date into just befor midnight.
+		 */
+		public static function makeNight(d:Date):Date
+		{
+			var d:Date = new Date(d.time);
+			d.hours = 23;
+            d.minutes = 59;
+            d.seconds = 59;
+            d.milliseconds = 999;				
+            return d;
+		}
+
+		/**
+		 * Sort of converts a date into UTC.
+		 */
+		public static function getUTCDate(d:Date):Date
+		{
+			var nd:Date = new Date();
+			var offset:Number = d.getTimezoneOffset() * 60 * 1000; 
+			nd.setTime(d.getTime() + offset);
+			return nd;
+		}
+	}
+}
diff --git a/vendors/uploadify/com/adobe/utils/DictionaryUtil.as b/vendors/uploadify/com/adobe/utils/DictionaryUtil.as
new file mode 100644
index 000000000..9552ef494
--- /dev/null
+++ b/vendors/uploadify/com/adobe/utils/DictionaryUtil.as
@@ -0,0 +1,87 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.utils
+{
+	import flash.utils.Dictionary;
+	
+	public class DictionaryUtil
+	{
+		
+		/**
+		*	Returns an Array of all keys within the specified dictionary.	
+		* 
+		* 	@param d The Dictionary instance whose keys will be returned.
+		* 
+		* 	@return Array of keys contained within the Dictionary
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/					
+		public static function getKeys(d:Dictionary):Array
+		{
+			var a:Array = new Array();
+			
+			for (var key:Object in d)
+			{
+				a.push(key);
+			}
+			
+			return a;
+		}
+		
+		/**
+		*	Returns an Array of all values within the specified dictionary.		
+		* 
+		* 	@param d The Dictionary instance whose values will be returned.
+		* 
+		* 	@return Array of values contained within the Dictionary
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/					
+		public static function getValues(d:Dictionary):Array
+		{
+			var a:Array = new Array();
+			
+			for each (var value:Object in d)
+			{
+				a.push(value);
+			}
+			
+			return a;
+		}
+		
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/utils/IntUtil.as b/vendors/uploadify/com/adobe/utils/IntUtil.as
new file mode 100644
index 000000000..8c812fe08
--- /dev/null
+++ b/vendors/uploadify/com/adobe/utils/IntUtil.as
@@ -0,0 +1,99 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.adobe.utils {
+	
+	import flash.utils.Endian;
+	
+	/**
+	 * Contains reusable methods for operations pertaining 
+	 * to int values.
+	 */
+	public class IntUtil {
+		
+		/**
+		 * Rotates x left n bits
+		 *
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function rol ( x:int, n:int ):int {
+			return ( x << n ) | ( x >>> ( 32 - n ) );
+		}
+		
+		/**
+		 * Rotates x right n bits
+		 *
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function ror ( x:int, n:int ):uint {
+			var nn:int = 32 - n;
+			return ( x << nn ) | ( x >>> ( 32 - nn ) );
+		}
+		
+		/** String for quick lookup of a hex character based on index */
+		private static var hexChars:String = "0123456789abcdef";
+		
+		/**
+		 * Outputs the hex value of a int, allowing the developer to specify
+		 * the endinaness in the process.  Hex output is lowercase.
+		 *
+		 * @param n The int value to output as hex
+		 * @param bigEndian Flag to output the int as big or little endian
+		 * @return A string of length 8 corresponding to the 
+		 *		hex representation of n ( minus the leading "0x" )
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 * @tiptext
+		 */
+		public static function toHex( n:int, bigEndian:Boolean = false ):String {
+			var s:String = "";
+			
+			if ( bigEndian ) {
+				for ( var i:int = 0; i < 4; i++ ) {
+					s += hexChars.charAt( ( n >> ( ( 3 - i ) * 8 + 4 ) ) & 0xF ) 
+						+ hexChars.charAt( ( n >> ( ( 3 - i ) * 8 ) ) & 0xF );
+				}
+			} else {
+				for ( var x:int = 0; x < 4; x++ ) {
+					s += hexChars.charAt( ( n >> ( x * 8 + 4 ) ) & 0xF )
+						+ hexChars.charAt( ( n >> ( x * 8 ) ) & 0xF );
+				}
+			}
+			
+			return s;
+		}
+	}
+		
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/utils/NumberFormatter.as b/vendors/uploadify/com/adobe/utils/NumberFormatter.as
new file mode 100644
index 000000000..6fe12e145
--- /dev/null
+++ b/vendors/uploadify/com/adobe/utils/NumberFormatter.as
@@ -0,0 +1,74 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.utils
+{
+
+	/**
+	* 	Class that contains static utility methods for formatting Numbers
+	* 
+	* 	@langversion ActionScript 3.0
+	*	@playerversion Flash 9.0
+	*	@tiptext
+	*
+	*	@see #mx.formatters.NumberFormatter
+	*/		
+	public class NumberFormatter
+	{
+	
+		/**
+		*	Formats a number to include a leading zero if it is a single digit
+		*	between -1 and 10. 	
+		* 
+		* 	@param n The number that will be formatted
+		*
+		*	@return A string with single digits between -1 and 10 padded with a 
+		*	leading zero.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/		
+		public static function addLeadingZero(n:Number):String
+		{
+			var out:String = String(n);
+			
+			if(n < 10 && n > -1)
+			{
+				out = "0" + out;
+			}
+			
+			return out;
+		}	
+	
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/utils/StringUtil.as b/vendors/uploadify/com/adobe/utils/StringUtil.as
new file mode 100644
index 000000000..6aa1979fd
--- /dev/null
+++ b/vendors/uploadify/com/adobe/utils/StringUtil.as
@@ -0,0 +1,270 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.utils
+{
+	
+	/**
+	* 	Class that contains static utility methods for manipulating Strings.
+	* 
+	* 	@langversion ActionScript 3.0
+	*	@playerversion Flash 9.0
+	*	@tiptext
+	*/		
+	public class StringUtil
+	{
+
+		
+		/**
+		*	Does a case insensitive compare or two strings and returns true if
+		*	they are equal.
+		* 
+		*	@param s1 The first string to compare.
+		*
+		*	@param s2 The second string to compare.
+		*
+		*	@returns A boolean value indicating whether the strings' values are 
+		*	equal in a case sensitive compare.	
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/			
+		public static function stringsAreEqual(s1:String, s2:String, 
+											caseSensitive:Boolean):Boolean
+		{
+			if(caseSensitive)
+			{
+				return (s1 == s2);
+			}
+			else
+			{
+				return (s1.toUpperCase() == s2.toUpperCase());
+			}
+		}
+		
+		/**
+		*	Removes whitespace from the front and the end of the specified
+		*	string.
+		* 
+		*	@param input The String whose beginning and ending whitespace will
+		*	will be removed.
+		*
+		*	@returns A String with whitespace removed from the begining and end	
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/			
+		public static function trim(input:String):String
+		{
+			return StringUtil.ltrim(StringUtil.rtrim(input));
+		}
+
+		/**
+		*	Removes whitespace from the front of the specified string.
+		* 
+		*	@param input The String whose beginning whitespace will will be removed.
+		*
+		*	@returns A String with whitespace removed from the begining	
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function ltrim(input:String):String
+		{
+			var size:Number = input.length;
+			for(var i:Number = 0; i < size; i++)
+			{
+				if(input.charCodeAt(i) > 32)
+				{
+					return input.substring(i);
+				}
+			}
+			return "";
+		}
+
+		/**
+		*	Removes whitespace from the end of the specified string.
+		* 
+		*	@param input The String whose ending whitespace will will be removed.
+		*
+		*	@returns A String with whitespace removed from the end	
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function rtrim(input:String):String
+		{
+			var size:Number = input.length;
+			for(var i:Number = size; i > 0; i--)
+			{
+				if(input.charCodeAt(i - 1) > 32)
+				{
+					return input.substring(0, i);
+				}
+			}
+
+			return "";
+		}
+
+		/**
+		*	Determines whether the specified string begins with the spcified prefix.
+		* 
+		*	@param input The string that the prefix will be checked against.
+		*
+		*	@param prefix The prefix that will be tested against the string.
+		*
+		*	@returns True if the string starts with the prefix, false if it does not.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function beginsWith(input:String, prefix:String):Boolean
+		{			
+			return (prefix == input.substring(0, prefix.length));
+		}	
+
+		/**
+		*	Determines whether the specified string ends with the spcified suffix.
+		* 
+		*	@param input The string that the suffic will be checked against.
+		*
+		*	@param prefix The suffic that will be tested against the string.
+		*
+		*	@returns True if the string ends with the suffix, false if it does not.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function endsWith(input:String, suffix:String):Boolean
+		{
+			return (suffix == input.substring(input.length - suffix.length));
+		}	
+
+		/**
+		*	Removes all instances of the remove string in the input string.
+		* 
+		*	@param input The string that will be checked for instances of remove
+		*	string
+		*
+		*	@param remove The string that will be removed from the input string.
+		*
+		*	@returns A String with the remove string removed.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/	
+		public static function remove(input:String, remove:String):String
+		{
+			return StringUtil.replace(input, remove, "");
+		}
+
+		/**
+		*	Replaces all instances of the replace string in the input string
+		*	with the replaceWith string.
+		* 
+		*	@param input The string that instances of replace string will be 
+		*	replaces with removeWith string.
+		*
+		*	@param replace The string that will be replaced by instances of 
+		*	the replaceWith string.
+		*
+		*	@param replaceWith The string that will replace instances of replace
+		*	string.
+		*
+		*	@returns A new String with the replace string replaced with the 
+		*	replaceWith string.
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/
+		public static function replace(input:String, replace:String, replaceWith:String):String
+		{
+			//change to StringBuilder
+			var sb:String = new String();
+			var found:Boolean = false;
+
+			var sLen:Number = input.length;
+			var rLen:Number = replace.length;
+
+			for (var i:Number = 0; i < sLen; i++)
+			{
+				if(input.charAt(i) == replace.charAt(0))
+				{   
+					found = true;
+					for(var j:Number = 0; j < rLen; j++)
+					{
+						if(!(input.charAt(i + j) == replace.charAt(j)))
+						{
+							found = false;
+							break;
+						}
+					}
+
+					if(found)
+					{
+						sb += replaceWith;
+						i = i + (rLen - 1);
+						continue;
+					}
+				}
+				sb += input.charAt(i);
+			}
+			//TODO : if the string is not found, should we return the original
+			//string?
+			return sb;
+		}
+		
+		/**
+		*	Specifies whether the specified string is either non-null, or contains
+		*  	characters (i.e. length is greater that 0)
+		* 
+		*	@param s The string which is being checked for a value
+		*
+		* 	@langversion ActionScript 3.0
+		*	@playerversion Flash 9.0
+		*	@tiptext
+		*/		
+		public static function stringHasValue(s:String):Boolean
+		{
+			//todo: this needs a unit test
+			return (s != null && s.length > 0);			
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/utils/XMLUtil.as b/vendors/uploadify/com/adobe/utils/XMLUtil.as
new file mode 100644
index 000000000..24fce00fa
--- /dev/null
+++ b/vendors/uploadify/com/adobe/utils/XMLUtil.as
@@ -0,0 +1,168 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.utils
+{
+
+	public class XMLUtil
+	{
+		/**
+		 * Constant representing a text node type returned from XML.nodeKind.
+		 * 
+		 * @see XML.nodeKind()
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */
+		public static const TEXT:String = "text";
+		
+		/**
+		 * Constant representing a comment node type returned from XML.nodeKind.
+		 * 
+		 * @see XML.nodeKind()
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */		
+		public static const COMMENT:String = "comment";
+		
+		/**
+		 * Constant representing a processing instruction type returned from XML.nodeKind.
+		 * 
+		 * @see XML.nodeKind()
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */		
+		public static const PROCESSING_INSTRUCTION:String = "processing-instruction";
+		
+		/**
+		 * Constant representing an attribute type returned from XML.nodeKind.
+		 * 
+		 * @see XML.nodeKind()
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */		
+		public static const ATTRIBUTE:String = "attribute";
+		
+		/**
+		 * Constant representing a element type returned from XML.nodeKind.
+		 * 
+		 * @see XML.nodeKind()
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */		
+		public static const ELEMENT:String = "element";
+		
+		/**
+		 * Checks whether the specified string is valid and well formed XML.
+		 * 
+		 * @param data The string that is being checked to see if it is valid XML.
+		 * 
+		 * @return A Boolean value indicating whether the specified string is
+		 * valid XML.
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */
+		public static function isValidXML(data:String):Boolean
+		{
+			var xml:XML;
+			
+			try
+			{
+				xml = new XML(data);
+			}
+			catch(e:Error)
+			{
+				return false;
+			}
+			
+			if(xml.nodeKind() != XMLUtil.ELEMENT)
+			{
+				return false;
+			}
+			
+			return true;
+		}
+		
+		/**
+		 * Returns the next sibling of the specified node relative to the node's parent.
+		 * 
+		 * @param x The node whose next sibling will be returned.
+		 * 
+		 * @return The next sibling of the node. null if the node does not have 
+		 * a sibling after it, or if the node has no parent.
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */		
+		public static function getNextSibling(x:XML):XML
+		{	
+			return XMLUtil.getSiblingByIndex(x, 1);
+		}
+		
+		/**
+		 * Returns the sibling before the specified node relative to the node's parent.
+		 * 
+		 * @param x The node whose sibling before it will be returned.
+		 * 
+		 * @return The sibling before the node. null if the node does not have 
+		 * a sibling before it, or if the node has no parent.
+		 * 
+		 * @langversion ActionScript 3.0
+		 * @playerversion Flash 9.0
+		 */			
+		public static function getPreviousSibling(x:XML):XML
+		{	
+			return XMLUtil.getSiblingByIndex(x, -1);
+		}		
+		
+		protected static function getSiblingByIndex(x:XML, count:int):XML	
+		{
+			var out:XML;
+			
+			try
+			{
+				out = x.parent().children()[x.childIndex() + count];	
+			} 		
+			catch(e:Error)
+			{
+				return null;
+			}
+			
+			return out;			
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/webapis/ServiceBase.as b/vendors/uploadify/com/adobe/webapis/ServiceBase.as
new file mode 100644
index 000000000..7080287c0
--- /dev/null
+++ b/vendors/uploadify/com/adobe/webapis/ServiceBase.as
@@ -0,0 +1,48 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+package com.adobe.webapis 
+{
+	import flash.events.EventDispatcher;
+
+	/**
+	* Base class for remote service classes.
+	*/
+	public class ServiceBase extends EventDispatcher
+	{
+		public function ServiceBase()
+		{
+		}
+		
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/webapis/URLLoaderBase.as b/vendors/uploadify/com/adobe/webapis/URLLoaderBase.as
new file mode 100644
index 000000000..fc0085c45
--- /dev/null
+++ b/vendors/uploadify/com/adobe/webapis/URLLoaderBase.as
@@ -0,0 +1,108 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+package com.adobe.webapis
+{
+	import flash.events.IOErrorEvent;
+	import flash.events.SecurityErrorEvent;
+	import flash.events.ProgressEvent;
+	
+	import com.adobe.net.DynamicURLLoader;
+	
+		/**
+		*  	Dispatched when data is 
+		*  	received as the download operation progresses.
+		*	 
+		* 	@eventType flash.events.ProgressEvent.PROGRESS
+		* 
+		* @langversion ActionScript 3.0
+		* @playerversion Flash 9.0
+		*/
+		[Event(name="progress", type="flash.events.ProgressEvent")]		
+	
+		/**
+		*	Dispatched if a call to the server results in a fatal 
+		*	error that terminates the download.
+		* 
+		* 	@eventType flash.events.IOErrorEvent.IO_ERROR
+		* 
+		* @langversion ActionScript 3.0
+		* @playerversion Flash 9.0
+		*/
+		[Event(name="ioError", type="flash.events.IOErrorEvent")]		
+		
+		/**
+		*	A securityError event occurs if a call attempts to
+		*	load data from a server outside the security sandbox.
+		* 
+		* 	@eventType flash.events.SecurityErrorEvent.SECURITY_ERROR
+		* 
+		* @langversion ActionScript 3.0
+		* @playerversion Flash 9.0
+		*/
+		[Event(name="securityError", type="flash.events.SecurityErrorEvent")]	
+	
+	/**
+	*	Base class for services that utilize URLLoader
+	*	to communicate with remote APIs / Services.
+	* 
+	* @langversion ActionScript 3.0
+	* @playerversion Flash 9.0
+	*/
+	public class URLLoaderBase extends ServiceBase
+	{	
+		protected function getURLLoader():DynamicURLLoader
+		{
+			var loader:DynamicURLLoader = new DynamicURLLoader();
+				loader.addEventListener("progress", onProgress);
+				loader.addEventListener("ioError", onIOError);
+				loader.addEventListener("securityError", onSecurityError);
+			
+			return loader;			
+		}		
+		
+		private function onIOError(event:IOErrorEvent):void
+		{
+			dispatchEvent(event);
+		}			
+		
+		private function onSecurityError(event:SecurityErrorEvent):void
+		{
+			dispatchEvent(event);
+		}	
+		
+		private function onProgress(event:ProgressEvent):void
+		{
+			dispatchEvent(event);
+		}	
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/com/adobe/webapis/events/ServiceEvent.as b/vendors/uploadify/com/adobe/webapis/events/ServiceEvent.as
new file mode 100644
index 000000000..d1aaf3d44
--- /dev/null
+++ b/vendors/uploadify/com/adobe/webapis/events/ServiceEvent.as
@@ -0,0 +1,75 @@
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+package com.adobe.webapis.events
+{
+
+	import flash.events.Event;
+
+	/**
+	* Event class that contains data loaded from remote services.
+	*
+	* @author Mike Chambers
+	*/
+	public class ServiceEvent extends Event
+	{
+		private var _data:Object = new Object();;
+
+		/**
+		* Constructor for ServiceEvent class.
+		*
+		* @param type The type of event that the instance represents.
+		*/
+		public function ServiceEvent(type:String, bubbles:Boolean = false, 
+														cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+		}
+
+		/**
+		* 	This object contains data loaded in response
+		* 	to remote service calls, and properties associated with that call.
+		*/
+		public function get data():Object
+		{
+			return _data;
+		}
+
+		public function set data(d:Object):void
+		{
+			_data = d;
+		}
+		
+
+	}
+}
\ No newline at end of file
diff --git a/vendors/uploadify/example/_notes/dwsync.xml b/vendors/uploadify/example/_notes/dwsync.xml
new file mode 100644
index 000000000..36ecaa56e
--- /dev/null
+++ b/vendors/uploadify/example/_notes/dwsync.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/vendors/uploadify/example/cancel.png b/vendors/uploadify/example/cancel.png
new file mode 100644
index 000000000..1c062ae5d
Binary files /dev/null and b/vendors/uploadify/example/cancel.png differ
diff --git a/vendors/uploadify/example/css/_notes/dwsync.xml b/vendors/uploadify/example/css/_notes/dwsync.xml
new file mode 100644
index 000000000..049ffa596
--- /dev/null
+++ b/vendors/uploadify/example/css/_notes/dwsync.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/vendors/uploadify/example/css/default.css b/vendors/uploadify/example/css/default.css
new file mode 100644
index 000000000..ec5902d47
--- /dev/null
+++ b/vendors/uploadify/example/css/default.css
@@ -0,0 +1,10 @@
+body {
+	font: 12px/16px Arial, Helvetica, sans-serif;
+}
+#fileQueue {
+	width: 400px;
+	height: 300px;
+	overflow: auto;
+	border: 1px solid #E5E5E5;
+	margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/vendors/uploadify/example/css/uploadify.css b/vendors/uploadify/example/css/uploadify.css
new file mode 100644
index 000000000..0cf8c0eaf
--- /dev/null
+++ b/vendors/uploadify/example/css/uploadify.css
@@ -0,0 +1,53 @@
+/*
+Uploadify v2.1.0
+Release Date: August 24, 2009
+
+Copyright (c) 2009 Ronnie Garcia, Travis Nickels
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+.uploadifyQueueItem {
+	font: 11px Verdana, Geneva, sans-serif;
+	border: 2px solid #E5E5E5;
+	background-color: #F5F5F5;
+	margin-top: 5px;
+	padding: 10px;
+	width: 350px;
+}
+.uploadifyError {
+	border: 2px solid #FBCBBC !important;
+	background-color: #FDE5DD !important;
+}
+.uploadifyQueueItem .cancel {
+	float: right;
+}
+.uploadifyProgress {
+	background-color: #FFFFFF;
+	border-top: 1px solid #808080;
+	border-left: 1px solid #808080;
+	border-right: 1px solid #C5C5C5;
+	border-bottom: 1px solid #C5C5C5;
+	margin-top: 10px;
+	width: 100%;
+}
+.uploadifyProgressBar {
+	background-color: #0099FF;
+	width: 1px;
+	height: 3px;
+}
\ No newline at end of file
diff --git a/vendors/uploadify/example/index.php b/vendors/uploadify/example/index.php
new file mode 100644
index 000000000..769d11c61
--- /dev/null
+++ b/vendors/uploadify/example/index.php
@@ -0,0 +1,31 @@
+
+
+
+
+Uploadify Example Script
+
+
+
+
+
+
+
+
+
+
      
+
+
      Cancel All Uploads
      
+
+
diff --git a/vendors/uploadify/example/scripts/_notes/dwsync.xml b/vendors/uploadify/example/scripts/_notes/dwsync.xml
new file mode 100644
index 000000000..13ca04347
--- /dev/null
+++ b/vendors/uploadify/example/scripts/_notes/dwsync.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/vendors/uploadify/example/scripts/check.php b/vendors/uploadify/example/scripts/check.php
new file mode 100644
index 000000000..d7dc57177
--- /dev/null
+++ b/vendors/uploadify/example/scripts/check.php
@@ -0,0 +1,35 @@
+ $value) {
+	if ($key != 'folder') {
+		if (file_exists($_SERVER['DOCUMENT_ROOT'] . $_POST['folder'] . '/' . $value)) {
+			$fileArray[$key] = $value;
+		}
+	}
+}
+echo json_encode($fileArray);
+?>
\ No newline at end of file
diff --git a/vendors/uploadify/example/scripts/expressInstall.swf b/vendors/uploadify/example/scripts/expressInstall.swf
new file mode 100644
index 000000000..0fbf8fca9
Binary files /dev/null and b/vendors/uploadify/example/scripts/expressInstall.swf differ
diff --git a/vendors/uploadify/example/scripts/jquery-1.3.2.min.js b/vendors/uploadify/example/scripts/jquery-1.3.2.min.js
new file mode 100644
index 000000000..b1ae21d8b
--- /dev/null
+++ b/vendors/uploadify/example/scripts/jquery-1.3.2.min.js
@@ -0,0 +1,19 @@
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"
      
 
 
      ","
      "]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
      ","
      "]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
+/*
+ * Sizzle CSS Selector Engine - v0.9.3
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="
      ";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
      ";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
      ").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
      ';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
\ No newline at end of file
diff --git a/vendors/uploadify/example/scripts/jquery.uploadify.v2.1.0.min.js b/vendors/uploadify/example/scripts/jquery.uploadify.v2.1.0.min.js
new file mode 100644
index 000000000..04592ffec
--- /dev/null
+++ b/vendors/uploadify/example/scripts/jquery.uploadify.v2.1.0.min.js
@@ -0,0 +1,26 @@
+/*
+Uploadify v2.1.0
+Release Date: August 24, 2009
+
+Copyright (c) 2009 Ronnie Garcia, Travis Nickels
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+if(jQuery){(function(a){a.extend(a.fn,{uploadify:function(b){a(this).each(function(){settings=a.extend({id:a(this).attr("id"),uploader:"uploadify.swf",script:"uploadify.php",expressInstall:null,folder:"",height:30,width:110,cancelImg:"cancel.png",wmode:"opaque",scriptAccess:"sameDomain",fileDataName:"Filedata",method:"POST",queueSizeLimit:999,simUploadLimit:1,queueID:false,displayData:"percentage",onInit:function(){},onSelect:function(){},onQueueFull:function(){},onCheck:function(){},onCancel:function(){},onError:function(){},onProgress:function(){},onComplete:function(){},onAllComplete:function(){}},b);var e=location.pathname;e=e.split("/");e.pop();e=e.join("/")+"/";var f={};f.uploadifyID=settings.id;f.pagepath=e;if(settings.buttonImg){f.buttonImg=escape(settings.buttonImg)}if(settings.buttonText){f.buttonText=escape(settings.buttonText)}if(settings.rollover){f.rollover=true}f.script=settings.script;f.folder=escape(settings.folder);if(settings.scriptData){var g="";for(var d in settings.scriptData){g+="&"+d+"="+settings.scriptData[d]}f.scriptData=escape(g.substr(1))}f.width=settings.width;f.height=settings.height;f.wmode=settings.wmode;f.method=settings.method;f.queueSizeLimit=settings.queueSizeLimit;f.simUploadLimit=settings.simUploadLimit;if(settings.hideButton){f.hideButton=true}if(settings.fileDesc){f.fileDesc=settings.fileDesc}if(settings.fileExt){f.fileExt=settings.fileExt}if(settings.multi){f.multi=true}if(settings.auto){f.auto=true}if(settings.sizeLimit){f.sizeLimit=settings.sizeLimit}if(settings.checkScript){f.checkScript=settings.checkScript}if(settings.fileDataName){f.fileDataName=settings.fileDataName}if(settings.queueID){f.queueID=settings.queueID}if(settings.onInit()!==false){a(this).css("display","none");a(this).after('
      ');swfobject.embedSWF(settings.uploader,settings.id+"Uploader",settings.width,settings.height,"9.0.24",settings.expressInstall,f,{quality:"high",wmode:settings.wmode,allowScriptAccess:settings.scriptAccess});if(settings.queueID==false){a("#"+a(this).attr("id")+"Uploader").after('
      ')}}if(typeof(settings.onOpen)=="function"){a(this).bind("uploadifyOpen",settings.onOpen)}a(this).bind("uploadifySelect",{action:settings.onSelect,queueID:settings.queueID},function(j,h,i){if(j.data.action(j,h,i)!==false){var k=Math.round(i.size/1024*100)*0.01;var l="KB";if(k>1000){k=Math.round(k*0.001*100)*0.01;l="MB"}var m=k.toString().split(".");if(m.length>1){k=m[0]+"."+m[1].substr(0,2)}else{k=m[0]}if(i.name.length>20){fileName=i.name.substr(0,20)+"..."}else{fileName=i.name}queue="#"+a(this).attr("id")+"Queue";if(j.data.queueID){queue="#"+j.data.queueID}a(queue).append('
      '+fileName+" ("+k+l+')
      ')}});if(typeof(settings.onSelectOnce)=="function"){a(this).bind("uploadifySelectOnce",settings.onSelectOnce)}a(this).bind("uploadifyQueueFull",{action:settings.onQueueFull},function(h,i){if(h.data.action(h,i)!==false){alert("The queue is full.  The max size is "+i+".")}});a(this).bind("uploadifyCheckExist",{action:settings.onCheck},function(m,l,k,j,o){var i=new Object();i=k;i.folder=e+j;if(o){for(var h in k){var n=h}}a.post(l,i,function(r){for(var p in r){if(m.data.action(m,l,k,j,o)!==false){var q=confirm("Do you want to replace the file "+r[p]+"?");if(!q){document.getElementById(a(m.target).attr("id")+"Uploader").cancelFileUpload(p,true,true)}}}if(o){document.getElementById(a(m.target).attr("id")+"Uploader").startFileUpload(n,true)}else{document.getElementById(a(m.target).attr("id")+"Uploader").startFileUpload(null,true)}},"json")});a(this).bind("uploadifyCancel",{action:settings.onCancel},function(l,h,k,m,j){if(l.data.action(l,h,k,m,j)!==false){var i=(j==true)?0:250;a("#"+a(this).attr("id")+h).fadeOut(i,function(){a(this).remove()})}});if(typeof(settings.onClearQueue)=="function"){a(this).bind("uploadifyClearQueue",settings.onClearQueue)}var c=[];a(this).bind("uploadifyError",{action:settings.onError},function(l,h,k,j){if(l.data.action(l,h,k,j)!==false){var i=new Array(h,k,j);c.push(i);a("#"+a(this).attr("id")+h+" .percentage").text(" - "+j.type+" Error");a("#"+a(this).attr("id")+h).addClass("uploadifyError")}});a(this).bind("uploadifyProgress",{action:settings.onProgress,toDisplay:settings.displayData},function(j,h,i,k){if(j.data.action(j,h,i,k)!==false){a("#"+a(this).attr("id")+h+"ProgressBar").css("width",k.percentage+"%");if(j.data.toDisplay=="percentage"){displayData=" - "+k.percentage+"%"}if(j.data.toDisplay=="speed"){displayData=" - "+k.speed+"KB/s"}if(j.data.toDisplay==null){displayData=" "}a("#"+a(this).attr("id")+h+" .percentage").text(displayData)}});a(this).bind("uploadifyComplete",{action:settings.onComplete},function(k,h,j,i,l){if(k.data.action(k,h,j,unescape(i),l)!==false){a("#"+a(this).attr("id")+h+" .percentage").text(" - Completed");a("#"+a(this).attr("id")+h).fadeOut(250,function(){a(this).remove()})}});if(typeof(settings.onAllComplete)=="function"){a(this).bind("uploadifyAllComplete",{action:settings.onAllComplete},function(h,i){if(h.data.action(h,i)!==false){c=[]}})}})},uploadifySettings:function(f,j,c){var g=false;a(this).each(function(){if(f=="scriptData"&&j!=null){if(c){var i=j}else{var i=a.extend(settings.scriptData,j)}var l="";for(var k in i){l+="&"+k+"="+escape(i[k])}j=l.substr(1)}g=document.getElementById(a(this).attr("id")+"Uploader").updateSettings(f,j)});if(j==null){if(f=="scriptData"){var b=unescape(g).split("&");var e=new Object();for(var d=0;d 
+	is released under the MIT License  
+*/
+var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad'}}aa.outerHTML='"+af+"";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab
\ No newline at end of file
diff --git a/vendors/uploadify/example/scripts/uploadify.swf b/vendors/uploadify/example/scripts/uploadify.swf
new file mode 100644
index 000000000..4d27952f5
Binary files /dev/null and b/vendors/uploadify/example/scripts/uploadify.swf differ
diff --git a/vendors/uploadify/expressInstall.swf b/vendors/uploadify/expressInstall.swf
new file mode 100644
index 000000000..0fbf8fca9
Binary files /dev/null and b/vendors/uploadify/expressInstall.swf differ
diff --git a/vendors/uploadify/jquery-1.3.2.min.js b/vendors/uploadify/jquery-1.3.2.min.js
new file mode 100644
index 000000000..b1ae21d8b
--- /dev/null
+++ b/vendors/uploadify/jquery-1.3.2.min.js
@@ -0,0 +1,19 @@
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
      "]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
      ","
      "]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
+/*
+ * Sizzle CSS Selector Engine - v0.9.3
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="
      ";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
      ";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
      ").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
      ';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
\ No newline at end of file
diff --git a/vendors/uploadify/jquery.uploadify.v2.1.0.js b/vendors/uploadify/jquery.uploadify.v2.1.0.js
new file mode 100644
index 000000000..9a78cd32d
--- /dev/null
+++ b/vendors/uploadify/jquery.uploadify.v2.1.0.js
@@ -0,0 +1,258 @@
+/*
+Uploadify v2.1.0
+Release Date: August 24, 2009
+
+Copyright (c) 2009 Ronnie Garcia, Travis Nickels
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+if(jQuery)(
+	function(jQuery){
+		jQuery.extend(jQuery.fn,{
+			uploadify:function(options) {
+				jQuery(this).each(function(){
+					settings = jQuery.extend({
+					id             : jQuery(this).attr('id'), // The ID of the object being Uploadified
+					uploader       : 'uploadify.swf', // The path to the uploadify swf file
+					script         : 'uploadify.php', // The path to the uploadify backend upload script
+					expressInstall : null, // The path to the express install swf file
+					folder         : '', // The path to the upload folder
+					height         : 30, // The height of the flash button
+					width          : 110, // The width of the flash button
+					cancelImg      : 'cancel.png', // The path to the cancel image for the default file queue item container
+					wmode          : 'opaque', // The wmode of the flash file
+					scriptAccess   : 'sameDomain', // Set to "always" to allow script access across domains
+					fileDataName   : 'Filedata', // The name of the file collection object in the backend upload script
+					method         : 'POST', // The method for sending variables to the backend upload script
+					queueSizeLimit : 999, // The maximum size of the file queue
+					simUploadLimit : 1, // The number of simultaneous uploads allowed
+					queueID        : false, // The optional ID of the queue container
+					displayData    : 'percentage', // Set to "speed" to show the upload speed in the default queue item
+					onInit         : function() {}, // Function to run when uploadify is initialized
+					onSelect       : function() {}, // Function to run when a file is selected
+					onQueueFull    : function() {}, // Function to run when the queue reaches capacity
+					onCheck        : function() {}, // Function to run when script checks for duplicate files on the server
+					onCancel       : function() {}, // Function to run when an item is cleared from the queue
+					onError        : function() {}, // Function to run when an upload item returns an error
+					onProgress     : function() {}, // Function to run each time the upload progress is updated
+					onComplete     : function() {}, // Function to run when an upload is completed
+					onAllComplete  : function() {}  // Functino to run when all uploads are completed
+				}, options);
+				var pagePath = location.pathname;
+				pagePath = pagePath.split('/');
+				pagePath.pop();
+				pagePath = pagePath.join('/') + '/';
+				var data = {};
+				data.uploadifyID = settings.id;
+				data.pagepath = pagePath;
+				if (settings.buttonImg) data.buttonImg = escape(settings.buttonImg);
+				if (settings.buttonText) data.buttonText = escape(settings.buttonText);
+				if (settings.rollover) data.rollover = true;
+				data.script = settings.script;
+				data.folder = escape(settings.folder);
+				if (settings.scriptData) {
+					var scriptDataString = '';
+					for (var name in settings.scriptData) {
+						scriptDataString += '&' + name + '=' + settings.scriptData[name];
+					}
+					data.scriptData = escape(scriptDataString.substr(1));
+				}
+				data.width          = settings.width;
+				data.height         = settings.height;
+				data.wmode          = settings.wmode;
+				data.method         = settings.method;
+				data.queueSizeLimit = settings.queueSizeLimit;
+				data.simUploadLimit = settings.simUploadLimit;
+				if (settings.hideButton)   data.hideButton   = true;
+				if (settings.fileDesc)     data.fileDesc     = settings.fileDesc;
+				if (settings.fileExt)      data.fileExt      = settings.fileExt;
+				if (settings.multi)        data.multi        = true;
+				if (settings.auto)         data.auto         = true;
+				if (settings.sizeLimit)    data.sizeLimit    = settings.sizeLimit;
+				if (settings.checkScript)  data.checkScript  = settings.checkScript;
+				if (settings.fileDataName) data.fileDataName = settings.fileDataName;
+				if (settings.queueID)      data.queueID      = settings.queueID;
+				if (settings.onInit() !== false) {
+					jQuery(this).css('display','none');
+					jQuery(this).after('
      ');
+					swfobject.embedSWF(settings.uploader, settings.id + 'Uploader', settings.width, settings.height, '9.0.24', settings.expressInstall, data, {'quality':'high','wmode':settings.wmode,'allowScriptAccess':settings.scriptAccess});
+					if (settings.queueID == false) {
+						jQuery("#" + jQuery(this).attr('id') + "Uploader").after('
      ');
+					}
+				}
+				if (typeof(settings.onOpen) == 'function') {
+					jQuery(this).bind("uploadifyOpen", settings.onOpen);
+				}
+				jQuery(this).bind("uploadifySelect", {'action': settings.onSelect, 'queueID': settings.queueID}, function(event, ID, fileObj) {
+					if (event.data.action(event, ID, fileObj) !== false) {
+						var byteSize = Math.round(fileObj.size / 1024 * 100) * .01;
+						var suffix = 'KB';
+						if (byteSize > 1000) {
+							byteSize = Math.round(byteSize *.001 * 100) * .01;
+							suffix = 'MB';
+						}
+						var sizeParts = byteSize.toString().split('.');
+						if (sizeParts.length > 1) {
+							byteSize = sizeParts[0] + '.' + sizeParts[1].substr(0,2);
+						} else {
+							byteSize = sizeParts[0];
+						}
+						if (fileObj.name.length > 20) {
+							fileName = fileObj.name.substr(0,20) + '...';
+						} else {
+							fileName = fileObj.name;
+						}
+						queue = '#' + jQuery(this).attr('id') + 'Queue';
+						if (event.data.queueID) {
+							queue = '#' + event.data.queueID;
+						}
+						jQuery(queue).append('
      \
+								
      \
+									\
+								
      \
+								' + fileName + ' (' + byteSize + suffix + ')\
+								
      \
+									
      \
+								
      \
+							
      ');
+					}
+				});
+				if (typeof(settings.onSelectOnce) == 'function') {
+					jQuery(this).bind("uploadifySelectOnce", settings.onSelectOnce);
+				}
+				jQuery(this).bind("uploadifyQueueFull", {'action': settings.onQueueFull}, function(event, queueSizeLimit) {
+					if (event.data.action(event, queueSizeLimit) !== false) {
+						alert('The queue is full.  The max size is ' + queueSizeLimit + '.');
+					}
+				});
+				jQuery(this).bind("uploadifyCheckExist", {'action': settings.onCheck}, function(event, checkScript, fileQueueObj, folder, single) {
+					var postData = new Object();
+					postData = fileQueueObj;
+					postData.folder = pagePath + folder;
+					if (single) {
+						for (var ID in fileQueueObj) {
+							var singleFileID = ID;
+						}
+					}
+					jQuery.post(checkScript, postData, function(data) {
+						for(var key in data) {
+							if (event.data.action(event, checkScript, fileQueueObj, folder, single) !== false) {
+								var replaceFile = confirm("Do you want to replace the file " + data[key] + "?");
+								if (!replaceFile) {
+									document.getElementById(jQuery(event.target).attr('id') + 'Uploader').cancelFileUpload(key, true,true);
+								}
+							}
+						}
+						if (single) {
+							document.getElementById(jQuery(event.target).attr('id') + 'Uploader').startFileUpload(singleFileID, true);
+						} else {
+							document.getElementById(jQuery(event.target).attr('id') + 'Uploader').startFileUpload(null, true);
+						}
+					}, "json");
+				});
+				jQuery(this).bind("uploadifyCancel", {'action': settings.onCancel}, function(event, ID, fileObj, data, clearFast) {
+					if (event.data.action(event, ID, fileObj, data, clearFast) !== false) {
+						var fadeSpeed = (clearFast == true) ? 0 : 250;
+						jQuery("#" + jQuery(this).attr('id') + ID).fadeOut(fadeSpeed, function() { jQuery(this).remove() });
+					}
+				});
+				if (typeof(settings.onClearQueue) == 'function') {
+					jQuery(this).bind("uploadifyClearQueue", settings.onClearQueue);
+				}
+				var errorArray = [];
+				jQuery(this).bind("uploadifyError", {'action': settings.onError}, function(event, ID, fileObj, errorObj) {
+					if (event.data.action(event, ID, fileObj, errorObj) !== false) {
+						var fileArray = new Array(ID, fileObj, errorObj);
+						errorArray.push(fileArray);
+						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(" - " + errorObj.type + " Error");
+						jQuery("#" + jQuery(this).attr('id') + ID).addClass('uploadifyError');
+					}
+				});
+				jQuery(this).bind("uploadifyProgress", {'action': settings.onProgress, 'toDisplay': settings.displayData}, function(event, ID, fileObj, data) {
+					if (event.data.action(event, ID, fileObj, data) !== false) {
+						jQuery("#" + jQuery(this).attr('id') + ID + "ProgressBar").css('width', data.percentage + '%');
+						if (event.data.toDisplay == 'percentage') displayData = ' - ' + data.percentage + '%';
+						if (event.data.toDisplay == 'speed') displayData = ' - ' + data.speed + 'KB/s';
+						if (event.data.toDisplay == null) displayData = ' ';
+						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(displayData);
+					}
+				});
+				jQuery(this).bind("uploadifyComplete", {'action': settings.onComplete}, function(event, ID, fileObj, response, data) {
+					if (event.data.action(event, ID, fileObj, unescape(response), data) !== false) {
+						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(' - Completed');
+						jQuery("#" + jQuery(this).attr('id') + ID).fadeOut(250, function() { jQuery(this).remove()});
+					}
+				});
+				if (typeof(settings.onAllComplete) == 'function') {
+					jQuery(this).bind("uploadifyAllComplete", {'action': settings.onAllComplete}, function(event, uploadObj) {
+						if (event.data.action(event, uploadObj) !== false) {
+							errorArray = [];
+						}
+					});
+				}
+			});
+		},
+		uploadifySettings:function(settingName, settingValue, resetObject) {
+			var returnValue = false;
+			jQuery(this).each(function() {
+				if (settingName == 'scriptData' && settingValue != null) {
+					if (resetObject) {
+						var scriptData = settingValue;
+					} else {
+						var scriptData = jQuery.extend(settings.scriptData, settingValue);
+					}
+					var scriptDataString = '';
+					for (var name in scriptData) {
+						scriptDataString += '&' + name + '=' + escape(scriptData[name]);
+					}
+					settingValue = scriptDataString.substr(1);
+				}
+				returnValue = document.getElementById(jQuery(this).attr('id') + 'Uploader').updateSettings(settingName, settingValue);
+			});
+			if (settingValue == null) {
+				if (settingName == 'scriptData') {
+					var returnSplit = unescape(returnValue).split('&');
+					var returnObj   = new Object();
+					for (var i = 0; i < returnSplit.length; i++) {
+						var iSplit = returnSplit[i].split('=');
+						returnObj[iSplit[0]] = iSplit[1];
+					}
+					returnValue = returnObj;
+				}
+				return returnValue;
+			}
+		},
+		uploadifyUpload:function(ID) {
+			jQuery(this).each(function() {
+				document.getElementById(jQuery(this).attr('id') + 'Uploader').startFileUpload(ID, false);
+			});
+		},
+		uploadifyCancel:function(ID) {
+			jQuery(this).each(function() {
+				document.getElementById(jQuery(this).attr('id') + 'Uploader').cancelFileUpload(ID, true, false);
+			});
+		},
+		uploadifyClearQueue:function() {
+			jQuery(this).each(function() {
+				document.getElementById(jQuery(this).attr('id') + 'Uploader').clearFileUploadQueue(false);
+			});
+		}
+	})
+})(jQuery);
\ No newline at end of file
diff --git a/vendors/uploadify/jquery.uploadify.v2.1.0.min.js b/vendors/uploadify/jquery.uploadify.v2.1.0.min.js
new file mode 100644
index 000000000..04592ffec
--- /dev/null
+++ b/vendors/uploadify/jquery.uploadify.v2.1.0.min.js
@@ -0,0 +1,26 @@
+/*
+Uploadify v2.1.0
+Release Date: August 24, 2009
+
+Copyright (c) 2009 Ronnie Garcia, Travis Nickels
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+if(jQuery){(function(a){a.extend(a.fn,{uploadify:function(b){a(this).each(function(){settings=a.extend({id:a(this).attr("id"),uploader:"uploadify.swf",script:"uploadify.php",expressInstall:null,folder:"",height:30,width:110,cancelImg:"cancel.png",wmode:"opaque",scriptAccess:"sameDomain",fileDataName:"Filedata",method:"POST",queueSizeLimit:999,simUploadLimit:1,queueID:false,displayData:"percentage",onInit:function(){},onSelect:function(){},onQueueFull:function(){},onCheck:function(){},onCancel:function(){},onError:function(){},onProgress:function(){},onComplete:function(){},onAllComplete:function(){}},b);var e=location.pathname;e=e.split("/");e.pop();e=e.join("/")+"/";var f={};f.uploadifyID=settings.id;f.pagepath=e;if(settings.buttonImg){f.buttonImg=escape(settings.buttonImg)}if(settings.buttonText){f.buttonText=escape(settings.buttonText)}if(settings.rollover){f.rollover=true}f.script=settings.script;f.folder=escape(settings.folder);if(settings.scriptData){var g="";for(var d in settings.scriptData){g+="&"+d+"="+settings.scriptData[d]}f.scriptData=escape(g.substr(1))}f.width=settings.width;f.height=settings.height;f.wmode=settings.wmode;f.method=settings.method;f.queueSizeLimit=settings.queueSizeLimit;f.simUploadLimit=settings.simUploadLimit;if(settings.hideButton){f.hideButton=true}if(settings.fileDesc){f.fileDesc=settings.fileDesc}if(settings.fileExt){f.fileExt=settings.fileExt}if(settings.multi){f.multi=true}if(settings.auto){f.auto=true}if(settings.sizeLimit){f.sizeLimit=settings.sizeLimit}if(settings.checkScript){f.checkScript=settings.checkScript}if(settings.fileDataName){f.fileDataName=settings.fileDataName}if(settings.queueID){f.queueID=settings.queueID}if(settings.onInit()!==false){a(this).css("display","none");a(this).after('
      ');swfobject.embedSWF(settings.uploader,settings.id+"Uploader",settings.width,settings.height,"9.0.24",settings.expressInstall,f,{quality:"high",wmode:settings.wmode,allowScriptAccess:settings.scriptAccess});if(settings.queueID==false){a("#"+a(this).attr("id")+"Uploader").after('
      ')}}if(typeof(settings.onOpen)=="function"){a(this).bind("uploadifyOpen",settings.onOpen)}a(this).bind("uploadifySelect",{action:settings.onSelect,queueID:settings.queueID},function(j,h,i){if(j.data.action(j,h,i)!==false){var k=Math.round(i.size/1024*100)*0.01;var l="KB";if(k>1000){k=Math.round(k*0.001*100)*0.01;l="MB"}var m=k.toString().split(".");if(m.length>1){k=m[0]+"."+m[1].substr(0,2)}else{k=m[0]}if(i.name.length>20){fileName=i.name.substr(0,20)+"..."}else{fileName=i.name}queue="#"+a(this).attr("id")+"Queue";if(j.data.queueID){queue="#"+j.data.queueID}a(queue).append('
      '+fileName+" ("+k+l+')
      ')}});if(typeof(settings.onSelectOnce)=="function"){a(this).bind("uploadifySelectOnce",settings.onSelectOnce)}a(this).bind("uploadifyQueueFull",{action:settings.onQueueFull},function(h,i){if(h.data.action(h,i)!==false){alert("The queue is full.  The max size is "+i+".")}});a(this).bind("uploadifyCheckExist",{action:settings.onCheck},function(m,l,k,j,o){var i=new Object();i=k;i.folder=e+j;if(o){for(var h in k){var n=h}}a.post(l,i,function(r){for(var p in r){if(m.data.action(m,l,k,j,o)!==false){var q=confirm("Do you want to replace the file "+r[p]+"?");if(!q){document.getElementById(a(m.target).attr("id")+"Uploader").cancelFileUpload(p,true,true)}}}if(o){document.getElementById(a(m.target).attr("id")+"Uploader").startFileUpload(n,true)}else{document.getElementById(a(m.target).attr("id")+"Uploader").startFileUpload(null,true)}},"json")});a(this).bind("uploadifyCancel",{action:settings.onCancel},function(l,h,k,m,j){if(l.data.action(l,h,k,m,j)!==false){var i=(j==true)?0:250;a("#"+a(this).attr("id")+h).fadeOut(i,function(){a(this).remove()})}});if(typeof(settings.onClearQueue)=="function"){a(this).bind("uploadifyClearQueue",settings.onClearQueue)}var c=[];a(this).bind("uploadifyError",{action:settings.onError},function(l,h,k,j){if(l.data.action(l,h,k,j)!==false){var i=new Array(h,k,j);c.push(i);a("#"+a(this).attr("id")+h+" .percentage").text(" - "+j.type+" Error");a("#"+a(this).attr("id")+h).addClass("uploadifyError")}});a(this).bind("uploadifyProgress",{action:settings.onProgress,toDisplay:settings.displayData},function(j,h,i,k){if(j.data.action(j,h,i,k)!==false){a("#"+a(this).attr("id")+h+"ProgressBar").css("width",k.percentage+"%");if(j.data.toDisplay=="percentage"){displayData=" - "+k.percentage+"%"}if(j.data.toDisplay=="speed"){displayData=" - "+k.speed+"KB/s"}if(j.data.toDisplay==null){displayData=" "}a("#"+a(this).attr("id")+h+" .percentage").text(displayData)}});a(this).bind("uploadifyComplete",{action:settings.onComplete},function(k,h,j,i,l){if(k.data.action(k,h,j,unescape(i),l)!==false){a("#"+a(this).attr("id")+h+" .percentage").text(" - Completed");a("#"+a(this).attr("id")+h).fadeOut(250,function(){a(this).remove()})}});if(typeof(settings.onAllComplete)=="function"){a(this).bind("uploadifyAllComplete",{action:settings.onAllComplete},function(h,i){if(h.data.action(h,i)!==false){c=[]}})}})},uploadifySettings:function(f,j,c){var g=false;a(this).each(function(){if(f=="scriptData"&&j!=null){if(c){var i=j}else{var i=a.extend(settings.scriptData,j)}var l="";for(var k in i){l+="&"+k+"="+escape(i[k])}j=l.substr(1)}g=document.getElementById(a(this).attr("id")+"Uploader").updateSettings(f,j)});if(j==null){if(f=="scriptData"){var b=unescape(g).split("&");var e=new Object();for(var d=0;d 
+	is released under the MIT License  
+*/
+var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad'}}aa.outerHTML='"+af+"";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab
\ No newline at end of file
diff --git a/vendors/uploadify/uploadify.swf b/vendors/uploadify/uploadify.swf
new file mode 100644
index 000000000..0385d9e6e
Binary files /dev/null and b/vendors/uploadify/uploadify.swf differ
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 9d904a7ff..9e5a5c68d 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -298,4 +298,28 @@ display:inline;
 
 #tidypics_image_upload_list {
 list-style: none;
+}
+
+/*----- uploadify ------*/
+.uploadifyQueueItem {
+background-color:#F5F5F5;
+border:2px solid #E5E5E5;
+font:11px Verdana,Geneva,sans-serif;
+margin-top:5px;
+padding:10px;
+width:350px;
+}
+
+.uploadifyProgress {
+background-color:#FFFFFF;
+border-color:#808080 #C5C5C5 #C5C5C5 #808080;
+border-style:solid;
+border-width:1px;
+margin-top:10px;
+width:100%;
+}
+.uploadifyProgressBar {
+background-color: #0099FF;
+width: 1px;
+height: 3px;
 }
\ No newline at end of file
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
new file mode 100644
index 000000000..b71068a13
--- /dev/null
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -0,0 +1,64 @@
+access_id;
+
+$ts = time();
+$token = generate_action_token($ts);
+
+
+$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
+if (!$maxfilesize) {
+	$maxfilesize = 5;
+}
+
+$quota = get_plugin_setting('quota','tidypics');
+if ($quota) {
+	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
+	$image_repo_size = (int)$image_repo_size_md->value;
+	$image_repo_size = $image_repo_size / 1024 / 1024;
+	$quote_percentage = round(100 * ($image_repo_size / $quota));
+	// for small quotas, so one decimal place
+	if ($quota < 10) {
+		$image_repo_size = sprintf('%.1f', $image_repo_size);
+	} else {
+		$image_repo_size = round($image_repo_size);
+	}
+	if ($image_repo_size > $quota) {
+		$image_repo_size = $quota;
+	}
+}
+
+?>
+
+
      
+
+
      Instructions here for uploading images using Ajax/Flash
      
+
+Upload Files |
+Clear Queue
+
+
      
+
+
+
diff --git a/views/default/tidypics/js/uploader.php b/views/default/tidypics/js/uploader.php
new file mode 100644
index 000000000..38666573c
--- /dev/null
+++ b/views/default/tidypics/js/uploader.php
@@ -0,0 +1,4 @@
+
+	
+	
+
-- 
cgit v1.2.3


From 893364a28955358ad259bfb75798560616ab3d49 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Mon, 25 Oct 2010 00:22:20 +0000
Subject: supporting both basic and flash uploader

---
 actions/addalbum.php                         |  2 ++
 actions/ajax_upload.php                      |  5 ++-
 actions/upload.php                           |  6 ++--
 lib/album.php                                |  8 +++--
 pages/edit_multiple.php                      | 54 ++++++++++++++--------------
 pages/upload.php                             | 16 +++++----
 start.php                                    | 12 ++++++-
 views/default/tidypics/css.php               | 27 ++++++++++++--
 views/default/tidypics/forms/ajax_upload.php | 36 ++++++++++++++-----
 views/default/tidypics/forms/edit_multi.php  | 23 ++++++------
 views/default/tidypics/forms/upload.php      |  7 ++--
 11 files changed, 127 insertions(+), 69 deletions(-)

diff --git a/actions/addalbum.php b/actions/addalbum.php
index bdac9bfbf..8ddcca131 100644
--- a/actions/addalbum.php
+++ b/actions/addalbum.php
@@ -42,6 +42,8 @@ if (!$album->save()) {
 	forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
 }
 
+mkdir(tp_get_img_dir() . $album->guid, 0755, true);
+
 system_message(elgg_echo("album:created"));
 
 // Remove the album post cache
diff --git a/actions/ajax_upload.php b/actions/ajax_upload.php
index 3d44df199..973e4220a 100644
--- a/actions/ajax_upload.php
+++ b/actions/ajax_upload.php
@@ -33,7 +33,8 @@ $image->setMimeType(tp_upload_get_mimetype($name));
 $image->simpletype = "image";
 $image->access_id = $album->access_id;
 $image->title = substr($name, 0, strrpos($name, '.'));
-$image_guid = $image->save();
+$image->batch = get_input('batch');
+$result = $image->save();
 
 $image->setOriginalFilename($name);
 $image->saveImageFile($temp_file, $file_size);
@@ -43,5 +44,7 @@ $image->saveThumbnails($image_lib);
 
 $album->prependImageList(array($image->guid));
 
+error_log('complete');
+
 echo "1";
 exit;
\ No newline at end of file
diff --git a/actions/upload.php b/actions/upload.php
index 8dae85277..b3ad9ebc3 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -9,8 +9,8 @@ include_once dirname(dirname(__FILE__)) . "/lib/upload.php";
 
 // Get common variables
 $access_id = (int) get_input("access_id");
-$container_guid = (int) get_input('container_guid', 0);
-$album = get_entity($container_guid);
+$album_guid = (int) get_input('album_guid', 0);
+$album = get_entity($album_guid);
 if (!$album) {
 	register_error(elgg_echo('tidypics:baduploadform'));
 	forward($_SERVER['HTTP_REFERER']);
@@ -101,7 +101,7 @@ foreach($_FILES as $key => $sent_file) {
 
 	//this will save to users folder in /image/ and organize by photo album
 	$file = new TidypicsImage();
-	$file->container_guid = $container_guid;
+	$file->container_guid = $album_guid;
 	$file->setMimeType($mime);
 	$file->simpletype="image";
 	$file->access_id = $access_id;
diff --git a/lib/album.php b/lib/album.php
index 916ccbc31..0d5140875 100644
--- a/lib/album.php
+++ b/lib/album.php
@@ -210,9 +210,11 @@ class TidypicsAlbum extends ElggObject {
 	protected function deleteImages() {
 		// get all the images from this album as long as less than 999 images
 		$images = get_entities("object", "image", $this->guid, '', 999);
-		foreach ($images as $image) {
-			if ($image) {
-				$image->delete();
+		if ($images) {
+			foreach ($images as $image) {
+				if ($image) {
+					$image->delete();
+				}
 			}
 		}
 	}
diff --git a/pages/edit_multiple.php b/pages/edit_multiple.php
index ec507ba4b..938ac203c 100644
--- a/pages/edit_multiple.php
+++ b/pages/edit_multiple.php
@@ -10,38 +10,36 @@ include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
 gatekeeper();
 set_context('photos');
 
-// parse out photo guids
-$file_string = get_input('files');
-$file_array_sent = explode('-', $file_string);
-$new_file_array = array();
-
-// set owner of page based on first photo guid
-$photo_guid = (int)$file_array_sent[0];
-$photo = get_entity($photo_guid);
-
-// set page owner based on owner of photo album
-set_page_owner($photo->owner_guid);
-$album = get_entity($photo->container_guid);
-if ($album) {
-	$owner_guid = $album->container_guid;
-	if ($owner_guid) {
-		set_page_owner($owner_guid);
-	}
-}
+set_page_owner(get_loggedin_userid());
 
-foreach ($file_array_sent as $file_guid) {
-	if ($entity = get_entity($file_guid)) {
-		if ($entity->canEdit()) {
-			array_push($new_file_array, $file_guid);
-		}
-		if (!$album_guid) {
-			$album_guid = $entity->container_guid;
+
+$batch = get_input('batch');
+if ($batch) {
+	$images = get_entities_from_metadata('batch', $batch, 'object', 'image', get_loggedin_userid(), 100);
+} else {
+	// parse out photo guids
+	$file_string = get_input('files');
+	$file_array_sent = explode('-', $file_string);
+
+	$images = array();
+	foreach ($file_array_sent as $file_guid) {
+		if ($entity = get_entity($file_guid)) {
+			if ($entity->canEdit()) {
+				array_push($images, $entity);
+			}
 		}
 	}
 }
 
+if (!$images) {
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+
 $title = elgg_echo('tidypics:editprops');
-$area2 .= elgg_view_title($title);
-$area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid));
-$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+
+$content .= elgg_view_title($title);
+$content .= elgg_view("tidypics/forms/edit_multi", array('images' => $images));
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $content);
 page_draw($title, $body);
diff --git a/pages/upload.php b/pages/upload.php
index 8e15dd612..b6a828cf9 100644
--- a/pages/upload.php
+++ b/pages/upload.php
@@ -9,11 +9,13 @@ include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
 // must be logged in to upload images
 gatekeeper();
 
-$album_guid = (int) get_input('container_guid');
+$album_guid = (int) get_input('album_guid');
 if (!$album_guid) {
 	forward();
 }
 
+$uploader = get_input('uploader', 'ajax');
+
 $album = get_entity($album_guid);
 
 //if album does not exist or user does not have access
@@ -22,9 +24,8 @@ if (!$album || !$album->canEdit()) {
 	forward($_SERVER['HTTP_REFERER']);
 }
 
-// set page owner based on container (user or group) 
-$container = $album->container_guid;
-set_page_owner($container);
+// set page owner based on container (user or group)
+set_page_owner($album->container_guid);
 
 $page_owner = page_owner_entity();
 if ($page_owner instanceof ElggGroup) {
@@ -36,8 +37,11 @@ set_context('photos');
 $title = elgg_echo('album:addpix') . ': ' . $album->title;
 $area2 .= elgg_view_title($title);
 
-$area2 .= elgg_view("tidypics/forms/upload", array('album' => $album_guid ) );
-//$area2 .= elgg_view("tidypics/forms/ajax_upload", array('album' => $album_guid ) );
+if ($uploader == 'basic') {
+	$area2 .= elgg_view("tidypics/forms/upload", array('album' => $album));
+} else {
+	$area2 .= elgg_view("tidypics/forms/ajax_upload", array('album' => $album));
+}
 
 $body = elgg_view_layout('two_column_left_sidebar', '', $area2);
 
diff --git a/start.php b/start.php
index 9b3dab08f..a50f23c57 100644
--- a/start.php
+++ b/start.php
@@ -263,7 +263,10 @@ function tidypics_page_handler($page) {
 
 			case "upload": //upload images to album
 				if (isset($page[1])) {
-					set_input('container_guid', $page[1]);
+					set_input('album_guid', $page[1]);
+				}
+				if (isset($page[2])) {
+					set_input('uploader', 'basic');
 				}
 				include($CONFIG->pluginspath . "tidypics/pages/upload.php");
 				break;
@@ -275,6 +278,13 @@ function tidypics_page_handler($page) {
 				include($CONFIG->pluginspath . "tidypics/pages/edit.php");
 				break;
 
+			case "batch": //update titles and descriptions
+				if (isset($page[1])) {
+					set_input('batch', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/edit_multiple.php");
+				break;
+
 			case "friends": // albums of friends
 				if (isset($page[1])) {
 					set_input('username', $page[1]);
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 9e5a5c68d..ea2081da6 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -304,7 +304,7 @@ list-style: none;
 .uploadifyQueueItem {
 background-color:#F5F5F5;
 border:2px solid #E5E5E5;
-font:11px Verdana,Geneva,sans-serif;
+font-size:11px;
 margin-top:5px;
 padding:10px;
 width:350px;
@@ -322,4 +322,27 @@ width:100%;
 background-color: #0099FF;
 width: 1px;
 height: 3px;
-}
\ No newline at end of file
+}
+
+#tidypics_uploader {
+position:relative;
+width:400px;
+}
+
+#tidypics_choose_button {
+position:absolute;
+top:0;
+left:0;
+z-index:0;
+display:block;
+float:left;
+}
+
+#tidypics_flash_uploader {
+position:relative;
+z-index:100;
+}
+
+#uploadifyQueue {
+margin-bottom: 20px;
+}
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index b71068a13..25c658570 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -2,13 +2,14 @@
 
 extend_view('metatags', 'tidypics/js/uploader');
 
-$container_guid = get_input('container_guid');
-$album = get_entity($vars['album']);
+$album = $vars['album'];
 $access_id = $album->access_id;
 
 $ts = time();
 $token = generate_action_token($ts);
 
+$batch = time();
+
 
 $maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
 if (!$maxfilesize) {
@@ -36,29 +37,46 @@ if ($quota) {
 
 
      
 
-
      Instructions here for uploading images using Ajax/Flash
      
-
-Upload Files |
-Clear Queue
+	
      Instructions here for uploading images using Ajax/Flash
      
+
+	
      
+		Choose images
+		
      
+			
+		
      
+	
      
+
+Upload Files
+
+
      
+Add titles and descriptions
+
      
+Basic uploader
+
 
 
      
 
 
 
diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php
index 8c3e40242..aba6fd324 100644
--- a/views/default/tidypics/forms/edit_multi.php
+++ b/views/default/tidypics/forms/edit_multi.php
@@ -2,26 +2,25 @@
 /**
  * form for mass editing all uploaded images
  */
+
+$images = $vars['images'];
+$album = get_entity($images[0]->container_guid);
+
 ?>
 
      
 
 getCoverImageGuid()) {
+	if (!$album->getCoverImageGuid()) {
 		$no_cover = true;
 	}
 	
-	foreach ($file_array as $key => $file_guid) {
-		$entity = get_entity($file_guid);
-		$guid = $entity->guid;
-		$body = $entity->description;
-		$title = $entity->title;
-		$tags = $entity->tags;
-		$container_guid = $entity->container_guid;
+	foreach ($images as $key => $image) {
+		$guid = $image->guid;
+		$body = $image->description;
+		$title = $image->title;
+		$tags = $image->tags;
 		
 		// first one is default cover if there isn't one already
 		if ($no_cover) {
@@ -54,7 +53,7 @@
 	}
 	
 ?>
-
+
 
      
 
 
      
\ No newline at end of file
diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index 691d9701b..5a9703171 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -3,8 +3,7 @@ global $CONFIG;
 
 //this is for image uploads only. Image edits are handled by edit.php form
 
-$container_guid = get_input('container_guid');
-$album = get_entity($vars['album']);
+$album = $vars['album'];
 $access_id = $album->access_id;
 
 $maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
@@ -59,8 +58,8 @@ if ($quota) {
 
      
 
      
 	';
+	if ($album) {
+		echo '';
 	}
 	if ($access_id) {
 		echo '';
-- 
cgit v1.2.3


From 9e0d8ea4aa08f6390c0f93f6466c2a101dffcbed Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 29 Oct 2010 11:28:00 +0000
Subject: tags now support avatars on riverdashboard (but no longer support
 versions of Elgg < 1.7)

---
 actions/addtag.php                       |  5 +++--
 languages/en.php                         |  3 ++-
 upgrades/2010102801.php                  | 26 ++++++++++++++++++++++++
 views/default/river/object/image/tag.php | 34 ++++++++++++++++++--------------
 4 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 upgrades/2010102801.php

diff --git a/actions/addtag.php b/actions/addtag.php
index 9e5313b7f..97418f495 100644
--- a/actions/addtag.php
+++ b/actions/addtag.php
@@ -71,14 +71,15 @@ $owner_id = get_loggedin_userid();
 $tagger = get_loggedin_user();
 
 //Save annotation
-if ($image->annotate('phototag', serialize($tag), $access_id, $owner_id)) {
+$annotation_id = $image->annotate('phototag', serialize($tag), $access_id, $owner_id);
+if ($annotation_id) {
 	// if tag is a user id, add relationship for searching (find all images with user x)
 	if ($relationships_type === 'user') {
 		if (!check_entity_relationship($user_id, 'phototag', $image_guid)) {
 			add_entity_relationship($user_id, 'phototag', $image_guid);
 
 			// also add this to the river - subject is image, object is the tagged user
-			add_to_river('river/object/image/tag', 'tag', $image_guid, $user_id, $access_id);
+			add_to_river('river/object/image/tag', 'tag', $tagger->guid, $user_id, $access_id, 0, $annotation_id);
 
 			// notify user of tagging as long as not self
 			if ($owner_id != $user_id) {
diff --git a/languages/en.php b/languages/en.php
index 2a4c63e87..28a705590 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -161,7 +161,8 @@ The photo can be viewed here: %s",
 			'image:river:created' => "%s added the photo %s to album %s",
 			'image:river:item' => "an photo",
 			'image:river:annotate' => "a comment on the photo",
-			'image:river:tagged' => "was tagged in the photo",
+			'image:river:tagged' => "%s tagged %s in the photo %s",
+			'image:river:tagged:unknown' => "%s tagged %s in a photo",
 
 			//albums
 			'album:river:created' => "%s created a new photo album",
diff --git a/upgrades/2010102801.php b/upgrades/2010102801.php
new file mode 100644
index 000000000..9190912fe
--- /dev/null
+++ b/upgrades/2010102801.php
@@ -0,0 +1,26 @@
+dbprefix}river WHERE view = 'river/object/image/tag'";
+$river_items = mysql_query($query);
+while ($item = mysql_fetch_object($river_items)) {
+	$DB_QUERY_CACHE = $DB_PROFILE = array();
+
+	// find the annotation for this river item
+	$annotations = get_annotations($item->subject_guid, '', '', 'phototag', '', 0, 999);
+	foreach ($annotations as $annotation) {
+		$tag = unserialize($annotation->value);
+		if ($tag->type === 'user') {
+			if ($tag->value == $item->object_guid) {
+				$update = "UPDATE {$CONFIG->dbprefix}river SET subject_guid = $annotation->owner_guid, annotation_id = $annotation->id where id = $item->id";
+				mysql_query($update);
+			}
+		}
+	}
+}
diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php
index 961761c99..a59066c67 100644
--- a/views/default/river/object/image/tag.php
+++ b/views/default/river/object/image/tag.php
@@ -1,22 +1,26 @@
 subject_guid);
-$person_tagged = get_entity($vars['item']->object_guid);
-if ($image->title) {
-	$title = $image->title;
-} else {
-	$title = "untitled";
-}
-
-// viewer may not have permission to view image
-if (!$image) {
-	return;
-}
+$tagger = get_entity($vars['item']->subject_guid);
+$tagged = get_entity($vars['item']->object_guid);
+$annotation = get_annotation($vars['item']->annotation_id);
+if ($annotation) {
+	$image = get_entity($annotation->entity_guid);
 
+	// viewer may not have permission to view image
+	if (!$image) {
+		return;
+	}
 
-$image_url = "getURL()}\">{$title}";
-$person_url = "getURL()}\">{$person_tagged->name}";
+	$image_title = $image->title;
+}
 
-$string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url;
+$tagger_link = "getURL()}\">$tagger->name";
+$tagged_link = "getURL()}\">$tagged->name";
+if (!empty($image_title)) {
+	$image_link = "getURL()}\">$image_title";
+	$string = sprintf(elgg_echo('image:river:tagged'), $tagger_link, $tagged_link, $image_link);
+} else {
+	$string = sprintf(elgg_echo('image:river:tagged:unknown'), $tagger_link, $tagged_link);	
+}
 
 echo $string;
-- 
cgit v1.2.3


From 6b2d56cab523b68dde58a83c87abcecf100c1f67 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 29 Oct 2010 11:30:11 +0000
Subject: forgot version from previous commit

---
 version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.php b/version.php
index 557ea5d1c..d125847d8 100644
--- a/version.php
+++ b/version.php
@@ -5,4 +5,4 @@
  * Used for the upgrade system.
  */
 
-$version = 2010073101;
+$version = 2010102801;
-- 
cgit v1.2.3


From eeee719c4bdfa433d73336484234ad7fcd3698a1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 29 Oct 2010 11:36:07 +0000
Subject: fixed display issue with tag menu

---
 views/default/tidypics/css.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index ea2081da6..fb4b16832 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -248,6 +248,10 @@ float:left;
 float:left;
 }
 
+#tidypics_tagmenu_left .input-filter {
+width:150px;
+}
+
 #tidypics_tagmenu_right .submit_button {
 margin-top:2px;
 }
-- 
cgit v1.2.3


From 1c8dccf838eb15a9b69924f1f29a4786c6eadbb9 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Fri, 29 Oct 2010 11:39:34 +0000
Subject: added cancel button for uploads and updated css for errors

---
 actions/ajax_upload.php                      | 1 +
 views/default/tidypics/css.php               | 9 +++++++++
 views/default/tidypics/forms/ajax_upload.php | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/actions/ajax_upload.php b/actions/ajax_upload.php
index 973e4220a..a9743cf54 100644
--- a/actions/ajax_upload.php
+++ b/actions/ajax_upload.php
@@ -14,6 +14,7 @@ if (!$album) {
 	exit;
 }
 
+// probably POST limit exceeded
 if (empty($_FILES)) {
 	exit;
 }
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index fb4b16832..3fd3c81aa 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -350,3 +350,12 @@ z-index:100;
 #uploadifyQueue {
 margin-bottom: 20px;
 }
+
+.uploadifyQueueItem .cancel {
+float: right;
+}
+
+.uploadifyError {
+border: 2px solid #FBCBBC;
+background-color: #FDE5DD;
+}
\ No newline at end of file
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index 25c658570..313ca17f9 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -70,7 +70,7 @@ $("#uploadify").uploadify({
 						'batch'        : ''
 					 },
 	'fileDataName' : 'Image',
-	'cancelImg'  : '/_images/cancel.png',
+	'cancelImg'  : '_graphics/icon_customise_remove.gif',
 	'multi'      : true,
 	'auto'       : false,
 	'fileDesc'   : '',
-- 
cgit v1.2.3


From afca726e88935388808d0b4f88989003e3eb9d46 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 01:34:33 +0000
Subject: fixed bug with setting initial version

---
 views/default/tidypics/admin/upgrade.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/views/default/tidypics/admin/upgrade.php b/views/default/tidypics/admin/upgrade.php
index 3450bd7db..fd324b2d9 100644
--- a/views/default/tidypics/admin/upgrade.php
+++ b/views/default/tidypics/admin/upgrade.php
@@ -1,5 +1,6 @@
 pluginspath}tidypics/version.php";
 
 $upgrade_url = "{$vars['url']}action/tidypics/admin/upgrade";
@@ -11,7 +12,8 @@ if ($local_version === FALSE) {
 	if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) {
 		$local_version = 0;
 	} else {
-		set_plugin_setting('version', $local_version, 'tidypics');
+		// set initial version for new install
+		set_plugin_setting('version', $version, 'tidypics');
 		$local_version = $version;
 	}
 } elseif ($local_version == '1.62') {
@@ -27,4 +29,4 @@ if ($local_version == $version) {
 echo elgg_view('output/url', array(	'text' => 'Upgrade',
 									'href' => $upgrade_url,
 									'is_action' => TRUE));
-echo '
      ';
\ No newline at end of file
+echo '
      ';
-- 
cgit v1.2.3


From e7c68e41e7076d32aa885dcee230bdd98bf1fbd7 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 01:40:52 +0000
Subject: a little cleanup of upgrade view

---
 languages/en.php                         | 1 +
 views/default/tidypics/admin/upgrade.php | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 28a705590..0a8e31672 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -49,6 +49,7 @@ $english = array(
 			'tidypics:administration' => 'Tidypics Administration',
 			'tidypics:stats' => 'Stats',
 			'tidypics:nophotosingroup' => 'This groups does not have any photos yet',
+                        'tidypics:upgrade' => 'Upgrade',
 
 			'flickr:setup' => 'Flickr Setup',
 			'flickr:usernamesetup' => 'Please enter your Flickr username here:',
diff --git a/views/default/tidypics/admin/upgrade.php b/views/default/tidypics/admin/upgrade.php
index fd324b2d9..bb0a12467 100644
--- a/views/default/tidypics/admin/upgrade.php
+++ b/views/default/tidypics/admin/upgrade.php
@@ -26,7 +26,10 @@ if ($local_version == $version) {
 	return TRUE;
 }
 
-echo elgg_view('output/url', array(	'text' => 'Upgrade',
-									'href' => $upgrade_url,
-									'is_action' => TRUE));
+echo elgg_view('output/url', array(
+    'text' => elgg_echo('tidypics:upgrade'),
+    'href' => $upgrade_url,
+    'is_action' => TRUE)
+);
+
 echo '
      ';
-- 
cgit v1.2.3


From d6fcd6f942c8e882866f5404cb987aa3c6fde690 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 13:11:37 +0000
Subject: upgraded to uploadify 2.1.1

---
 vendors/uploadify/README                         |   7 +
 vendors/uploadify/jquery.uploadify.v2.1.0.js     | 258 ----------------------
 vendors/uploadify/jquery.uploadify.v2.1.0.min.js |  26 ---
 vendors/uploadify/jquery.uploadify.v2.1.1.js     | 259 +++++++++++++++++++++++
 vendors/uploadify/jquery.uploadify.v2.1.1.min.js |   1 +
 views/default/tidypics/js/uploader.php           |   2 +-
 6 files changed, 268 insertions(+), 285 deletions(-)
 create mode 100644 vendors/uploadify/README
 delete mode 100644 vendors/uploadify/jquery.uploadify.v2.1.0.js
 delete mode 100644 vendors/uploadify/jquery.uploadify.v2.1.0.min.js
 create mode 100644 vendors/uploadify/jquery.uploadify.v2.1.1.js
 create mode 100644 vendors/uploadify/jquery.uploadify.v2.1.1.min.js

diff --git a/vendors/uploadify/README b/vendors/uploadify/README
new file mode 100644
index 000000000..09fee5497
--- /dev/null
+++ b/vendors/uploadify/README
@@ -0,0 +1,7 @@
+jQuery Uploadify library
+
+Written by Ronnie Garcia, Travis Nickels
+
+Modified by Cash Costello
+
+MIT License 
diff --git a/vendors/uploadify/jquery.uploadify.v2.1.0.js b/vendors/uploadify/jquery.uploadify.v2.1.0.js
deleted file mode 100644
index 9a78cd32d..000000000
--- a/vendors/uploadify/jquery.uploadify.v2.1.0.js
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-Uploadify v2.1.0
-Release Date: August 24, 2009
-
-Copyright (c) 2009 Ronnie Garcia, Travis Nickels
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-if(jQuery)(
-	function(jQuery){
-		jQuery.extend(jQuery.fn,{
-			uploadify:function(options) {
-				jQuery(this).each(function(){
-					settings = jQuery.extend({
-					id             : jQuery(this).attr('id'), // The ID of the object being Uploadified
-					uploader       : 'uploadify.swf', // The path to the uploadify swf file
-					script         : 'uploadify.php', // The path to the uploadify backend upload script
-					expressInstall : null, // The path to the express install swf file
-					folder         : '', // The path to the upload folder
-					height         : 30, // The height of the flash button
-					width          : 110, // The width of the flash button
-					cancelImg      : 'cancel.png', // The path to the cancel image for the default file queue item container
-					wmode          : 'opaque', // The wmode of the flash file
-					scriptAccess   : 'sameDomain', // Set to "always" to allow script access across domains
-					fileDataName   : 'Filedata', // The name of the file collection object in the backend upload script
-					method         : 'POST', // The method for sending variables to the backend upload script
-					queueSizeLimit : 999, // The maximum size of the file queue
-					simUploadLimit : 1, // The number of simultaneous uploads allowed
-					queueID        : false, // The optional ID of the queue container
-					displayData    : 'percentage', // Set to "speed" to show the upload speed in the default queue item
-					onInit         : function() {}, // Function to run when uploadify is initialized
-					onSelect       : function() {}, // Function to run when a file is selected
-					onQueueFull    : function() {}, // Function to run when the queue reaches capacity
-					onCheck        : function() {}, // Function to run when script checks for duplicate files on the server
-					onCancel       : function() {}, // Function to run when an item is cleared from the queue
-					onError        : function() {}, // Function to run when an upload item returns an error
-					onProgress     : function() {}, // Function to run each time the upload progress is updated
-					onComplete     : function() {}, // Function to run when an upload is completed
-					onAllComplete  : function() {}  // Functino to run when all uploads are completed
-				}, options);
-				var pagePath = location.pathname;
-				pagePath = pagePath.split('/');
-				pagePath.pop();
-				pagePath = pagePath.join('/') + '/';
-				var data = {};
-				data.uploadifyID = settings.id;
-				data.pagepath = pagePath;
-				if (settings.buttonImg) data.buttonImg = escape(settings.buttonImg);
-				if (settings.buttonText) data.buttonText = escape(settings.buttonText);
-				if (settings.rollover) data.rollover = true;
-				data.script = settings.script;
-				data.folder = escape(settings.folder);
-				if (settings.scriptData) {
-					var scriptDataString = '';
-					for (var name in settings.scriptData) {
-						scriptDataString += '&' + name + '=' + settings.scriptData[name];
-					}
-					data.scriptData = escape(scriptDataString.substr(1));
-				}
-				data.width          = settings.width;
-				data.height         = settings.height;
-				data.wmode          = settings.wmode;
-				data.method         = settings.method;
-				data.queueSizeLimit = settings.queueSizeLimit;
-				data.simUploadLimit = settings.simUploadLimit;
-				if (settings.hideButton)   data.hideButton   = true;
-				if (settings.fileDesc)     data.fileDesc     = settings.fileDesc;
-				if (settings.fileExt)      data.fileExt      = settings.fileExt;
-				if (settings.multi)        data.multi        = true;
-				if (settings.auto)         data.auto         = true;
-				if (settings.sizeLimit)    data.sizeLimit    = settings.sizeLimit;
-				if (settings.checkScript)  data.checkScript  = settings.checkScript;
-				if (settings.fileDataName) data.fileDataName = settings.fileDataName;
-				if (settings.queueID)      data.queueID      = settings.queueID;
-				if (settings.onInit() !== false) {
-					jQuery(this).css('display','none');
-					jQuery(this).after('
      ');
-					swfobject.embedSWF(settings.uploader, settings.id + 'Uploader', settings.width, settings.height, '9.0.24', settings.expressInstall, data, {'quality':'high','wmode':settings.wmode,'allowScriptAccess':settings.scriptAccess});
-					if (settings.queueID == false) {
-						jQuery("#" + jQuery(this).attr('id') + "Uploader").after('
      ');
-					}
-				}
-				if (typeof(settings.onOpen) == 'function') {
-					jQuery(this).bind("uploadifyOpen", settings.onOpen);
-				}
-				jQuery(this).bind("uploadifySelect", {'action': settings.onSelect, 'queueID': settings.queueID}, function(event, ID, fileObj) {
-					if (event.data.action(event, ID, fileObj) !== false) {
-						var byteSize = Math.round(fileObj.size / 1024 * 100) * .01;
-						var suffix = 'KB';
-						if (byteSize > 1000) {
-							byteSize = Math.round(byteSize *.001 * 100) * .01;
-							suffix = 'MB';
-						}
-						var sizeParts = byteSize.toString().split('.');
-						if (sizeParts.length > 1) {
-							byteSize = sizeParts[0] + '.' + sizeParts[1].substr(0,2);
-						} else {
-							byteSize = sizeParts[0];
-						}
-						if (fileObj.name.length > 20) {
-							fileName = fileObj.name.substr(0,20) + '...';
-						} else {
-							fileName = fileObj.name;
-						}
-						queue = '#' + jQuery(this).attr('id') + 'Queue';
-						if (event.data.queueID) {
-							queue = '#' + event.data.queueID;
-						}
-						jQuery(queue).append('
      \
-								
      \
-									\
-								
      \
-								' + fileName + ' (' + byteSize + suffix + ')\
-								
      \
-									
      \
-								
      \
-							
      ');
-					}
-				});
-				if (typeof(settings.onSelectOnce) == 'function') {
-					jQuery(this).bind("uploadifySelectOnce", settings.onSelectOnce);
-				}
-				jQuery(this).bind("uploadifyQueueFull", {'action': settings.onQueueFull}, function(event, queueSizeLimit) {
-					if (event.data.action(event, queueSizeLimit) !== false) {
-						alert('The queue is full.  The max size is ' + queueSizeLimit + '.');
-					}
-				});
-				jQuery(this).bind("uploadifyCheckExist", {'action': settings.onCheck}, function(event, checkScript, fileQueueObj, folder, single) {
-					var postData = new Object();
-					postData = fileQueueObj;
-					postData.folder = pagePath + folder;
-					if (single) {
-						for (var ID in fileQueueObj) {
-							var singleFileID = ID;
-						}
-					}
-					jQuery.post(checkScript, postData, function(data) {
-						for(var key in data) {
-							if (event.data.action(event, checkScript, fileQueueObj, folder, single) !== false) {
-								var replaceFile = confirm("Do you want to replace the file " + data[key] + "?");
-								if (!replaceFile) {
-									document.getElementById(jQuery(event.target).attr('id') + 'Uploader').cancelFileUpload(key, true,true);
-								}
-							}
-						}
-						if (single) {
-							document.getElementById(jQuery(event.target).attr('id') + 'Uploader').startFileUpload(singleFileID, true);
-						} else {
-							document.getElementById(jQuery(event.target).attr('id') + 'Uploader').startFileUpload(null, true);
-						}
-					}, "json");
-				});
-				jQuery(this).bind("uploadifyCancel", {'action': settings.onCancel}, function(event, ID, fileObj, data, clearFast) {
-					if (event.data.action(event, ID, fileObj, data, clearFast) !== false) {
-						var fadeSpeed = (clearFast == true) ? 0 : 250;
-						jQuery("#" + jQuery(this).attr('id') + ID).fadeOut(fadeSpeed, function() { jQuery(this).remove() });
-					}
-				});
-				if (typeof(settings.onClearQueue) == 'function') {
-					jQuery(this).bind("uploadifyClearQueue", settings.onClearQueue);
-				}
-				var errorArray = [];
-				jQuery(this).bind("uploadifyError", {'action': settings.onError}, function(event, ID, fileObj, errorObj) {
-					if (event.data.action(event, ID, fileObj, errorObj) !== false) {
-						var fileArray = new Array(ID, fileObj, errorObj);
-						errorArray.push(fileArray);
-						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(" - " + errorObj.type + " Error");
-						jQuery("#" + jQuery(this).attr('id') + ID).addClass('uploadifyError');
-					}
-				});
-				jQuery(this).bind("uploadifyProgress", {'action': settings.onProgress, 'toDisplay': settings.displayData}, function(event, ID, fileObj, data) {
-					if (event.data.action(event, ID, fileObj, data) !== false) {
-						jQuery("#" + jQuery(this).attr('id') + ID + "ProgressBar").css('width', data.percentage + '%');
-						if (event.data.toDisplay == 'percentage') displayData = ' - ' + data.percentage + '%';
-						if (event.data.toDisplay == 'speed') displayData = ' - ' + data.speed + 'KB/s';
-						if (event.data.toDisplay == null) displayData = ' ';
-						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(displayData);
-					}
-				});
-				jQuery(this).bind("uploadifyComplete", {'action': settings.onComplete}, function(event, ID, fileObj, response, data) {
-					if (event.data.action(event, ID, fileObj, unescape(response), data) !== false) {
-						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(' - Completed');
-						jQuery("#" + jQuery(this).attr('id') + ID).fadeOut(250, function() { jQuery(this).remove()});
-					}
-				});
-				if (typeof(settings.onAllComplete) == 'function') {
-					jQuery(this).bind("uploadifyAllComplete", {'action': settings.onAllComplete}, function(event, uploadObj) {
-						if (event.data.action(event, uploadObj) !== false) {
-							errorArray = [];
-						}
-					});
-				}
-			});
-		},
-		uploadifySettings:function(settingName, settingValue, resetObject) {
-			var returnValue = false;
-			jQuery(this).each(function() {
-				if (settingName == 'scriptData' && settingValue != null) {
-					if (resetObject) {
-						var scriptData = settingValue;
-					} else {
-						var scriptData = jQuery.extend(settings.scriptData, settingValue);
-					}
-					var scriptDataString = '';
-					for (var name in scriptData) {
-						scriptDataString += '&' + name + '=' + escape(scriptData[name]);
-					}
-					settingValue = scriptDataString.substr(1);
-				}
-				returnValue = document.getElementById(jQuery(this).attr('id') + 'Uploader').updateSettings(settingName, settingValue);
-			});
-			if (settingValue == null) {
-				if (settingName == 'scriptData') {
-					var returnSplit = unescape(returnValue).split('&');
-					var returnObj   = new Object();
-					for (var i = 0; i < returnSplit.length; i++) {
-						var iSplit = returnSplit[i].split('=');
-						returnObj[iSplit[0]] = iSplit[1];
-					}
-					returnValue = returnObj;
-				}
-				return returnValue;
-			}
-		},
-		uploadifyUpload:function(ID) {
-			jQuery(this).each(function() {
-				document.getElementById(jQuery(this).attr('id') + 'Uploader').startFileUpload(ID, false);
-			});
-		},
-		uploadifyCancel:function(ID) {
-			jQuery(this).each(function() {
-				document.getElementById(jQuery(this).attr('id') + 'Uploader').cancelFileUpload(ID, true, false);
-			});
-		},
-		uploadifyClearQueue:function() {
-			jQuery(this).each(function() {
-				document.getElementById(jQuery(this).attr('id') + 'Uploader').clearFileUploadQueue(false);
-			});
-		}
-	})
-})(jQuery);
\ No newline at end of file
diff --git a/vendors/uploadify/jquery.uploadify.v2.1.0.min.js b/vendors/uploadify/jquery.uploadify.v2.1.0.min.js
deleted file mode 100644
index 04592ffec..000000000
--- a/vendors/uploadify/jquery.uploadify.v2.1.0.min.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Uploadify v2.1.0
-Release Date: August 24, 2009
-
-Copyright (c) 2009 Ronnie Garcia, Travis Nickels
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-if(jQuery){(function(a){a.extend(a.fn,{uploadify:function(b){a(this).each(function(){settings=a.extend({id:a(this).attr("id"),uploader:"uploadify.swf",script:"uploadify.php",expressInstall:null,folder:"",height:30,width:110,cancelImg:"cancel.png",wmode:"opaque",scriptAccess:"sameDomain",fileDataName:"Filedata",method:"POST",queueSizeLimit:999,simUploadLimit:1,queueID:false,displayData:"percentage",onInit:function(){},onSelect:function(){},onQueueFull:function(){},onCheck:function(){},onCancel:function(){},onError:function(){},onProgress:function(){},onComplete:function(){},onAllComplete:function(){}},b);var e=location.pathname;e=e.split("/");e.pop();e=e.join("/")+"/";var f={};f.uploadifyID=settings.id;f.pagepath=e;if(settings.buttonImg){f.buttonImg=escape(settings.buttonImg)}if(settings.buttonText){f.buttonText=escape(settings.buttonText)}if(settings.rollover){f.rollover=true}f.script=settings.script;f.folder=escape(settings.folder);if(settings.scriptData){var g="";for(var d in settings.scriptData){g+="&"+d+"="+settings.scriptData[d]}f.scriptData=escape(g.substr(1))}f.width=settings.width;f.height=settings.height;f.wmode=settings.wmode;f.method=settings.method;f.queueSizeLimit=settings.queueSizeLimit;f.simUploadLimit=settings.simUploadLimit;if(settings.hideButton){f.hideButton=true}if(settings.fileDesc){f.fileDesc=settings.fileDesc}if(settings.fileExt){f.fileExt=settings.fileExt}if(settings.multi){f.multi=true}if(settings.auto){f.auto=true}if(settings.sizeLimit){f.sizeLimit=settings.sizeLimit}if(settings.checkScript){f.checkScript=settings.checkScript}if(settings.fileDataName){f.fileDataName=settings.fileDataName}if(settings.queueID){f.queueID=settings.queueID}if(settings.onInit()!==false){a(this).css("display","none");a(this).after('
      ');swfobject.embedSWF(settings.uploader,settings.id+"Uploader",settings.width,settings.height,"9.0.24",settings.expressInstall,f,{quality:"high",wmode:settings.wmode,allowScriptAccess:settings.scriptAccess});if(settings.queueID==false){a("#"+a(this).attr("id")+"Uploader").after('
      ')}}if(typeof(settings.onOpen)=="function"){a(this).bind("uploadifyOpen",settings.onOpen)}a(this).bind("uploadifySelect",{action:settings.onSelect,queueID:settings.queueID},function(j,h,i){if(j.data.action(j,h,i)!==false){var k=Math.round(i.size/1024*100)*0.01;var l="KB";if(k>1000){k=Math.round(k*0.001*100)*0.01;l="MB"}var m=k.toString().split(".");if(m.length>1){k=m[0]+"."+m[1].substr(0,2)}else{k=m[0]}if(i.name.length>20){fileName=i.name.substr(0,20)+"..."}else{fileName=i.name}queue="#"+a(this).attr("id")+"Queue";if(j.data.queueID){queue="#"+j.data.queueID}a(queue).append('
      '+fileName+" ("+k+l+')
      ')}});if(typeof(settings.onSelectOnce)=="function"){a(this).bind("uploadifySelectOnce",settings.onSelectOnce)}a(this).bind("uploadifyQueueFull",{action:settings.onQueueFull},function(h,i){if(h.data.action(h,i)!==false){alert("The queue is full.  The max size is "+i+".")}});a(this).bind("uploadifyCheckExist",{action:settings.onCheck},function(m,l,k,j,o){var i=new Object();i=k;i.folder=e+j;if(o){for(var h in k){var n=h}}a.post(l,i,function(r){for(var p in r){if(m.data.action(m,l,k,j,o)!==false){var q=confirm("Do you want to replace the file "+r[p]+"?");if(!q){document.getElementById(a(m.target).attr("id")+"Uploader").cancelFileUpload(p,true,true)}}}if(o){document.getElementById(a(m.target).attr("id")+"Uploader").startFileUpload(n,true)}else{document.getElementById(a(m.target).attr("id")+"Uploader").startFileUpload(null,true)}},"json")});a(this).bind("uploadifyCancel",{action:settings.onCancel},function(l,h,k,m,j){if(l.data.action(l,h,k,m,j)!==false){var i=(j==true)?0:250;a("#"+a(this).attr("id")+h).fadeOut(i,function(){a(this).remove()})}});if(typeof(settings.onClearQueue)=="function"){a(this).bind("uploadifyClearQueue",settings.onClearQueue)}var c=[];a(this).bind("uploadifyError",{action:settings.onError},function(l,h,k,j){if(l.data.action(l,h,k,j)!==false){var i=new Array(h,k,j);c.push(i);a("#"+a(this).attr("id")+h+" .percentage").text(" - "+j.type+" Error");a("#"+a(this).attr("id")+h).addClass("uploadifyError")}});a(this).bind("uploadifyProgress",{action:settings.onProgress,toDisplay:settings.displayData},function(j,h,i,k){if(j.data.action(j,h,i,k)!==false){a("#"+a(this).attr("id")+h+"ProgressBar").css("width",k.percentage+"%");if(j.data.toDisplay=="percentage"){displayData=" - "+k.percentage+"%"}if(j.data.toDisplay=="speed"){displayData=" - "+k.speed+"KB/s"}if(j.data.toDisplay==null){displayData=" "}a("#"+a(this).attr("id")+h+" .percentage").text(displayData)}});a(this).bind("uploadifyComplete",{action:settings.onComplete},function(k,h,j,i,l){if(k.data.action(k,h,j,unescape(i),l)!==false){a("#"+a(this).attr("id")+h+" .percentage").text(" - Completed");a("#"+a(this).attr("id")+h).fadeOut(250,function(){a(this).remove()})}});if(typeof(settings.onAllComplete)=="function"){a(this).bind("uploadifyAllComplete",{action:settings.onAllComplete},function(h,i){if(h.data.action(h,i)!==false){c=[]}})}})},uploadifySettings:function(f,j,c){var g=false;a(this).each(function(){if(f=="scriptData"&&j!=null){if(c){var i=j}else{var i=a.extend(settings.scriptData,j)}var l="";for(var k in i){l+="&"+k+"="+escape(i[k])}j=l.substr(1)}g=document.getElementById(a(this).attr("id")+"Uploader").updateSettings(f,j)});if(j==null){if(f=="scriptData"){var b=unescape(g).split("&");var e=new Object();for(var d=0;d
      ');
+					swfobject.embedSWF(settings.uploader, settings.id + 'Uploader', settings.width, settings.height, '9.0.24', settings.expressInstall, data, {'quality':'high','wmode':settings.wmode,'allowScriptAccess':settings.scriptAccess}, {}, settings.onEmbedFlash);
+					if (settings.queueID == false) {
+						jQuery("#" + jQuery(this).attr('id') + "Uploader").after('
      ');
+					}
+				}
+				if (typeof(settings.onOpen) == 'function') {
+					jQuery(this).bind("uploadifyOpen", settings.onOpen);
+				}
+				jQuery(this).bind("uploadifySelect", {'action': settings.onSelect, 'queueID': settings.queueID}, function(event, ID, fileObj) {
+					if (event.data.action(event, ID, fileObj) !== false) {
+						var byteSize = Math.round(fileObj.size / 1024 * 100) * .01;
+						var suffix = 'KB';
+						if (byteSize > 1000) {
+							byteSize = Math.round(byteSize *.001 * 100) * .01;
+							suffix = 'MB';
+						}
+						var sizeParts = byteSize.toString().split('.');
+						if (sizeParts.length > 1) {
+							byteSize = sizeParts[0] + '.' + sizeParts[1].substr(0,2);
+						} else {
+							byteSize = sizeParts[0];
+						}
+						if (fileObj.name.length > 20) {
+							fileName = fileObj.name.substr(0,20) + '...';
+						} else {
+							fileName = fileObj.name;
+						}
+						queue = '#' + jQuery(this).attr('id') + 'Queue';
+						if (event.data.queueID) {
+							queue = '#' + event.data.queueID;
+						}
+						jQuery(queue).append('
      \
+								
      \
+									\
+								
      \
+								' + fileName + ' (' + byteSize + suffix + ')\
+								
      \
+									
      \
+								
      \
+							
      ');
+					}
+				});
+				if (typeof(settings.onSelectOnce) == 'function') {
+					jQuery(this).bind("uploadifySelectOnce", settings.onSelectOnce);
+				}
+				jQuery(this).bind("uploadifyQueueFull", {'action': settings.onQueueFull}, function(event, queueSizeLimit) {
+					if (event.data.action(event, queueSizeLimit) !== false) {
+						alert('The queue is full.  The max size is ' + queueSizeLimit + '.');
+					}
+				});
+				jQuery(this).bind("uploadifyCheckExist", {'action': settings.onCheck}, function(event, checkScript, fileQueueObj, folder, single) {
+					var postData = new Object();
+					postData = fileQueueObj;
+					postData.folder = pagePath + folder;
+					if (single) {
+						for (var ID in fileQueueObj) {
+							var singleFileID = ID;
+						}
+					}
+					jQuery.post(checkScript, postData, function(data) {
+						for(var key in data) {
+							if (event.data.action(event, checkScript, fileQueueObj, folder, single) !== false) {
+								var replaceFile = confirm("Do you want to replace the file " + data[key] + "?");
+								if (!replaceFile) {
+									document.getElementById(jQuery(event.target).attr('id') + 'Uploader').cancelFileUpload(key, true,true);
+								}
+							}
+						}
+						if (single) {
+							document.getElementById(jQuery(event.target).attr('id') + 'Uploader').startFileUpload(singleFileID, true);
+						} else {
+							document.getElementById(jQuery(event.target).attr('id') + 'Uploader').startFileUpload(null, true);
+						}
+					}, "json");
+				});
+				jQuery(this).bind("uploadifyCancel", {'action': settings.onCancel}, function(event, ID, fileObj, data, clearFast) {
+					if (event.data.action(event, ID, fileObj, data, clearFast) !== false) {
+						var fadeSpeed = (clearFast == true) ? 0 : 250;
+						jQuery("#" + jQuery(this).attr('id') + ID).fadeOut(fadeSpeed, function() { jQuery(this).remove() });
+					}
+				});
+				if (typeof(settings.onClearQueue) == 'function') {
+					jQuery(this).bind("uploadifyClearQueue", settings.onClearQueue);
+				}
+				var errorArray = [];
+				jQuery(this).bind("uploadifyError", {'action': settings.onError}, function(event, ID, fileObj, errorObj) {
+					if (event.data.action(event, ID, fileObj, errorObj) !== false) {
+						var fileArray = new Array(ID, fileObj, errorObj);
+						errorArray.push(fileArray);
+						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(" - " + errorObj.type + " Error");
+						jQuery("#" + jQuery(this).attr('id') + ID).addClass('uploadifyError');
+					}
+				});
+				jQuery(this).bind("uploadifyProgress", {'action': settings.onProgress, 'toDisplay': settings.displayData}, function(event, ID, fileObj, data) {
+					if (event.data.action(event, ID, fileObj, data) !== false) {
+						jQuery("#" + jQuery(this).attr('id') + ID + "ProgressBar").css('width', data.percentage + '%');
+						if (event.data.toDisplay == 'percentage') displayData = ' - ' + data.percentage + '%';
+						if (event.data.toDisplay == 'speed') displayData = ' - ' + data.speed + 'KB/s';
+						if (event.data.toDisplay == null) displayData = ' ';
+						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(displayData);
+					}
+				});
+				jQuery(this).bind("uploadifyComplete", {'action': settings.onComplete}, function(event, ID, fileObj, response, data) {
+					if (event.data.action(event, ID, fileObj, unescape(response), data) !== false) {
+						jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(' - Completed');
+						jQuery("#" + jQuery(this).attr('id') + ID).fadeOut(250, function() { jQuery(this).remove()});
+					}
+				});
+				if (typeof(settings.onAllComplete) == 'function') {
+					jQuery(this).bind("uploadifyAllComplete", {'action': settings.onAllComplete}, function(event, uploadObj) {
+						if (event.data.action(event, uploadObj) !== false) {
+							errorArray = [];
+						}
+					});
+				}
+			});
+		},
+		uploadifySettings:function(settingName, settingValue, resetObject) {
+			var returnValue = false;
+			jQuery(this).each(function() {
+				if (settingName == 'scriptData' && settingValue != null) {
+					if (resetObject) {
+						var scriptData = settingValue;
+					} else {
+						var scriptData = jQuery.extend(settings.scriptData, settingValue);
+					}
+					var scriptDataString = '';
+					for (var name in scriptData) {
+						scriptDataString += '&' + name + '=' + escape(scriptData[name]);
+					}
+					settingValue = scriptDataString.substr(1);
+				}
+				returnValue = document.getElementById(jQuery(this).attr('id') + 'Uploader').updateSettings(settingName, settingValue);
+			});
+			if (settingValue == null) {
+				if (settingName == 'scriptData') {
+					var returnSplit = unescape(returnValue).split('&');
+					var returnObj   = new Object();
+					for (var i = 0; i < returnSplit.length; i++) {
+						var iSplit = returnSplit[i].split('=');
+						returnObj[iSplit[0]] = iSplit[1];
+					}
+					returnValue = returnObj;
+				}
+				return returnValue;
+			}
+		},
+		uploadifyUpload:function(ID) {
+			jQuery(this).each(function() {
+				document.getElementById(jQuery(this).attr('id') + 'Uploader').startFileUpload(ID, false);
+			});
+		},
+		uploadifyCancel:function(ID) {
+			jQuery(this).each(function() {
+				document.getElementById(jQuery(this).attr('id') + 'Uploader').cancelFileUpload(ID, true, false);
+			});
+		},
+		uploadifyClearQueue:function() {
+			jQuery(this).each(function() {
+				document.getElementById(jQuery(this).attr('id') + 'Uploader').clearFileUploadQueue(false);
+			});
+		}
+	})
+})(jQuery);
\ No newline at end of file
diff --git a/vendors/uploadify/jquery.uploadify.v2.1.1.min.js b/vendors/uploadify/jquery.uploadify.v2.1.1.min.js
new file mode 100644
index 000000000..0a5ff7bea
--- /dev/null
+++ b/vendors/uploadify/jquery.uploadify.v2.1.1.min.js
@@ -0,0 +1 @@
+if(jQuery){(function(jQuery){jQuery.extend(jQuery.fn,{uploadify:function(options){jQuery(this).each(function(){settings=jQuery.extend({id:jQuery(this).attr("id"),uploader:"uploadify.swf",script:"uploadify.php",expressInstall:null,folder:"",height:30,width:110,cancelImg:"cancel.png",wmode:"opaque",scriptAccess:"sameDomain",fileDataName:"Filedata",method:"POST",queueSizeLimit:999,simUploadLimit:1,queueID:false,displayData:"percentage",onInit:function(){},onEmbedFlash:function(){},onSelect:function(){},onQueueFull:function(){},onCheck:function(){},onCancel:function(){},onError:function(){},onProgress:function(){},onComplete:function(){},onAllComplete:function(){}},options);var pagePath=location.pathname;pagePath=pagePath.split("/");pagePath.pop();pagePath=pagePath.join("/")+"/";var data={};data.uploadifyID=settings.id;data.pagepath=pagePath;if(settings.buttonImg){data.buttonImg=escape(settings.buttonImg)}if(settings.buttonText){data.buttonText=escape(settings.buttonText)}if(settings.rollover){data.rollover=true}data.script=settings.script;data.folder=escape(settings.folder);if(settings.scriptData){var scriptDataString="";for(var name in settings.scriptData){scriptDataString+="&"+name+"="+settings.scriptData[name]}data.scriptData=escape(scriptDataString.substr(1))}data.width=settings.width;data.height=settings.height;data.wmode=settings.wmode;data.method=settings.method;data.queueSizeLimit=settings.queueSizeLimit;data.simUploadLimit=settings.simUploadLimit;if(settings.hideButton){data.hideButton=true}if(settings.fileDesc){data.fileDesc=settings.fileDesc}if(settings.fileExt){data.fileExt=settings.fileExt}if(settings.multi){data.multi=true}if(settings.auto){data.auto=true}if(settings.sizeLimit){data.sizeLimit=settings.sizeLimit}if(settings.checkScript){data.checkScript=settings.checkScript}if(settings.fileDataName){data.fileDataName=settings.fileDataName}if(settings.queueID){data.queueID=settings.queueID}if(settings.onInit()!==false){jQuery(this).css("display","none");jQuery(this).after('
      ');swfobject.embedSWF(settings.uploader,settings.id+"Uploader",settings.width,settings.height,"9.0.24",settings.expressInstall,data,{quality:"high",wmode:settings.wmode,allowScriptAccess:settings.scriptAccess},{},settings.onEmbedFlash);if(settings.queueID==false){jQuery("#"+jQuery(this).attr("id")+"Uploader").after('
      ')}}if(typeof(settings.onOpen)=="function"){jQuery(this).bind("uploadifyOpen",settings.onOpen)}jQuery(this).bind("uploadifySelect",{action:settings.onSelect,queueID:settings.queueID},function(event,ID,fileObj){if(event.data.action(event,ID,fileObj)!==false){var byteSize=Math.round(fileObj.size/1024*100)*0.01;var suffix="KB";if(byteSize>1000){byteSize=Math.round(byteSize*0.001*100)*0.01;suffix="MB"}var sizeParts=byteSize.toString().split(".");if(sizeParts.length>1){byteSize=sizeParts[0]+"."+sizeParts[1].substr(0,2)}else{byteSize=sizeParts[0]}if(fileObj.name.length>20){fileName=fileObj.name.substr(0,20)+"..."}else{fileName=fileObj.name}queue="#"+jQuery(this).attr("id")+"Queue";if(event.data.queueID){queue="#"+event.data.queueID}jQuery(queue).append('
      '+fileName+" ("+byteSize+suffix+')
      ')}});if(typeof(settings.onSelectOnce)=="function"){jQuery(this).bind("uploadifySelectOnce",settings.onSelectOnce)}jQuery(this).bind("uploadifyQueueFull",{action:settings.onQueueFull},function(event,queueSizeLimit){if(event.data.action(event,queueSizeLimit)!==false){alert("The queue is full.  The max size is "+queueSizeLimit+".")}});jQuery(this).bind("uploadifyCheckExist",{action:settings.onCheck},function(event,checkScript,fileQueueObj,folder,single){var postData=new Object();postData=fileQueueObj;postData.folder=pagePath+folder;if(single){for(var ID in fileQueueObj){var singleFileID=ID}}jQuery.post(checkScript,postData,function(data){for(var key in data){if(event.data.action(event,checkScript,fileQueueObj,folder,single)!==false){var replaceFile=confirm("Do you want to replace the file "+data[key]+"?");if(!replaceFile){document.getElementById(jQuery(event.target).attr("id")+"Uploader").cancelFileUpload(key,true,true)}}}if(single){document.getElementById(jQuery(event.target).attr("id")+"Uploader").startFileUpload(singleFileID,true)}else{document.getElementById(jQuery(event.target).attr("id")+"Uploader").startFileUpload(null,true)}},"json")});jQuery(this).bind("uploadifyCancel",{action:settings.onCancel},function(event,ID,fileObj,data,clearFast){if(event.data.action(event,ID,fileObj,data,clearFast)!==false){var fadeSpeed=(clearFast==true)?0:250;jQuery("#"+jQuery(this).attr("id")+ID).fadeOut(fadeSpeed,function(){jQuery(this).remove()})}});if(typeof(settings.onClearQueue)=="function"){jQuery(this).bind("uploadifyClearQueue",settings.onClearQueue)}var errorArray=[];jQuery(this).bind("uploadifyError",{action:settings.onError},function(event,ID,fileObj,errorObj){if(event.data.action(event,ID,fileObj,errorObj)!==false){var fileArray=new Array(ID,fileObj,errorObj);errorArray.push(fileArray);jQuery("#"+jQuery(this).attr("id")+ID+" .percentage").text(" - "+errorObj.type+" Error");jQuery("#"+jQuery(this).attr("id")+ID).addClass("uploadifyError")}});jQuery(this).bind("uploadifyProgress",{action:settings.onProgress,toDisplay:settings.displayData},function(event,ID,fileObj,data){if(event.data.action(event,ID,fileObj,data)!==false){jQuery("#"+jQuery(this).attr("id")+ID+"ProgressBar").css("width",data.percentage+"%");if(event.data.toDisplay=="percentage"){displayData=" - "+data.percentage+"%"}if(event.data.toDisplay=="speed"){displayData=" - "+data.speed+"KB/s"}if(event.data.toDisplay==null){displayData=" "}jQuery("#"+jQuery(this).attr("id")+ID+" .percentage").text(displayData)}});jQuery(this).bind("uploadifyComplete",{action:settings.onComplete},function(event,ID,fileObj,response,data){if(event.data.action(event,ID,fileObj,unescape(response),data)!==false){jQuery("#"+jQuery(this).attr("id")+ID+" .percentage").text(" - Completed");jQuery("#"+jQuery(this).attr("id")+ID).fadeOut(250,function(){jQuery(this).remove()})}});if(typeof(settings.onAllComplete)=="function"){jQuery(this).bind("uploadifyAllComplete",{action:settings.onAllComplete},function(event,uploadObj){if(event.data.action(event,uploadObj)!==false){errorArray=[]}})}})},uploadifySettings:function(settingName,settingValue,resetObject){var returnValue=false;jQuery(this).each(function(){if(settingName=="scriptData"&&settingValue!=null){if(resetObject){var scriptData=settingValue}else{var scriptData=jQuery.extend(settings.scriptData,settingValue)}var scriptDataString="";for(var name in scriptData){scriptDataString+="&"+name+"="+escape(scriptData[name])}settingValue=scriptDataString.substr(1)}returnValue=document.getElementById(jQuery(this).attr("id")+"Uploader").updateSettings(settingName,settingValue)});if(settingValue==null){if(settingName=="scriptData"){var returnSplit=unescape(returnValue).split("&");var returnObj=new Object();for(var i=0;i
-	
+	
 
-- 
cgit v1.2.3


From 22383071d02cea7aaaed09957fad2ccd0a4b1b04 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 14:14:18 +0000
Subject: cleaned up the CSS and text for the new uploader

---
 languages/en.php                             | 12 ++++---
 views/default/tidypics/css.php               | 24 +++++++++++---
 views/default/tidypics/forms/ajax_upload.php | 49 +++++++++++++++++++---------
 views/default/tidypics/forms/upload.php      |  4 +--
 4 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 0a8e31672..26ef79605 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -9,7 +9,6 @@ $english = array(
 			'images' => "Images",
 			'caption' => "Caption",
 			'photos' => "Photos",
-			'images:upload' => "Upload Images",
 			'images:multiupload' => "Flash Multi Upload Tool",
 			'images:multiupload:todo' => "Choose one or more files for upload.",
 			'album' => "Photo Album",
@@ -49,7 +48,7 @@ $english = array(
 			'tidypics:administration' => 'Tidypics Administration',
 			'tidypics:stats' => 'Stats',
 			'tidypics:nophotosingroup' => 'This groups does not have any photos yet',
-                        'tidypics:upgrade' => 'Upgrade',
+			'tidypics:upgrade' => 'Upgrade',
 
 			'flickr:setup' => 'Flickr Setup',
 			'flickr:usernamesetup' => 'Please enter your Flickr username here:',
@@ -110,8 +109,13 @@ $english = array(
 			'album:tags' => "Tags",
 			'album:cover' => "Make image album cover?",
 			'tidypics:quota' => "Quota usage:",
-			'tidypics:upload:filedesc' => 'Image files (jpeg, png, gif)',
-
+	
+			'tidypics:uploader:choose' => "Choose photos",
+			'tidypics:uploader:upload' => "Upload photos",
+			'tidypics:uploader:describe' => "Describe photos",
+			'tidypics:uploader:filedesc' => 'Image files (jpeg, png, gif)',
+			'tidypics:uploader:instructs' => 'There are three easy steps for adding photos to your album using this uploader: choosing, uploading, and describing them. If you do not have Flash, there is also a basic uploader available.',
+			'tidypics:uploader:basic' => 'You can upload up to 10 photos at a time (%s MB maximum per photo)',
 		//views
 
 			'image:total' => "Images in album:",
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 3fd3c81aa..d836cabcf 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -305,6 +305,25 @@ list-style: none;
 }
 
 /*----- uploadify ------*/
+
+#tidypics_uploader_steps {
+list-style:none;
+}
+
+#tidypics_uploader_steps li {
+margin-bottom: 20px;
+}
+
+#tidypics_uploader_steps li a {
+font-weight:bold;
+}
+
+.tidypics_choose_button_hover {
+color:#0054a7;
+text-decoration:underline;
+}
+
+
 .uploadifyQueueItem {
 background-color:#F5F5F5;
 border:2px solid #E5E5E5;
@@ -331,6 +350,7 @@ height: 3px;
 #tidypics_uploader {
 position:relative;
 width:400px;
+min-height:20px;
 }
 
 #tidypics_choose_button {
@@ -347,10 +367,6 @@ position:relative;
 z-index:100;
 }
 
-#uploadifyQueue {
-margin-bottom: 20px;
-}
-
 .uploadifyQueueItem .cancel {
 float: right;
 }
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index 313ca17f9..c906b7673 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -33,32 +33,40 @@ if ($quota) {
 	}
 }
 
+$basic_uploader_url = current_page_url() . '/basic';
+
 ?>
 
 
      
 
-	
      Instructions here for uploading images using Ajax/Flash
      
+	
      
 
+	
 
      
 
 
 
diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index 5a9703171..8bbda08b3 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -35,8 +35,8 @@ if ($quota) {
 	ob_start();
 	?>
 	
      
-		
      
-		
      
+		
      
+		
      
 		
-- 
cgit v1.2.3


From 621e0a079c4f9410356c49a39bdd68c098e3bc96 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 14:30:24 +0000
Subject: managing the workflow for uploading images

---
 views/default/tidypics/css.php               | 10 +++++++++
 views/default/tidypics/forms/ajax_upload.php | 32 +++++++++++++++++++---------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index d836cabcf..6932b8a75 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -323,6 +323,15 @@ color:#0054a7;
 text-decoration:underline;
 }
 
+.tidypics_disable {
+color:#cccccc;
+}
+
+.tidypics_disable:hover {
+color:#cccccc;
+text-decoration:none;
+}
+
 
 .uploadifyQueueItem {
 background-color:#F5F5F5;
@@ -341,6 +350,7 @@ border-width:1px;
 margin-top:10px;
 width:100%;
 }
+
 .uploadifyProgressBar {
 background-color: #0099FF;
 width: 1px;
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index c906b7673..fb9060a50 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -53,12 +53,12 @@ $basic_uploader_url = current_page_url() . '/basic';
 	
      
 		
 		
    44. 
-			
+			
 				2. 
 			
 		
      45. 
 		
    45. 
-			
+			
 				3. 
 			
 		
      46. 
@@ -78,14 +78,14 @@ $("#uploadify").uploadify({
 						'batch'        : ''
 					 },
 	'fileDataName' : 'Image',
-	'cancelImg'  : '_graphics/icon_customise_remove.gif',
-	'multi'      : true,
-	'auto'       : false,
-	'fileDesc'   : '',
-	'fileExt'    : '*.jpg;*.jpeg;*.png;*.gif',
-	'wmode'      : 'transparent',
-	'buttonImg'  : " ",
-	'height'     : 20,
+	'cancelImg'    : '_graphics/icon_customise_remove.gif',
+	'multi'        : true,
+	'auto'         : false,
+	'fileDesc'     : '',
+	'fileExt'      : '*.jpg;*.jpeg;*.png;*.gif',
+	'wmode'        : 'transparent',
+	'buttonImg'    : " ",
+	'height'       : 20,
 	'onEmbedFlash' : function(event) {
 		$("#" + event.id).hover(
 			function(){
@@ -95,7 +95,19 @@ $("#uploadify").uploadify({
 				$("#tidypics_choose_button").removeClass('tidypics_choose_button_hover');
 			}
 		);
+	},
+	'onSelectOnce'  : function() {
+		$("#tidypics_upload_button").removeClass('tidypics_disable');
+	},
+	'onAllComplete' : function() {
+		$("#tidypics_describe_button").removeClass('tidypics_disable');
+	},
+	'onCancel'      : function(event, queueID, fileObj, data) {
+		if (data.fileCount == 0) {
+			$("#tidypics_upload_button").addClass('tidypics_disable');
+		}
 	}
+
 });
 
 
-- 
cgit v1.2.3


From 94e82c781a9bc5a171193523cac50ea83e69dcfd Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 14:49:14 +0000
Subject: handling new album in ajax upload code now

---
 actions/ajax_upload_complete.php             | 24 ++++++++++++++++++++++++
 start.php                                    |  1 +
 views/default/tidypics/forms/ajax_upload.php | 16 +++++++++++++---
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 actions/ajax_upload_complete.php

diff --git a/actions/ajax_upload_complete.php b/actions/ajax_upload_complete.php
new file mode 100644
index 000000000..4fc96061e
--- /dev/null
+++ b/actions/ajax_upload_complete.php
@@ -0,0 +1,24 @@
+new_album == TP_NEW_ALBUM) {
+	$album->new_album = TP_OLD_ALBUM;
+
+	// we throw the notification manually here so users are not told about the new album until there
+	// is at least a few photos in it
+	object_notifications('create', 'object', $album);
+
+	add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
+}
+
+exit;
\ No newline at end of file
diff --git a/start.php b/start.php
index a50f23c57..c44bc9f1e 100644
--- a/start.php
+++ b/start.php
@@ -464,6 +464,7 @@ register_elgg_event_handler('pagesetup', 'system', 'tidypics_adminmenu');
 // Register actions
 register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
 register_action("tidypics/ajax_upload", true, $CONFIG->pluginspath . "tidypics/actions/ajax_upload.php");
+register_action("tidypics/ajax_upload_complete", true, $CONFIG->pluginspath . "tidypics/actions/ajax_upload_complete.php");
 register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
 register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
 register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index fb9060a50..912d1c03e 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -10,6 +10,10 @@ $token = generate_action_token($ts);
 
 $batch = time();
 
+$basic_uploader_url = current_page_url() . '/basic';
+
+$upload_endpoint_url = "{$vars['url']}action/tidypics/ajax_upload/";
+$upload_complete_url = "{$vars['url']}action/tidypics/ajax_upload_complete/";
 
 $maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
 if (!$maxfilesize) {
@@ -33,8 +37,6 @@ if ($quota) {
 	}
 }
 
-$basic_uploader_url = current_page_url() . '/basic';
-
 ?>
 
 
      
@@ -69,7 +71,7 @@ $basic_uploader_url = current_page_url() . '/basic';
 
 $("#uploadify").uploadify({
 	'uploader'     : 'mod/tidypics/vendors/uploadify/uploadify.swf',
-	'script'       : 'action/tidypics/ajax_upload/',
+	'script'       : '',
 	'scriptData'   : {
 						'album_guid'   : 'guid; ?>',
 						'__elgg_token' : '',
@@ -101,6 +103,14 @@ $("#uploadify").uploadify({
 	},
 	'onAllComplete' : function() {
 		$("#tidypics_describe_button").removeClass('tidypics_disable');
+		$.post(
+			'',
+			{ 
+				album_guid   : 'guid; ?>',
+				__elgg_token : '',
+				__elgg_ts    : ''
+			}
+		);
 	},
 	'onCancel'      : function(event, queueID, fileObj, data) {
 		if (data.fileCount == 0) {
-- 
cgit v1.2.3


From d4394d9645b379c1d57c096ee4136fbae4904b1d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 14:55:31 +0000
Subject: added river events for ajax upload

---
 actions/ajax_upload.php          | 5 ++++-
 actions/ajax_upload_complete.php | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/actions/ajax_upload.php b/actions/ajax_upload.php
index a9743cf54..9aea9c19d 100644
--- a/actions/ajax_upload.php
+++ b/actions/ajax_upload.php
@@ -45,7 +45,10 @@ $image->saveThumbnails($image_lib);
 
 $album->prependImageList(array($image->guid));
 
-error_log('complete');
+
+if (get_plugin_setting('img_river_view', 'tidypics') === "all") {
+	add_to_river('river/object/image/create', 'create', $image->owner_guid, $image->guid);
+}
 
 echo "1";
 exit;
\ No newline at end of file
diff --git a/actions/ajax_upload_complete.php b/actions/ajax_upload_complete.php
index 4fc96061e..0912854a3 100644
--- a/actions/ajax_upload_complete.php
+++ b/actions/ajax_upload_complete.php
@@ -21,4 +21,7 @@ if ($album->new_album == TP_NEW_ALBUM) {
 	add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
 }
 
+// plugins can register to be told when a Tidypics album has had images added
+trigger_elgg_event('upload', 'tp_album', $album);
+
 exit;
\ No newline at end of file
-- 
cgit v1.2.3


From 4f57a2a6e8c9f1130b4772125aa6d434e6c2a5c3 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 15:17:53 +0000
Subject: turning off choose and upload after the images are uploaded

---
 views/default/tidypics/css.php               |  2 +-
 views/default/tidypics/forms/ajax_upload.php | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 6932b8a75..f7dd256a1 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -352,7 +352,7 @@ width:100%;
 }
 
 .uploadifyProgressBar {
-background-color: #0099FF;
+background-color: #0054a7;
 width: 1px;
 height: 3px;
 }
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index 912d1c03e..1d2a240ad 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -102,6 +102,11 @@ $("#uploadify").uploadify({
 		$("#tidypics_upload_button").removeClass('tidypics_disable');
 	},
 	'onAllComplete' : function() {
+		$("#tidypics_choose_button").addClass('tidypics_disable');
+		$("#tidypics_upload_button").addClass('tidypics_disable');
+		$("#tidypics_choose_button").attr("href", "javascript:void(0)");
+		$("#tidypics_upload_button").attr("href", "javascript:void(0)");
+
 		$("#tidypics_describe_button").removeClass('tidypics_disable');
 		$.post(
 			'',
@@ -112,6 +117,11 @@ $("#uploadify").uploadify({
 			}
 		);
 	},
+	'onComplete'    : function(event, queueID) {
+		// check for errors here
+		$("#uploadify" + queueID + " > .cancel").remove();
+		return false;
+	},
 	'onCancel'      : function(event, queueID, fileObj, data) {
 		if (data.fileCount == 0) {
 			$("#tidypics_upload_button").addClass('tidypics_disable');
-- 
cgit v1.2.3


From 6cc8f7714561a681428c2d402b15666e8e0af0fd Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 16:58:33 +0000
Subject: working around use_only_cookies

---
 start.php                                    | 66 ++++++++++++++++++++++++++++
 views/default/tidypics/forms/ajax_upload.php | 16 +++----
 2 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/start.php b/start.php
index c44bc9f1e..4d2b12798 100644
--- a/start.php
+++ b/start.php
@@ -68,6 +68,9 @@ function tidypics_init() {
 
 	// slideshow plugin hook
 	register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
+
+        // ajax handler for uploads when use_only_cookies is set
+        register_plugin_hook('forward', 'system', 'tidypics_ajax_session_handler');
 }
 
 /**
@@ -451,10 +454,73 @@ function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
 	return $slideshow_link;
 }
 
+/**
+ * Convenience function for listing recent images
+ * 
+ * @param int $max
+ * @param bool $pagination
+ * @return string
+ */
 function tp_mostrecentimages($max = 8, $pagination = true) {
 	return list_entities("object", "image", 0, $max, false, false, $pagination);
 }
 
+/**
+ * Work around for Flash/session issues
+ *
+ * @param string $hook
+ * @param string $entity_type
+ * @param string $returnvalue
+ * @param array  $params
+ */
+function tidypics_ajax_session_handler($hook, $entity_type, $returnvalue, $params) {
+    global $CONFIG;
+
+    $url = current_page_url();
+    if ($url !== "{$CONFIG->wwwroot}action/tidypics/ajax_upload/") {
+        return;
+    }
+
+    if (get_loggedin_userid() != 0) {
+        return;
+    }
+
+    // action_gatekeeper rejected ajax call from Flash due to session issue
+    
+	// Validate token
+    $token = get_input('__elgg_token');
+    $ts = get_input('__elgg_ts');
+    $session_id = get_input('Elgg');
+	$tidypics_token = get_input('tidypics_token');
+	$user_guid = get_input('user_guid');
+
+	$user = get_user($user_guid);
+	if (!$user) {
+		return;
+	}
+
+	if (!$token || !$ts || !$session_id || !$tidypics_token) {
+		return;
+	}
+
+	$hour = 60*60;
+	$now = time();
+	if ($ts < $now-$hour || $ts > $now+$hour) {
+		return;
+	}
+
+	$generated_token = md5($session_id . get_site_secret() . $ts . $user->salt);
+
+	if ($tidypics_token !== $generated_token) {
+		return;
+	}
+
+	// passed token test, so login and process action
+	login($user);
+	include $CONFIG->actions['tidypics/ajax_upload']['file'];
+
+	exit;
+}
 
 // Make sure tidypics_init is called on initialization
 register_elgg_event_handler('init', 'system', 'tidypics_init');
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index 1d2a240ad..87a6ad0ed 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -3,15 +3,13 @@
 extend_view('metatags', 'tidypics/js/uploader');
 
 $album = $vars['album'];
-$access_id = $album->access_id;
 
 $ts = time();
 $token = generate_action_token($ts);
-
 $batch = time();
+$tidypics_token = md5(session_id() . get_site_secret() . $ts . get_loggedin_user()->salt);
 
 $basic_uploader_url = current_page_url() . '/basic';
-
 $upload_endpoint_url = "{$vars['url']}action/tidypics/ajax_upload/";
 $upload_complete_url = "{$vars['url']}action/tidypics/ajax_upload_complete/";
 
@@ -73,11 +71,13 @@ $("#uploadify").uploadify({
 	'uploader'     : 'mod/tidypics/vendors/uploadify/uploadify.swf',
 	'script'       : '',
 	'scriptData'   : {
-						'album_guid'   : 'guid; ?>',
-						'__elgg_token' : '',
-						'__elgg_ts'    : '',
-						'Elgg'         : '',
-						'batch'        : ''
+						'album_guid'     : 'guid; ?>',
+						'user_guid'      : '',
+						'__elgg_token'   : '',
+						'__elgg_ts'      : '',
+						'Elgg'           : '',
+						'tidypics_token' : '',
+						'batch'          : ''
 					 },
 	'fileDataName' : 'Image',
 	'cancelImg'    : '_graphics/icon_customise_remove.gif',
-- 
cgit v1.2.3


From 43c7b8c642a5fc8541122414849a75770975b222 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 17:26:32 +0000
Subject: handling errors in ajax upload

---
 actions/ajax_upload.php                      | 11 +++++++++--
 lib/upload.php                               |  7 +++++--
 views/default/tidypics/forms/ajax_upload.php |  8 +++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/actions/ajax_upload.php b/actions/ajax_upload.php
index 9aea9c19d..1f5588197 100644
--- a/actions/ajax_upload.php
+++ b/actions/ajax_upload.php
@@ -16,6 +16,7 @@ if (!$album) {
 
 // probably POST limit exceeded
 if (empty($_FILES)) {
+	echo 'Image was too large';
 	exit;
 }
 
@@ -28,9 +29,15 @@ $temp_file = $_FILES['Image']['tmp_name'];
 $name = $_FILES['Image']['name'];
 $file_size = $_FILES['Image']['size'];
 
+$mime = tp_upload_get_mimetype($name);
+if ($mime == 'unknown') {
+	echo 'Not an image';
+	exit;
+}
+
 $image = new TidypicsImage();
 $image->container_guid = $album_guid;
-$image->setMimeType(tp_upload_get_mimetype($name));
+$image->setMimeType($mime);
 $image->simpletype = "image";
 $image->access_id = $album->access_id;
 $image->title = substr($name, 0, strrpos($name, '.'));
@@ -50,5 +57,5 @@ if (get_plugin_setting('img_river_view', 'tidypics') === "all") {
 	add_to_river('river/object/image/create', 'create', $image->owner_guid, $image->guid);
 }
 
-echo "1";
+echo "success";
 exit;
\ No newline at end of file
diff --git a/lib/upload.php b/lib/upload.php
index ac926403d..30540dced 100644
--- a/lib/upload.php
+++ b/lib/upload.php
@@ -11,7 +11,7 @@
  */
 function tp_upload_get_mimetype($originalName) {
 	$extension = substr(strrchr($originalName, '.'), 1);
-	switch ($extension) {
+	switch (strtolower($extension)) {
 		case 'png':
 			return 'image/png';
 			break;
@@ -19,9 +19,12 @@ function tp_upload_get_mimetype($originalName) {
 			return 'image/gif';
 			break;
 		case 'jpg':
-		default:
+		case 'jpeg':
 			return 'image/jpeg';
 			break;
+		default:
+			return 'unknown';
+			break;
 	}
 }
 
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index 87a6ad0ed..47aa954c7 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -83,8 +83,6 @@ $("#uploadify").uploadify({
 	'cancelImg'    : '_graphics/icon_customise_remove.gif',
 	'multi'        : true,
 	'auto'         : false,
-	'fileDesc'     : '',
-	'fileExt'      : '*.jpg;*.jpeg;*.png;*.gif',
 	'wmode'        : 'transparent',
 	'buttonImg'    : " ",
 	'height'       : 20,
@@ -117,8 +115,12 @@ $("#uploadify").uploadify({
 			}
 		);
 	},
-	'onComplete'    : function(event, queueID) {
+	'onComplete'    : function(event, queueID, fileObj, response) {
 		// check for errors here
+		if (response != 'success') {
+			$("#uploadify" + queueID + " .percentage").text(" - " + response);
+			$("#uploadify" + queueID).addClass('uploadifyError');
+		}
 		$("#uploadify" + queueID + " > .cancel").remove();
 		return false;
 	},
-- 
cgit v1.2.3


From f1b63cb2469bd332a20ed8f47109ab52f6381f4c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 30 Oct 2010 17:45:51 +0000
Subject: increased width of flash to cover text

---
 views/default/tidypics/forms/ajax_upload.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index 47aa954c7..c703d293b 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -86,6 +86,7 @@ $("#uploadify").uploadify({
 	'wmode'        : 'transparent',
 	'buttonImg'    : " ",
 	'height'       : 20,
+	'width'        : 130,
 	'onEmbedFlash' : function(event) {
 		$("#" + event.id).hover(
 			function(){
-- 
cgit v1.2.3


From 92ec25ec441330323e4fcbdfa33ebcf900420097 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 31 Oct 2010 12:47:25 +0000
Subject: integrated Jeff's batch code into trunk

---
 actions/ajax_upload_complete.php                   | 23 ++++++++++
 actions/upload.php                                 | 22 +++++++---
 languages/en.php                                   |  3 +-
 views/default/river/object/image/create.php        |  2 +-
 .../default/river/object/tidypics_batch/create.php | 51 ++++++++++++++++++++++
 views/default/tidypics/forms/ajax_upload.php       |  3 +-
 views/default/tidypics/forms/settings.php          |  6 +--
 7 files changed, 97 insertions(+), 13 deletions(-)
 create mode 100644 views/default/river/object/tidypics_batch/create.php

diff --git a/actions/ajax_upload_complete.php b/actions/ajax_upload_complete.php
index 0912854a3..b66b563e3 100644
--- a/actions/ajax_upload_complete.php
+++ b/actions/ajax_upload_complete.php
@@ -21,6 +21,29 @@ if ($album->new_album == TP_NEW_ALBUM) {
 	add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
 }
 
+$params = array(
+	'type'            => 'object',
+	'subtype'         => 'image',
+	'metadata_names'  => 'batch',
+	'metadata_values' => get_input('batch'),
+);
+$images = elgg_get_entities_from_metadata($params);
+if ($images) {
+	// Create a new batch object to contain these photos
+	$batch = new ElggObject();
+	$batch->subtype = "tidypics_batch";
+	$batch->access_id = ACCESS_PUBLIC;
+	$batch->container_guid = $album->guid;
+	if ($batch->save()) {
+		foreach ($images as $image) {
+			add_entity_relationship($image->guid, "belongs_to_batch", $batch->getGUID());
+		}
+		if (get_plugin_setting('img_river_view', 'tidypics') == "batch") {
+			add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
+		}
+	}
+}
+
 // plugins can register to be told when a Tidypics album has had images added
 trigger_elgg_event('upload', 'tp_album', $album);
 
diff --git a/actions/upload.php b/actions/upload.php
index b3ad9ebc3..f2b626f01 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -120,11 +120,6 @@ foreach($_FILES as $key => $sent_file) {
 	$file->extractExifData();
 	$file->saveThumbnails($image_lib);
 
-	//keep one file handy so we can add a notice to the river if single image option selected
-	if (!$file_for_river) {
-		$file_for_river = $file;
-	}
-
 	array_push($uploaded_images, $file->guid);
 
 	// plugins can register to be told when a new image has been uploaded
@@ -171,11 +166,24 @@ if (count($not_uploaded) > 0) {
 	system_message(elgg_echo('tidypics:upl_success'));
 }
 
+if (count($uploaded_images)) {
+	// Create a new batch object to contain these photos
+	$batch = new ElggObject();
+	$batch->subtype = "tidypics_batch";
+	$batch->access_id = $access_id;
+	$batch->container_guid = $album_guid;
 
-if (count($uploaded_images) && $img_river_view == "1") {
-	add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
+	if ($batch->save()) {
+		foreach ($uploaded_images as $uploaded_guid) {
+			add_entity_relationship($uploaded_guid, "belongs_to_batch", $batch->getGUID());
+		}
+		if ($img_river_view == "batch") {
+			add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
+		}
+	}
 }
 
+
 if (count($uploaded_images) > 0) {
 	$album->prependImageList($uploaded_images);
 }
diff --git a/languages/en.php b/languages/en.php
index 26ef79605..2bb18d959 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -164,7 +164,8 @@ The photo can be viewed here: %s",
 
 			//images
 			'image:river:created' => "%s added the photo %s to album %s",
-			'image:river:item' => "an photo",
+			'image:river:created:multiple' => "%s added %u photos to album %s",
+			'image:river:item' => "a photo",
 			'image:river:annotate' => "a comment on the photo",
 			'image:river:tagged' => "%s tagged %s in the photo %s",
 			'image:river:tagged:unknown' => "%s tagged %s in a photo",
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 8a0a8deff..9de043e91 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -5,7 +5,7 @@ $image = get_entity($vars['item']->object_guid);
 if ($image->title) {
 	$title = $image->title;
 } else {
-	$title = "untitled";
+	$title = elgg_echo("untitled");
 }
 
 $url = "getURL()}\">{$performed_by->name}";
diff --git a/views/default/river/object/tidypics_batch/create.php b/views/default/river/object/tidypics_batch/create.php
new file mode 100644
index 000000000..e7a4d1409
--- /dev/null
+++ b/views/default/river/object/tidypics_batch/create.php
@@ -0,0 +1,51 @@
+subject_guid);
+$batch = get_entity($vars['item']->object_guid);
+$album = get_entity($batch->container_guid);
+
+if (!$batch || !$album) {
+	return true;
+}
+
+// Get images related to this batch
+$images = elgg_get_entities_from_relationship(array(
+			'relationship' => 'belongs_to_batch',
+			'relationship_guid' => $batch->getGUID(),
+			'inverse_relationship' => true,
+			'types' => array('object'),
+			'subtypes' => array('image'),
+			'offset' => 0,
+		));
+
+// nothing to show
+if (!$images) {
+	return true;
+}
+
+$user_link = "getURL()}\">{$performed_by->name}";
+$album_link = "" . $album->title . "";
+if (count($images) > 1) {
+	$image_text = elgg_echo("image:river:created:multiple");
+	$string = sprintf($image_text, $user_link, count($images), $album_link);
+} else {
+	$image_text = elgg_echo("image:river:created");
+	$title = $images[0]->title;
+	if (!$title) {
+		$title = elgg_echo("untitled");
+	}
+	$image_link = "getURL() . "\">" . $title . "";
+	$string = sprintf($image_text, $user_link, $image_link, $album_link);
+}
+
+$string .= "
      ";
+
+if (count($images)) {
+	foreach($images as $image) {
+		$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> ';
+	}
+}
+
+$string .= "
      ";
+
+echo $string;
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index c703d293b..c81c9173d 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -112,7 +112,8 @@ $("#uploadify").uploadify({
 			{ 
 				album_guid   : 'guid; ?>',
 				__elgg_token : '',
-				__elgg_ts    : ''
+				__elgg_ts    : '',
+				batch        : ''
 			}
 		);
 	},
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index dc5c02f15..c8a1b4bd9 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -93,7 +93,7 @@ $form_body .= elgg_view('input/pulldown', array(
 ));
 $form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
 
-if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+if (is_callable('exec') && !in_array('exec', $disablefunc)) {
 	// Image Magick Path
 	$im_path = $plugin->im_path;
 	if(!$im_path) {
@@ -108,14 +108,14 @@ if (is_callable('exec') && !in_array('exec',$disablefunc)) {
 $form_body .= '
      ' . elgg_echo('tidypics:settings:heading:river') . '
      ';
 $img_river_view = $plugin->img_river_view;
 if (!$img_river_view) {
-	$img_river_view = '1';
+	$img_river_view = 'batch';
 }
 $form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view');
 $form_body .= elgg_view('input/pulldown', array(
 		'internalname' => 'params[img_river_view]',
 		'options_values' => array(
 				'all' => 'all',
-				'1' => '1',
+				'batch' => '1',
 				'none' => 'none',
 		),
 		'value' => $img_river_view
-- 
cgit v1.2.3


From 243e836190128b14e1c5aa53b6d01b6771b19d8c Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 31 Oct 2010 20:03:50 +0000
Subject: First cut at a album sorting interface

---
 actions/sortalbum.php           | 18 ++++++++++++++
 languages/en.php                |  6 +++++
 pages/sortalbum.php             | 38 +++++++++++++++++++++++++++++
 pages/viewalbum.php             |  3 +++
 start.php                       |  8 ++++++
 views/default/tidypics/css.php  | 20 ++++++++++++++-
 views/default/tidypics/sort.php | 54 +++++++++++++++++++++++++++++++++++++++++
 7 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 actions/sortalbum.php
 create mode 100644 pages/sortalbum.php
 create mode 100644 views/default/tidypics/sort.php

diff --git a/actions/sortalbum.php b/actions/sortalbum.php
new file mode 100644
index 000000000..1aa0e052f
--- /dev/null
+++ b/actions/sortalbum.php
@@ -0,0 +1,18 @@
+setImageList($guids);
+
+system_message(sprintf(elgg_echo('tidypics:album:sorted'), $album->title));
+forward($album->getURL());
\ No newline at end of file
diff --git a/languages/en.php b/languages/en.php
index 2bb18d959..b2c88b27c 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -49,6 +49,7 @@ $english = array(
 			'tidypics:stats' => 'Stats',
 			'tidypics:nophotosingroup' => 'This groups does not have any photos yet',
 			'tidypics:upgrade' => 'Upgrade',
+			'tidypics:sort' => 'Sorting the %s album',
 
 			'flickr:setup' => 'Flickr Setup',
 			'flickr:usernamesetup' => 'Please enter your Flickr username here:',
@@ -97,6 +98,7 @@ $english = array(
 			'album:addpix' => "Add photos to album",
 			'album:edit' => "Edit album",
 			'album:delete' => "Delete album",
+			'album:sort' => "Sort album",
 
 			'image:edit' => "Edit image",
 			'image:delete' => "Delete image",
@@ -116,6 +118,9 @@ $english = array(
 			'tidypics:uploader:filedesc' => 'Image files (jpeg, png, gif)',
 			'tidypics:uploader:instructs' => 'There are three easy steps for adding photos to your album using this uploader: choosing, uploading, and describing them. If you do not have Flash, there is also a basic uploader available.',
 			'tidypics:uploader:basic' => 'You can upload up to 10 photos at a time (%s MB maximum per photo)',
+
+			'tidypics:sort:instruct' => 'Sort the album photos by dragging and dropping the images. Then click the save button.',
+
 		//views
 
 			'image:total' => "Images in album:",
@@ -195,6 +200,7 @@ The photo can be viewed here: %s",
 			'album:delete:confirm' => "Are you sure you want to delete this album?",
 			'album:created' => "Your new album has been created.",
 			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
+			'tidypics:album:sorted' => 'The album %s is sorted',
 
 			'tidypics:upgrade:success' => 'Upgrade of Tidypics a success',
 			
diff --git a/pages/sortalbum.php b/pages/sortalbum.php
new file mode 100644
index 000000000..0bbd8159e
--- /dev/null
+++ b/pages/sortalbum.php
@@ -0,0 +1,38 @@
+container_guid) {
+	set_page_owner($album->container_guid);
+} else {
+	set_page_owner($album->owner_guid);
+}
+
+$owner = page_owner_entity();
+
+$title = sprintf(elgg_echo('tidypics:sort'), $album->title);
+
+$content = elgg_view_title($title);
+$content .= elgg_view('tidypics/sort', array('album' => $album));
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $content);
+
+page_draw($title, $body);
diff --git a/pages/viewalbum.php b/pages/viewalbum.php
index fe3c5bc62..870596769 100644
--- a/pages/viewalbum.php
+++ b/pages/viewalbum.php
@@ -54,6 +54,9 @@ if (can_write_to_container(0, $album->container_guid)) {
 	add_submenu_item(	elgg_echo('album:addpix'),
 			$CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid,
 			'photos');
+	add_submenu_item(	elgg_echo('album:sort'),
+			$CONFIG->wwwroot . 'pg/photos/sort/' . $album_guid,
+			'photos');
 	add_submenu_item(	elgg_echo('album:edit'),
 			$CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid,
 			'photos');
diff --git a/start.php b/start.php
index 4d2b12798..1401c2c2c 100644
--- a/start.php
+++ b/start.php
@@ -257,6 +257,13 @@ function tidypics_page_handler($page) {
 				include($CONFIG->pluginspath . "tidypics/pages/viewalbum.php");
 				break;
 
+			case "sort": //sort a photo album
+				if (isset($page[1])) {
+					set_input('guid', $page[1]);
+				}
+				include($CONFIG->pluginspath . "tidypics/pages/sortalbum.php");
+				break;
+
 			case "new":  //create new album
 				if (isset($page[1])) {
 					set_input('username', $page[1]);
@@ -532,6 +539,7 @@ register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actio
 register_action("tidypics/ajax_upload", true, $CONFIG->pluginspath . "tidypics/actions/ajax_upload.php");
 register_action("tidypics/ajax_upload_complete", true, $CONFIG->pluginspath . "tidypics/actions/ajax_upload_complete.php");
 register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
+register_action("tidypics/sortalbum", false, $CONFIG->pluginspath. "tidypics/actions/sortalbum.php");
 register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
 register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
 register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index f7dd256a1..abcdc86a9 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -384,4 +384,22 @@ float: right;
 .uploadifyError {
 border: 2px solid #FBCBBC;
 background-color: #FDE5DD;
-}
\ No newline at end of file
+}
+
+#tidypics_album_sort {
+padding:0;
+margin:0;
+}
+
+#tidypics_album_sort li {
+float:left;
+margin:3px;
+width:161px;
+height:161px;
+}
+
+#tidypics_album_sort img {
+border:1px solid #dedede;
+padding:4px;
+}
+
diff --git a/views/default/tidypics/sort.php b/views/default/tidypics/sort.php
new file mode 100644
index 000000000..66dd8a999
--- /dev/null
+++ b/views/default/tidypics/sort.php
@@ -0,0 +1,54 @@
+getImageList();
+
+// create submission form
+$body = elgg_view('input/hidden', array('internalname' => 'guids'));
+$body .= elgg_view('input/hidden', array('internalname' => 'album_guid', 'value' => $album->guid));
+$body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
+?>
+
      
+	
      
+		
+	
      
+	 'tidypics_sort_form',
+		'action'     => "{$vars['url']}action/tidypics/sortalbum",
+		'body'       => $body,
+	);
+	echo elgg_view('input/form', $params);
+	?>
+
+	
        
+		";
+		}
+		?>
+	
      
+	
      
+
      
+
+
\ No newline at end of file
-- 
cgit v1.2.3


From 4a42b2a59720d020b45d0d1c71183966407f21c8 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Nov 2010 12:02:29 +0000
Subject: cleaned up language pack formatting

---
 languages/da.php | 20 +++-----------------
 languages/de.php | 46 ++++------------------------------------------
 languages/en.php | 21 ---------------------
 languages/es.php | 34 +++++++++-------------------------
 languages/fr.php |  4 +---
 languages/he.php |  2 --
 languages/it.php | 46 +++++++++++++++++-----------------------------
 languages/pl.php | 33 ++++++++-------------------------
 languages/ru.php | 32 ++++++++++----------------------
 languages/tr.php | 12 +++++-------
 10 files changed, 57 insertions(+), 193 deletions(-)

diff --git a/languages/da.php b/languages/da.php
index b27639772..2e2976210 100644
--- a/languages/da.php
+++ b/languages/da.php
@@ -1,15 +1,13 @@
  "Billede",
 			'images' => "Billeder",
 			'caption' => "Beskrivelse",
@@ -75,7 +73,6 @@
 
 
 		//actions
-
 			'album:create' => "Skab album",
 			'album:add' => "Tilføj nyt album",
 			'album:addpix' => "Tilføj fotos",
@@ -87,7 +84,6 @@
 			'image:download' => "Download billede",
 
 		//forms
-
 			'album:title' => "Titel",
 			'album:desc' => "Beskrivelse",
 			'album:tags' => "Nøgleord",
@@ -95,7 +91,6 @@
 			'tidypics:quota' => "Plads:",
 
 		//views
-
 			'image:total' => "Billeder i album:",
 			'image:by' => "Billede tilføjet af",
 			'album:by' => "Album oprettet af:",
@@ -134,13 +129,9 @@
 			'album:more' => "Vis alle albums",
 
 		//river
-
-			//images
 			'image:river:created' => "%s har tilføjet et billede %s i album %s",
 			'image:river:item' => "et billede",
 			'image:river:annotate' => "en kommentar til billedet",
-
-			//albums
 			'album:river:created' => "%s har tilføjet et nyt album",
 			'album:river:group' => "i gruppen",
 			'album:river:item' => "et album",
@@ -156,7 +147,6 @@
 			'images:saved' => "Alle billeder er gemt",
 			'image:deleted' => "Billedet blev slettet",
 			'image:delete:confirm' => "Ønsker du at slette dette billede?",
-
 			'images:edited' => "Billedet er blevet opdateret",
 			'album:edited' => "Albummet er blevet opdateret",
 			'album:saved' => "Albummet blev gemt",
@@ -167,7 +157,6 @@
 			'tidypics:upgrade:success' => 'Tidypics blev opgraderet med succes',
 
 		//Error messages
-
 			'tidypics:partialuploadfailure' => "Der opstod en fejl under uploadingen af billeder (%s af %s billeder)",
 			'tidypics:completeuploadfailure' => "Upload af billede mislykkedes",
 			'tidypics:exceedpostlimit' => "Alt for mange store billeder på én gang - forsøg evt. at overføre færre eller mindre billeder",
@@ -182,14 +171,11 @@
 			'tidypics:nosettings' => "Administratoren af webstedet, har ikke foretaget justeringer for fotoalbum",
 			'tidypics:exceed_quota' => "Din tildelte plads er opbrugt!",
 			'images:notedited' => "Ikke alle billeder er blevet opdateret",
-
 			'album:none' => "Ingen albums skabt endnu",
 			'album:uploadfailed' => "Dit album kunne ikke gemmes",
 			'album:deletefailed' => "Dit album kunne ikke slettes",
 			'album:blank' => "Giv venligst dette album en titel samt beskrivelse",
-
 			'tidypics:upgrade:failed' => "Opgraderingen af Tidypics mislykkedes",
-	);
+);
 
-	add_translation("da",$danish);
-?>
+add_translation("da", $danish);
\ No newline at end of file
diff --git a/languages/de.php b/languages/de.php
index 7b014bc0d..555c42058 100644
--- a/languages/de.php
+++ b/languages/de.php
@@ -1,17 +1,15 @@
  "Unbenannt",
 
 		// Menu items and titles
-
 			'image' => "Bild",
 			'images' => "Bilder",
 			'caption' => "Beschreibung",
@@ -59,7 +57,6 @@
 		//settings
 			'tidypics:settings' => 'Einstellungen',
 			'tidypics:admin:instructions' => 'Das sind die Tidypics Einstellungen',
-
 			'tidypics:settings:image_lib' => "Image Library: ",
 			'tidypics:settings:thumbnail' => "Thumbnail Creation",			
 			'tidypics:settings:download_link' => "Zeige Download-Link",
@@ -71,7 +68,6 @@
 			'tidypics:settings:maxfilesize' => "Maximale Bildgröße in Megabytes (MB):",
 			'tidypics:settings:quota' => "Benutzer/Gruppen Speicherplatz in (MB) (0 = Kein Speicherplatz)",
 			'tidypics:settings:watermark' => "Gib den Text für den Wasserzeichen ein - ImageMagick Cmdline muss ausgewählt sein für die Bildbibliothek",
-
 			'tidypics:settings:im_path' => "Gib den Pfad zu ImageMagick Befehle (mit abschließendem Slasch)",
 			'tidypics:settings:img_river_view' => "Wie viele Einträge in der aktivitäten Liste beim Upload von mehreren Bildern",
 			'tidypics:settings:album_river_view' => "Zeige Albumcover oder ein Set von Fotos für neuen Album",
@@ -82,19 +78,16 @@
 
 
 		//actions
-
 			'album:create' => "Album hinzufügen",
 			'album:add' => "Neues Album hinzufügen",
 			'album:addpix' => "Fotos hinzufügen",
 			'album:edit' => "Album bearbeiten",
 			'album:delete' => "Album löschen",
-
 			'image:edit' => "Bild bearbeiten",
 			'image:delete' => "Bild löschen",
 			'image:download' => "Bild herunterladen",
 
 		//forms
-
 			'album:title' => "Titel",
 			'album:desc' => "Beschreibung",
 			'album:tags' => "Stichwörter",
@@ -102,7 +95,6 @@
 			'tidypics:quota' => "Speicherplatz:",
 
 		//views
-
 			'image:total' => "Bilder im Album:",
 			'image:by' => "Bild hinzugefügt von",
 			'album:by' => "Album erstellt von:",
@@ -125,7 +117,6 @@
 			'tidypics:phototagging:success' => 'Foto-Link erfolgreich hinzugefügt',
 			'tidypics:phototagging:error' => 'Unerwarteter Fehler beim verlinken',
 			'tidypics:deletetag:success' => 'Ausgewählte Links wurden erfolgreich gelöscht',
-
 			'tidypics:tag:subject' => "Du wurdest in einem Foto verlinkt",
 			'tidypics:tag:body' => "Du wurdest in diesem Foto verlinkt %s von %s.
 			
@@ -136,7 +127,6 @@ Das Foto kanns du hier sehen: %s",
 			'tidypics:posted' => 'Das Bild eingestellt:',
 
 		//widgets
-
 			'tidypics:widget:albums' => "Fotoalben",
 			'tidypics:widget:album_descr' => "Zeige neuste Alben",
 			'tidypics:widget:num_albums' => "Anzahl der Alben",
@@ -146,14 +136,10 @@ Das Foto kanns du hier sehen: %s",
 			'album:more' => "Alle Alben ansehen",
 
 		//river
-
-			//images
 			'image:river:created' => "%s hat ein Bild %s zum Album %s hinzugefügt",
 			'image:river:item' => "ein Bild",
 			'image:river:annotate' => "einen Kommentar zum Bild",
 			'image:river:tagged' => "war im Foto verlinkt",
-
-			//albums
 			'album:river:created' => "%s hat ein neues Album erstellt",
 			'album:river:group' => "in der Gruppe",
 			'album:river:item' => "ein Album",
@@ -163,14 +149,12 @@ Das Foto kanns du hier sehen: %s",
 			'tidypics:newalbum' => 'Neues Fotoalbum',
 
 
-
-			//  Status messages
+		//  Status messages
 			'tidypics:upl_success' => "Die Bilder sind erfolgreich hochgeladen",
 			'image:saved' => "Das Bild wurde gespeichert",
 			'images:saved' => "Alle Bilder sind gespeichert",
 			'image:deleted' => "Das Bild wurde gelöscht",
 			'image:delete:confirm' => "Willst du das Bild wirklich löschen?",
-
 			'images:edited' => "Das Bild wurde aktualisiert",
 			'album:edited' => "Das Album wurde aktualisiert",
 			'album:saved' => "Das Album wurde gespeichert",
@@ -178,25 +162,12 @@ Das Foto kanns du hier sehen: %s",
 			'album:delete:confirm' => "Willst du das Album wirklich löschen?",
 			'album:created' => "Dein neues Album ist erstellt",
 			'tidypics:settings:save:ok' => 'Tidypics Einstellungen erfolgreich gespeichert',
-
-
-
-
-
-
-
-
-
-
-
 			'tidypics:upgrade:success' => 'Upgrade von Tidypics erfolgreich',
 
 		//Error messages
-
 			'tidypics:partialuploadfailure' => "Es sind Fehler beim Hochladen einiger Bilder aufgetreten (%s von %s Bildern)",
 			'tidypics:completeuploadfailure' => "Bilder-Upload fehlgeschlagen",
 			'tidypics:exceedpostlimit' => "Zuviele große Bilder auf einmal - versuche weniger oder kleinere Bilder hochzuladen",
-
 			'tidypics:noimages' => "Keine Bilder zum Upload ausgewählt",
 			'tidypics:image_mem' => "Das Bild ist zu groß",
 			'tidypics:image_pixels' => "Das Bild hat zuviele Pixel",
@@ -205,23 +176,14 @@ Das Foto kanns du hier sehen: %s",
 			'tidypics:not_image' => "Das Bild-Typ wurde nicht erkannt",
 			'image:deletefailed' => "Dein Bild konnte nicht gelöscht werden",
 			'image:downloadfailed' => "Fehler: Das Bild ist zur Zeit nicht verfügbar",
-
-
 			'tidypics:nosettings' => "Admin dieser Seite hat keine Einstellungen für Fotoalben vorgenommen",
 			'tidypics:exceed_quota' => "Dir zugewiesener Speicherplatz ist ausgeschöpft!",
-
 			'images:notedited' => "Nicht alle Bilder konnten erfolgreich upgedated werden",
-
 			'album:none' => "Bis jetzt keine Alben erstellt",
-
 			'album:uploadfailed' => "Dein Album konnte nicht gespeichert werden",
 			'album:deletefailed' => "Dein Album konnte nicht gelöscht werden",
 			'album:blank' => "Bitte gib diesem Album einen Titel und eine Beschreibung",
-
-			
-			
 			'tidypics:upgrade:failed' => "Upgrade von Tidypics gescheitert",
-	);
+);
 
-	add_translation("de",$german);
-?>
+add_translation("de", $german);
diff --git a/languages/en.php b/languages/en.php
index b2c88b27c..55d3efdf3 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -84,7 +84,6 @@ $english = array(
 			'tidypics:settings:smallsize' => "Album view image size",
 			'tidypics:settings:thumbsize' => "Thumbnail image size",
 			'tidypics:settings:im_id' => "Image ID",
-
 			'tidypics:settings:heading:img_lib' => "Image Library Settings",
 			'tidypics:settings:heading:main' => "Major Settings",
 			'tidypics:settings:heading:river' => "Activity Integration Options",
@@ -92,37 +91,31 @@ $english = array(
 			'tidypics:settings:heading:groups' => "Group Settings",
 	
 		//actions
-
 			'album:create' => "Create new album",
 			'album:add' => "Add Photo Album",
 			'album:addpix' => "Add photos to album",
 			'album:edit' => "Edit album",
 			'album:delete' => "Delete album",
 			'album:sort' => "Sort album",
-
 			'image:edit' => "Edit image",
 			'image:delete' => "Delete image",
 			'image:download' => "Download image",
 
 		//forms
-
 			'album:title' => "Title",
 			'album:desc' => "Description",
 			'album:tags' => "Tags",
 			'album:cover' => "Make image album cover?",
 			'tidypics:quota' => "Quota usage:",
-	
 			'tidypics:uploader:choose' => "Choose photos",
 			'tidypics:uploader:upload' => "Upload photos",
 			'tidypics:uploader:describe' => "Describe photos",
 			'tidypics:uploader:filedesc' => 'Image files (jpeg, png, gif)',
 			'tidypics:uploader:instructs' => 'There are three easy steps for adding photos to your album using this uploader: choosing, uploading, and describing them. If you do not have Flash, there is also a basic uploader available.',
 			'tidypics:uploader:basic' => 'You can upload up to 10 photos at a time (%s MB maximum per photo)',
-
 			'tidypics:sort:instruct' => 'Sort the album photos by dragging and dropping the images. Then click the save button.',
 
 		//views
-
 			'image:total' => "Images in album:",
 			'image:by' => "Image added by",
 			'album:by' => "Album created by",
@@ -145,7 +138,6 @@ $english = array(
 			'tidypics:phototagging:success' => 'Photo tag was successfully added',
 			'tidypics:phototagging:error' => 'Unexpected error occurred during tagging',
 			'tidypics:deletetag:success' => 'Selected tags were successfully deleted',
-			
 			'tidypics:tag:subject' => "You have been tagged in a photo",
 			'tidypics:tag:body' => "You have been tagged in the photo %s by %s.			
 			
@@ -156,7 +148,6 @@ The photo can be viewed here: %s",
 			'tidypics:posted' => 'posted a photo:',
 
 		//widgets
-
 			'tidypics:widget:albums' => "Photo Albums",
 			'tidypics:widget:album_descr' => "Showcase your photo albums",
 			'tidypics:widget:num_albums' => "Number of albums to display",
@@ -166,16 +157,12 @@ The photo can be viewed here: %s",
 			'album:more' => "View all albums",
 
 		//  river
-
-			//images
 			'image:river:created' => "%s added the photo %s to album %s",
 			'image:river:created:multiple' => "%s added %u photos to album %s",
 			'image:river:item' => "a photo",
 			'image:river:annotate' => "a comment on the photo",
 			'image:river:tagged' => "%s tagged %s in the photo %s",
 			'image:river:tagged:unknown' => "%s tagged %s in a photo",
-
-			//albums
 			'album:river:created' => "%s created a new photo album",
 			'album:river:group' => "in the group",
 			'album:river:item' => "an album",
@@ -186,13 +173,11 @@ The photo can be viewed here: %s",
 
 
 		//  Status messages
-
 			'tidypics:upl_success' => "Your images uploaded successfully.",
 			'image:saved' => "Your image was successfully saved.",
 			'images:saved' => "All images were successfully saved.",
 			'image:deleted' => "Your image was successfully deleted.",
 			'image:delete:confirm' => "Are you sure you want to delete this image?",
-
 			'images:edited' => "Your images were successfully updated.",
 			'album:edited' => "Your album was successfully updated.",
 			'album:saved' => "Your album was successfully saved.",
@@ -201,16 +186,13 @@ The photo can be viewed here: %s",
 			'album:created' => "Your new album has been created.",
 			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
 			'tidypics:album:sorted' => 'The album %s is sorted',
-
 			'tidypics:upgrade:success' => 'Upgrade of Tidypics a success',
-			
 			'flickr:enterusername' => 'You must enter a username',
 			'flickr:savedusername' => 'Successfully saved username of %s',
 			'flickr:saveduserid' => 'Successfully saved userid of %s',
 			'flickr:savedalbum' => 'Album saved - %s',
 
 		//Error messages
-
 			'tidypics:baduploadform' => "There was an error with the upload form",
 			'tidypics:partialuploadfailure' => "There were errors uploading some of the images (%s of %s images).",
 			'tidypics:completeuploadfailure' => "Upload of images failed.",
@@ -227,14 +209,11 @@ The photo can be viewed here: %s",
 			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
 			'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator",
 			'images:notedited' => "Not all images were successfully updated",
-
 			'album:none' => "No albums have been created yet.",
 			'album:uploadfailed' => "Sorry; we could not save your album.",
 			'album:deletefailed' => "Your album could not be deleted at this time.",
 			'album:blank' => "Please give this album a title and description.",
-
 			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed",
-			
 			'flickr:errorusername' => 'Username %s not found on Flickr',
 			'flickr:errorusername2' => 'You must enter a username',
 			'flickr:errorimageimport' => 'This image has already been imported',
diff --git a/languages/es.php b/languages/es.php
index 1c9b580ef..08ec2734d 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -1,7 +1,7 @@
  "sin titulo",
 
@@ -57,38 +57,34 @@
 			'tidypics:settings:exif' => "Mostrar data de EXIF",
 			'tidypics:settings:view_count' => "Ver contador",
 			'tidypics:settings:grp_perm_override' => "Permitir acceso completo a los miembros de este grupo al album de fotos",
-			'tidypics:settings:maxfilesize' => "Tamao máximo de la imagen en megabytes (MB):",
+			'tidypics:settings:maxfilesize' => "Tama�o máximo de la imagen en megabytes (MB):",
 			'tidypics:settings:quota' => "Usuario/Grupo Cuota (MB) - 0 MB de cuota",
 			'tidypics:settings:watermark' => "Introduce el texto que aparecerá en la marca de agua - ImageMagick Cmdline debe ser seleccionado para la libreria de imagenes",
 			'tidypics:settings:im_path' => "Ingresa la ruta de tu ImageMagick commands (incluye el slash)",
-			'tidypics:settings:img_river_view' => "Cuántas entradas deseas para cada grupo de imágenes cargadas",
+			'tidypics:settings:img_river_view' => "�Cuántas entradas deseas para cada grupo de imágenes cargadas",
 			'tidypics:settings:album_river_view' => "Muestra la portada del álbum o el set de fotos para el álbum nuevo",
 			'tidypics:settings:largesize' => "Tamaño inicial de la imagen",
 			'tidypics:settings:smallsize' => "Tamaño de imagen de vista del álbum",
-			'tidypics:settings:thumbsize' => "Tamao de imagen miniatura",
+			'tidypics:settings:thumbsize' => "Tama�o de imagen miniatura",
 
 		//actions
-
 			'album:create' => "Crear nuevo álbum",
 			'album:add' => "Añadir Álbum de fotos",
 			'album:addpix' => "ñadir fotos al Álbum",
 			'album:edit' => "Editar álbum",
 			'album:delete' => "Borrar álbum",
-
 			'image:edit' => "Editar imagen",
 			'image:delete' => "Borrar imagen",
 			'image:download' => "Descargar imagen",
 
 		//forms
-
 			'album:title' => "Titulo",
 			'album:desc' => "Descripción",
 			'album:tags' => "Etiquetas",
-			'album:cover' => "Desea hacer de esta imagen la portada del álbum?",
+			'album:cover' => "�Desea hacer de esta imagen la portada del álbum?",
 			'tidypics:quota' => "Cuota usada:",
 
 		//views
-
 			'image:total' => "Imagenes en  el álbum:",
 			'image:by' => "Imagenes añadidas por",
 			'album:by' => "Álbum creador por",
@@ -117,7 +113,6 @@
 			'tidypics:posted' => 'publicar una foto:',
 
 		//widgets
-
 			'tidypics:widget:albums' => "Álbumnes de fotos",
 			'tidypics:widget:album_descr' => "Mosrar tu último álbum de fotos",
 			'tidypics:widget:num_albums' => "Número de álbumnes a mostrar",
@@ -127,14 +122,10 @@
 			'album:more' => "Ver todos los álbumnes",
 
 		//  river
-
-			//images
 			'image:river:created' => "%s añadio la foto %s al álbum %s",
 			'image:river:item' => "una foto",
 			'image:river:annotate' => "un comentario en la foto",
 			'image:river:tagged' => "fue etiquetada en la foto",
-
-			//albums
 			'album:river:created' => "%s creo un nuevo álbum de fotos",
 			'album:river:group' => "en el grupo",
 			'album:river:item' => "un álbum",
@@ -145,25 +136,21 @@
 
 
 		//  Status messages
-
 			'tidypics:upl_success' => "Tu imagen fue cargada exitosamente.",
 			'image:saved' => "Tu imagen fue guardada exitosamente.",
 			'images:saved' => "Todas tus imagenes fueron guardadas exitosamente.",
 			'image:deleted' => "Tu imagen fue borrada exitosamente.",
-			'image:delete:confirm' => "Estás seguro de que deseas borrar esta imagen?",
+			'image:delete:confirm' => "�Estás seguro de que deseas borrar esta imagen?",
 			'images:edited' => "Tu imagen fue editada exitosamente.",
-
 			'album:edited' => "Tu álbum fue cargado exitosamente.",
 			'album:saved' => "Tu álbum fue guardado exitosamente.",
 			'album:deleted' => "Tu álbum fue borrado exitosamente.",
-			'album:delete:confirm' => "Estás seguro de que deseas borrar esta imagen?",
+			'album:delete:confirm' => "�Estás seguro de que deseas borrar esta imagen?",
 			'album:created' => "Tu nuevo álbum ha sido creado.",
 			'tidypics:settings:save:ok' => 'Las preferencias del plugin de Tidypics han sido exitosamente guardadas',
-
 			'tidypics:upgrade:success' => 'La actualización de Tidypics ha sido un exito',
 
 		//Error messages
-
 			'tidypics:partialuploadfailure' => "Ocurrieron errores mientas se cargaban algunas de las imagenes (%s de %s imagenes).",
 			'tidypics:completeuploadfailure' => "Carga de imagenes fallidas.",
 			'tidypics:exceedpostlimit' => "Las imagenes son muy grandes - trate de cargar imagenes m&ás pequeñas.",
@@ -178,14 +165,11 @@
 			'tidypics:nosettings' => "El Administrador de este sitio no ha configurado las preferencias de los álbumnes de fotos.",
 			'tidypics:exceed_quota' => "Has excedido la cuota asignada por el administrador",
 			'images:notedited' => "No todas las imagenes fueron actualizas exitosamente",
-
 			'album:none' => "No ha sido creado ningún álbum aún.",
 			'album:uploadfailed' => "Lo sentimos; no pudimos guardar tu álbum.",
 			'album:deletefailed' => "Tu álbum no pudo ser borrado en este momento.",
 			'album:blank' => "Por favor, dale a este Álbum un titulo y una descripción.",
-
 			'tidypics:upgrade:failed' => "La actualización de Tidypics ha fallado",
-	);
+);
 
-	add_translation("es",$spanish);
-?>
\ No newline at end of file
+add_translation("es", $spanish);
diff --git a/languages/fr.php b/languages/fr.php
index ceca62807..375159e0b 100644
--- a/languages/fr.php
+++ b/languages/fr.php
@@ -101,7 +101,7 @@ $french = array(
 	 'tidypics:phototagging:error'  =>  "Erreur innatendue durant le taggage" , 
 	 'tidypics:deletetag:success'  =>  "Les tags sélectionnés ont correctement été supprimés" , 
 	 'tidypics:tag:subject'  =>  "Vous avez été taggé dans une photo !!!" , 
-	 'tidypics:tag:body'  =>  "Vous avez été taggé dans la photo %s par %s !!!
+	 'tidypics:tag:body'  =>  "Vous avez été taggé dans la photo %s par %s !!!
 La photo peut être consultée ici: %s" , 
 	 'tidypics:posted'  =>  "a posté une photo" , 
 	 'tidypics:widget:albums'  =>  "Albums photo" , 
@@ -155,5 +155,3 @@ La photo peut être consultée ici: %s" ,
 ); 
 
 add_translation('fr', $french); 
-
-?>
\ No newline at end of file
diff --git a/languages/he.php b/languages/he.php
index 8edee9c0c..5f232daf6 100644
--- a/languages/he.php
+++ b/languages/he.php
@@ -145,5 +145,3 @@ $hebrew = array(
 ); 
 
 add_translation('he', $hebrew); 
-
-?>
\ No newline at end of file
diff --git a/languages/it.php b/languages/it.php
index 36863851c..18f8818cc 100644
--- a/languages/it.php
+++ b/languages/it.php
@@ -1,9 +1,12 @@
  "Immagine",
 			'images' => "Immagini",
 			'caption' => "Caption",		
@@ -21,22 +24,19 @@
 			'item:object:album' => "Album",
 			'tidypics:settings:maxfilesize' => "Dimensione massima dei file in kilo bytes (KB):",
 			'tidypics:enablephotos' => 'Attiva Group Photo Albums',
-			'tidypics:editprops' => 'Modifica le propriet della immagine',
+			'tidypics:editprops' => 'Modifica le propriet� della immagine',
 	
 		//actions
-		
 			'album:create' => "Crea un nuovo album",
 			'album:add' => "Aggiungi un foto Album",
 			'album:addpix' => "Aggiungi foto all'album",
 			'album:edit' => "Modifica album",
 			'album:delete' => "Cancella album",
-
 			'image:edit' => "Modifica immagine",
 			'image:delete' => "Cancella immagine",
 			'image:download' => "Download immagine",
 		
 		//forms
-		
 			'album:title' => "Titolo",
 			'album:desc' => "Descrizione",
 			'album:tags' => "Tags",
@@ -44,8 +44,7 @@
 			'album:cover:yes' => "Si",
 			'image:access:note' => "(view access is inherited from the album)",
 			
-		//views 
-		
+		//views
 			'image:total' => "immagini nell'album:",
 			'image:by' => "immagini aggiunte da",
 			'album:by' => "Album creato da",
@@ -55,7 +54,6 @@
 			'image:next' => "Avanti",
 		
 		//widgets
-		
 			'album:widget' => "Album Fotografici",
 			'album:more' => "Vedi tutti gli albums",
 			'album:widget:description' => "Visualizza il tuo ultimo album fotografico",
@@ -63,13 +61,9 @@
 			'album:num_albums' => "Numero di album da mostrare",
 			
 		//  river
-		
-			//images
 			'image:river:created' => "%s uploaded",
 			'image:river:item' => "una immagine",
-			'image:river:annotate' => "a comment on the image",	
-		
-			//albums
+			'image:river:annotate' => "a comment on the image",
 			'album:river:created' => "%s created a new photo album: ",
 			'album:river:item' => "an album",
 			'album:river:annotate' => "un commento nel foto album",
@@ -79,35 +73,29 @@
 			
 				
 		//  Status messages
-			
 			'image:saved' => "Immagine salvata.",
 			'images:saved' => "Tutte le immagini sono state salvate.",
 			'image:deleted' => "Immagine cancellata.",			
 			'image:delete:confirm' => "Sei sicuro di volerla cancellare?",
-			
 			'images:edited' => "Immagini modificate.",
 			'album:edited' => "Album fotografico aggiornato.",
 			'album:saved' => "Album fotografico salvato.",
-			'album:deleted' => "L'album  stato cancellato.",	
+			'album:deleted' => "L'album � stato cancellato.",	
 			'album:delete:confirm' => "Sei sicuro di voler cancellare questo album?",
 			'album:created' => "Nuovo Album creato.",
 			'tidypics:status:processing' => "Attendere ....",
 				
 		//Error messages
-				 
 			'image:none' => "Non ci sono immagini.",
-			'image:uploadfailed' => "il file non  stato caricato:",
+			'image:uploadfailed' => "il file non � stato caricato:",
 			'image:deletefailed' => "L'immagine non puo essere cancellata in questo momento.",
-			'image:downloadfailed' => "Spiacente; questa immagine non  attualmente disponibile.",
-			
+			'image:downloadfailed' => "Spiacente; questa immagine non � attualmente disponibile.",
 			'image:notimage' => "Sono accettate immagini jpg, gif o png delle dimensioni entro i limiti.",
 			'images:notedited' => "Non tutte le immagini sono state caricate",
-		 
-			'album:none' => "Nessun album  stato ancora creato.",
-			'album:uploadfailed' => "Spiacente; non  possibile salvare l'album.",
-			'album:deletefailed' => "L'album non pu essere cancellato.",
+			'album:none' => "Nessun album � stato ancora creato.",
+			'album:uploadfailed' => "Spiacente; non � possibile salvare l'album.",
+			'album:deletefailed' => "L'album non pu� essere cancellato.",
 			'album:blank' => "Dai a quest'album un titolo e una descrizione."
-	);
+);
 					
-	add_translation("it",$italian);
-?>
\ No newline at end of file
+add_translation("it", $italian);
diff --git a/languages/pl.php b/languages/pl.php
index 7f48b488b..69276cb1c 100644
--- a/languages/pl.php
+++ b/languages/pl.php
@@ -1,13 +1,12 @@
  "Obrazek",
 			'images' => "Obrazki",
 			'caption' => "Opis",
@@ -24,23 +23,19 @@
 			'item:object:image' => "Zdjęcia",
 			'item:object:album' => "Albumy",
 			'tidypics:settings:maxfilesize' => "Maximum file size in kilo bytes (KB):",
-
             'tidypics:editprops' => 'Edycja obrazu Właściwości',
 	
 		//actions
-		
 			'album:create' => "Nowy album",
 			'album:add' => "Dodaj album zdjęciowy",
 			'album:addpix' => "Dodaj zdjęcia",
 			'album:edit' => "Edytuj album",
 			'album:delete' => "Skasuj album",
-
 			'image:edit' => "Edytuj obrazek",
 			'image:delete' => "Skasuj obrazek",
 			'image:download' => "Pobierz obrazek",
 		
 		//forms
-		
 			'album:title' => "Tytuł albumu",
 			'album:desc' => "Opis (widoczny tylko dla twórcy)",
 			'album:tags' => "Tagi",
@@ -48,8 +43,7 @@
 			'album:cover:yes' => "Tak",
 			'image:access:note' => "(prawa dostępu pobierane są z ustawień albumu)",
 			
-		//views 
-		
+		//views
 			'image:total' => "Obrazki w albumie:",
 			'image:by' => "Obrazek dodany przez",
 			'album:by' => "Album stworzony przez",
@@ -59,7 +53,6 @@
 			'image:next' => "Kolejna",
 		
 		//widgets
-		
 			'album:widget' => "Albumy zdjęciowe",
 			'album:more' => "Pokaż wszystkie albumy",
 			'album:widget:description' => "Pokazuje twoje ostatnie albumy zdjęciowe",
@@ -67,24 +60,18 @@
 			'album:num_albums' => "Liczba wyświetlanych albumów",
 			
 		//  river
-		
-			//images
 			'image:river:created' => "wgrano %s",
 			'image:river:item' => "obrazek",
 			'image:river:annotate' => "%s skomentował",
-		
-			//albums
 			'album:river:created' => "Stworzono %s",
 			'album:river:item' => "album",
 			'album:river:annotate' => "%s skomentował",
 				
 		//  Status messages
-			
 			'image:saved' => "Twój obrazek został pomyślnie zapisany.",
 			'images:saved' => "Wszystkie obrazki zostały pomyślnie zapisane.",
 			'image:deleted' => "Twój obrazek został pomyślnie skasowany.",
 			'image:delete:confirm' => "Czy jesteś pewien że chcesz skasować ten obrazek?",
-			
 			'images:edited' => "Twoje obrazki zostały pomyślnie zapisane.",
 			'album:edited' => "Twój album został pomyślnie zapisany.",
 			'album:saved' => "Twój album został pomyślnie zapisany.",
@@ -94,20 +81,16 @@
 			'tidypics:status:processing' => "Please wait while we process your picture....",
 				
 		//Error messages
-
 			'image:none' => "Jeszcze nie dodano żadnych obrazków.",
 			'image:uploadfailed' => "Pliki nie zapisane:",
 			'image:deletefailed' => "Nie udało się skasować obrazka.",
 			'image:downloadfailed' => "Nie udało się ściągnąć albumu.",
-			
 			'image:notimage' => "Akceptowane formaty to tylko: jpeg, gif i png, and the allowed file size.",
 			'images:notedited' => "Nie wszystkie obrazki zostały zapisane",
-		 
 			'album:none' => "Jeszcze nie dodano żadnych albumów.",
 			'album:uploadfailed' => "Nie udało się zapisać twojego albumu.",
 			'album:deletefailed' => "Nie udało się usunąć twojego albumu.",
 			'album:blank' => "Please give this albumu a tytuł and opis."
-	);
+);
 					
-	add_translation("pl",$polish);
-?>
\ No newline at end of file
+add_translation("pl", $polish);
\ No newline at end of file
diff --git a/languages/ru.php b/languages/ru.php
index 2722450c3..c1a4e7e86 100644
--- a/languages/ru.php
+++ b/languages/ru.php
@@ -1,9 +1,12 @@
  "Фотография",
 			'images' => "Фотографии",
 			'caption' => "Описание",		
@@ -24,19 +27,16 @@
 			'tidypics:editprops' => 'Редактировать данные фотогографии',
 	
 		//actions
-		
 			'album:create' => "Создать новый Альбом",
 			'album:add' => "Добавить Альбом",
 			'album:addpix' => "Добавить Фотки в Альбом",
 			'album:edit' => "Редактировать Альбом",
 			'album:delete' => "Стереть Альбом",
-
 			'image:edit' => "Редактировать Фотку",
 			'image:delete' => "Стереть Фотку",
 			'image:download' => "Скачать Фотку",
 		
 		//forms
-		
 			'album:title' => "Заголовок",
 			'album:desc' => "Описание",
 			'album:tags' => "Тэги",
@@ -44,8 +44,7 @@
 			'album:cover:yes' => "Да",
 			'image:access:note' => "(ыровень доступа как и у основного Альбома)",
 			
-		//views 
-		
+		//views
 			'image:total' => "Всего Фоток:",
 			'image:by' => "Фотка добавлена:",
 			'album:by' => "Альбом принадлежит:",
@@ -55,7 +54,6 @@
 			'image:next' => "Вперед",
 		
 		//widgets
-		
 			'album:widget' => "Фотоальбомы",
 			'album:more' => "Посмотреть все Альбомы",
 			'album:widget:description' => "Продемонстрировать свой новый Альбом",
@@ -63,13 +61,9 @@
 			'album:num_albums' => "Число Альбомов для показа",
 			
 		//  river
-		
-			//images
 			'image:river:created' => "%s загрузил",
 			'image:river:item' => "фотку",
-			'image:river:annotate' => "комментариы к Фотке",	
-		
-			//albums
+			'image:river:annotate' => "комментариы к Фотке",
 			'album:river:created' => "%s создал новый Альбом: ",
 			'album:river:item' => "Альбом",
 			'album:river:annotate' => "Комментарий к Альбому",
@@ -79,12 +73,10 @@
 			
 				
 		//  Status messages
-			
 			'image:saved' => "Ваша фотография загружена успешно.",
 			'images:saved' => "Все Фотки успешно сохранены.",
 			'image:deleted' => "Ваша Фотография стерта.",			
 			'image:delete:confirm' => "Вы уверены, что хотите стереть эту Фотку?",
-			
 			'images:edited' => "Ваши Фотки успешно обновленны.",
 			'album:edited' => "Ваш Альбом обновлен.",
 			'album:saved' => "Ваш Альбом сохранен.",
@@ -94,20 +86,16 @@
 			'tidypics:status:processing' => "Подозчдите пока мы загружаем фотку....",
 				
 		//Error messages
-				 
 			'image:none' => "На данный момент никаких фоток не обнаружено.",
 			'image:uploadfailed' => "Файлы не загружены:",
 			'image:deletefailed' => "В данный момент эту Фотку стереть невозможно.",
 			'image:downloadfailed' => "На данный момент эту фотку просмотреть невозможно.",
-			
 			'image:notimage' => "Допускаются только фотки формата jpeg, gif, или png разрешенного размера.",
 			'images:notedited' => "Не все фотографии были обновленны",
-		 
 			'album:none' => "Пока никаких Альбомов не имеется.",
 			'album:uploadfailed' => "Ваш Альбом сохранить не удалось.",
 			'album:deletefailed' => "В данный момент ваш Альбом стереть невозможно.",
 			'album:blank' => "Пожалуйста создайте заголовок и описание вашего Альбома.",
-	);
+);
 					
-	add_translation("ru",$russian);
-?>
\ No newline at end of file
+add_translation("ru", $russian);
diff --git a/languages/tr.php b/languages/tr.php
index fff696c47..7d650572a 100644
--- a/languages/tr.php
+++ b/languages/tr.php
@@ -1,10 +1,10 @@
 
\ No newline at end of file
-- 
cgit v1.2.3


From 16c998f076fb03cb3b8b33b960f46bbfb5da0cb4 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Nov 2010 12:44:27 +0000
Subject: updated the Italian and Danish language packs - thanks to gillie and
 lord55

---
 languages/da.php | 21 +++++++++++++++------
 languages/en.php |  2 --
 languages/it.php | 23 +++++++++++++++++++----
 languages/pl.php |  2 +-
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/languages/da.php b/languages/da.php
index 2e2976210..78113d467 100644
--- a/languages/da.php
+++ b/languages/da.php
@@ -12,9 +12,6 @@ $danish = array(
 			'images' => "Billeder",
 			'caption' => "Beskrivelse",
 			'photos' => "Fotos",
-			'images:upload' => "Upload fotos",
-			'images:multiupload' => "Flash Multi-Upload værktøj",
-			'images:multiupload:todo' => "Vælg et eller flere billeder til upload!",
 			'album' => "Fotoalbum",
 			'albums' => "Fotoalbums",
 			'album:slideshow' => "Se slideshow",
@@ -50,9 +47,12 @@ $danish = array(
 			'tidypics:viewsbyothers' => "Visninger: %s (%s af dig)",
 			'tidypics:administration' => 'Tidypics administration',
 			'tidypics:stats' => 'Statistik',
+			'tidypics:upgrade' => 'Opgrader',
+			'tidypics:sort' => 'Sortér %s album',
 
 		//settings
 			'tidypics:settings' => 'Indstillinger',
+			'tidypics:settings:server:analysis' => 'Kør server analyse',
 			'tidypics:admin:instructions' => 'Dette er de centrale Tidypics indstillinger. Tilpas dem til din opsætning og klik derefter på Gem.',
 			'tidypics:settings:image_lib' => "Foto arkiv: ",
 			'tidypics:settings:download_link' => "Vis download-link",
@@ -78,7 +78,7 @@ $danish = array(
 			'album:addpix' => "Tilføj fotos",
 			'album:edit' => "Rediger album",
 			'album:delete' => "Slet album",
-
+			'album:sort' => "Sortér album",
 			'image:edit' => "Rediger billede",
 			'image:delete' => "Slet billede",
 			'image:download' => "Download billede",
@@ -89,7 +89,13 @@ $danish = array(
 			'album:tags' => "Nøgleord",
 			'album:cover' => "Billedet skal bruges som albumcover",
 			'tidypics:quota' => "Plads:",
-
+			'tidypics:uploader:choose' => "Vælg fotos",
+			'tidypics:uploader:upload' => "Upload fotos",
+			'tidypics:uploader:describe' => "Beskriv fotos",
+			'tidypics:uploader:instructs' => 'Med tre nemme trin kan du tilføje fotos i dit album ved hjælp af denne uploader: vælg, upload og beskriv fotos. Hvis du ikke har Flash, er der også en standard uploader til rådighed.',
+			'tidypics:uploader:basic' => 'Du kan uploade op til 10 fotos ad gangen (%s MB maksimum pr. foto)',
+			'tidypics:sort:instruct' => 'Sortér fotos i albummet ved hjælp af drag and drop. Klik derefter på knappen Gem.',
+	
 		//views
 			'image:total' => "Billeder i album:",
 			'image:by' => "Billede tilføjet af",
@@ -119,7 +125,6 @@ $danish = array(
 			'tidypics:posted' => 'Billedet indstilles individuelt:',
 
 		//widgets
-
 			'tidypics:widget:albums' => "Fotoalbum",
 			'tidypics:widget:album_descr' => "Viser seneste album",
 			'tidypics:widget:num_albums' => "Antal albums",
@@ -130,8 +135,11 @@ $danish = array(
 
 		//river
 			'image:river:created' => "%s har tilføjet et billede %s i album %s",
+			'image:river:created:multiple' => "%s added %u photos to album %s",
 			'image:river:item' => "et billede",
 			'image:river:annotate' => "en kommentar til billedet",
+			'image:river:tagged' => "%s tagged %s in the photo %s",
+			'image:river:tagged:unknown' => "%s tagged %s in a photo",
 			'album:river:created' => "%s har tilføjet et nyt album",
 			'album:river:group' => "i gruppen",
 			'album:river:item' => "et album",
@@ -154,6 +162,7 @@ $danish = array(
 			'album:delete:confirm' => "Ønsker du at slette dette album?",
 			'album:created' => "Deres nye album er skabt",
 			'tidypics:settings:save:ok' => 'Tidypics Indstillingerne er gemt',
+			'tidypics:album:sorted' => 'Albummet %s er sorteret',
 			'tidypics:upgrade:success' => 'Tidypics blev opgraderet med succes',
 
 		//Error messages
diff --git a/languages/en.php b/languages/en.php
index 55d3efdf3..27b6285dc 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -9,8 +9,6 @@ $english = array(
 			'images' => "Images",
 			'caption' => "Caption",
 			'photos' => "Photos",
-			'images:multiupload' => "Flash Multi Upload Tool",
-			'images:multiupload:todo' => "Choose one or more files for upload.",
 			'album' => "Photo Album",
 			'albums' => "Photo Albums",
 			'album:slideshow' => "View slideshow",
diff --git a/languages/it.php b/languages/it.php
index 18f8818cc..88f6dfcac 100644
--- a/languages/it.php
+++ b/languages/it.php
@@ -1,7 +1,7 @@
  "Immagini",
 			'caption' => "Caption",		
 			'photos' => "Foto",
-			'images:upload' => "Carica Immagine",
 			'album' => "Album fotografico",
 			'albums' => "Album fotografici",
 			'album:yours' => "Il tuo Album fotografico",
@@ -25,6 +24,11 @@ $italian = array(
 			'tidypics:settings:maxfilesize' => "Dimensione massima dei file in kilo bytes (KB):",
 			'tidypics:enablephotos' => 'Attiva Group Photo Albums',
 			'tidypics:editprops' => 'Modifica le propriet� della immagine',
+			'tidypics:upgrade' => 'Aggiorna',
+			'tidypics:sort' => 'Ordina il %s album',
+
+		//Settings
+			'tidypics:settings:server:analysis' => 'Esegui Analisi del Server',
 	
 		//actions
 			'album:create' => "Crea un nuovo album",
@@ -32,6 +36,7 @@ $italian = array(
 			'album:addpix' => "Aggiungi foto all'album",
 			'album:edit' => "Modifica album",
 			'album:delete' => "Cancella album",
+			'album:sort' => "Ordina album",
 			'image:edit' => "Modifica immagine",
 			'image:delete' => "Cancella immagine",
 			'image:download' => "Download immagine",
@@ -43,7 +48,13 @@ $italian = array(
 			'album:cover' => "Copertina dell'album?",
 			'album:cover:yes' => "Si",
 			'image:access:note' => "(view access is inherited from the album)",
-			
+			'tidypics:uploader:choose' => "Scegli le Foto",
+			'tidypics:uploader:upload' => "Carica le Foto",
+			'tidypics:uploader:describe' => "Descrivi le Foto",
+			'tidypics:uploader:instructs' => 'Ci sono tre semplici passaggi per aggiungere le Foto al tuo Album usando questo caricatore: la scelta, il caricamento e il descriverle. Se non hai Flash, è disponibile anche un caricatore di base.',
+			'tidypics:uploader:basic' => 'Puoi caricare fino a 10 Foto alla volta (%s MB massimo per foto)',
+			'tidypics:sort:instruct' => 'Ordina i Foto Album trascinando le immagini. Poi clicca il bottone salva.',
+
 		//views
 			'image:total' => "immagini nell'album:",
 			'image:by' => "immagini aggiunte da",
@@ -61,9 +72,12 @@ $italian = array(
 			'album:num_albums' => "Numero di album da mostrare",
 			
 		//  river
-			'image:river:created' => "%s uploaded",
+			'image:river:created' => "%s uploaded %s %s",
+			'image:river:created:multiple' => "%s added %u photos to album %s",
 			'image:river:item' => "una immagine",
 			'image:river:annotate' => "a comment on the image",
+			'image:river:tagged' => "%s tagged %s in the photo %s",
+			'image:river:tagged:unknown' => "%s tagged %s in a photo",
 			'album:river:created' => "%s created a new photo album: ",
 			'album:river:item' => "an album",
 			'album:river:annotate' => "un commento nel foto album",
@@ -84,6 +98,7 @@ $italian = array(
 			'album:delete:confirm' => "Sei sicuro di voler cancellare questo album?",
 			'album:created' => "Nuovo Album creato.",
 			'tidypics:status:processing' => "Attendere ....",
+			'tidypics:album:sorted' => "L'album %s è stato ordinato",
 				
 		//Error messages
 			'image:none' => "Non ci sono immagini.",
diff --git a/languages/pl.php b/languages/pl.php
index 69276cb1c..cdc4d3711 100644
--- a/languages/pl.php
+++ b/languages/pl.php
@@ -60,7 +60,7 @@ $polish = array(
 			'album:num_albums' => "Liczba wyświetlanych albumów",
 			
 		//  river
-			'image:river:created' => "wgrano %s",
+			'image:river:created' => "wgrano %s %s %s",
 			'image:river:item' => "obrazek",
 			'image:river:annotate' => "%s skomentował",
 			'album:river:created' => "Stworzono %s",
-- 
cgit v1.2.3


From 063670abd4337fdb478494e7dfa83b950889edc8 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Nov 2010 12:52:53 +0000
Subject: fixed some encoding issues in language files

---
 languages/en.php |  4 ++--
 languages/es.php | 14 +++++++-------
 languages/it.php |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/languages/en.php b/languages/en.php
index 27b6285dc..fce4b392a 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -203,13 +203,13 @@ The photo can be viewed here: %s",
 			'tidypics:not_image' => "This is not a recognized image type",
 			'tidypics:deletefailed' => "Sorry. Deletion failed.",
 			'tidypics:deleted' => "Successful deletion.",
-			'image:downloadfailed' => "Sorry; this image is not available at this time.",
+			'image:downloadfailed' => "Sorry; this image is not available.",
 			'tidypics:nosettings' => "Admin of this site has not set photo album settings.",
 			'tidypics:exceed_quota' => "You have exceeded the quota set by the administrator",
 			'images:notedited' => "Not all images were successfully updated",
 			'album:none' => "No albums have been created yet.",
 			'album:uploadfailed' => "Sorry; we could not save your album.",
-			'album:deletefailed' => "Your album could not be deleted at this time.",
+			'album:deletefailed' => "Your album could not be deleted.",
 			'album:blank' => "Please give this album a title and description.",
 			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed",
 			'flickr:errorusername' => 'Username %s not found on Flickr',
diff --git a/languages/es.php b/languages/es.php
index 08ec2734d..704f01979 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -57,15 +57,15 @@ $spanish = array(
 			'tidypics:settings:exif' => "Mostrar data de EXIF",
 			'tidypics:settings:view_count' => "Ver contador",
 			'tidypics:settings:grp_perm_override' => "Permitir acceso completo a los miembros de este grupo al album de fotos",
-			'tidypics:settings:maxfilesize' => "Tama�o máximo de la imagen en megabytes (MB):",
+			'tidypics:settings:maxfilesize' => "Tamaño máximo de la imagen en megabytes (MB):",
 			'tidypics:settings:quota' => "Usuario/Grupo Cuota (MB) - 0 MB de cuota",
 			'tidypics:settings:watermark' => "Introduce el texto que aparecerá en la marca de agua - ImageMagick Cmdline debe ser seleccionado para la libreria de imagenes",
 			'tidypics:settings:im_path' => "Ingresa la ruta de tu ImageMagick commands (incluye el slash)",
-			'tidypics:settings:img_river_view' => "�Cuántas entradas deseas para cada grupo de imágenes cargadas",
+			'tidypics:settings:img_river_view' => "¿Cuántas entradas deseas para cada grupo de imágenes cargadas?",
 			'tidypics:settings:album_river_view' => "Muestra la portada del álbum o el set de fotos para el álbum nuevo",
 			'tidypics:settings:largesize' => "Tamaño inicial de la imagen",
 			'tidypics:settings:smallsize' => "Tamaño de imagen de vista del álbum",
-			'tidypics:settings:thumbsize' => "Tama�o de imagen miniatura",
+			'tidypics:settings:thumbsize' => "Tamaño de imagen miniatura",
 
 		//actions
 			'album:create' => "Crear nuevo álbum",
@@ -81,11 +81,11 @@ $spanish = array(
 			'album:title' => "Titulo",
 			'album:desc' => "Descripción",
 			'album:tags' => "Etiquetas",
-			'album:cover' => "�Desea hacer de esta imagen la portada del álbum?",
+			'album:cover' => "¿Desea hacer de esta imagen la portada del álbum?",
 			'tidypics:quota' => "Cuota usada:",
 
 		//views
-			'image:total' => "Imagenes en  el álbum:",
+			'image:total' => "Imagenes en el álbum:",
 			'image:by' => "Imagenes añadidas por",
 			'album:by' => "Álbum creador por",
 			'album:created:on' => "Creado",
@@ -140,12 +140,12 @@ $spanish = array(
 			'image:saved' => "Tu imagen fue guardada exitosamente.",
 			'images:saved' => "Todas tus imagenes fueron guardadas exitosamente.",
 			'image:deleted' => "Tu imagen fue borrada exitosamente.",
-			'image:delete:confirm' => "�Estás seguro de que deseas borrar esta imagen?",
+			'image:delete:confirm' => "¿Estás seguro de que deseas borrar esta imagen?",
 			'images:edited' => "Tu imagen fue editada exitosamente.",
 			'album:edited' => "Tu álbum fue cargado exitosamente.",
 			'album:saved' => "Tu álbum fue guardado exitosamente.",
 			'album:deleted' => "Tu álbum fue borrado exitosamente.",
-			'album:delete:confirm' => "�Estás seguro de que deseas borrar esta imagen?",
+			'album:delete:confirm' => "¿Estás seguro de que deseas borrar esta imagen?",
 			'album:created' => "Tu nuevo álbum ha sido creado.",
 			'tidypics:settings:save:ok' => 'Las preferencias del plugin de Tidypics han sido exitosamente guardadas',
 			'tidypics:upgrade:success' => 'La actualización de Tidypics ha sido un exito',
diff --git a/languages/it.php b/languages/it.php
index 88f6dfcac..764ecf5f7 100644
--- a/languages/it.php
+++ b/languages/it.php
@@ -23,7 +23,7 @@ $italian = array(
 			'item:object:album' => "Album",
 			'tidypics:settings:maxfilesize' => "Dimensione massima dei file in kilo bytes (KB):",
 			'tidypics:enablephotos' => 'Attiva Group Photo Albums',
-			'tidypics:editprops' => 'Modifica le propriet� della immagine',
+			'tidypics:editprops' => 'Modifica le proprietà della immagine',
 			'tidypics:upgrade' => 'Aggiorna',
 			'tidypics:sort' => 'Ordina il %s album',
 
@@ -109,7 +109,7 @@ $italian = array(
 			'images:notedited' => "Non tutte le immagini sono state caricate",
 			'album:none' => "Nessun album � stato ancora creato.",
 			'album:uploadfailed' => "Spiacente; non � possibile salvare l'album.",
-			'album:deletefailed' => "L'album non pu� essere cancellato.",
+			'album:deletefailed' => "L'album non può essere cancellato.",
 			'album:blank' => "Dai a quest'album un titolo e una descrizione."
 );
 					
-- 
cgit v1.2.3


From a1c32cf049031a463b1d7bb49a5c2957924d83a5 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sat, 6 Nov 2010 13:07:34 +0000
Subject: welcome to version 1.7.0 Beta 1

---
 contributions.txt | 21 ++++++++++++++++-----
 manifest.xml      |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index 947f2b069..a05a449dd 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,16 +1,27 @@
 Changelog and contributors list
 
 ------------------------------------------------------------------------
-Version 1.6.9 Change List
-Release Date: 07/25/2010
+Version 1.7.0 Change List
+Final Release Date: ??
+Beta 1 Release Date: 11/06/2010
+Contributors:
+  * Cash Costello
+  * Jeff Tilson
+  * Original Flash code by Torsten Wesolek
+  * language files submitted by gillie and lord55
 ------------------------------------------------------------------------
-BEGIN VERSION 1.6.9 CHANGES
+BEGIN VERSION 1.7.0 CHANGES
 ------------------------------------------------------------------------
+ * Add Flash uploader
+ * Added album sorting
+ * Added batch upload river entries
  * Fixed bug where old installs of Tidypics would not upgrade
  * Fixed bug in activity river with link on image entry
- * 
+ * Fixed tag pop-up box display issue
+ * Fixed display of avatars in tag river entries
+ * Fixed 2 widget bugs
 ------------------------------------------------------------------------
-END VERSION 1.6.9 CHANGES
+END VERSION 1.7.0 CHANGES
 ------------------------------------------------------------------------
 
 ------------------------------------------------------------------------
diff --git a/manifest.xml b/manifest.xml
index f19991546..94f79b7e8 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 	
 	
 	
-- 
cgit v1.2.3


From ea8ea3c610582c8d564c5be38bc91b1987410a6b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 5 Jun 2011 12:14:47 +0000
Subject: merged in r580 and r581 into trunk

---
 actions/edit.php                             |   7 +-
 lib/album.php                                |   7 +-
 lib/migrate.php                              |   2 +
 lib/tidypics.php                             | 123 ++-------------------------
 pages/edit_multiple.php                      |   9 +-
 pages/lists/mostrecentimages.php             |   8 +-
 pages/ownedalbums.php                        |  16 +++-
 pages/world.php                              |   7 +-
 start.php                                    |  16 ++--
 upgrades/2010073101.php                      |   7 +-
 views/default/river/object/album/create.php  |   7 +-
 views/default/tidypics/albums.php            |   7 +-
 views/default/tidypics/forms/ajax_upload.php |   2 +-
 views/default/tidypics/forms/setupFlickr.php |   6 +-
 views/rss/object/album.php                   |   6 +-
 15 files changed, 94 insertions(+), 136 deletions(-)

diff --git a/actions/edit.php b/actions/edit.php
index cca66941a..df65448c8 100644
--- a/actions/edit.php
+++ b/actions/edit.php
@@ -36,7 +36,12 @@ if ($subtype == 'album' && $entity->access_id != $access) {
 	$entity->access_id = $access;
 
 	//get images from album and update access on image entities
-	$images = get_entities("object","image", $guid, '', 999, '', false);
+	$images = elgg_get_entities(array(
+		"type" => "object",
+		"subtype" => "image",
+		"container_guid" => $guid,
+		"limit" => ELGG_ENTITIES_NO_VALUE,
+	));
 	foreach ($images as $im) {
 		$im->access_id = $access;
 		$im->save();
diff --git a/lib/album.php b/lib/album.php
index 0d5140875..e178acd5d 100644
--- a/lib/album.php
+++ b/lib/album.php
@@ -209,7 +209,12 @@ class TidypicsAlbum extends ElggObject {
 
 	protected function deleteImages() {
 		// get all the images from this album as long as less than 999 images
-		$images = get_entities("object", "image", $this->guid, '', 999);
+		$images = elgg_get_entities(array(
+			"type=" => "object",
+			"subtype" => "image",
+			"container_guid" => $this->guid,
+			"limit" => ELGG_ENTITIES_NO_VALUE,
+		));
 		if ($images) {
 			foreach ($images as $image) {
 				if ($image) {
diff --git a/lib/migrate.php b/lib/migrate.php
index f8e68a1be..8c62126f0 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -4,6 +4,8 @@
  *
  * Supports moving photos from the files plugin to Tidypics. All of a users
  * photos end up in a single album.
+ *
+ * Not supported
  */
 
 // need access to ElggDiskFilestore::make_file_matrix(), which is protected.
diff --git a/lib/tidypics.php b/lib/tidypics.php
index 67d69e0da..581503a51 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -34,7 +34,14 @@
 function tp_get_latest_photos($num_images, $owner_guid = 0, $context = 'front') {
 	$prev_context = get_context();
 	set_context($context);
-	$image_html = tp_list_entities('object', 'image', $owner_guid, null, $num_images, false, false, false);
+	$image_html = elgg_list_entities(array(
+		'type' => 'object',
+		'subtype' => 'image',
+		'owner_guid' => $owner_guid,
+		'limit' => $num_images,
+		'full_view' => false,
+		'pagination' => false,
+	));
 	set_context($prev_context);
 	return $image_html;
 }
@@ -59,120 +66,6 @@ function tp_get_img_dir() {
  * that could/should exist in the core
  */
 
-/**
- *
- */
-function tp_get_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null, $timelower = 0, $timeupper = 0) {
-	global $CONFIG;
-
-	if ($subtype === false || $subtype === null || $subtype === 0)
-		return false;
-
-	if ($order_by == "") $order_by = "time_created desc";
-	$order_by = sanitise_string($order_by);
-	$limit = (int)$limit;
-	$offset = (int)$offset;
-	$site_guid = (int) $site_guid;
-	$timelower = (int) $timelower;
-	$timeupper = (int) $timeupper;
-	if ($site_guid == 0)
-		$site_guid = $CONFIG->site_guid;
-
-	$where = array();
-
-	if (is_array($subtype)) {
-		$tempwhere = "";
-		if (sizeof($subtype))
-			foreach($subtype as $typekey => $subtypearray) {
-				foreach($subtypearray as $subtypeval) {
-					$typekey = sanitise_string($typekey);
-					if (!empty($subtypeval)) {
-						if (!$subtypeval = (int) get_subtype_id($typekey, $subtypeval))
-							return false;
-					} else {
-						// @todo: Setting subtype to 0 when $subtype = '' returns entities with
-						// no subtype.  This is different to the non-array behavior
-						// but may be required in some cases.
-						$subtypeval = 0;
-					}
-					if (!empty($tempwhere)) $tempwhere .= " or ";
-					$tempwhere .= "(type = '{$typekey}' and subtype = {$subtypeval})";
-				}
-			}
-		if (!empty($tempwhere)) $where[] = "({$tempwhere})";
-
-	} else {
-
-		$type = sanitise_string($type);
-		if ($subtype !== "" AND !$subtype = get_subtype_id($type, $subtype))
-			return false;
-
-		if ($type != "")
-			$where[] = "type='$type'";
-		if ($subtype!=="")
-			$where[] = "subtype=$subtype";
-	}
-
-	if ($owner_guid != "") {
-		if (!is_array($owner_guid)) {
-			$owner_array = array($owner_guid);
-			$owner_guid = (int) $owner_guid;
-			$where[] = "owner_guid = '$owner_guid'";
-		} else if (sizeof($owner_guid) > 0) {
-			$owner_array = array_map('sanitise_int', $owner_guid);
-			// Cast every element to the owner_guid array to int
-			$owner_guid = array_map("sanitise_int", $owner_guid);
-			$owner_guid = implode(",",$owner_guid);
-			$where[] = "owner_guid in ({$owner_guid})";
-		}
-	}
-	if ($site_guid > 0)
-		$where[] = "site_guid = {$site_guid}";
-
-	if (!is_null($container_guid)) {
-		if (is_array($container_guid)) {
-			foreach($container_guid as $key => $val) $container_guid[$key] = (int) $val;
-			$where[] = "container_guid in (" . implode(",",$container_guid) . ")";
-		} else {
-			$container_guid = (int) $container_guid;
-			$where[] = "container_guid = {$container_guid}";
-		}
-	}
-	if ($timelower)
-		$where[] = "time_created >= {$timelower}";
-	if ($timeupper)
-		$where[] = "time_created <= {$timeupper}";
-
-	if (!$count) {
-		$query = "SELECT * from {$CONFIG->dbprefix}entities where ";
-	} else {
-		$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where ";
-	}
-	foreach ($where as $w)
-		$query .= " $w and ";
-	$query .= get_access_sql_suffix(); // Add access controls
-
-	if (!$count) {
-		$query .= " order by $order_by";
-		if ($limit) $query .= " limit $offset, $limit"; // Add order and limit
-		$dt = get_data($query, "entity_row_to_elggstar");
-		return $dt;
-	} else {
-		$total = get_data_row($query);
-		return $total->total;
-	}
-}
-
-function tp_list_entities($type= "", $subtype = "", $owner_guid = 0, $container_guid = null, $limit = 10, $fullview = true, $viewtypetoggle = false, $pagination = true) {
-
-	$offset = (int) get_input('offset');
-	$count = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true, 0, $container_guid);
-
-	$entities = tp_get_entities($type, $subtype, $owner_guid, "", $limit, $offset, false, 0, $container_guid);
-
-	return tp_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle, $pagination);
-}
-
 function tp_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = false, $pagination = true) {
 	$context = get_context();
 
diff --git a/pages/edit_multiple.php b/pages/edit_multiple.php
index 938ac203c..7c7b989cf 100644
--- a/pages/edit_multiple.php
+++ b/pages/edit_multiple.php
@@ -15,7 +15,14 @@ set_page_owner(get_loggedin_userid());
 
 $batch = get_input('batch');
 if ($batch) {
-	$images = get_entities_from_metadata('batch', $batch, 'object', 'image', get_loggedin_userid(), 100);
+	$images = elgg_get_entities_from_metadata(array(
+		'metadata_name' => 'batch',
+		'metadata_value' => $batch,
+		'type' => 'object',
+		'subtype' => 'image',
+		'owner_guid' => get_loggedin_userid(),
+		'limit' => ELGG_ENTITIES_NO_VALUE,
+	));
 } else {
 	// parse out photo guids
 	$file_string = get_input('files');
diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 722f1fc32..0a2595c85 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -44,7 +44,13 @@ if ($slideshow_link) {
 $max = 12;
 
 // grab the html to display the images
-$images = tp_list_entities("object", "image", $user_id, null, $max, false, false, true);
+$images = elgg_list_entities(array(
+	"type" => "object",
+	"subtype" => "image",
+	"owner_guid" => $user_id,
+	"limit" => $max,
+	"full_view" => false,
+));
 
 
 // this view takes care of the title on the main column and the content wrapper
diff --git a/pages/ownedalbums.php b/pages/ownedalbums.php
index 67583c65c..9483512c6 100644
--- a/pages/ownedalbums.php
+++ b/pages/ownedalbums.php
@@ -41,9 +41,21 @@ $area2 = elgg_view_title($title);
 set_context('search');
 set_input('search_viewtype', 'gallery');
 if ($owner instanceof ElggGroup) {
-	$content .= tp_list_entities("object", "album", 0, $owner->guid, 12, false);
+	$content .= elgg_list_entities(array(
+		"type" => "object",
+		"subtype" => "album",
+		"container_guid" => $owner->guid,
+		"limit" => 12,
+		"full_view" => false,
+));
 } else {
-	$content .= tp_list_entities("object", "album", $owner->guid, $owner->guid, 12, false);
+	$content .= elgg_list_entities(array(
+		"type" => "object",
+		"subtype" => "album",
+		"container_guid" => $owner->guid,
+		"limit" => 12,
+		"full_view" => false,
+));
 }
 
 $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
diff --git a/pages/world.php b/pages/world.php
index fe97a882d..25a69da52 100644
--- a/pages/world.php
+++ b/pages/world.php
@@ -18,7 +18,12 @@ $area2 = elgg_view_title($title);
 
 set_context('search');
 set_input('search_viewtype', 'gallery');
-$content .= tp_list_entities('object','album', 0, null, $num_albums, false);
+$content .= elgg_list_entities(array(
+	'type' => 'object',
+	'subtype' => 'album',
+	'limit' => $num_albums,
+	'pagination' => false,
+));
 set_context('photos');
 
 $area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
diff --git a/start.php b/start.php
index 1401c2c2c..d7110dfd0 100644
--- a/start.php
+++ b/start.php
@@ -25,17 +25,17 @@ function tidypics_init() {
 	}
 
 	// Extend CSS
-	extend_view('css', 'tidypics/css');
+	elgg_extend_view('css', 'tidypics/css');
 
 	// Extend hover-over and profile menu
-	extend_view('profile/menu/links','tidypics/hover_menu');
+	elgg_extend_view('profile/menu/links','tidypics/hover_menu');
 
 	//group view  ** psuedo widget view for group pages**
-	extend_view('groups/right_column','tidypics/groupprofile_albums');
+	elgg_extend_view('groups/right_column','tidypics/groupprofile_albums');
 
 	// rss extensions
-	extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
-	extend_view('extensions/channel', 'extensions/tidypics/channel');
+	elgg_extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
+	elgg_extend_view('extensions/channel', 'extensions/tidypics/channel');
 
 	// Register a page handler, so we can have nice URLs
 	register_page_handler('photos','tidypics_page_handler');
@@ -69,8 +69,8 @@ function tidypics_init() {
 	// slideshow plugin hook
 	register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
 
-        // ajax handler for uploads when use_only_cookies is set
-        register_plugin_hook('forward', 'system', 'tidypics_ajax_session_handler');
+	// ajax handler for uploads when use_only_cookies is set
+	register_plugin_hook('forward', 'system', 'tidypics_ajax_session_handler');
 }
 
 /**
@@ -456,7 +456,7 @@ function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
 	$slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:location.href+'?view=rss'})";
 
 	// add the slideshow javascript to the header
-	extend_view('metatags', 'tidypics/js/slideshow');
+	elgg_extend_view('metatags', 'tidypics/js/slideshow');
 
 	return $slideshow_link;
 }
diff --git a/upgrades/2010073101.php b/upgrades/2010073101.php
index 20fd33144..587490500 100644
--- a/upgrades/2010073101.php
+++ b/upgrades/2010073101.php
@@ -11,7 +11,12 @@ while ($guid_obj = mysql_fetch_object($album_guids)) {
 	$DB_QUERY_CACHE = $DB_PROFILE = $ENTITY_CACHE = array();
 
 	$album = get_entity($guid_obj->guid);
-	$images = get_entities("object", "image", $album->guid, '', 9999);
+	$images = elgg_get_entities(array(
+		"type" => "object",
+		"subtype" => "image",
+		"container_guid" => $album->guid,
+		"limit" => ELGG_ENTITIES_NO_VALUE,
+	));
 	$image_list = array();
 	foreach ($images as $image) {
 		$image_list[] = $image->guid;
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 47d20f3ae..4d797d842 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -28,7 +28,12 @@ if ($album_river_view == "cover") {
 
 	$string .= "
      ";
 
-	$images = get_entities("object", "image", $album->guid, 'time_created desc', 7);
+	$images = elgg_get_entities(array(
+		"type" => "object",
+		"subtype" => "image",
+		"container_guid" => $album->guid,
+		"limit" => 7,
+	));
 
 	if (count($images)) {
 		foreach($images as $image) {
diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php
index 7e0cd2d6c..61daadba7 100644
--- a/views/default/tidypics/albums.php
+++ b/views/default/tidypics/albums.php
@@ -7,7 +7,12 @@ if (!$number) {
 }
 
 $owner = page_owner_entity();
-$owner_albums = get_entities("object", "album", page_owner(), "", $number, 0, false);
+$owner_albums = elgg_get_entities(array(
+	"type" => "object",
+	"subtype" => "album",
+	"container_guid" => page_owner(),
+	"limit" => $number,
+));
 
 echo '
      ';
 
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php
index c81c9173d..4a7a05c0c 100644
--- a/views/default/tidypics/forms/ajax_upload.php
+++ b/views/default/tidypics/forms/ajax_upload.php
@@ -1,6 +1,6 @@
 ". elgg_echo( 'flickr:intro' ) . "
      ";
 $form_body .= elgg_echo( 'flickr:usernamesetup') . "  
      ";
 $form_body .= "";
 
-$albums = get_entities( "object", "album", $user->guid );
+$albums = elgg_get_entities(array(
+	"type=" => "object",
+	"subtype" => "album",
+	"owner_guid" => $user->guid,
+));
 $options = array( 0 => elgg_echo( 'flickr:selectalbum' ));
 foreach( $albums as $album ) {
 	$title = $album->title;
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index 8a8f97cc2..a37fdd041 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -43,7 +43,11 @@ if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
 	}
 
 
-	$images = get_entities("object", "image", 0, "", 0, 0, false, 0, $album->guid);
+	$images = elgg_get_entities(array(
+		"type" => "object",
+		"subtype" => "image",
+		"container_guid" => $album->guid,
+	));
 
 
 	foreach ($images as $image) {
-- 
cgit v1.2.3


From aab76ab18aa6c191dd16c3672afdacfa61ae69bb Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 5 Jun 2011 12:25:10 +0000
Subject: Fixes #135 not posting the batch to the river on first upload to an
 album

---
 actions/ajax_upload_complete.php | 8 +++++++-
 actions/upload.php               | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/actions/ajax_upload_complete.php b/actions/ajax_upload_complete.php
index b66b563e3..2abca50dc 100644
--- a/actions/ajax_upload_complete.php
+++ b/actions/ajax_upload_complete.php
@@ -11,6 +11,12 @@ if (!$album) {
 	exit;
 }
 
+if ($album->new_album == TP_NEW_ALBUM) {
+	$new_album = true;
+} else {
+	$new_album = false;
+}
+
 if ($album->new_album == TP_NEW_ALBUM) {
 	$album->new_album = TP_OLD_ALBUM;
 
@@ -38,7 +44,7 @@ if ($images) {
 		foreach ($images as $image) {
 			add_entity_relationship($image->guid, "belongs_to_batch", $batch->getGUID());
 		}
-		if (get_plugin_setting('img_river_view', 'tidypics') == "batch") {
+		if (get_plugin_setting('img_river_view', 'tidypics') == "batch" && $new_album == false) {
 			add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
 		}
 	}
diff --git a/actions/upload.php b/actions/upload.php
index f2b626f01..c0496da96 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -23,6 +23,12 @@ if (!$image_lib) {
 
 $img_river_view = get_plugin_setting('img_river_view', 'tidypics');
 
+if ($album->new_album == TP_NEW_ALBUM) {
+	$new_album = true;
+} else {
+	$new_album = false;
+}
+
 
 // post limit exceeded
 if (count($_FILES) == 0) {
@@ -177,7 +183,7 @@ if (count($uploaded_images)) {
 		foreach ($uploaded_images as $uploaded_guid) {
 			add_entity_relationship($uploaded_guid, "belongs_to_batch", $batch->getGUID());
 		}
-		if ($img_river_view == "batch") {
+		if ($img_river_view == "batch" && $new_album == false) {
 			add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
 		}
 	}
-- 
cgit v1.2.3


From 881307d9dc5dba4c73b6898a4079ef8f507a90e2 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 5 Jun 2011 12:33:35 +0000
Subject: Fixes #127 using elgg_strtolower() for i18n support

---
 actions/flickrImportPhotoset.php | 2 +-
 lib/image.php                    | 2 +-
 lib/watermark.php                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php
index eeb42d622..c92e5c795 100644
--- a/actions/flickrImportPhotoset.php
+++ b/actions/flickrImportPhotoset.php
@@ -206,7 +206,7 @@ foreach( $photos_to_upload as $name => $photo ) {
 	//this will save to users folder in /image/ and organize by photo album
 	$prefix = "image/" . $container_guid . "/";
 	$file = new ElggFile();
-	$filestorename = strtolower(time().$name);
+	$filestorename = elgg_strtolower(time().$name);
 	$file->setFilename($prefix.$filestorename . ".jpg"); //that's all flickr stores so I think this is safe
 	$file->setMimeType($mime);
 	$file->originalfilename = $name;
diff --git a/lib/image.php b/lib/image.php
index c68560df6..7f98a08d7 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -45,7 +45,7 @@ class TidypicsImage extends ElggFile {
 	 */
 	public function setOriginalFilename($originalName) {
 		$prefix = "image/" . $this->container_guid . "/";
-		$filestorename = strtolower(time() . $originalName);
+		$filestorename = elgg_strtolower(time() . $originalName);
 		$this->setFilename($prefix . $filestorename);
 		$this->originalfilename = $originalName;
 	}
diff --git a/lib/watermark.php b/lib/watermark.php
index 6b16f0e4a..ce77c00e2 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -30,12 +30,12 @@ function tp_process_watermark_text($text, $owner) {
  */
 function tp_get_watermark_filename($text, $owner) {
 
-	$base = strtolower($text);
+	$base = elgg_strtolower($text);
 	$base = preg_replace("/[^\w-]+/", "-", $base);
 	$base = trim($base, '-');
 
 	$filename = tp_get_img_dir();
-	$filename .= strtolower($owner->username . "_" . $base . "_stamp");
+	$filename .= elgg_strtolower($owner->username . "_" . $base . "_stamp");
 
 	return $filename;
 }
-- 
cgit v1.2.3


From fba844ea760259a3a317eb1454294bc6361e7b4a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 5 Jun 2011 16:58:09 +0000
Subject: Fixes #141 forcing the creation of album directory in user
 directories for group album

---
 actions/upload.php | 4 ++--
 lib/image.php      | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/actions/upload.php b/actions/upload.php
index c0496da96..3bbd97e60 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -105,11 +105,11 @@ foreach($_FILES as $key => $sent_file) {
 		continue;
 	}
 
-	//this will save to users folder in /image/ and organize by photo album
+	//this will save to user's folder in /image/ and organize by photo album
 	$file = new TidypicsImage();
 	$file->container_guid = $album_guid;
 	$file->setMimeType($mime);
-	$file->simpletype="image";
+	$file->simpletype = "image";
 	$file->access_id = $access_id;
 	//$file->title = substr($name, 0, strrpos($name, '.'));
 
diff --git a/lib/image.php b/lib/image.php
index 7f98a08d7..14ac2e688 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -60,6 +60,13 @@ class TidypicsImage extends ElggFile {
 	 */
 	public function saveImageFile($uploadedFilename, $size) {
 
+		// we need to make sure the directory for the album exists
+		// @note for group albums, the photos are distributed among the users
+		$dir = tp_get_img_dir() . $this->getContainer();
+		if (!file_exists($dir)) {
+			mkdir($dir, 0755, true);
+		}
+
 		$filename = $this->getFilenameOnFilestore();
 
 		$result = move_uploaded_file($uploadedFilename, $filename);
-- 
cgit v1.2.3


From 18ccaf511a13341c0985970ce4d532cdca1b9266 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 5 Jun 2011 18:10:55 +0000
Subject: fixed overflow issue caused by using Elgg's gallery view

---
 views/default/tidypics/content_wrapper.php |  2 +-
 views/default/tidypics/css.php             | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/views/default/tidypics/content_wrapper.php b/views/default/tidypics/content_wrapper.php
index 757d069bb..08146b31b 100644
--- a/views/default/tidypics/content_wrapper.php
+++ b/views/default/tidypics/content_wrapper.php
@@ -1,7 +1,7 @@
 
-
      
+
      
 
      
 
 /* ---- tidypics object views ---- */
 
-#tidypics_wrapper {
+.tidypics_wrapper > table.entity_gallery {
+	border-spacing: 0;
+}
+
+.tidypics_wrapper .entity_gallery td {
+	padding: 0;
+}
+
+.tidypics_wrapper .entity_gallery_item,
+.tidypics_wrapper .entity_gallery_item:hover {
+	background-color: transparent;
+	color: inherit;
 }
 
 #tidypics_breadcrumbs {
-- 
cgit v1.2.3


From 0b3e08aed1ddbf117a42e56c9fe0ab72e71d996e Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 5 Jun 2011 18:15:15 +0000
Subject: welcome to the long overdue 1.7.0 version

---
 contributions.txt | 3 ++-
 manifest.xml      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index a05a449dd..06672bce6 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -2,7 +2,7 @@ Changelog and contributors list
 
 ------------------------------------------------------------------------
 Version 1.7.0 Change List
-Final Release Date: ??
+Final Release Date: 06/05/2011
 Beta 1 Release Date: 11/06/2010
 Contributors:
   * Cash Costello
@@ -20,6 +20,7 @@ BEGIN VERSION 1.7.0 CHANGES
  * Fixed tag pop-up box display issue
  * Fixed display of avatars in tag river entries
  * Fixed 2 widget bugs
+ * Fixed bug with images that have national characters in filename
 ------------------------------------------------------------------------
 END VERSION 1.7.0 CHANGES
 ------------------------------------------------------------------------
diff --git a/manifest.xml b/manifest.xml
index 94f79b7e8..f4396d03d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,10 +1,10 @@
 
 
 	
-	
+	
 	
 	
-	
+	
 	
-	
+	
 
-- 
cgit v1.2.3


From 0db39bf5f812ed0fbfcfc06f482f27c3aa18cd2b Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 5 Jun 2011 18:31:41 +0000
Subject: well, not quite. This fixes a css issue with the album sorter.

---
 views/default/tidypics/css.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 3a70a0ca6..25a29fdc3 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -407,6 +407,7 @@ float:left;
 margin:3px;
 width:161px;
 height:161px;
+list-style:none;
 }
 
 #tidypics_album_sort img {
-- 
cgit v1.2.3


From e6f2aab29afb89bc07ff8bd867a9c69f85f1eb21 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 8 Jun 2011 00:16:53 +0000
Subject: using the page handler for the admin page

---
 pages/admin.php | 12 +++---------
 start.php       |  6 +++++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pages/admin.php b/pages/admin.php
index 4013e55ac..1a04ab279 100644
--- a/pages/admin.php
+++ b/pages/admin.php
@@ -1,13 +1,7 @@
 url . "mod/tidypics/pages/admin.php");
+		add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "pg/photos/admin/");
 	}
 }
 
@@ -365,6 +365,10 @@ function tidypics_page_handler($page) {
 				}
 				include($CONFIG->pluginspath . "tidypics/pages/flickr/setup.php");
 				break;
+
+			case "admin":
+				include ($CONFIG->pluginspath . "tidypics/pages/admin.php");
+				break;
 		}
 	}
 	else {
-- 
cgit v1.2.3


From d94bfb36201438a48cbe2c521e28e18232682a51 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 10 Jul 2011 12:57:56 +0000
Subject: admins can turn off flash uploader

---
 actions/admin/settings.php                | 6 ++++++
 languages/en.php                          | 1 +
 pages/upload.php                          | 7 ++++++-
 views/default/tidypics/forms/settings.php | 7 +++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/actions/admin/settings.php b/actions/admin/settings.php
index 2c529d950..d3801f655 100644
--- a/actions/admin/settings.php
+++ b/actions/admin/settings.php
@@ -51,6 +51,12 @@ if (is_array(get_input('view_count'))) {
 	set_plugin_setting('view_count', 'disabled', 'tidypics');
 }
 
+if (is_array(get_input('uploader'))) {
+	set_plugin_setting('uploader', 'enabled', 'tidypics');
+} else {
+	set_plugin_setting('uploader', 'disabled', 'tidypics');
+}
+
 if (is_array(get_input('grp_perm_override'))) {
 	set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
 } else {
diff --git a/languages/en.php b/languages/en.php
index fce4b392a..d9c9a302b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -71,6 +71,7 @@ $english = array(
 			'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
 			'tidypics:settings:exif' => "Show EXIF data",
 			'tidypics:settings:view_count' => "View counter",
+			'tidypics:settings:uploader' => "Use Flash uploader",
 			'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
 			'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
 			'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",
diff --git a/pages/upload.php b/pages/upload.php
index b6a828cf9..7ac4930b5 100644
--- a/pages/upload.php
+++ b/pages/upload.php
@@ -14,7 +14,12 @@ if (!$album_guid) {
 	forward();
 }
 
-$uploader = get_input('uploader', 'ajax');
+if (get_plugin_setting('uploader', 'tidypics') != "disabled") {
+	$uploader = get_input('uploader', 'ajax');
+} else {
+	$uploader = 'basic';
+}
+
 
 $album = get_entity($album_guid);
 
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index c8a1b4bd9..5eae9becc 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -48,6 +48,13 @@ if (!$view_count) {
 }
 $form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
 
+// Use flash uploader
+$uploader = $plugin->uploader;
+if (!$uploader) {
+	$uploader = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:uploader') => 'enabled'), 'internalname' => 'uploader', 'value' => $uploader )) . "
      ";
+
 // Watermark Text
 $form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
 $form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
-- 
cgit v1.2.3


From 99510fff7fb01cdbf5f5c6fd3eed866576e91809 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 10 Jul 2011 13:13:37 +0000
Subject: slideshow and rss feed now show more images

---
 start.php                  | 7 ++++++-
 views/rss/object/album.php | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/start.php b/start.php
index 60dc46579..270173fcf 100644
--- a/start.php
+++ b/start.php
@@ -457,7 +457,12 @@ function tidypics_slideshow($hook, $entity_type, $returnvalue, $params) {
 		return $returnvalue;
 	}
 
-	$slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:location.href+'?view=rss'})";
+	$url = current_page_url();
+	if (strpos($url, '?')) {
+		$url = substr($url, 0, strpos($url, '?'));
+	}
+	$url = "$url?limit=50&view=rss";
+	$slideshow_link = "javascript:PicLensLite.start({maxScale:0,feedUrl:'$url'})";
 
 	// add the slideshow javascript to the header
 	elgg_extend_view('metatags', 'tidypics/js/slideshow');
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index a37fdd041..8df98cf7a 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -42,11 +42,13 @@ if (get_context() == "search" && get_input('search_viewtype') == "gallery") {
  "object",
 		"subtype" => "image",
 		"container_guid" => $album->guid,
+		"limit" => $limit,
 	));
 
 
-- 
cgit v1.2.3


From d63be66fa04fd7b8509f0b1786ffbd468ef5a281 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 10 Jul 2011 13:19:27 +0000
Subject: showing 16 photos on an album page rather than 8

---
 views/default/object/album.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/object/album.php b/views/default/object/album.php
index 7c43c4e96..13b94aed5 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -107,7 +107,7 @@ if (get_context() == "search") {
 	echo '
      ' . autop($desc) . '
      ';
 
 	$offset = (int)get_input('offset', 0);
-	echo $album->viewImages(8, $offset);
+	echo $album->viewImages(16, $offset);
 	//	echo '
      ' . elgg_echo('image:none') . '
      ';
 	//	$num_images = 0;
 	//}
-- 
cgit v1.2.3


From e21ecb111c84a097ef3ac98485578bc5a30c5b0a Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Sun, 10 Jul 2011 13:22:20 +0000
Subject: Tidypics 1.7.1

---
 contributions.txt | 13 +++++++++++++
 manifest.xml      |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/contributions.txt b/contributions.txt
index 06672bce6..b7869daa6 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,18 @@
 Changelog and contributors list
 
+------------------------------------------------------------------------
+Version 1.7.1 Change List
+Release Date: 07/10/2011
+------------------------------------------------------------------------
+BEGIN VERSION 1.7.1 CHANGES
+------------------------------------------------------------------------
+ * Added a toggle for enabling the Flash uploader
+ * Fixed bug with slideshow not displaying all images in an album
+ * Fixed bug with only 8 images showing on an album page. Default is 16.
+------------------------------------------------------------------------
+END VERSION 1.7.1 CHANGES
+------------------------------------------------------------------------
+
 ------------------------------------------------------------------------
 Version 1.7.0 Change List
 Final Release Date: 06/05/2011
diff --git a/manifest.xml b/manifest.xml
index f4396d03d..e8701a408 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 	
 	
 	
-- 
cgit v1.2.3


From fa6ad0e7351c6884591479047b04034a3de69d41 Mon Sep 17 00:00:00 2001
From: cash 
Date: Tue, 11 Oct 2011 21:44:45 -0400
Subject: fixed admin tabs links

---
 views/default/tidypics/admin/tidypics.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php
index a46781c2a..d3f188741 100644
--- a/views/default/tidypics/admin/tidypics.php
+++ b/views/default/tidypics/admin/tidypics.php
@@ -31,11 +31,11 @@ switch($tab) {
 
      
 	
      
 		
        
-			
      • >
        • 
-			
      • >
        • 
-			
      • >
        • 
-			
      • >
        • 
-			
      • >
        • 
+			
      • >
        • 
+			
      • >
        • 
+			
      • >
        • 
+			
      • >
        • 
+			
      • >
        • 
 		
      
 	
      
 	
Date: Tue, 11 Oct 2011 21:46:34 -0400
Subject: removed suggested path for imagemagick as it conflicts with apache
 security - need better solution

---
 views/default/tidypics/forms/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index 5eae9becc..7e2aabb14 100644
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -104,7 +104,7 @@ if (is_callable('exec') && !in_array('exec', $disablefunc)) {
 	// Image Magick Path
 	$im_path = $plugin->im_path;
 	if(!$im_path) {
-		$im_path = "/usr/bin/";
+		$im_path = "";
 	}
 	$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
 	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
-- 
cgit v1.2.3


From f782c22748e416d088902bc838ed28aa57f7520b Mon Sep 17 00:00:00 2001
From: cash 
Date: Tue, 11 Oct 2011 22:00:24 -0400
Subject: auto setting reasonable defaults on first use

---
 views/default/settings/tidypics/edit.php | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php
index a6b2c2d0c..681007ac5 100644
--- a/views/default/settings/tidypics/edit.php
+++ b/views/default/settings/tidypics/edit.php
@@ -1,4 +1,32 @@
 wwwroot . 'mod/tidypics/pages/server_analysis.php';
 $settings_url = $CONFIG->wwwroot . 'mod/tidypics/pages/admin.php';
-- 
cgit v1.2.3


From 2edf8597f95b69a4e8ce3bfd65a3968badca5341 Mon Sep 17 00:00:00 2001
From: cash 
Date: Tue, 11 Oct 2011 22:08:35 -0400
Subject: added check for session only cookies to server analysis

---
 pages/server_analysis.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pages/server_analysis.php b/pages/server_analysis.php
index db3aed5f6..7e4218b83 100644
--- a/pages/server_analysis.php
+++ b/pages/server_analysis.php
@@ -124,6 +124,11 @@ echo elgg_view_title($title);
 			
 			
 		
+		
+			Cookie only sessions
+			
+			Cookie only sessions may affect the Flash uploader
+		
 	
 	
      
 		">Server configuration doc
-- 
cgit v1.2.3


From 73a9388c461624d6fe4401cc81c45cf346a393b6 Mon Sep 17 00:00:00 2001
From: cash 
Date: Tue, 11 Oct 2011 22:15:48 -0400
Subject: fixed pagination bug on all site albums

---
 pages/world.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/world.php b/pages/world.php
index 25a69da52..4599f8209 100644
--- a/pages/world.php
+++ b/pages/world.php
@@ -22,7 +22,6 @@ $content .= elgg_list_entities(array(
 	'type' => 'object',
 	'subtype' => 'album',
 	'limit' => $num_albums,
-	'pagination' => false,
 ));
 set_context('photos');
 
-- 
cgit v1.2.3


From eee08cc81b18730fa780169915679a68f143f9c5 Mon Sep 17 00:00:00 2001
From: cash 
Date: Tue, 11 Oct 2011 22:28:13 -0400
Subject: Tidypics 1.7.2

---
 contributions.txt | 14 ++++++++++++++
 manifest.xml      |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/contributions.txt b/contributions.txt
index b7869daa6..eec662923 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,19 @@
 Changelog and contributors list
 
+------------------------------------------------------------------------
+Version 1.7.2 Change List
+Release Date: 10/11/2011
+------------------------------------------------------------------------
+BEGIN VERSION 1.7.2 CHANGES
+------------------------------------------------------------------------
+ * Fixed bug with admin tabs
+ * Fixed bug with pagination on all site albums page
+ * New installs get default settings automatically added
+ * Added a server check for cookie-only sessions
+------------------------------------------------------------------------
+END VERSION 1.7.2 CHANGES
+------------------------------------------------------------------------
+
 ------------------------------------------------------------------------
 Version 1.7.1 Change List
 Release Date: 07/10/2011
diff --git a/manifest.xml b/manifest.xml
index e8701a408..f3d3e877e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 	
 	
 	
-- 
cgit v1.2.3


From 356b46c118fe5b5f7a874955b5d5c3a9fc7552a1 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 9 Nov 2011 06:52:28 -0500
Subject: removed settings since those can be reached through Tidypics
 Administration

---
 views/default/settings/tidypics/edit.php | 40 --------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 views/default/settings/tidypics/edit.php

diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php
deleted file mode 100644
index 681007ac5..000000000
--- a/views/default/settings/tidypics/edit.php
+++ /dev/null
@@ -1,40 +0,0 @@
-wwwroot . 'mod/tidypics/pages/server_analysis.php';
-$settings_url = $CONFIG->wwwroot . 'mod/tidypics/pages/admin.php';
-?>
-
-
      
-Run Server Analysis
-
      
-
      
-Change Tidypics Settings
-
      
\ No newline at end of file
-- 
cgit v1.2.3


From e2cae6f6e9dc7c6b1bbbed069dce7d5024cd4589 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 9 Nov 2011 07:08:43 -0500
Subject: added river strings for Elgg 1.8

---
 languages/en.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/languages/en.php b/languages/en.php
index d9c9a302b..4213e0b6a 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -166,6 +166,8 @@ The photo can be viewed here: %s",
 			'album:river:group' => "in the group",
 			'album:river:item' => "an album",
 			'album:river:annotate' => "a comment on the photo album",
+			'river:comment:object:image' => '%s commented on the photo %s',
+			'river:comment:object:album' => '%s commented on the album %s',
 
 		// notifications
 			'tidypics:newalbum' => 'New photo album',
-- 
cgit v1.2.3


From 5e82c81f707d1b959d1134215fb060b6be1ff642 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 9 Nov 2011 07:41:42 -0500
Subject: delete batch when the last image in it has been deleted

---
 lib/image.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lib/image.php b/lib/image.php
index 14ac2e688..f6ecd8ad9 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -24,6 +24,26 @@ class TidypicsImage extends ElggFile {
 	 */
 	public function delete() {
 
+		// check if batch should be deleted
+		$batch = elgg_get_entities_from_relationship(array(
+			'relationship' => 'belongs_to_batch',
+			'relationship_guid' => $this->guid,
+			'inverse_relationship' => false,
+		));
+		if ($batch) {
+			$batch = $batch[0];
+			$count = elgg_get_entities_from_relationship(array(
+				'relationship' => 'belongs_to_batch',
+				'relationship_guid' => $batch->guid,
+				'inverse_relationship' => true,
+				'count' => true,
+			));
+			if ($count == 1) {
+				// last image so delete batch
+				$batch->delete();
+			}
+		}
+
 		$album = get_entity($this->container_guid);
 		if ($album) {
 			$album->removeImage($this->guid);
-- 
cgit v1.2.3


From a66f0637a0821cd2c229a2d6323c48b575cb2535 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Wed, 9 Nov 2011 07:46:07 -0500
Subject: Tidypics 1.7.3

---
 contributions.txt | 13 +++++++++++++
 manifest.xml      |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/contributions.txt b/contributions.txt
index eec662923..6ab7253f9 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -1,5 +1,18 @@
 Changelog and contributors list
 
+------------------------------------------------------------------------
+Version 1.7.3 Change List
+Release Date: 11/09/2011
+------------------------------------------------------------------------
+BEGIN VERSION 1.7.3 CHANGES
+------------------------------------------------------------------------
+ * Removed admin settings in favor of Tidypics Administration
+ * Add two river strings for those using Elgg 1.8
+ * Fixed bug where the batch object was not being deleted when had 0 images
+------------------------------------------------------------------------
+END VERSION 1.7.3 CHANGES
+------------------------------------------------------------------------
+
 ------------------------------------------------------------------------
 Version 1.7.2 Change List
 Release Date: 10/11/2011
diff --git a/manifest.xml b/manifest.xml
index f3d3e877e..5dabe4dfd 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,7 +1,7 @@
 
 
 	
-	
+	
 	
 	
 	
-- 
cgit v1.2.3


From 0fe5af64cf1f5d69e0253e27dec70e346814fcdf Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 10 Nov 2011 06:45:50 -0500
Subject: moved admin settings form to a location that is better for Elgg 1.8

---
 views/default/forms/tidypics/admin/settings.php | 179 +++++++++++++++++++++++
 views/default/tidypics/admin/settings.php       |  29 ++--
 views/default/tidypics/forms/settings.php       | 183 ------------------------
 3 files changed, 196 insertions(+), 195 deletions(-)
 create mode 100644 views/default/forms/tidypics/admin/settings.php
 delete mode 100644 views/default/tidypics/forms/settings.php

diff --git a/views/default/forms/tidypics/admin/settings.php b/views/default/forms/tidypics/admin/settings.php
new file mode 100644
index 000000000..06b3f4cb9
--- /dev/null
+++ b/views/default/forms/tidypics/admin/settings.php
@@ -0,0 +1,179 @@
+' . elgg_echo('tidypics:settings:heading:main') . '';
+
+// Tagging
+$tagging = $plugin->tagging;
+if (!$tagging) {
+	$tagging = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
+
+// Download Link
+$download_link = $plugin->download_link;
+if (!$download_link) {
+	$download_link = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
+
+// Ratings
+$photo_ratings = $plugin->photo_ratings;
+if (!$photo_ratings) {
+	$photo_ratings = "disabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
+
+// Show EXIF
+$exif = $plugin->exif;
+if (!$exif) {
+	$exif = "disabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
+
+// Show View count
+$view_count = $plugin->view_count;
+if (!$view_count) {
+	$view_count = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
+
+// Use flash uploader
+$uploader = $plugin->uploader;
+if (!$uploader) {
+	$uploader = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:uploader') => 'enabled'), 'internalname' => 'uploader', 'value' => $uploader )) . "
      ";
+
+// Watermark Text
+$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
+$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
+
+// Max Image Size
+$maxfilesize = $plugin->maxfilesize;
+if (!$maxfilesize) {
+	$maxfilesize = (int)5; // 5 MB
+}
+$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
+$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
+
+// Quota Size
+$quota = $plugin->quota;
+if (!$quota) {
+	$quota = 0;
+}
+$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
+$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
+
+// Image Library
+if (extension_loaded('imagick')) {
+	$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
+}
+
+$disablefunc = explode(',', ini_get('disable_functions'));
+if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+	$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
+}
+
+$img_lib_options['GD'] = 'GD';
+
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:img_lib') . '
      ';
+$image_lib = $plugin->image_lib;
+if (!$image_lib) {
+	$image_lib = 'GD';
+}
+$form_body .= '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
+$form_body .= elgg_view('input/pulldown', array(
+		'internalname' => 'params[image_lib]',
+		'options_values' => $img_lib_options,
+		'value' => $image_lib
+));
+$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
+
+if (is_callable('exec') && !in_array('exec', $disablefunc)) {
+	// Image Magick Path
+	$im_path = $plugin->im_path;
+	if(!$im_path) {
+		$im_path = "";
+	}
+	$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
+}
+
+
+// River Image options
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:river') . '
      ';
+$img_river_view = $plugin->img_river_view;
+if (!$img_river_view) {
+	$img_river_view = 'batch';
+}
+$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view') . ': ';
+$form_body .= elgg_view('input/pulldown', array(
+		'internalname' => 'params[img_river_view]',
+		'options_values' => array(
+				'all' => 'all',
+				'batch' => '1',
+				'none' => 'none',
+		),
+		'value' => $img_river_view
+));
+$form_body .= '
      ';
+
+// River Album options
+$album_river_view = $plugin->album_river_view;
+if (!$album_river_view) {
+	$album_river_view = 'set';
+}
+$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view') . ': ';
+$form_body .= elgg_view('input/pulldown', array(
+		'internalname' => 'params[album_river_view]',
+		'options_values' => array(
+				'cover' => 'cover',
+				'set' => 'set',
+		),
+		'value' => $album_river_view
+));
+$form_body .= '
      ';
+
+// Thumbnail sizes
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:sizes') . '
      ';
+$form_body .= "
      You must edit the css if you change the default sizes
      ";
+$image_sizes = $plugin->image_sizes;
+if(!$image_sizes) {
+	$image_sizes = array(); // set default values
+	$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
+	$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
+	$image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60;
+} else {
+	$image_sizes = unserialize($image_sizes);
+}
+$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
+$form_body .= 'width:    ';
+$form_body .= 'height: 
      ';
+
+$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
+$form_body .= 'width and height:    ';
+//$form_body .= 'height: 
      ';
+
+$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
+$form_body .= 'width and height:    ';
+//$form_body .= 'height: 
      ';
+
+
+// Group permission override
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:groups') . '
      ';
+$grp_perm_override = $plugin->grp_perm_override;
+if (!$grp_perm_override) {
+	$grp_perm_override = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
+
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
+
+echo $form_body;
diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php
index 6dace1830..e1d20f953 100644
--- a/views/default/tidypics/admin/settings.php
+++ b/views/default/tidypics/admin/settings.php
@@ -1,18 +1,23 @@
  elgg_echo("tidypics:admin:instructions")));
+$form_body = elgg_view('forms/tidypics/admin/settings', $vars);
 
-?>
-
      
- "{$vars['url']}mod/tidypics/pages/server_analysis.php",
+	'text' => elgg_echo('tidypics:settings:server:analysis'),
+));
 
-$url = "{$vars['url']}mod/tidypics/pages/server_analysis.php";
-$text = elgg_echo('tidypics:settings:server:analysis');
+echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions')));
 
-echo "$text";
-?>
-
      
-';
+echo elgg_view('tidypics/admin/upgrade');
+echo $server_analysis_link;
+echo '
      ';
 
-echo elgg_view("tidypics/forms/settings");
+echo elgg_view('input/form', array(
+	'body' => $form_body,
+	'action' => $vars['url'] . 'action/tidypics/admin/settings',
+));
diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
deleted file mode 100644
index 7e2aabb14..000000000
--- a/views/default/tidypics/forms/settings.php
+++ /dev/null
@@ -1,183 +0,0 @@
-' . elgg_echo('tidypics:settings:heading:main') . '';
-
-// Tagging
-$tagging = $plugin->tagging;
-if (!$tagging) {
-	$tagging = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
-
-// Download Link
-$download_link = $plugin->download_link;
-if (!$download_link) {
-	$download_link = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
-
-// Ratings
-$photo_ratings = $plugin->photo_ratings;
-if (!$photo_ratings) {
-	$photo_ratings = "disabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
-
-// Show EXIF
-$exif = $plugin->exif;
-if (!$exif) {
-	$exif = "disabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
-
-// Show View count
-$view_count = $plugin->view_count;
-if (!$view_count) {
-	$view_count = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
-
-// Use flash uploader
-$uploader = $plugin->uploader;
-if (!$uploader) {
-	$uploader = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:uploader') => 'enabled'), 'internalname' => 'uploader', 'value' => $uploader )) . "
      ";
-
-// Watermark Text
-$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
-$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
-
-// Max Image Size
-$maxfilesize = $plugin->maxfilesize;
-if (!$maxfilesize) {
-	$maxfilesize = (int)5; // 5 MB
-}
-$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
-$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
-
-// Quota Size
-$quota = $plugin->quota;
-if (!$quota) {
-	$quota = 0;
-}
-$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
-$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
-
-// Image Library
-if (extension_loaded('imagick')) {
-	$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
-}
-
-$disablefunc = explode(',', ini_get('disable_functions'));
-if (is_callable('exec') && !in_array('exec',$disablefunc)) {
-	$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
-}
-
-$img_lib_options['GD'] = 'GD';
-
-$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:img_lib') . '
      ';
-$image_lib = $plugin->image_lib;
-if (!$image_lib) {
-	$image_lib = 'GD';
-}
-$form_body .= '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
-$form_body .= elgg_view('input/pulldown', array(
-		'internalname' => 'params[image_lib]',
-		'options_values' => $img_lib_options,
-		'value' => $image_lib
-));
-$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
-
-if (is_callable('exec') && !in_array('exec', $disablefunc)) {
-	// Image Magick Path
-	$im_path = $plugin->im_path;
-	if(!$im_path) {
-		$im_path = "";
-	}
-	$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
-}
-
-
-// River Image options
-$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:river') . '
      ';
-$img_river_view = $plugin->img_river_view;
-if (!$img_river_view) {
-	$img_river_view = 'batch';
-}
-$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view');
-$form_body .= elgg_view('input/pulldown', array(
-		'internalname' => 'params[img_river_view]',
-		'options_values' => array(
-				'all' => 'all',
-				'batch' => '1',
-				'none' => 'none',
-		),
-		'value' => $img_river_view
-));
-$form_body .= '
      ';
-
-// River Album options
-$album_river_view = $plugin->album_river_view;
-if (!$album_river_view) {
-	$album_river_view = 'set';
-}
-$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view');
-$form_body .= elgg_view('input/pulldown', array(
-		'internalname' => 'params[album_river_view]',
-		'options_values' => array(
-				'cover' => 'cover',
-				'set' => 'set',
-		),
-		'value' => $album_river_view
-));
-$form_body .= '
      ';
-
-// Thumbnail sizes
-$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:sizes') . '
      ';
-$form_body .= "
      You must edit the css if you change the default sizes
      ";
-$image_sizes = $plugin->image_sizes;
-if(!$image_sizes) {
-	$image_sizes = array(); // set default values
-	$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
-	$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
-	$image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60;
-} else {
-	$image_sizes = unserialize($image_sizes);
-}
-$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
-$form_body .= 'width:    ';
-$form_body .= 'height: 
      ';
-
-$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
-$form_body .= 'width and height:    ';
-//$form_body .= 'height: 
      ';
-
-$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
-$form_body .= 'width and height:    ';
-//$form_body .= 'height: 
      ';
-
-
-// Group permission override
-$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:groups') . '
      ';
-$grp_perm_override = $plugin->grp_perm_override;
-if (!$grp_perm_override) {
-	$grp_perm_override = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
-
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-
-echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
-- 
cgit v1.2.3


From b46b9b1464249916d105ee46f0bdb7972863070d Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 10 Nov 2011 07:00:44 -0500
Subject: moved upload forms to new location

---
 pages/flickr/importPhotosets.php              |  50 ---------
 pages/flickr/setup.php                        |  17 ----
 pages/upload.php                              |  13 ++-
 views/default/forms/tidypics/ajax_upload.php  | 141 ++++++++++++++++++++++++++
 views/default/forms/tidypics/basic_upload.php | 104 +++++++++++++++++++
 views/default/tidypics/forms/ajax_upload.php  | 137 -------------------------
 views/default/tidypics/forms/setupFlickr.php  |  45 --------
 views/default/tidypics/forms/upload.php       | 103 -------------------
 8 files changed, 256 insertions(+), 354 deletions(-)
 delete mode 100644 pages/flickr/importPhotosets.php
 delete mode 100644 pages/flickr/setup.php
 create mode 100644 views/default/forms/tidypics/ajax_upload.php
 create mode 100644 views/default/forms/tidypics/basic_upload.php
 delete mode 100644 views/default/tidypics/forms/ajax_upload.php
 delete mode 100644 views/default/tidypics/forms/setupFlickr.php
 delete mode 100644 views/default/tidypics/forms/upload.php

diff --git a/pages/flickr/importPhotosets.php b/pages/flickr/importPhotosets.php
deleted file mode 100644
index a807a0782..000000000
--- a/pages/flickr/importPhotosets.php
+++ /dev/null
@@ -1,50 +0,0 @@
-" . elgg_echo( 'flickr:desc' ) . "";
-	
-	$viewer = get_loggedin_user();
-	
-	require_once dirname(dirname(dirname(__FILE__))) . "/lib/phpFlickr/phpFlickr.php";
-	require_once( dirname(dirname(dirname(__FILE__)))) . "/lib/flickr.php";
-	$f = new phpFlickr("26b2abba37182aca62fe0eb2c7782050");
-	
-	$viewer = get_loggedin_user();
-	$flickr_username = get_metadata_byname( $viewer->guid, "flickr_username" );
-	$flickr_id = get_metadata_byname( $viewer->guid, "flickr_id" );
-	$album_id = get_metadata_byname( $viewer->guid, "flickr_album_id" );
-	
-	if( intval( $album_id->value ) <= 0 ) {
-		register_error( sprintf( elgg_echo( 'flickr:errornoalbum' ), $album_id->value ));
-		forward( "/mod/tidypics/pages/flickr/setup.php" );
-	}
-	
-	$photosets = $f->photosets_getList( $flickr_id->value );
-	foreach( $photosets["photoset"] as $photoset ) {
-		$body .= "
      ";
-		$body .= "$photoset[title]
      ";
-		
-		$count = 0;
-		$looper = 0;
-		//create links to import photos 10 at a time
-		while( $photoset["photos"] > $count ) {
-			$looper++;
-			$body .= " $looper";
-			$count = $count + 10;			
-		}
-		$body .= "
      $photoset[photos] images";
-		$body .= "
      ";
-//		echo "
      "; var_dump( $photoset ); echo "
      "; die;
-	}
-
-//	$body .= elgg_view("tidypics/forms/setupFlickr", array(), false, true );
-	flickr_menu();
-	page_draw( elgg_echo( 'flickr:importmanager' ), elgg_view_layout("two_column_left_sidebar", '', $body));
-	
-?>
\ No newline at end of file
diff --git a/pages/flickr/setup.php b/pages/flickr/setup.php
deleted file mode 100644
index 1de8c29c2..000000000
--- a/pages/flickr/setup.php
+++ /dev/null
@@ -1,17 +0,0 @@
-"; var_dump($body); echo "
      "; - page_draw( elgg_echo( 'flickr:setup'), elgg_view_layout("two_column_left_sidebar", '', $body)); -?> \ No newline at end of file diff --git a/pages/upload.php b/pages/upload.php index 7ac4930b5..6580c6f52 100644 --- a/pages/upload.php +++ b/pages/upload.php @@ -6,6 +6,8 @@ include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"; +global $CONFIG; + // must be logged in to upload images gatekeeper(); @@ -43,9 +45,16 @@ $title = elgg_echo('album:addpix') . ': ' . $album->title; $area2 .= elgg_view_title($title); if ($uploader == 'basic') { - $area2 .= elgg_view("tidypics/forms/upload", array('album' => $album)); + $area2 .= elgg_view('input/form', array( + 'action' => "{$CONFIG->wwwroot}action/tidypics/upload", + 'body' => elgg_view('forms/tidypics/basic_upload', array('album' => $album)), + 'internalid' => 'tidypicsUpload', + 'enctype' => 'multipart/form-data', + 'method' => 'post', + )); + } else { - $area2 .= elgg_view("tidypics/forms/ajax_upload", array('album' => $album)); + $area2 .= elgg_view("forms/tidypics/ajax_upload", array('album' => $album)); } $body = elgg_view_layout('two_column_left_sidebar', '', $area2); diff --git a/views/default/forms/tidypics/ajax_upload.php b/views/default/forms/tidypics/ajax_upload.php new file mode 100644 index 000000000..a1d13e80b --- /dev/null +++ b/views/default/forms/tidypics/ajax_upload.php @@ -0,0 +1,141 @@ +salt); + +$basic_uploader_url = current_page_url() . '/basic'; +$upload_endpoint_url = "{$vars['url']}action/tidypics/ajax_upload/"; +$upload_complete_url = "{$vars['url']}action/tidypics/ajax_upload_complete/"; + +$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); +if (!$maxfilesize) { + $maxfilesize = 5; +} + +$quota = get_plugin_setting('quota','tidypics'); +if ($quota) { + $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); + $image_repo_size = (int)$image_repo_size_md->value; + $image_repo_size = $image_repo_size / 1024 / 1024; + $quote_percentage = round(100 * ($image_repo_size / $quota)); + // for small quotas, so one decimal place + if ($quota < 10) { + $image_repo_size = sprintf('%.1f', $image_repo_size); + } else { + $image_repo_size = round($image_repo_size); + } + if ($image_repo_size > $quota) { + $image_repo_size = $quota; + } +} + +?> + +
      + +

      + + +
      + + diff --git a/views/default/forms/tidypics/basic_upload.php b/views/default/forms/tidypics/basic_upload.php new file mode 100644 index 000000000..55ab854a4 --- /dev/null +++ b/views/default/forms/tidypics/basic_upload.php @@ -0,0 +1,104 @@ +access_id; + +$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); +if (!$maxfilesize) { + $maxfilesize = 5; +} + +$quota = get_plugin_setting('quota','tidypics'); +if ($quota) { + $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); + $image_repo_size = (int)$image_repo_size_md->value; + $image_repo_size = $image_repo_size / 1024 / 1024; + $quote_percentage = round(100 * ($image_repo_size / $quota)); + // for small quotas, so one decimal place + if ($quota < 10) { + $image_repo_size = sprintf('%.1f', $image_repo_size); + } else { + $image_repo_size = round($image_repo_size); + } + if ($image_repo_size > $quota) { + $image_repo_size = $quota; + } +} + +?> +
      +
      + +

      +
      +
      + +
      + +

      +
      +
      ...
      +
      +
        + ' . elgg_view("input/file",array('internalname' => "upload_$x")) . ''; + } + ?> +
      +

      +

      + guid . '" />'; + } + if ($access_id) { + echo ''; + } + ?> + " onclick="displayProgress();" /> +

      + +
      + \ No newline at end of file diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php deleted file mode 100644 index 4a7a05c0c..000000000 --- a/views/default/tidypics/forms/ajax_upload.php +++ /dev/null @@ -1,137 +0,0 @@ -salt); - -$basic_uploader_url = current_page_url() . '/basic'; -$upload_endpoint_url = "{$vars['url']}action/tidypics/ajax_upload/"; -$upload_complete_url = "{$vars['url']}action/tidypics/ajax_upload_complete/"; - -$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); -if (!$maxfilesize) { - $maxfilesize = 5; -} - -$quota = get_plugin_setting('quota','tidypics'); -if ($quota) { - $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); - $image_repo_size = (int)$image_repo_size_md->value; - $image_repo_size = $image_repo_size / 1024 / 1024; - $quote_percentage = round(100 * ($image_repo_size / $quota)); - // for small quotas, so one decimal place - if ($quota < 10) { - $image_repo_size = sprintf('%.1f', $image_repo_size); - } else { - $image_repo_size = round($image_repo_size); - } - if ($image_repo_size > $quota) { - $image_repo_size = $quota; - } -} - -?> - -
      - -

      - - -
      - - - diff --git a/views/default/tidypics/forms/setupFlickr.php b/views/default/tidypics/forms/setupFlickr.php deleted file mode 100644 index 6c461176d..000000000 --- a/views/default/tidypics/forms/setupFlickr.php +++ /dev/null @@ -1,45 +0,0 @@ -guid, "flickr_username" ); -$flickr_album_id = get_metadata_byname( $user->guid, "flickr_album_id" ); - -$action = $vars['url'] . 'admin/action/tidypics/flickrSetup'; - -$form_body = "

      ". elgg_echo( 'flickr:intro' ) . "

      "; -$form_body .= elgg_echo( 'flickr:usernamesetup') . "
      "; -$form_body .= ""; - -$albums = elgg_get_entities(array( - "type=" => "object", - "subtype" => "album", - "owner_guid" => $user->guid, -)); -$options = array( 0 => elgg_echo( 'flickr:selectalbum' )); -foreach( $albums as $album ) { - $title = $album->title; - switch( $album->access_id ) { - case ACCESS_PRIVATE: - $title .= " (" . elgg_echo( 'private' ) . ")"; - break; - case ACCESS_PUBLIC: - $title .= " (" . elgg_echo( 'public' ) . ")"; - break; - default: - $title .= " (no known permission set)"; - break; - } - $options[$album->guid] = $title; -} - -$form_body .= "
      " . elgg_echo( 'flickr:albumdesc' ); -$form_body .= elgg_view('input/pulldown', array('internalname' => 'album_id', - 'options_values' => $options, - 'value' => $flickr_album_id->value )); -$form_body .= "
      "; -$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))); - -flickr_menu(); - -echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php deleted file mode 100644 index 8bbda08b3..000000000 --- a/views/default/tidypics/forms/upload.php +++ /dev/null @@ -1,103 +0,0 @@ -access_id; - -$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); -if (!$maxfilesize) { - $maxfilesize = 5; -} - -$quota = get_plugin_setting('quota','tidypics'); -if ($quota) { - $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); - $image_repo_size = (int)$image_repo_size_md->value; - $image_repo_size = $image_repo_size / 1024 / 1024; - $quote_percentage = round(100 * ($image_repo_size / $quota)); - // for small quotas, so one decimal place - if ($quota < 10) { - $image_repo_size = sprintf('%.1f', $image_repo_size); - } else { - $image_repo_size = round($image_repo_size); - } - if ($image_repo_size > $quota) { - $image_repo_size = $quota; - } -} - -?> -

      -
      - -

      -
      -
      - -
      - -

      -
      -
      ...
      -
      -
        - ' . elgg_view("input/file",array('internalname' => "upload_$x")) . ''; - } - ?> -
      -

      -

      - guid . '" />'; - } - if ($access_id) { - echo ''; - } - ?> - " onclick="displayProgress();" /> -

      - "{$vars['url']}action/tidypics/upload", - 'body' => $form_body, - 'internalid' => 'tidypicsUpload', - 'enctype' => 'multipart/form-data', - 'method' => 'post',) -); -?> -
      - \ No newline at end of file -- cgit v1.2.3 From 30fe751219cd087eabcd0c880015c2d71f8186e1 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Thu, 10 Nov 2011 07:06:54 -0500 Subject: removed flickr integration --- actions/admin/flickrSetup.php | 36 - actions/flickrImportPhotoset.php | 337 ---- languages/en.php | 20 +- lib/phpFlickr/PEAR/DB.php | 1388 ----------------- lib/phpFlickr/PEAR/DB/common.php | 2157 -------------------------- lib/phpFlickr/PEAR/DB/mysql.php | 1034 ------------ lib/phpFlickr/PEAR/DB/pgsql.php | 1097 ------------- lib/phpFlickr/PEAR/DB/storage.php | 504 ------ lib/phpFlickr/PEAR/HTTP/Request.php | 1484 ------------------ lib/phpFlickr/PEAR/HTTP/Request/Listener.php | 106 -- lib/phpFlickr/PEAR/Net/Socket.php | 528 ------- lib/phpFlickr/PEAR/Net/URL.php | 410 ----- lib/phpFlickr/PEAR/PEAR.php | 1108 ------------- lib/phpFlickr/README.txt | 215 --- lib/phpFlickr/auth.php | 37 - lib/phpFlickr/example.php | 30 - lib/phpFlickr/getToken.php | 19 - lib/phpFlickr/phpFlickr.php | 1453 ----------------- start.php | 13 - 19 files changed, 1 insertion(+), 11975 deletions(-) delete mode 100644 actions/admin/flickrSetup.php delete mode 100644 actions/flickrImportPhotoset.php delete mode 100644 lib/phpFlickr/PEAR/DB.php delete mode 100644 lib/phpFlickr/PEAR/DB/common.php delete mode 100644 lib/phpFlickr/PEAR/DB/mysql.php delete mode 100644 lib/phpFlickr/PEAR/DB/pgsql.php delete mode 100644 lib/phpFlickr/PEAR/DB/storage.php delete mode 100644 lib/phpFlickr/PEAR/HTTP/Request.php delete mode 100644 lib/phpFlickr/PEAR/HTTP/Request/Listener.php delete mode 100644 lib/phpFlickr/PEAR/Net/Socket.php delete mode 100644 lib/phpFlickr/PEAR/Net/URL.php delete mode 100644 lib/phpFlickr/PEAR/PEAR.php delete mode 100644 lib/phpFlickr/README.txt delete mode 100644 lib/phpFlickr/auth.php delete mode 100644 lib/phpFlickr/example.php delete mode 100644 lib/phpFlickr/getToken.php delete mode 100644 lib/phpFlickr/phpFlickr.php diff --git a/actions/admin/flickrSetup.php b/actions/admin/flickrSetup.php deleted file mode 100644 index 1eaf9a037..000000000 --- a/actions/admin/flickrSetup.php +++ /dev/null @@ -1,36 +0,0 @@ -people_findByUsername( $flickr_username ); - if( !empty( $flickr_user["id"] )) { - create_metadata( $user->guid, "flickr_username", $flickr_username, "text", $user->guid, ACCESS_PUBLIC ); - create_metadata( $user->guid, "flickr_id", $flickr_user["id"], "text", $user->guid, ACCESS_PUBLIC ); - if( $album_id ) { - create_metadata( $user->guid, "flickr_album_id", $album_id, "text", $user->guid, ACCESS_PUBLIC ); - $album = get_entity( $album_id ); - } - - system_message( sprintf( elgg_echo( 'flickr:savedusername' ), $flickr_username )); - system_message( sprintf( elgg_echo( 'flickr:saveduserid' ), $flickr_user["id"] )); - system_message( sprintf( elgg_echo( 'flickr:savedalbum' ), $album->title )); - } else { - register_error( sprintf( elgg_echo( 'flickr:errorusername' ), $flickr_username )); - } -} - -forward($_SERVER['HTTP_REFERER']); -//echo "
      "; var_dump( array($flickr_username, $return_url )); echo "
      "; diff --git a/actions/flickrImportPhotoset.php b/actions/flickrImportPhotoset.php deleted file mode 100644 index c92e5c795..000000000 --- a/actions/flickrImportPhotoset.php +++ /dev/null @@ -1,337 +0,0 @@ -guid, "flickr_id" ); - -if( empty( $flickr_id )) { - register_error( elgg_echo( 'flickr:errorusername2' )); - forward( $return_url ); - die; //just in case -} - -// Get the friendly URL of the user's photos -$photos_url = $f->urls_getUserPhotos( $flickr_id->value ); -$photos = $f->photosets_getPhotos( $set_id, null, null, 10, $page_pp ); - -$photos_to_upload = array(); -foreach ($photos["photoset"]["photo"] as $photo) { - - //check if we already have this image - $meta = get_metadata_byname( $user->guid, $photo["id"] ); - if ($meta->value == 1) { //we've downloaded this already - register_error( elgg_echo( 'flickr:errorimageimport' )); - continue; - } - //store this so we don't download the same photo multiple times - create_metadata( $user->guid, $photo["id"], "1", "text", $user->guid, ACCESS_PUBLIC ); - - $photo_info = $f->photos_getInfo( $photo["id"], $photo["secret"] ); - $tags = array(); - foreach ($photo_info["tags"]["tag"] as $tag) { - $tags[] = $tag["raw"]; - } - $tags = implode( ", ", $tags ); - - $image_url = $f->buildPhotoURL( $photo ); - $photos_to_upload[ $photo_info["id"] . ".jpg" ] = array( "url"=> $image_url, "tags" => $tags, "title" => $photo_info["title"], "description" => $photo_info["description"], "flickr_page" => "$photos_url$photo[id]" ); - - $body .= "
      "; - $body .= "$photo_info[title]
      Views: $photo_info[views]
      "; - $body .= ""; - $body .= "$photo[title]"; - $body .= ""; -} -// echo "
      "; var_dump( $photos_to_upload );; die;
-
-/**
- * Elgg multi-image uploader action
-* 
-* This will upload up to 10 images at at time to an album
- */
-
-global $CONFIG;
-include dirname(dirname(__FILE__)) . "/lib/resize.php";
-include dirname(dirname(__FILE__)) . "/lib/exif.php";
-
-// Make sure we're logged in 
-gatekeeper();
-
-// Get common variables
-$access_id = (int) get_input("access_id");
-$container_guid = (int) get_input('container_guid', 0);
-$container_guid = intval ($album_id);
-
-$album = get_entity($container_guid);
-
-$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); 
-if (!$maxfilesize)
-	$maxfilesize = 5; // default to 5 MB if not set 
-$maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs
-
-$quota = get_plugin_setting('quota','tidypics');
-$quota = 1024 * 1024 * $quota;
-$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
-$image_repo_size = (int)$image_repo_size_md->value;
-
-$image_lib = get_plugin_setting('image_lib', 'tidypics');
-if (!$image_lib)
-	$image_lib = "GD";
-
-/*
-// post limit exceeded
-if (count($_FILES) == 0) {
-	trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
-	register_error(elgg_echo('tidypics:exceedpostlimit'));
-	forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
-}
-*/
-
-/*
-// test to make sure at least 1 image was selected by user
-$num_images = 0;
-foreach($_FILES as $key => $sent_file) {
-	if (!empty($sent_file['name']))
-		$num_images++;
-}
-*/
-if ( count( $photos_to_upload ) == 0 ) {
-	// have user try again
-	register_error(elgg_echo('tidypics:noimages'));
-	forward(get_input('forward_url', $_SERVER['HTTP_REFERER']));
-	die; //just in case
-}
-
-$uploaded_images = array();
-$not_uploaded = array();
-$error_msgs = array();
-
-$img_river_view = get_plugin_setting('img_river_view', 'tidypics');
-
-/*
-$accepted_formats = array(
-							'image/jpeg',
-							'image/png',
-							'image/gif',
-							'image/pjpeg',
-							'image/x-png',
-							);
-
-*/
-//foreach($_FILES as $key => $sent_file) {
-foreach( $photos_to_upload as $name => $photo ) {
-
-/*	
-	// skip empty entries 
-	if (empty($sent_file['name']))
-		continue;
-	
-	$name = $sent_file['name'];
-	$mime = $sent_file['type'];
-
-	if ($sent_file['error']) {
-		array_push($not_uploaded, $sent_file['name']);
-		if ($sent_file['error'] == 1) {
-			trigger_error('Tidypics warning: image exceed server php upload limit', E_USER_WARNING);
-			array_push($error_msgs, elgg_echo('tidypics:image_mem'));
-		}
-		else {
-			array_push($error_msgs, elgg_echo('tidypics:unk_error'));
-		}
-		continue;
-	}
-	
-	//make sure file is an image
-	if (!in_array($mime, $accepted_formats)) {
-		array_push($not_uploaded, $sent_file['name']);
-		array_push($error_msgs, elgg_echo('tidypics:not_image'));
-		continue;
-	}
-
-*/
-/* I'm not going to check filesize here because flickr has already resized it for me 
-	// check quota
-	if ($quota) {
-		if ($image_repo_size + $sent_file['size'] > $quota) {
-			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
-			continue;
-		}
-	}
-	
-	// make sure file does not exceed memory limit
-	if ($sent_file['size'] > $maxfilesize) {
-		array_push($not_uploaded, $sent_file['name']);
-		array_push($error_msgs, elgg_echo('tidypics:image_mem'));
-		continue;
-	}
-	
-	// make sure the in memory image size does not exceed memory available - GD only
-	$imginfo = getimagesize($sent_file['tmp_name']);
-	$mem_avail = ini_get('memory_limit');
-	$mem_avail = rtrim($mem_avail, 'M');
-	$mem_avail = $mem_avail * 1024 * 1024;
-	if ($image_lib == 'GD') {
-		$mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);
-		
-		$mem_used = memory_get_usage();
-			
-		$mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer
-		if ($mem_required > $mem_avail) {
-			array_push($not_uploaded, $sent_file['name']);
-			array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
-			trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
-			continue;
-		}
-	} else if ($image_lib == 'ImageMagickPHP') {
-		// haven't been able to determine a limit like there is for GD
-	}
-*/
-	$mime = "image/jpeg"; //not sure how to get this from the file if we aren't posting it
-	
-	//this will save to users folder in /image/ and organize by photo album
-	$prefix = "image/" . $container_guid . "/";
-	$file = new ElggFile();
-	$filestorename = elgg_strtolower(time().$name);
-	$file->setFilename($prefix.$filestorename . ".jpg"); //that's all flickr stores so I think this is safe
-	$file->setMimeType($mime);
-	$file->originalfilename = $name;
-	$file->subtype="image";
-	$file->simpletype="image";
-	$file->access_id = $access_id;
-	if ($container_guid) {
-		$file->container_guid = $container_guid;
-	}
-
-	// get the file from flickr and save it locally
-	$filename = $file->getFilenameOnFilestore(); 
-	$destination=fopen($filename,"w");
-	$source=fopen($photo["url"],"r");
-
-	while ($a=fread($source,1024)) fwrite($destination,$a);
-	fclose($source);
-	fclose($destination);
-
-	/*
-	$file->open("write");
-	$file->write();
-	$file->write(get_uploaded_file($key));
-	$file->close();
-	*/	
-	$result = $file->save();
-
-	if (!$result) {
-		array_push($not_uploaded, $sent_file['name']);
-		array_push($error_msgs, elgg_echo('tidypics:save_error'));
-		continue;
-	}
-	
-	//add tags
-	create_metadata( $file->guid, "tags", $photo["tags"], "text", $user->guid, ACCESS_PUBLIC );
-	
-	//add title and description
-	create_object_entity( $file->guid, $photo["title"], $photo["description"] );
-	
-	//get and store the exif data
-	td_get_exif($file);
-	
-	// resize photos to create thumbnails
-	if ($image_lib == 'ImageMagick') { // ImageMagick command line
-		
-		if (tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
-		}
-		
-	} else if ($image_lib == 'ImageMagickPHP') {  // imagick php extension 
-		
-		if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
-		}
-	
-	} else { 
-		
-		if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {
-			trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
-		}
-		
-	} // end of image library selector
-
-	//keep one file handy so we can add a notice to the river if single image option selected
-	if(!$file_for_river) {
-		$file_for_river = $file;
-	}
-
-	array_push($uploaded_images, $file->guid);
-
-	// update user/group size for checking quota
-	$image_repo_size += $sent_file['size'];
-
-	// successful upload so check if this is a new album and throw river event/notification if so
-	if ($album->new_album == TP_NEW_ALBUM) {
-		$album->new_album = TP_OLD_ALBUM;
-
-		// we throw the notification manually here so users are not told about the new album until there
-		// is at least a few photos in it
-		object_notifications('create', 'object', $album);
-		
-		add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
-	}
-
-	if ($img_river_view == "all") {
-		add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
-	}
-	unset($file);  // may not be needed but there seems to be a memory leak
-
-} //end of for loop
-			
-if (count($not_uploaded) > 0) {
-	if (count($uploaded_images) > 0)
-		$error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images))  . '
      ';
-	else
-		$error = elgg_echo("tidypics:completeuploadfailure") . '
      ';
-
-	$num_failures = count($not_uploaded);
-	for ($i = 0; $i < $num_failures; $i++) {
-		$error .= "{$not_uploaded[$i]}: {$error_msgs[$i]} 
      ";
-	}
-	register_error($error);
-	
-	if (count($uploaded_images) == 0)
-		forward(get_input('forward_url', $_SERVER['HTTP_REFERER'])); //upload failed, so forward to previous page
-	else {
-		// some images did upload so we fall through
-	}
-} else {
-		system_message(elgg_echo('tidypics:upl_success'));
-}
-
-if (count($uploaded_images) && $img_river_view == "1") {
-	if (function_exists('add_to_river')) {
-		add_to_river('river/object/image/create', 'create', $file_for_river->getObjectOwnerGUID(), $file_for_river->getGUID());
-	}
-}
-
-// update image repo size
-create_metadata($album->container_guid, "image_repo_size", $image_repo_size, 'integer', $album->container_guid);
-
-// plugins can register to be told when a Tidypics album has had images added
-trigger_elgg_event('upload', 'tp_album', $album);
-
-//forward to multi-image edit page
-
-$url = $CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images);
-forward($url); 
diff --git a/languages/en.php b/languages/en.php
index 4213e0b6a..8bc66a5f6 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -48,16 +48,6 @@ $english = array(
 			'tidypics:nophotosingroup' => 'This groups does not have any photos yet',
 			'tidypics:upgrade' => 'Upgrade',
 			'tidypics:sort' => 'Sorting the %s album',
-
-			'flickr:setup' => 'Flickr Setup',
-			'flickr:usernamesetup' => 'Please enter your Flickr username here:',
-			'flickr:selectalbum' => 'Select album to import photos into',
-			'flickr:albumdesc' => 'Album to import photos to:',
-			'flickr:importmanager' => 'Photoset Import Manager',
-			'flickr:desc' => 'Click on the set you wish to import into this site.
      Copies of the photos will be made and stored on this site where they can be viewed and commented on.',
-			'flickr:intro' => 'Flickr Integration allows you to import photos from your flickr account into this Elgg site. By entering your username and choosing an album to import into, you can begin the process. 
      When you have saved your username and album selection, click on the Import Flickr Photos link to the left to select which Flickr set you would like to import photos from.',
-			'flickr:menusetup' => 'Flickr Setup',
-			'flickr:menuimport' => 'Import Flickr Photos',
 			
 		//settings
 			'tidypics:settings' => 'Settings',
@@ -188,10 +178,6 @@ The photo can be viewed here: %s",
 			'tidypics:settings:save:ok' => 'Successfully saved the Tidypics plugin settings',
 			'tidypics:album:sorted' => 'The album %s is sorted',
 			'tidypics:upgrade:success' => 'Upgrade of Tidypics a success',
-			'flickr:enterusername' => 'You must enter a username',
-			'flickr:savedusername' => 'Successfully saved username of %s',
-			'flickr:saveduserid' => 'Successfully saved userid of %s',
-			'flickr:savedalbum' => 'Album saved - %s',
 
 		//Error messages
 			'tidypics:baduploadform' => "There was an error with the upload form",
@@ -214,11 +200,7 @@ The photo can be viewed here: %s",
 			'album:uploadfailed' => "Sorry; we could not save your album.",
 			'album:deletefailed' => "Your album could not be deleted.",
 			'album:blank' => "Please give this album a title and description.",
-			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed",
-			'flickr:errorusername' => 'Username %s not found on Flickr',
-			'flickr:errorusername2' => 'You must enter a username',
-			'flickr:errorimageimport' => 'This image has already been imported',
-			'flickr:errornoalbum' => "No album selected.  Please choose and save an album: %s" 
+			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed", 
 );
 
 add_translation("en", $english);
diff --git a/lib/phpFlickr/PEAR/DB.php b/lib/phpFlickr/PEAR/DB.php
deleted file mode 100644
index a3eede070..000000000
--- a/lib/phpFlickr/PEAR/DB.php
+++ /dev/null
@@ -1,1388 +0,0 @@
-
- * @author     Tomas V.V.Cox 
- * @author     Daniel Convissor 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: DB.php 32 2005-08-01 06:21:02Z dancoulter $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the PEAR class so it can be extended from
- */
-require_once 'PEAR.php';
-
-
-// {{{ constants
-// {{{ error codes
-
-/**#@+
- * One of PEAR DB's portable error codes.
- * @see DB_common::errorCode(), DB::errorMessage()
- *
- * {@internal If you add an error code here, make sure you also add a textual
- * version of it in DB::errorMessage().}}
- */
-
-/**
- * The code returned by many methods upon success
- */
-define('DB_OK', 1);
-
-/**
- * Unkown error
- */
-define('DB_ERROR', -1);
-
-/**
- * Syntax error
- */
-define('DB_ERROR_SYNTAX', -2);
-
-/**
- * Tried to insert a duplicate value into a primary or unique index
- */
-define('DB_ERROR_CONSTRAINT', -3);
-
-/**
- * An identifier in the query refers to a non-existant object
- */
-define('DB_ERROR_NOT_FOUND', -4);
-
-/**
- * Tried to create a duplicate object
- */
-define('DB_ERROR_ALREADY_EXISTS', -5);
-
-/**
- * The current driver does not support the action you attempted
- */
-define('DB_ERROR_UNSUPPORTED', -6);
-
-/**
- * The number of parameters does not match the number of placeholders
- */
-define('DB_ERROR_MISMATCH', -7);
-
-/**
- * A literal submitted did not match the data type expected
- */
-define('DB_ERROR_INVALID', -8);
-
-/**
- * The current DBMS does not support the action you attempted
- */
-define('DB_ERROR_NOT_CAPABLE', -9);
-
-/**
- * A literal submitted was too long so the end of it was removed
- */
-define('DB_ERROR_TRUNCATED', -10);
-
-/**
- * A literal number submitted did not match the data type expected
- */
-define('DB_ERROR_INVALID_NUMBER', -11);
-
-/**
- * A literal date submitted did not match the data type expected
- */
-define('DB_ERROR_INVALID_DATE', -12);
-
-/**
- * Attempt to divide something by zero
- */
-define('DB_ERROR_DIVZERO', -13);
-
-/**
- * A database needs to be selected
- */
-define('DB_ERROR_NODBSELECTED', -14);
-
-/**
- * Could not create the object requested
- */
-define('DB_ERROR_CANNOT_CREATE', -15);
-
-/**
- * Could not drop the database requested because it does not exist
- */
-define('DB_ERROR_CANNOT_DROP', -17);
-
-/**
- * An identifier in the query refers to a non-existant table
- */
-define('DB_ERROR_NOSUCHTABLE', -18);
-
-/**
- * An identifier in the query refers to a non-existant column
- */
-define('DB_ERROR_NOSUCHFIELD', -19);
-
-/**
- * The data submitted to the method was inappropriate
- */
-define('DB_ERROR_NEED_MORE_DATA', -20);
-
-/**
- * The attempt to lock the table failed
- */
-define('DB_ERROR_NOT_LOCKED', -21);
-
-/**
- * The number of columns doesn't match the number of values
- */
-define('DB_ERROR_VALUE_COUNT_ON_ROW', -22);
-
-/**
- * The DSN submitted has problems
- */
-define('DB_ERROR_INVALID_DSN', -23);
-
-/**
- * Could not connect to the database
- */
-define('DB_ERROR_CONNECT_FAILED', -24);
-
-/**
- * The PHP extension needed for this DBMS could not be found
- */
-define('DB_ERROR_EXTENSION_NOT_FOUND',-25);
-
-/**
- * The present user has inadequate permissions to perform the task requestd
- */
-define('DB_ERROR_ACCESS_VIOLATION', -26);
-
-/**
- * The database requested does not exist
- */
-define('DB_ERROR_NOSUCHDB', -27);
-
-/**
- * Tried to insert a null value into a column that doesn't allow nulls
- */
-define('DB_ERROR_CONSTRAINT_NOT_NULL',-29);
-/**#@-*/
-
-
-// }}}
-// {{{ prepared statement-related
-
-
-/**#@+
- * Identifiers for the placeholders used in prepared statements.
- * @see DB_common::prepare()
- */
-
-/**
- * Indicates a scalar (?) placeholder was used
- *
- * Quote and escape the value as necessary.
- */
-define('DB_PARAM_SCALAR', 1);
-
-/**
- * Indicates an opaque (&) placeholder was used
- *
- * The value presented is a file name.  Extract the contents of that file
- * and place them in this column.
- */
-define('DB_PARAM_OPAQUE', 2);
-
-/**
- * Indicates a misc (!) placeholder was used
- *
- * The value should not be quoted or escaped.
- */
-define('DB_PARAM_MISC',   3);
-/**#@-*/
-
-
-// }}}
-// {{{ binary data-related
-
-
-/**#@+
- * The different ways of returning binary data from queries.
- */
-
-/**
- * Sends the fetched data straight through to output
- */
-define('DB_BINMODE_PASSTHRU', 1);
-
-/**
- * Lets you return data as usual
- */
-define('DB_BINMODE_RETURN', 2);
-
-/**
- * Converts the data to hex format before returning it
- *
- * For example the string "123" would become "313233".
- */
-define('DB_BINMODE_CONVERT', 3);
-/**#@-*/
-
-
-// }}}
-// {{{ fetch modes
-
-
-/**#@+
- * Fetch Modes.
- * @see DB_common::setFetchMode()
- */
-
-/**
- * Indicates the current default fetch mode should be used
- * @see DB_common::$fetchmode
- */
-define('DB_FETCHMODE_DEFAULT', 0);
-
-/**
- * Column data indexed by numbers, ordered from 0 and up
- */
-define('DB_FETCHMODE_ORDERED', 1);
-
-/**
- * Column data indexed by column names
- */
-define('DB_FETCHMODE_ASSOC', 2);
-
-/**
- * Column data as object properties
- */
-define('DB_FETCHMODE_OBJECT', 3);
-
-/**
- * For multi-dimensional results, make the column name the first level
- * of the array and put the row number in the second level of the array
- *
- * This is flipped from the normal behavior, which puts the row numbers
- * in the first level of the array and the column names in the second level.
- */
-define('DB_FETCHMODE_FLIPPED', 4);
-/**#@-*/
-
-/**#@+
- * Old fetch modes.  Left here for compatibility.
- */
-define('DB_GETMODE_ORDERED', DB_FETCHMODE_ORDERED);
-define('DB_GETMODE_ASSOC',   DB_FETCHMODE_ASSOC);
-define('DB_GETMODE_FLIPPED', DB_FETCHMODE_FLIPPED);
-/**#@-*/
-
-
-// }}}
-// {{{ tableInfo() && autoPrepare()-related
-
-
-/**#@+
- * The type of information to return from the tableInfo() method.
- *
- * Bitwised constants, so they can be combined using |
- * and removed using ^.
- *
- * @see DB_common::tableInfo()
- *
- * {@internal Since the TABLEINFO constants are bitwised, if more of them are
- * added in the future, make sure to adjust DB_TABLEINFO_FULL accordingly.}}
- */
-define('DB_TABLEINFO_ORDER', 1);
-define('DB_TABLEINFO_ORDERTABLE', 2);
-define('DB_TABLEINFO_FULL', 3);
-/**#@-*/
-
-
-/**#@+
- * The type of query to create with the automatic query building methods.
- * @see DB_common::autoPrepare(), DB_common::autoExecute()
- */
-define('DB_AUTOQUERY_INSERT', 1);
-define('DB_AUTOQUERY_UPDATE', 2);
-/**#@-*/
-
-
-// }}}
-// {{{ portability modes
-
-
-/**#@+
- * Portability Modes.
- *
- * Bitwised constants, so they can be combined using |
- * and removed using ^.
- *
- * @see DB_common::setOption()
- *
- * {@internal Since the PORTABILITY constants are bitwised, if more of them are
- * added in the future, make sure to adjust DB_PORTABILITY_ALL accordingly.}}
- */
-
-/**
- * Turn off all portability features
- */
-define('DB_PORTABILITY_NONE', 0);
-
-/**
- * Convert names of tables and fields to lower case
- * when using the get*(), fetch*() and tableInfo() methods
- */
-define('DB_PORTABILITY_LOWERCASE', 1);
-
-/**
- * Right trim the data output by get*() and fetch*()
- */
-define('DB_PORTABILITY_RTRIM', 2);
-
-/**
- * Force reporting the number of rows deleted
- */
-define('DB_PORTABILITY_DELETE_COUNT', 4);
-
-/**
- * Enable hack that makes numRows() work in Oracle
- */
-define('DB_PORTABILITY_NUMROWS', 8);
-
-/**
- * Makes certain error messages in certain drivers compatible
- * with those from other DBMS's
- *
- * + mysql, mysqli:  change unique/primary key constraints
- *   DB_ERROR_ALREADY_EXISTS -> DB_ERROR_CONSTRAINT
- *
- * + odbc(access):  MS's ODBC driver reports 'no such field' as code
- *   07001, which means 'too few parameters.'  When this option is on
- *   that code gets mapped to DB_ERROR_NOSUCHFIELD.
- */
-define('DB_PORTABILITY_ERRORS', 16);
-
-/**
- * Convert null values to empty strings in data output by
- * get*() and fetch*()
- */
-define('DB_PORTABILITY_NULL_TO_EMPTY', 32);
-
-/**
- * Turn on all portability features
- */
-define('DB_PORTABILITY_ALL', 63);
-/**#@-*/
-
-// }}}
-
-
-// }}}
-// {{{ class DB
-
-/**
- * Database independent query interface
- *
- * The main "DB" class is simply a container class with some static
- * methods for creating DB objects as well as some utility functions
- * common to all parts of DB.
- *
- * The object model of DB is as follows (indentation means inheritance):
- * 
      - * DB           The main DB class.  This is simply a utility class
- *              with some "static" methods for creating DB objects as
- *              well as common utility functions for other DB classes.
- *
- * DB_common    The base for each DB implementation.  Provides default
- * |            implementations (in OO lingo virtual methods) for
- * |            the actual DB implementations as well as a bunch of
- * |            query utility functions.
- * |
- * +-DB_mysql   The DB implementation for MySQL.  Inherits DB_common.
- *              When calling DB::factory or DB::connect for MySQL
- *              connections, the object returned is an instance of this
- *              class.
- * 
      
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken 
- * @author     Tomas V.V.Cox 
- * @author     Daniel Convissor 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/DB
- */
-class DB
-{
-    // {{{ &factory()
-
-    /**
-     * Create a new DB object for the specified database type but don't
-     * connect to the database
-     *
-     * @param string $type     the database type (eg "mysql")
-     * @param array  $options  an associative array of option names and values
-     *
-     * @return object  a new DB object.  A DB_Error object on failure.
-     *
-     * @see DB_common::setOption()
-     */
-    function &factory($type, $options = false)
-    {
-        if (!is_array($options)) {
-            $options = array('persistent' => $options);
-        }
-
-        if (isset($options['debug']) && $options['debug'] >= 2) {
-            // expose php errors with sufficient debug level
-            include_once "DB/{$type}.php";
-        } else {
-            @include_once "DB/{$type}.php";
-        }
-
-        $classname = "DB_${type}";
-
-        if (!class_exists($classname)) {
-            $tmp = PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null,
-                                    "Unable to include the DB/{$type}.php"
-                                    . " file for '$dsn'",
-                                    'DB_Error', true);
-            return $tmp;
-        }
-
-        @$obj =& new $classname;
-
-        foreach ($options as $option => $value) {
-            $test = $obj->setOption($option, $value);
-            if (DB::isError($test)) {
-                return $test;
-            }
-        }
-
-        return $obj;
-    }
-
-    // }}}
-    // {{{ &connect()
-
-    /**
-     * Create a new DB object including a connection to the specified database
-     *
-     * Example 1.
-     * 
-     * require_once 'DB.php';
-     *
-     * $dsn = 'pgsql://user:password@host/database';
-     * $options = array(
-     *     'debug'       => 2,
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     *
-     * $db =& DB::connect($dsn, $options);
-     * if (PEAR::isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * 
-     *
-     * @param mixed $dsn      the string "data source name" or array in the
-     *                         format returned by DB::parseDSN()
-     * @param array $options  an associative array of option names and values
-     *
-     * @return object  a new DB object.  A DB_Error object on failure.
-     *
-     * @uses DB_dbase::connect(), DB_fbsql::connect(), DB_ibase::connect(),
-     *       DB_ifx::connect(), DB_msql::connect(), DB_mssql::connect(),
-     *       DB_mysql::connect(), DB_mysqli::connect(), DB_oci8::connect(),
-     *       DB_odbc::connect(), DB_pgsql::connect(), DB_sqlite::connect(),
-     *       DB_sybase::connect()
-     *
-     * @uses DB::parseDSN(), DB_common::setOption(), PEAR::isError()
-     */
-    function &connect($dsn, $options = array())
-    {
-        $dsninfo = DB::parseDSN($dsn);
-        $type = $dsninfo['phptype'];
-
-        if (!is_array($options)) {
-            /*
-             * For backwards compatibility.  $options used to be boolean,
-             * indicating whether the connection should be persistent.
-             */
-            $options = array('persistent' => $options);
-        }
-
-        if (isset($options['debug']) && $options['debug'] >= 2) {
-            // expose php errors with sufficient debug level
-            include_once "DB/${type}.php";
-        } else {
-            @include_once "DB/${type}.php";
-        }
-
-        $classname = "DB_${type}";
-        if (!class_exists($classname)) {
-            $tmp = PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null,
-                                    "Unable to include the DB/{$type}.php"
-                                    . " file for '$dsn'",
-                                    'DB_Error', true);
-            return $tmp;
-        }
-
-        @$obj =& new $classname;
-
-        foreach ($options as $option => $value) {
-            $test = $obj->setOption($option, $value);
-            if (DB::isError($test)) {
-                return $test;
-            }
-        }
-
-        $err = $obj->connect($dsninfo, $obj->getOption('persistent'));
-        if (DB::isError($err)) {
-            $err->addUserInfo($dsn);
-            return $err;
-        }
-
-        return $obj;
-    }
-
-    // }}}
-    // {{{ apiVersion()
-
-    /**
-     * Return the DB API version
-     *
-     * @return string  the DB API version number
-     */
-    function apiVersion()
-    {
-        return '@package_version@';
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Determines if a variable is a DB_Error object
-     *
-     * @param mixed $value  the variable to check
-     *
-     * @return bool  whether $value is DB_Error object
-     */
-    function isError($value)
-    {
-        return is_a($value, 'DB_Error');
-    }
-
-    // }}}
-    // {{{ isConnection()
-
-    /**
-     * Determines if a value is a DB_ object
-     *
-     * @param mixed $value  the value to test
-     *
-     * @return bool  whether $value is a DB_ object
-     */
-    function isConnection($value)
-    {
-        return (is_object($value) &&
-                is_subclass_of($value, 'db_common') &&
-                method_exists($value, 'simpleQuery'));
-    }
-
-    // }}}
-    // {{{ isManip()
-
-    /**
-     * Tell whether a query is a data manipulation or data definition query
-     *
-     * Examples of data manipulation queries are INSERT, UPDATE and DELETE.
-     * Examples of data definition queries are CREATE, DROP, ALTER, GRANT,
-     * REVOKE.
-     *
-     * @param string $query  the query
-     *
-     * @return boolean  whether $query is a data manipulation query
-     */
-    function isManip($query)
-    {
-        $manips = 'INSERT|UPDATE|DELETE|REPLACE|'
-                . 'CREATE|DROP|'
-                . 'LOAD DATA|SELECT .* INTO|COPY|'
-                . 'ALTER|GRANT|REVOKE|'
-                . 'LOCK|UNLOCK';
-        if (preg_match('/^\s*"?(' . $manips . ')\s+/i', $query)) {
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ errorMessage()
-
-    /**
-     * Return a textual error message for a DB error code
-     *
-     * @param integer $value  the DB error code
-     *
-     * @return string  the error message or false if the error code was
-     *                  not recognized
-     */
-    function errorMessage($value)
-    {
-        static $errorMessages;
-        if (!isset($errorMessages)) {
-            $errorMessages = array(
-                DB_ERROR                    => 'unknown error',
-                DB_ERROR_ACCESS_VIOLATION   => 'insufficient permissions',
-                DB_ERROR_ALREADY_EXISTS     => 'already exists',
-                DB_ERROR_CANNOT_CREATE      => 'can not create',
-                DB_ERROR_CANNOT_DROP        => 'can not drop',
-                DB_ERROR_CONNECT_FAILED     => 'connect failed',
-                DB_ERROR_CONSTRAINT         => 'constraint violation',
-                DB_ERROR_CONSTRAINT_NOT_NULL=> 'null value violates not-null constraint',
-                DB_ERROR_DIVZERO            => 'division by zero',
-                DB_ERROR_EXTENSION_NOT_FOUND=> 'extension not found',
-                DB_ERROR_INVALID            => 'invalid',
-                DB_ERROR_INVALID_DATE       => 'invalid date or time',
-                DB_ERROR_INVALID_DSN        => 'invalid DSN',
-                DB_ERROR_INVALID_NUMBER     => 'invalid number',
-                DB_ERROR_MISMATCH           => 'mismatch',
-                DB_ERROR_NEED_MORE_DATA     => 'insufficient data supplied',
-                DB_ERROR_NODBSELECTED       => 'no database selected',
-                DB_ERROR_NOSUCHDB           => 'no such database',
-                DB_ERROR_NOSUCHFIELD        => 'no such field',
-                DB_ERROR_NOSUCHTABLE        => 'no such table',
-                DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-                DB_ERROR_NOT_FOUND          => 'not found',
-                DB_ERROR_NOT_LOCKED         => 'not locked',
-                DB_ERROR_SYNTAX             => 'syntax error',
-                DB_ERROR_UNSUPPORTED        => 'not supported',
-                DB_ERROR_TRUNCATED          => 'truncated',
-                DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
-                DB_OK                       => 'no error',
-            );
-        }
-
-        if (DB::isError($value)) {
-            $value = $value->getCode();
-        }
-
-        return isset($errorMessages[$value]) ? $errorMessages[$value]
-                     : $errorMessages[DB_ERROR];
-    }
-
-    // }}}
-    // {{{ parseDSN()
-
-    /**
-     * Parse a data source name
-     *
-     * Additional keys can be added by appending a URI query string to the
-     * end of the DSN.
-     *
-     * The format of the supplied DSN is in its fullest form:
-     * 
-     *  phptype(dbsyntax)://username:password@protocol+hostspec/database?option=8&another=true
-     * 
-     *
-     * Most variations are allowed:
-     * 
-     *  phptype://username:password@protocol+hostspec:110//usr/db_file.db?mode=0644
-     *  phptype://username:password@hostspec/database_name
-     *  phptype://username:password@hostspec
-     *  phptype://username@hostspec
-     *  phptype://hostspec/database
-     *  phptype://hostspec
-     *  phptype(dbsyntax)
-     *  phptype
-     * 
-     *
-     * @param string $dsn Data Source Name to be parsed
-     *
-     * @return array an associative array with the following keys:
-     *  + phptype:  Database backend used in PHP (mysql, odbc etc.)
-     *  + dbsyntax: Database used with regards to SQL syntax etc.
-     *  + protocol: Communication protocol to use (tcp, unix etc.)
-     *  + hostspec: Host specification (hostname[:port])
-     *  + database: Database to use on the DBMS server
-     *  + username: User name for login
-     *  + password: Password for login
-     */
-    function parseDSN($dsn)
-    {
-        $parsed = array(
-            'phptype'  => false,
-            'dbsyntax' => false,
-            'username' => false,
-            'password' => false,
-            'protocol' => false,
-            'hostspec' => false,
-            'port'     => false,
-            'socket'   => false,
-            'database' => false,
-        );
-
-        if (is_array($dsn)) {
-            $dsn = array_merge($parsed, $dsn);
-            if (!$dsn['dbsyntax']) {
-                $dsn['dbsyntax'] = $dsn['phptype'];
-            }
-            return $dsn;
-        }
-
-        // Find phptype and dbsyntax
-        if (($pos = strpos($dsn, '://')) !== false) {
-            $str = substr($dsn, 0, $pos);
-            $dsn = substr($dsn, $pos + 3);
-        } else {
-            $str = $dsn;
-            $dsn = null;
-        }
-
-        // Get phptype and dbsyntax
-        // $str => phptype(dbsyntax)
-        if (preg_match('|^(.+?)\((.*?)\)$|', $str, $arr)) {
-            $parsed['phptype']  = $arr[1];
-            $parsed['dbsyntax'] = !$arr[2] ? $arr[1] : $arr[2];
-        } else {
-            $parsed['phptype']  = $str;
-            $parsed['dbsyntax'] = $str;
-        }
-
-        if (!count($dsn)) {
-            return $parsed;
-        }
-
-        // Get (if found): username and password
-        // $dsn => username:password@protocol+hostspec/database
-        if (($at = strrpos($dsn,'@')) !== false) {
-            $str = substr($dsn, 0, $at);
-            $dsn = substr($dsn, $at + 1);
-            if (($pos = strpos($str, ':')) !== false) {
-                $parsed['username'] = rawurldecode(substr($str, 0, $pos));
-                $parsed['password'] = rawurldecode(substr($str, $pos + 1));
-            } else {
-                $parsed['username'] = rawurldecode($str);
-            }
-        }
-
-        // Find protocol and hostspec
-
-        if (preg_match('|^([^(]+)\((.*?)\)/?(.*?)$|', $dsn, $match)) {
-            // $dsn => proto(proto_opts)/database
-            $proto       = $match[1];
-            $proto_opts  = $match[2] ? $match[2] : false;
-            $dsn         = $match[3];
-
-        } else {
-            // $dsn => protocol+hostspec/database (old format)
-            if (strpos($dsn, '+') !== false) {
-                list($proto, $dsn) = explode('+', $dsn, 2);
-            }
-            if (strpos($dsn, '/') !== false) {
-                list($proto_opts, $dsn) = explode('/', $dsn, 2);
-            } else {
-                $proto_opts = $dsn;
-                $dsn = null;
-            }
-        }
-
-        // process the different protocol options
-        $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
-        $proto_opts = rawurldecode($proto_opts);
-        if ($parsed['protocol'] == 'tcp') {
-            if (strpos($proto_opts, ':') !== false) {
-                list($parsed['hostspec'],
-                     $parsed['port']) = explode(':', $proto_opts);
-            } else {
-                $parsed['hostspec'] = $proto_opts;
-            }
-        } elseif ($parsed['protocol'] == 'unix') {
-            $parsed['socket'] = $proto_opts;
-        }
-
-        // Get dabase if any
-        // $dsn => database
-        if ($dsn) {
-            if (($pos = strpos($dsn, '?')) === false) {
-                // /database
-                $parsed['database'] = rawurldecode($dsn);
-            } else {
-                // /database?param1=value1¶m2=value2
-                $parsed['database'] = rawurldecode(substr($dsn, 0, $pos));
-                $dsn = substr($dsn, $pos + 1);
-                if (strpos($dsn, '&') !== false) {
-                    $opts = explode('&', $dsn);
-                } else { // database?param1=value1
-                    $opts = array($dsn);
-                }
-                foreach ($opts as $opt) {
-                    list($key, $value) = explode('=', $opt);
-                    if (!isset($parsed[$key])) {
-                        // don't allow params overwrite
-                        $parsed[$key] = rawurldecode($value);
-                    }
-                }
-            }
-        }
-
-        return $parsed;
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ class DB_Error
-
-/**
- * DB_Error implements a class for reporting portable database error
- * messages
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/DB
- */
-class DB_Error extends PEAR_Error
-{
-    // {{{ constructor
-
-    /**
-     * DB_Error constructor
-     *
-     * @param mixed $code       DB error code, or string with error message
-     * @param int   $mode       what "error mode" to operate in
-     * @param int   $level      what error level to use for $mode &
-     *                           PEAR_ERROR_TRIGGER
-     * @param mixed $debuginfo  additional debug info, such as the last query
-     *
-     * @see PEAR_Error
-     */
-    function DB_Error($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
-                      $level = E_USER_NOTICE, $debuginfo = null)
-    {
-        if (is_int($code)) {
-            $this->PEAR_Error('DB Error: ' . DB::errorMessage($code), $code,
-                              $mode, $level, $debuginfo);
-        } else {
-            $this->PEAR_Error("DB Error: $code", DB_ERROR,
-                              $mode, $level, $debuginfo);
-        }
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ class DB_result
-
-/**
- * This class implements a wrapper for a DB result set
- *
- * A new instance of this class will be returned by the DB implementation
- * after processing a query that returns data.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/DB
- */
-class DB_result
-{
-    // {{{ properties
-
-    /**
-     * Should results be freed automatically when there are no more rows?
-     * @var boolean
-     * @see DB_common::$options
-     */
-    var $autofree;
-
-    /**
-     * A reference to the DB_ object
-     * @var object
-     */
-    var $dbh;
-
-    /**
-     * The current default fetch mode
-     * @var integer
-     * @see DB_common::$fetchmode
-     */
-    var $fetchmode;
-
-    /**
-     * The name of the class into which results should be fetched when
-     * DB_FETCHMODE_OBJECT is in effect
-     *
-     * @var string
-     * @see DB_common::$fetchmode_object_class
-     */
-    var $fetchmode_object_class;
-
-    /**
-     * The number of rows to fetch from a limit query
-     * @var integer
-     */
-    var $limit_count = null;
-
-    /**
-     * The row to start fetching from in limit queries
-     * @var integer
-     */
-    var $limit_from = null;
-
-    /**
-     * The execute parameters that created this result
-     * @var array
-     * @since Property available since Release 1.7.0
-     */
-    var $parameters;
-
-    /**
-     * The query string that created this result
-     *
-     * Copied here incase it changes in $dbh, which is referenced
-     *
-     * @var string
-     * @since Property available since Release 1.7.0
-     */
-    var $query;
-
-    /**
-     * The query result resource id created by PHP
-     * @var resource
-     */
-    var $result;
-
-    /**
-     * The present row being dealt with
-     * @var integer
-     */
-    var $row_counter = null;
-
-    /**
-     * The prepared statement resource id created by PHP in $dbh
-     *
-     * This resource is only available when the result set was created using
-     * a driver's native execute() method, not PEAR DB's emulated one.
-     *
-     * Copied here incase it changes in $dbh, which is referenced
-     *
-     * {@internal  Mainly here because the InterBase/Firebird API is only
-     * able to retrieve data from result sets if the statemnt handle is
-     * still in scope.}}
-     *
-     * @var resource
-     * @since Property available since Release 1.7.0
-     */
-    var $statement;
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor sets the object's properties
-     *
-     * @param object   &$dbh     the DB object reference
-     * @param resource $result   the result resource id
-     * @param array    $options  an associative array with result options
-     *
-     * @return void
-     */
-    function DB_result(&$dbh, $result, $options = array())
-    {
-        $this->autofree    = $dbh->options['autofree'];
-        $this->dbh         = &$dbh;
-        $this->fetchmode   = $dbh->fetchmode;
-        $this->fetchmode_object_class = $dbh->fetchmode_object_class;
-        $this->parameters  = $dbh->last_parameters;
-        $this->query       = $dbh->last_query;
-        $this->result      = $result;
-        $this->statement   = empty($dbh->last_stmt) ? null : $dbh->last_stmt;
-        foreach ($options as $key => $value) {
-            $this->setOption($key, $value);
-        }
-    }
-
-    /**
-     * Set options for the DB_result object
-     *
-     * @param string $key    the option to set
-     * @param mixed  $value  the value to set the option to
-     *
-     * @return void
-     */
-    function setOption($key, $value = null)
-    {
-        switch ($key) {
-            case 'limit_from':
-                $this->limit_from = $value;
-                break;
-            case 'limit_count':
-                $this->limit_count = $value;
-        }
-    }
-
-    // }}}
-    // {{{ fetchRow()
-
-    /**
-     * Fetch a row of data and return it by reference into an array
-     *
-     * The type of array returned can be controlled either by setting this
-     * method's $fetchmode parameter or by changing the default
-     * fetch mode setFetchMode() before calling this method.
-     *
-     * There are two options for standardizing the information returned
-     * from databases, ensuring their values are consistent when changing
-     * DBMS's.  These portability options can be turned on when creating a
-     * new DB object or by using setOption().
-     *
-     *   + DB_PORTABILITY_LOWERCASE
-     *     convert names of fields to lower case
-     *
-     *   + DB_PORTABILITY_RTRIM
-     *     right trim the data
-     *
-     * @param int $fetchmode  the constant indicating how to format the data
-     * @param int $rownum     the row number to fetch (index starts at 0)
-     *
-     * @return mixed  an array or object containing the row's data,
-     *                 NULL when the end of the result set is reached
-     *                 or a DB_Error object on failure.
-     *
-     * @see DB_common::setOption(), DB_common::setFetchMode()
-     */
-    function &fetchRow($fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null)
-    {
-        if ($fetchmode === DB_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->fetchmode;
-        }
-        if ($fetchmode === DB_FETCHMODE_OBJECT) {
-            $fetchmode = DB_FETCHMODE_ASSOC;
-            $object_class = $this->fetchmode_object_class;
-        }
-        if ($this->limit_from !== null) {
-            if ($this->row_counter === null) {
-                $this->row_counter = $this->limit_from;
-                // Skip rows
-                if ($this->dbh->features['limit'] === false) {
-                    $i = 0;
-                    while ($i++ < $this->limit_from) {
-                        $this->dbh->fetchInto($this->result, $arr, $fetchmode);
-                    }
-                }
-            }
-            if ($this->row_counter >= ($this->limit_from + $this->limit_count))
-            {
-                if ($this->autofree) {
-                    $this->free();
-                }
-                $tmp = null;
-                return $tmp;
-            }
-            if ($this->dbh->features['limit'] === 'emulate') {
-                $rownum = $this->row_counter;
-            }
-            $this->row_counter++;
-        }
-        $res = $this->dbh->fetchInto($this->result, $arr, $fetchmode, $rownum);
-        if ($res === DB_OK) {
-            if (isset($object_class)) {
-                // The default mode is specified in the
-                // DB_common::fetchmode_object_class property
-                if ($object_class == 'stdClass') {
-                    $arr = (object) $arr;
-                } else {
-                    $arr = &new $object_class($arr);
-                }
-            }
-            return $arr;
-        }
-        if ($res == null && $this->autofree) {
-            $this->free();
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Fetch a row of data into an array which is passed by reference
-     *
-     * The type of array returned can be controlled either by setting this
-     * method's $fetchmode parameter or by changing the default
-     * fetch mode setFetchMode() before calling this method.
-     *
-     * There are two options for standardizing the information returned
-     * from databases, ensuring their values are consistent when changing
-     * DBMS's.  These portability options can be turned on when creating a
-     * new DB object or by using setOption().
-     *
-     *   + DB_PORTABILITY_LOWERCASE
-     *     convert names of fields to lower case
-     *
-     *   + DB_PORTABILITY_RTRIM
-     *     right trim the data
-     *
-     * @param array &$arr       the variable where the data should be placed
-     * @param int   $fetchmode  the constant indicating how to format the data
-     * @param int   $rownum     the row number to fetch (index starts at 0)
-     *
-     * @return mixed  DB_OK if a row is processed, NULL when the end of the
-     *                 result set is reached or a DB_Error object on failure
-     *
-     * @see DB_common::setOption(), DB_common::setFetchMode()
-     */
-    function fetchInto(&$arr, $fetchmode = DB_FETCHMODE_DEFAULT, $rownum = null)
-    {
-        if ($fetchmode === DB_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->fetchmode;
-        }
-        if ($fetchmode === DB_FETCHMODE_OBJECT) {
-            $fetchmode = DB_FETCHMODE_ASSOC;
-            $object_class = $this->fetchmode_object_class;
-        }
-        if ($this->limit_from !== null) {
-            if ($this->row_counter === null) {
-                $this->row_counter = $this->limit_from;
-                // Skip rows
-                if ($this->dbh->features['limit'] === false) {
-                    $i = 0;
-                    while ($i++ < $this->limit_from) {
-                        $this->dbh->fetchInto($this->result, $arr, $fetchmode);
-                    }
-                }
-            }
-            if ($this->row_counter >= (
-                    $this->limit_from + $this->limit_count))
-            {
-                if ($this->autofree) {
-                    $this->free();
-                }
-                return null;
-            }
-            if ($this->dbh->features['limit'] === 'emulate') {
-                $rownum = $this->row_counter;
-            }
-
-            $this->row_counter++;
-        }
-        $res = $this->dbh->fetchInto($this->result, $arr, $fetchmode, $rownum);
-        if ($res === DB_OK) {
-            if (isset($object_class)) {
-                // default mode specified in the
-                // DB_common::fetchmode_object_class property
-                if ($object_class == 'stdClass') {
-                    $arr = (object) $arr;
-                } else {
-                    $arr = new $object_class($arr);
-                }
-            }
-            return DB_OK;
-        }
-        if ($res == null && $this->autofree) {
-            $this->free();
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Get the the number of columns in a result set
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     */
-    function numCols()
-    {
-        return $this->dbh->numCols($this->result);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Get the number of rows in a result set
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function numRows()
-    {
-        if ($this->dbh->features['numrows'] === 'emulate'
-            && $this->dbh->options['portability'] & DB_PORTABILITY_NUMROWS)
-        {
-            if ($this->dbh->features['prepare']) {
-                $res = $this->dbh->query($this->query, $this->parameters);
-            } else {
-                $res = $this->dbh->query($this->query);
-            }
-            if (DB::isError($res)) {
-                return $res;
-            }
-            $i = 0;
-            while ($res->fetchInto($tmp, DB_FETCHMODE_ORDERED)) {
-                $i++;
-            }
-            return $i;
-        } else {
-            return $this->dbh->numRows($this->result);
-        }
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Get the next result if a batch of queries was executed
-     *
-     * @return bool  true if a new result is available or false if not
-     */
-    function nextResult()
-    {
-        return $this->dbh->nextResult($this->result);
-    }
-
-    // }}}
-    // {{{ free()
-
-    /**
-     * Frees the resources allocated for this result set
-     *
-     * @return bool  true on success.  A DB_Error object on failure.
-     */
-    function free()
-    {
-        $err = $this->dbh->freeResult($this->result);
-        if (DB::isError($err)) {
-            return $err;
-        }
-        $this->result = false;
-        $this->statement = false;
-        return true;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * @see DB_common::tableInfo()
-     * @deprecated Method deprecated some time before Release 1.2
-     */
-    function tableInfo($mode = null)
-    {
-        if (is_string($mode)) {
-            return $this->dbh->raiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-        return $this->dbh->tableInfo($this, $mode);
-    }
-
-    // }}}
-    // {{{ getQuery()
-
-    /**
-     * Determine the query string that created this result
-     *
-     * @return string  the query string
-     *
-     * @since Method available since Release 1.7.0
-     */
-    function getQuery()
-    {
-        return $this->query;
-    }
-
-    // }}}
-    // {{{ getRowCounter()
-
-    /**
-     * Tells which row number is currently being processed
-     *
-     * @return integer  the current row being looked at.  Starts at 1.
-     */
-    function getRowCounter()
-    {
-        return $this->row_counter;
-    }
-
-    // }}}
-}
-
-// }}}
-// {{{ class DB_row
-
-/**
- * PEAR DB Row Object
- *
- * The object contains a row of data from a result set.  Each column's data
- * is placed in a property named for the column.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/DB
- * @see        DB_common::setFetchMode()
- */
-class DB_row
-{
-    // {{{ constructor
-
-    /**
-     * The constructor places a row's data into properties of this object
-     *
-     * @param array  the array containing the row's data
-     *
-     * @return void
-     */
-    function DB_row(&$arr)
-    {
-        foreach ($arr as $key => $value) {
-            $this->$key = &$arr[$key];
-        }
-    }
-
-    // }}}
-}
-
-// }}}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/lib/phpFlickr/PEAR/DB/common.php b/lib/phpFlickr/PEAR/DB/common.php
deleted file mode 100644
index 04e71ff52..000000000
--- a/lib/phpFlickr/PEAR/DB/common.php
+++ /dev/null
@@ -1,2157 +0,0 @@
-
- * @author     Tomas V.V. Cox 
- * @author     Daniel Convissor 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: common.php 32 2005-08-01 06:21:02Z dancoulter $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the PEAR class so it can be extended from
- */
-require_once 'PEAR.php';
-
-/**
- * DB_common is the base class from which each database driver class extends
- *
- * All common methods are declared here.  If a given DBMS driver contains
- * a particular method, that method will overload the one here.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken 
- * @author     Tomas V.V. Cox 
- * @author     Daniel Convissor 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/DB
- */
-class DB_common extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * The current default fetch mode
-     * @var integer
-     */
-    var $fetchmode = DB_FETCHMODE_ORDERED;
-
-    /**
-     * The name of the class into which results should be fetched when
-     * DB_FETCHMODE_OBJECT is in effect
-     *
-     * @var string
-     */
-    var $fetchmode_object_class = 'stdClass';
-
-    /**
-     * Was a connection present when the object was serialized()?
-     * @var bool
-     * @see DB_common::__sleep(), DB_common::__wake()
-     */
-    var $was_connected = null;
-
-    /**
-     * The most recently executed query
-     * @var string
-     */
-    var $last_query = '';
-
-    /**
-     * Run-time configuration options
-     *
-     * The 'optimize' option has been deprecated.  Use the 'portability'
-     * option instead.
-     *
-     * @var array
-     * @see DB_common::setOption()
-     */
-    var $options = array(
-        'result_buffering' => 500,
-        'persistent' => false,
-        'ssl' => false,
-        'debug' => 0,
-        'seqname_format' => '%s_seq',
-        'autofree' => false,
-        'portability' => DB_PORTABILITY_NONE,
-        'optimize' => 'performance',  // Deprecated.  Use 'portability'.
-    );
-
-    /**
-     * The parameters from the most recently executed query
-     * @var array
-     * @since Property available since Release 1.7.0
-     */
-    var $last_parameters = array();
-
-    /**
-     * The elements from each prepared statement
-     * @var array
-     */
-    var $prepare_tokens = array();
-
-    /**
-     * The data types of the various elements in each prepared statement
-     * @var array
-     */
-    var $prepare_types = array();
-
-    /**
-     * The prepared queries
-     * @var array
-     */
-    var $prepared_queries = array();
-
-
-    // }}}
-    // {{{ DB_common
-
-    /**
-     * This constructor calls $this->PEAR('DB_Error')
-     *
-     * @return void
-     */
-    function DB_common()
-    {
-        $this->PEAR('DB_Error');
-    }
-
-    // }}}
-    // {{{ __sleep()
-
-    /**
-     * Automatically indicates which properties should be saved
-     * when PHP's serialize() function is called
-     *
-     * @return array  the array of properties names that should be saved
-     */
-    function __sleep()
-    {
-        if ($this->connection) {
-            // Don't disconnect(), people use serialize() for many reasons
-            $this->was_connected = true;
-        } else {
-            $this->was_connected = false;
-        }
-        if (isset($this->autocommit)) {
-            return array('autocommit',
-                         'dbsyntax',
-                         'dsn',
-                         'features',
-                         'fetchmode',
-                         'fetchmode_object_class',
-                         'options',
-                         'was_connected',
-                   );
-        } else {
-            return array('dbsyntax',
-                         'dsn',
-                         'features',
-                         'fetchmode',
-                         'fetchmode_object_class',
-                         'options',
-                         'was_connected',
-                   );
-        }
-    }
-
-    // }}}
-    // {{{ __wakeup()
-
-    /**
-     * Automatically reconnects to the database when PHP's unserialize()
-     * function is called
-     *
-     * The reconnection attempt is only performed if the object was connected
-     * at the time PHP's serialize() function was run.
-     *
-     * @return void
-     */
-    function __wakeup()
-    {
-        if ($this->was_connected) {
-            $this->connect($this->dsn, $this->options);
-        }
-    }
-
-    // }}}
-    // {{{ __toString()
-
-    /**
-     * Automatic string conversion for PHP 5
-     *
-     * @return string  a string describing the current PEAR DB object
-     *
-     * @since Method available since Release 1.7.0
-     */
-    function __toString()
-    {
-        $info = strtolower(get_class($this));
-        $info .=  ': (phptype=' . $this->phptype .
-                  ', dbsyntax=' . $this->dbsyntax .
-                  ')';
-        if ($this->connection) {
-            $info .= ' [connected]';
-        }
-        return $info;
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * DEPRECATED:  String conversion method
-     *
-     * @return string  a string describing the current PEAR DB object
-     *
-     * @deprecated Method deprecated in Release 1.7.0
-     */
-    function toString()
-    {
-        return $this->__toString();
-    }
-
-    // }}}
-    // {{{ quoteString()
-
-    /**
-     * DEPRECATED: Quotes a string so it can be safely used within string
-     * delimiters in a query
-     *
-     * @param string $string  the string to be quoted
-     *
-     * @return string  the quoted string
-     *
-     * @see DB_common::quoteSmart(), DB_common::escapeSimple()
-     * @deprecated Method deprecated some time before Release 1.2
-     */
-    function quoteString($string)
-    {
-        $string = $this->quote($string);
-        if ($string{0} == "'") {
-            return substr($string, 1, -1);
-        }
-        return $string;
-    }
-
-    // }}}
-    // {{{ quote()
-
-    /**
-     * DEPRECATED: Quotes a string so it can be safely used in a query
-     *
-     * @param string $string  the string to quote
-     *
-     * @return string  the quoted string or the string NULL
-     *                  if the value submitted is null.
-     *
-     * @see DB_common::quoteSmart(), DB_common::escapeSimple()
-     * @deprecated Deprecated in release 1.6.0
-     */
-    function quote($string = null)
-    {
-        return ($string === null) ? 'NULL'
-                                  : "'" . str_replace("'", "''", $string) . "'";
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     *
-     * Delimiting style depends on which database driver is being used.
-     *
-     * NOTE: just because you CAN use delimited identifiers doesn't mean
-     * you SHOULD use them.  In general, they end up causing way more
-     * problems than they solve.
-     *
-     * Portability is broken by using the following characters inside
-     * delimited identifiers:
-     *   + backtick (`) -- due to MySQL
-     *   + double quote (") -- due to Oracle
-     *   + brackets ([ or ]) -- due to Access
-     *
-     * Delimited identifiers are known to generally work correctly under
-     * the following drivers:
-     *   + mssql
-     *   + mysql
-     *   + mysqli
-     *   + oci8
-     *   + odbc(access)
-     *   + odbc(db2)
-     *   + pgsql
-     *   + sqlite
-     *   + sybase (must execute set quoted_identifier on sometime
-     *     prior to use)
-     *
-     * InterBase doesn't seem to be able to use delimited identifiers
-     * via PHP 4.  They work fine under PHP 5.
-     *
-     * @param string $str  the identifier name to be quoted
-     *
-     * @return string  the quoted identifier
-     *
-     * @since Method available since Release 1.6.0
-     */
-    function quoteIdentifier($str)
-    {
-        return '"' . str_replace('"', '""', $str) . '"';
-    }
-
-    // }}}
-    // {{{ quoteSmart()
-
-    /**
-     * Formats input so it can be safely used in a query
-     *
-     * The output depends on the PHP data type of input and the database
-     * type being used.
-     *
-     * @param mixed $in  the data to be formatted
-     *
-     * @return mixed  the formatted data.  The format depends on the input's
-     *                 PHP type:
-     * 
        
-     *  
      • 
-     *    input -> returns
-     *  
        • 
-     *  
      • 
-     *    null -> the string NULL
-     *  
        • 
-     *  
      • 
-     *    integer or double -> the unquoted number
-     *  
        • 
-     *  
      • 
-     *    bool -> output depends on the driver in use
-     *    Most drivers return integers: 1 if
-     *    true or 0 if
-     *    false.
-     *    Some return strings: TRUE if
-     *    true or FALSE if
-     *    false.
-     *    Finally one returns strings: T if
-     *    true or F if
-     *    false. Here is a list of each DBMS,
-     *    the values returned and the suggested column type:
-     *    
          
-     *      
        • 
-     *        dbase -> T/F
-     *        (Logical)
-     *      
          • 
-     *      
        • 
-     *        fbase -> TRUE/FALSE
-     *        (BOOLEAN)
-     *      
          • 
-     *      
        • 
-     *        ibase -> 1/0
-     *        (SMALLINT) [1]
-     *      
          • 
-     *      
        • 
-     *        ifx -> 1/0
-     *        (SMALLINT) [1]
-     *      
          • 
-     *      
        • 
-     *        msql -> 1/0
-     *        (INTEGER)
-     *      
          • 
-     *      
        • 
-     *        mssql -> 1/0
-     *        (BIT)
-     *      
          • 
-     *      
        • 
-     *        mysql -> 1/0
-     *        (TINYINT(1))
-     *      
          • 
-     *      
        • 
-     *        mysqli -> 1/0
-     *        (TINYINT(1))
-     *      
          • 
-     *      
        • 
-     *        oci8 -> 1/0
-     *        (NUMBER(1))
-     *      
          • 
-     *      
        • 
-     *        odbc -> 1/0
-     *        (SMALLINT) [1]
-     *      
          • 
-     *      
        • 
-     *        pgsql -> TRUE/FALSE
-     *        (BOOLEAN)
-     *      
          • 
-     *      
        • 
-     *        sqlite -> 1/0
-     *        (INTEGER)
-     *      
          • 
-     *      
        • 
-     *        sybase -> 1/0
-     *        (TINYINT(1))
-     *      
          • 
-     *    
        
-     *    [1] Accommodate the lowest common denominator because not all
-     *    versions of have BOOLEAN.
-     *  
        • 
-     *  
      • 
-     *    other (including strings and numeric strings) ->
-     *    the data with single quotes escaped by preceeding
-     *    single quotes, backslashes are escaped by preceeding
-     *    backslashes, then the whole string is encapsulated
-     *    between single quotes
-     *  
        • 
-     * 
      
-     *
-     * @see DB_common::escapeSimple()
-     * @since Method available since Release 1.6.0
-     */
-    function quoteSmart($in)
-    {
-        if (is_int($in) || is_double($in)) {
-            return $in;
-        } elseif (is_bool($in)) {
-            return $in ? 1 : 0;
-        } elseif (is_null($in)) {
-            return 'NULL';
-        } else {
-            return "'" . $this->escapeSimple($in) . "'";
-        }
-    }
-
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * In SQLite, this makes things safe for inserts/updates, but may
-     * cause problems when performing text comparisons against columns
-     * containing binary data. See the
-     * {@link http://php.net/sqlite_escape_string PHP manual} for more info.
-     *
-     * @param string $str  the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.6.0
-     */
-    function escapeSimple($str)
-    {
-        return str_replace("'", "''", $str);
-    }
-
-    // }}}
-    // {{{ provides()
-
-    /**
-     * Tells whether the present driver supports a given feature
-     *
-     * @param string $feature  the feature you're curious about
-     *
-     * @return bool  whether this driver supports $feature
-     */
-    function provides($feature)
-    {
-        return $this->features[$feature];
-    }
-
-    // }}}
-    // {{{ setFetchMode()
-
-    /**
-     * Sets the fetch mode that should be used by default for query results
-     *
-     * @param integer $fetchmode    DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC
-     *                               or DB_FETCHMODE_OBJECT
-     * @param string $object_class  the class name of the object to be returned
-     *                               by the fetch methods when the
-     *                               DB_FETCHMODE_OBJECT mode is selected.
-     *                               If no class is specified by default a cast
-     *                               to object from the assoc array row will be
-     *                               done.  There is also the posibility to use
-     *                               and extend the 'DB_row' class.
-     *
-     * @see DB_FETCHMODE_ORDERED, DB_FETCHMODE_ASSOC, DB_FETCHMODE_OBJECT
-     */
-    function setFetchMode($fetchmode, $object_class = 'stdClass')
-    {
-        switch ($fetchmode) {
-            case DB_FETCHMODE_OBJECT:
-                $this->fetchmode_object_class = $object_class;
-            case DB_FETCHMODE_ORDERED:
-            case DB_FETCHMODE_ASSOC:
-                $this->fetchmode = $fetchmode;
-                break;
-            default:
-                return $this->raiseError('invalid fetchmode mode');
-        }
-    }
-
-    // }}}
-    // {{{ setOption()
-
-    /**
-     * Sets run-time configuration options for PEAR DB
-     *
-     * Options, their data types, default values and description:
-     * 
        
-     * 
      • 
-     * autofree boolean = false
-     *      
        should results be freed automatically when there are no
-     *            more rows?
-     * 
      • 
-     * result_buffering integer = 500
-     *      
        how many rows of the result set should be buffered?
-     *      
        In mysql: mysql_unbuffered_query() is used instead of
-     *            mysql_query() if this value is 0.  (Release 1.7.0)
-     *      
        In oci8: this value is passed to ocisetprefetch().
-     *            (Release 1.7.0)
-     * 
      • 
-     * debug integer = 0
-     *      
        debug level
-     * 
      • 
-     * persistent boolean = false
-     *      
        should the connection be persistent?
-     * 
      • 
-     * portability integer = DB_PORTABILITY_NONE
-     *      
        portability mode constant (see below)
-     * 
      • 
-     * seqname_format string = %s_seq
-     *      
        the sprintf() format string used on sequence names.  This
-     *            format is applied to sequence names passed to
-     *            createSequence(), nextID() and dropSequence().
-     * 
      • 
-     * ssl boolean = false
-     *      
        use ssl to connect?
-     * 
        • 
-     * 
      
-     *
-     * -----------------------------------------
-     *
-     * PORTABILITY MODES
-     *
-     * These modes are bitwised, so they can be combined using |
-     * and removed using ^.  See the examples section below on how
-     * to do this.
-     *
-     * DB_PORTABILITY_NONE
-     * turn off all portability features
-     *
-     * This mode gets automatically turned on if the deprecated
-     * optimize option gets set to performance.
-     *
-     *
-     * DB_PORTABILITY_LOWERCASE
-     * convert names of tables and fields to lower case when using
-     * get*(), fetch*() and tableInfo()
-     *
-     * This mode gets automatically turned on in the following databases
-     * if the deprecated option optimize gets set to
-     * portability:
-     * + oci8
-     *
-     *
-     * DB_PORTABILITY_RTRIM
-     * right trim the data output by get*() fetch*()
-     *
-     *
-     * DB_PORTABILITY_DELETE_COUNT
-     * force reporting the number of rows deleted
-     *
-     * Some DBMS's don't count the number of rows deleted when performing
-     * simple DELETE FROM tablename queries.  This portability
-     * mode tricks such DBMS's into telling the count by adding
-     * WHERE 1=1 to the end of DELETE queries.
-     *
-     * This mode gets automatically turned on in the following databases
-     * if the deprecated option optimize gets set to
-     * portability:
-     * + fbsql
-     * + mysql
-     * + mysqli
-     * + sqlite
-     *
-     *
-     * DB_PORTABILITY_NUMROWS
-     * enable hack that makes numRows() work in Oracle
-     *
-     * This mode gets automatically turned on in the following databases
-     * if the deprecated option optimize gets set to
-     * portability:
-     * + oci8
-     *
-     *
-     * DB_PORTABILITY_ERRORS
-     * makes certain error messages in certain drivers compatible
-     * with those from other DBMS's
-     *
-     * + mysql, mysqli:  change unique/primary key constraints
-     *   DB_ERROR_ALREADY_EXISTS -> DB_ERROR_CONSTRAINT
-     *
-     * + odbc(access):  MS's ODBC driver reports 'no such field' as code
-     *   07001, which means 'too few parameters.'  When this option is on
-     *   that code gets mapped to DB_ERROR_NOSUCHFIELD.
-     *   DB_ERROR_MISMATCH -> DB_ERROR_NOSUCHFIELD
-     *
-     * DB_PORTABILITY_NULL_TO_EMPTY
-     * convert null values to empty strings in data output by get*() and
-     * fetch*().  Needed because Oracle considers empty strings to be null,
-     * while most other DBMS's know the difference between empty and null.
-     *
-     *
-     * DB_PORTABILITY_ALL
-     * turn on all portability features
-     *
-     * -----------------------------------------
-     *
-     * Example 1. Simple setOption() example
-     * 
-     * $db->setOption('autofree', true);
-     * 
-     *
-     * Example 2. Portability for lowercasing and trimming
-     * 
-     * $db->setOption('portability',
-     *                 DB_PORTABILITY_LOWERCASE | DB_PORTABILITY_RTRIM);
-     * 
-     *
-     * Example 3. All portability options except trimming
-     * 
-     * $db->setOption('portability',
-     *                 DB_PORTABILITY_ALL ^ DB_PORTABILITY_RTRIM);
-     * 
-     *
-     * @param string $option option name
-     * @param mixed  $value value for the option
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::$options
-     */
-    function setOption($option, $value)
-    {
-        if (isset($this->options[$option])) {
-            $this->options[$option] = $value;
-
-            /*
-             * Backwards compatibility check for the deprecated 'optimize'
-             * option.  Done here in case settings change after connecting.
-             */
-            if ($option == 'optimize') {
-                if ($value == 'portability') {
-                    switch ($this->phptype) {
-                        case 'oci8':
-                            $this->options['portability'] =
-                                    DB_PORTABILITY_LOWERCASE |
-                                    DB_PORTABILITY_NUMROWS;
-                            break;
-                        case 'fbsql':
-                        case 'mysql':
-                        case 'mysqli':
-                        case 'sqlite':
-                            $this->options['portability'] =
-                                    DB_PORTABILITY_DELETE_COUNT;
-                            break;
-                    }
-                } else {
-                    $this->options['portability'] = DB_PORTABILITY_NONE;
-                }
-            }
-
-            return DB_OK;
-        }
-        return $this->raiseError("unknown option $option");
-    }
-
-    // }}}
-    // {{{ getOption()
-
-    /**
-     * Returns the value of an option
-     *
-     * @param string $option  the option name you're curious about
-     *
-     * @return mixed  the option's value
-     */
-    function getOption($option)
-    {
-        if (isset($this->options[$option])) {
-            return $this->options[$option];
-        }
-        return $this->raiseError("unknown option $option");
-    }
-
-    // }}}
-    // {{{ prepare()
-
-    /**
-     * Prepares a query for multiple execution with execute()
-     *
-     * Creates a query that can be run multiple times.  Each time it is run,
-     * the placeholders, if any, will be replaced by the contents of
-     * execute()'s $data argument.
-     *
-     * Three types of placeholders can be used:
-     *   + ?  scalar value (i.e. strings, integers).  The system
-     *                   will automatically quote and escape the data.
-     *   + !  value is inserted 'as is'
-     *   + &  requires a file name.  The file's contents get
-     *                   inserted into the query (i.e. saving binary
-     *                   data in a db)
-     *
-     * Example 1.
-     * 
-     * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
-     * $data = array(
-     *     "John's text",
-     *     "'it''s good'",
-     *     'filename.txt'
-     * );
-     * $res = $db->execute($sth, $data);
-     * 
-     *
-     * Use backslashes to escape placeholder characters if you don't want
-     * them to be interpreted as placeholders:
-     * 
      -     *    "UPDATE foo SET col=? WHERE col='over \& under'"
-     * 
      
-     *
-     * With some database backends, this is emulated.
-     *
-     * {@internal ibase and oci8 have their own prepare() methods.}}
-     *
-     * @param string $query  the query to be prepared
-     *
-     * @return mixed  DB statement resource on success. A DB_Error object
-     *                 on failure.
-     *
-     * @see DB_common::execute()
-     */
-    function prepare($query)
-    {
-        $tokens   = preg_split('/((?prepare_tokens[] = &$newtokens;
-        end($this->prepare_tokens);
-
-        $k = key($this->prepare_tokens);
-        $this->prepare_types[$k] = $types;
-        $this->prepared_queries[$k] = implode(' ', $newtokens);
-
-        return $k;
-    }
-
-    // }}}
-    // {{{ autoPrepare()
-
-    /**
-     * Automaticaly generates an insert or update query and pass it to prepare()
-     *
-     * @param string $table         the table name
-     * @param array  $table_fields  the array of field names
-     * @param int    $mode          a type of query to make:
-     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
-     * @param string $where         for update queries: the WHERE clause to
-     *                               append to the SQL statement.  Don't
-     *                               include the "WHERE" keyword.
-     *
-     * @return resource  the query handle
-     *
-     * @uses DB_common::prepare(), DB_common::buildManipSQL()
-     */
-    function autoPrepare($table, $table_fields, $mode = DB_AUTOQUERY_INSERT,
-                         $where = false)
-    {
-        $query = $this->buildManipSQL($table, $table_fields, $mode, $where);
-        if (DB::isError($query)) {
-            return $query;
-        }
-        return $this->prepare($query);
-    }
-
-    // }}}
-    // {{{ autoExecute()
-
-    /**
-     * Automaticaly generates an insert or update query and call prepare()
-     * and execute() with it
-     *
-     * @param string $table         the table name
-     * @param array  $fields_values the associative array where $key is a
-     *                               field name and $value its value
-     * @param int    $mode          a type of query to make:
-     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
-     * @param string $where         for update queries: the WHERE clause to
-     *                               append to the SQL statement.  Don't
-     *                               include the "WHERE" keyword.
-     *
-     * @return mixed  a new DB_result object for successful SELECT queries
-     *                 or DB_OK for successul data manipulation queries.
-     *                 A DB_Error object on failure.
-     *
-     * @uses DB_common::autoPrepare(), DB_common::execute()
-     */
-    function autoExecute($table, $fields_values, $mode = DB_AUTOQUERY_INSERT,
-                         $where = false)
-    {
-        $sth = $this->autoPrepare($table, array_keys($fields_values), $mode,
-                                  $where);
-        if (DB::isError($sth)) {
-            return $sth;
-        }
-        $ret =& $this->execute($sth, array_values($fields_values));
-        $this->freePrepared($sth);
-        return $ret;
-
-    }
-
-    // }}}
-    // {{{ buildManipSQL()
-
-    /**
-     * Produces an SQL query string for autoPrepare()
-     *
-     * Example:
-     * 
      -     * buildManipSQL('table_sql', array('field1', 'field2', 'field3'),
-     *               DB_AUTOQUERY_INSERT);
-     * 
      
-     *
-     * That returns
-     * 
-     * INSERT INTO table_sql (field1,field2,field3) VALUES (?,?,?)
-     * 
-     *
-     * NOTES:
-     *   - This belongs more to a SQL Builder class, but this is a simple
-     *     facility.
-     *   - Be carefull! If you don't give a $where param with an UPDATE
-     *     query, all the records of the table will be updated!
-     *
-     * @param string $table         the table name
-     * @param array  $table_fields  the array of field names
-     * @param int    $mode          a type of query to make:
-     *                               DB_AUTOQUERY_INSERT or DB_AUTOQUERY_UPDATE
-     * @param string $where         for update queries: the WHERE clause to
-     *                               append to the SQL statement.  Don't
-     *                               include the "WHERE" keyword.
-     *
-     * @return string  the sql query for autoPrepare()
-     */
-    function buildManipSQL($table, $table_fields, $mode, $where = false)
-    {
-        if (count($table_fields) == 0) {
-            return $this->raiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-        $first = true;
-        switch ($mode) {
-            case DB_AUTOQUERY_INSERT:
-                $values = '';
-                $names = '';
-                foreach ($table_fields as $value) {
-                    if ($first) {
-                        $first = false;
-                    } else {
-                        $names .= ',';
-                        $values .= ',';
-                    }
-                    $names .= $value;
-                    $values .= '?';
-                }
-                return "INSERT INTO $table ($names) VALUES ($values)";
-            case DB_AUTOQUERY_UPDATE:
-                $set = '';
-                foreach ($table_fields as $value) {
-                    if ($first) {
-                        $first = false;
-                    } else {
-                        $set .= ',';
-                    }
-                    $set .= "$value = ?";
-                }
-                $sql = "UPDATE $table SET $set";
-                if ($where) {
-                    $sql .= " WHERE $where";
-                }
-                return $sql;
-            default:
-                return $this->raiseError(DB_ERROR_SYNTAX);
-        }
-    }
-
-    // }}}
-    // {{{ execute()
-
-    /**
-     * Executes a DB statement prepared with prepare()
-     *
-     * Example 1.
-     * 
-     * $sth = $db->prepare('INSERT INTO tbl (a, b, c) VALUES (?, !, &)');
-     * $data = array(
-     *     "John's text",
-     *     "'it''s good'",
-     *     'filename.txt'
-     * );
-     * $res =& $db->execute($sth, $data);
-     * 
-     *
-     * @param resource $stmt  a DB statement resource returned from prepare()
-     * @param mixed    $data  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  a new DB_result object for successful SELECT queries
-     *                 or DB_OK for successul data manipulation queries.
-     *                 A DB_Error object on failure.
-     *
-     * {@internal ibase and oci8 have their own execute() methods.}}
-     *
-     * @see DB_common::prepare()
-     */
-    function &execute($stmt, $data = array())
-    {
-        $realquery = $this->executeEmulateQuery($stmt, $data);
-        if (DB::isError($realquery)) {
-            return $realquery;
-        }
-        $result = $this->simpleQuery($realquery);
-
-        if ($result === DB_OK || DB::isError($result)) {
-            return $result;
-        } else {
-            $tmp =& new DB_result($this, $result);
-            return $tmp;
-        }
-    }
-
-    // }}}
-    // {{{ executeEmulateQuery()
-
-    /**
-     * Emulates executing prepared statements if the DBMS not support them
-     *
-     * @param resource $stmt  a DB statement resource returned from execute()
-     * @param mixed    $data  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  a string containing the real query run when emulating
-     *                 prepare/execute.  A DB_Error object on failure.
-     *
-     * @access protected
-     * @see DB_common::execute()
-     */
-    function executeEmulateQuery($stmt, $data = array())
-    {
-        $stmt = (int)$stmt;
-        $data = (array)$data;
-        $this->last_parameters = $data;
-
-        if (count($this->prepare_types[$stmt]) != count($data)) {
-            $this->last_query = $this->prepared_queries[$stmt];
-            return $this->raiseError(DB_ERROR_MISMATCH);
-        }
-
-        $realquery = $this->prepare_tokens[$stmt][0];
-
-        $i = 0;
-        foreach ($data as $value) {
-            if ($this->prepare_types[$stmt][$i] == DB_PARAM_SCALAR) {
-                $realquery .= $this->quoteSmart($value);
-            } elseif ($this->prepare_types[$stmt][$i] == DB_PARAM_OPAQUE) {
-                $fp = @fopen($value, 'rb');
-                if (!$fp) {
-                    return $this->raiseError(DB_ERROR_ACCESS_VIOLATION);
-                }
-                $realquery .= $this->quoteSmart(fread($fp, filesize($value)));
-                fclose($fp);
-            } else {
-                $realquery .= $value;
-            }
-
-            $realquery .= $this->prepare_tokens[$stmt][++$i];
-        }
-
-        return $realquery;
-    }
-
-    // }}}
-    // {{{ executeMultiple()
-
-    /**
-     * Performs several execute() calls on the same statement handle
-     *
-     * $data must be an array indexed numerically
-     * from 0, one execute call is done for every "row" in the array.
-     *
-     * If an error occurs during execute(), executeMultiple() does not
-     * execute the unfinished rows, but rather returns that error.
-     *
-     * @param resource $stmt  query handle from prepare()
-     * @param array    $data  numeric array containing the
-     *                         data to insert into the query
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::prepare(), DB_common::execute()
-     */
-    function executeMultiple($stmt, $data)
-    {
-        foreach ($data as $value) {
-            $res =& $this->execute($stmt, $value);
-            if (DB::isError($res)) {
-                return $res;
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freePrepared()
-
-    /**
-     * Frees the internal resources associated with a prepared query
-     *
-     * @param resource $stmt           the prepared statement's PHP resource
-     * @param bool     $free_resource  should the PHP resource be freed too?
-     *                                  Use false if you need to get data
-     *                                  from the result set later.
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_common::prepare()
-     */
-    function freePrepared($stmt, $free_resource = true)
-    {
-        $stmt = (int)$stmt;
-        if (isset($this->prepare_tokens[$stmt])) {
-            unset($this->prepare_tokens[$stmt]);
-            unset($this->prepare_types[$stmt]);
-            unset($this->prepared_queries[$stmt]);
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * It is defined here to ensure all drivers have this method available.
-     *
-     * @param string $query  the query string to modify
-     *
-     * @return string  the modified query string
-     *
-     * @access protected
-     * @see DB_mysql::modifyQuery(), DB_oci8::modifyQuery(),
-     *      DB_sqlite::modifyQuery()
-     */
-    function modifyQuery($query)
-    {
-        return $query;
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * It is defined here to assure that all implementations
-     * have this method defined.
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        return $query;
-    }
-
-    // }}}
-    // {{{ query()
-
-    /**
-     * Sends a query to the database server
-     *
-     * The query string can be either a normal statement to be sent directly
-     * to the server OR if $params are passed the query can have
-     * placeholders and it will be passed through prepare() and execute().
-     *
-     * @param string $query   the SQL query or the statement to prepare
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  a new DB_result object for successful SELECT queries
-     *                 or DB_OK for successul data manipulation queries.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_result, DB_common::prepare(), DB_common::execute()
-     */
-    function &query($query, $params = array())
-    {
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-            $ret =& $this->execute($sth, $params);
-            $this->freePrepared($sth, false);
-            return $ret;
-        } else {
-            $this->last_parameters = array();
-            $result = $this->simpleQuery($query);
-            if ($result === DB_OK || DB::isError($result)) {
-                return $result;
-            } else {
-                $tmp =& new DB_result($this, $result);
-                return $tmp;
-            }
-        }
-    }
-
-    // }}}
-    // {{{ limitQuery()
-
-    /**
-     * Generates and executes a LIMIT query
-     *
-     * @param string $query   the query
-     * @param intr   $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  a new DB_result object for successful SELECT queries
-     *                 or DB_OK for successul data manipulation queries.
-     *                 A DB_Error object on failure.
-     */
-    function &limitQuery($query, $from, $count, $params = array())
-    {
-        $query = $this->modifyLimitQuery($query, $from, $count, $params);
-        if (DB::isError($query)){
-            return $query;
-        }
-        $result =& $this->query($query, $params);
-        if (is_a($result, 'DB_result')) {
-            $result->setOption('limit_from', $from);
-            $result->setOption('limit_count', $count);
-        }
-        return $result;
-    }
-
-    // }}}
-    // {{{ getOne()
-
-    /**
-     * Fetches the first column of the first row from a query result
-     *
-     * Takes care of doing the query and freeing the results when finished.
-     *
-     * @param string $query   the SQL query
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return mixed  the returned value of the query.
-     *                 A DB_Error object on failure.
-     */
-    function &getOne($query, $params = array())
-    {
-        $params = (array)$params;
-        // modifyLimitQuery() would be nice here, but it causes BC issues
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-            $res =& $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res =& $this->query($query);
-        }
-
-        if (DB::isError($res)) {
-            return $res;
-        }
-
-        $err = $res->fetchInto($row, DB_FETCHMODE_ORDERED);
-        $res->free();
-
-        if ($err !== DB_OK) {
-            return $err;
-        }
-
-        return $row[0];
-    }
-
-    // }}}
-    // {{{ getRow()
-
-    /**
-     * Fetches the first row of data returned from a query result
-     *
-     * Takes care of doing the query and freeing the results when finished.
-     *
-     * @param string $query   the SQL query
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     * @param int $fetchmode  the fetch mode to use
-     *
-     * @return array  the first row of results as an array.
-     *                 A DB_Error object on failure.
-     */
-    function &getRow($query, $params = array(),
-                     $fetchmode = DB_FETCHMODE_DEFAULT)
-    {
-        // compat check, the params and fetchmode parameters used to
-        // have the opposite order
-        if (!is_array($params)) {
-            if (is_array($fetchmode)) {
-                if ($params === null) {
-                    $tmp = DB_FETCHMODE_DEFAULT;
-                } else {
-                    $tmp = $params;
-                }
-                $params = $fetchmode;
-                $fetchmode = $tmp;
-            } elseif ($params !== null) {
-                $fetchmode = $params;
-                $params = array();
-            }
-        }
-        // modifyLimitQuery() would be nice here, but it causes BC issues
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-            $res =& $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res =& $this->query($query);
-        }
-
-        if (DB::isError($res)) {
-            return $res;
-        }
-
-        $err = $res->fetchInto($row, $fetchmode);
-
-        $res->free();
-
-        if ($err !== DB_OK) {
-            return $err;
-        }
-
-        return $row;
-    }
-
-    // }}}
-    // {{{ getCol()
-
-    /**
-     * Fetches a single column from a query result and returns it as an
-     * indexed array
-     *
-     * @param string $query   the SQL query
-     * @param mixed  $col     which column to return (integer [column number,
-     *                         starting at 0] or string [column name])
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return array  the results as an array.  A DB_Error object on failure.
-     *
-     * @see DB_common::query()
-     */
-    function &getCol($query, $col = 0, $params = array())
-    {
-        $params = (array)$params;
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-
-            $res =& $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res =& $this->query($query);
-        }
-
-        if (DB::isError($res)) {
-            return $res;
-        }
-
-        $fetchmode = is_int($col) ? DB_FETCHMODE_ORDERED : DB_FETCHMODE_ASSOC;
-
-        if (!is_array($row = $res->fetchRow($fetchmode))) {
-            $ret = array();
-        } else {
-            if (!array_key_exists($col, $row)) {
-                $ret =& $this->raiseError(DB_ERROR_NOSUCHFIELD);
-            } else {
-                $ret = array($row[$col]);
-                while (is_array($row = $res->fetchRow($fetchmode))) {
-                    $ret[] = $row[$col];
-                }
-            }
-        }
-
-        $res->free();
-
-        if (DB::isError($row)) {
-            $ret = $row;
-        }
-
-        return $ret;
-    }
-
-    // }}}
-    // {{{ getAssoc()
-
-    /**
-     * Fetches an entire query result and returns it as an
-     * associative array using the first column as the key
-     *
-     * If the result set contains more than two columns, the value
-     * will be an array of the values from column 2-n.  If the result
-     * set contains only two columns, the returned value will be a
-     * scalar with the value of the second column (unless forced to an
-     * array with the $force_array parameter).  A DB error code is
-     * returned on errors.  If the result set contains fewer than two
-     * columns, a DB_ERROR_TRUNCATED error is returned.
-     *
-     * For example, if the table "mytable" contains:
-     *
-     * 
      -     *  ID      TEXT       DATE
-     * --------------------------------
-     *  1       'one'      944679408
-     *  2       'two'      944679408
-     *  3       'three'    944679408
-     * 
      
-     *
-     * Then the call getAssoc('SELECT id,text FROM mytable') returns:
-     * 
      -     *   array(
-     *     '1' => 'one',
-     *     '2' => 'two',
-     *     '3' => 'three',
-     *   )
-     * 
      
-     *
-     * ...while the call getAssoc('SELECT id,text,date FROM mytable') returns:
-     * 
      -     *   array(
-     *     '1' => array('one', '944679408'),
-     *     '2' => array('two', '944679408'),
-     *     '3' => array('three', '944679408')
-     *   )
-     * 
      
-     *
-     * If the more than one row occurs with the same value in the
-     * first column, the last row overwrites all previous ones by
-     * default.  Use the $group parameter if you don't want to
-     * overwrite like this.  Example:
-     *
-     * 
      -     * getAssoc('SELECT category,id,name FROM mytable', false, null,
-     *          DB_FETCHMODE_ASSOC, true) returns:
-     *
-     *   array(
-     *     '1' => array(array('id' => '4', 'name' => 'number four'),
-     *                  array('id' => '6', 'name' => 'number six')
-     *            ),
-     *     '9' => array(array('id' => '4', 'name' => 'number four'),
-     *                  array('id' => '6', 'name' => 'number six')
-     *            )
-     *   )
-     * 
      
-     *
-     * Keep in mind that database functions in PHP usually return string
-     * values for results regardless of the database's internal type.
-     *
-     * @param string $query        the SQL query
-     * @param bool   $force_array  used only when the query returns
-     *                              exactly two columns.  If true, the values
-     *                              of the returned array will be one-element
-     *                              arrays instead of scalars.
-     * @param mixed  $params       array, string or numeric data to be used in
-     *                              execution of the statement.  Quantity of
-     *                              items passed must match quantity of
-     *                              placeholders in query:  meaning 1
-     *                              placeholder for non-array parameters or
-     *                              1 placeholder per array element.
-     * @param int   $fetchmode     the fetch mode to use
-     * @param bool  $group         if true, the values of the returned array
-     *                              is wrapped in another array.  If the same
-     *                              key value (in the first column) repeats
-     *                              itself, the values will be appended to
-     *                              this array instead of overwriting the
-     *                              existing values.
-     *
-     * @return array  the associative array containing the query results.
-     *                A DB_Error object on failure.
-     */
-    function &getAssoc($query, $force_array = false, $params = array(),
-                       $fetchmode = DB_FETCHMODE_DEFAULT, $group = false)
-    {
-        $params = (array)$params;
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-
-            $res =& $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res =& $this->query($query);
-        }
-
-        if (DB::isError($res)) {
-            return $res;
-        }
-        if ($fetchmode == DB_FETCHMODE_DEFAULT) {
-            $fetchmode = $this->fetchmode;
-        }
-        $cols = $res->numCols();
-
-        if ($cols < 2) {
-            $tmp =& $this->raiseError(DB_ERROR_TRUNCATED);
-            return $tmp;
-        }
-
-        $results = array();
-
-        if ($cols > 2 || $force_array) {
-            // return array values
-            // XXX this part can be optimized
-            if ($fetchmode == DB_FETCHMODE_ASSOC) {
-                while (is_array($row = $res->fetchRow(DB_FETCHMODE_ASSOC))) {
-                    reset($row);
-                    $key = current($row);
-                    unset($row[key($row)]);
-                    if ($group) {
-                        $results[$key][] = $row;
-                    } else {
-                        $results[$key] = $row;
-                    }
-                }
-            } elseif ($fetchmode == DB_FETCHMODE_OBJECT) {
-                while ($row = $res->fetchRow(DB_FETCHMODE_OBJECT)) {
-                    $arr = get_object_vars($row);
-                    $key = current($arr);
-                    if ($group) {
-                        $results[$key][] = $row;
-                    } else {
-                        $results[$key] = $row;
-                    }
-                }
-            } else {
-                while (is_array($row = $res->fetchRow(DB_FETCHMODE_ORDERED))) {
-                    // we shift away the first element to get
-                    // indices running from 0 again
-                    $key = array_shift($row);
-                    if ($group) {
-                        $results[$key][] = $row;
-                    } else {
-                        $results[$key] = $row;
-                    }
-                }
-            }
-            if (DB::isError($row)) {
-                $results = $row;
-            }
-        } else {
-            // return scalar values
-            while (is_array($row = $res->fetchRow(DB_FETCHMODE_ORDERED))) {
-                if ($group) {
-                    $results[$row[0]][] = $row[1];
-                } else {
-                    $results[$row[0]] = $row[1];
-                }
-            }
-            if (DB::isError($row)) {
-                $results = $row;
-            }
-        }
-
-        $res->free();
-
-        return $results;
-    }
-
-    // }}}
-    // {{{ getAll()
-
-    /**
-     * Fetches all of the rows from a query result
-     *
-     * @param string $query      the SQL query
-     * @param mixed  $params     array, string or numeric data to be used in
-     *                            execution of the statement.  Quantity of
-     *                            items passed must match quantity of
-     *                            placeholders in query:  meaning 1
-     *                            placeholder for non-array parameters or
-     *                            1 placeholder per array element.
-     * @param int    $fetchmode  the fetch mode to use:
-     *                            + DB_FETCHMODE_ORDERED
-     *                            + DB_FETCHMODE_ASSOC
-     *                            + DB_FETCHMODE_ORDERED | DB_FETCHMODE_FLIPPED
-     *                            + DB_FETCHMODE_ASSOC | DB_FETCHMODE_FLIPPED
-     *
-     * @return array  the nested array.  A DB_Error object on failure.
-     */
-    function &getAll($query, $params = array(),
-                     $fetchmode = DB_FETCHMODE_DEFAULT)
-    {
-        // compat check, the params and fetchmode parameters used to
-        // have the opposite order
-        if (!is_array($params)) {
-            if (is_array($fetchmode)) {
-                if ($params === null) {
-                    $tmp = DB_FETCHMODE_DEFAULT;
-                } else {
-                    $tmp = $params;
-                }
-                $params = $fetchmode;
-                $fetchmode = $tmp;
-            } elseif ($params !== null) {
-                $fetchmode = $params;
-                $params = array();
-            }
-        }
-
-        if (sizeof($params) > 0) {
-            $sth = $this->prepare($query);
-
-            if (DB::isError($sth)) {
-                return $sth;
-            }
-
-            $res =& $this->execute($sth, $params);
-            $this->freePrepared($sth);
-        } else {
-            $res =& $this->query($query);
-        }
-
-        if ($res === DB_OK || DB::isError($res)) {
-            return $res;
-        }
-
-        $results = array();
-        while (DB_OK === $res->fetchInto($row, $fetchmode)) {
-            if ($fetchmode & DB_FETCHMODE_FLIPPED) {
-                foreach ($row as $key => $val) {
-                    $results[$key][] = $val;
-                }
-            } else {
-                $results[] = $row;
-            }
-        }
-
-        $res->free();
-
-        if (DB::isError($row)) {
-            $tmp =& $this->raiseError($row);
-            return $tmp;
-        }
-        return $results;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Determines the number of rows in a query result
-     *
-     * @param resource $result  the query result idenifier produced by PHP
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function numRows($result)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ getSequenceName()
-
-    /**
-     * Generates the name used inside the database for a sequence
-     *
-     * The createSequence() docblock contains notes about storing sequence
-     * names.
-     *
-     * @param string $sqn  the sequence's public name
-     *
-     * @return string  the sequence's name in the backend
-     *
-     * @access protected
-     * @see DB_common::createSequence(), DB_common::dropSequence(),
-     *      DB_common::nextID(), DB_common::setOption()
-     */
-    function getSequenceName($sqn)
-    {
-        return sprintf($this->getOption('seqname_format'),
-                       preg_replace('/[^a-z0-9_.]/i', '_', $sqn));
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::dropSequence(),
-     *      DB_common::getSequenceName()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Creates a new sequence
-     *
-     * The name of a given sequence is determined by passing the string
-     * provided in the $seq_name argument through PHP's sprintf()
-     * function using the value from the seqname_format option as
-     * the sprintf()'s format argument.
-     *
-     * seqname_format is set via setOption().
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_common::nextID()
-     */
-    function createSequence($seq_name)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_common::nextID()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * Communicates an error and invoke error callbacks, etc
-     *
-     * Basically a wrapper for PEAR::raiseError without the message string.
-     *
-     * @param mixed   integer error code, or a PEAR error object (all
-     *                 other parameters are ignored if this parameter is
-     *                 an object
-     * @param int     error mode, see PEAR_Error docs
-     * @param mixed   if error mode is PEAR_ERROR_TRIGGER, this is the
-     *                 error level (E_USER_NOTICE etc).  If error mode is
-     *                 PEAR_ERROR_CALLBACK, this is the callback function,
-     *                 either as a function name, or as an array of an
-     *                 object and method name.  For other error modes this
-     *                 parameter is ignored.
-     * @param string  extra debug information.  Defaults to the last
-     *                 query and native error code.
-     * @param mixed   native error code, integer or string depending the
-     *                 backend
-     *
-     * @return object  the PEAR_Error object
-     *
-     * @see PEAR_Error
-     */
-    function &raiseError($code = DB_ERROR, $mode = null, $options = null,
-                         $userinfo = null, $nativecode = null)
-    {
-        // The error is yet a DB error object
-        if (is_object($code)) {
-            // because we the static PEAR::raiseError, our global
-            // handler should be used if it is set
-            if ($mode === null && !empty($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            }
-            $tmp = PEAR::raiseError($code, null, $mode, $options,
-                                    null, null, true);
-            return $tmp;
-        }
-
-        if ($userinfo === null) {
-            $userinfo = $this->last_query;
-        }
-
-        if ($nativecode) {
-            $userinfo .= ' [nativecode=' . trim($nativecode) . ']';
-        } else {
-            $userinfo .= ' [DB Error: ' . DB::errorMessage($code) . ']';
-        }
-
-        $tmp = PEAR::raiseError(null, $code, $mode, $options, $userinfo,
-                                'DB_Error', true);
-        return $tmp;
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return mixed  the DBMS' error code.  A DB_Error object on failure.
-     */
-    function errorNative()
-    {
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Maps native error codes to DB's portable ones
-     *
-     * Uses the $errorcode_map property defined in each driver.
-     *
-     * @param string|int $nativecode  the error code returned by the DBMS
-     *
-     * @return int  the portable DB error code.  Return DB_ERROR if the
-     *               current driver doesn't have a mapping for the
-     *               $nativecode submitted.
-     */
-    function errorCode($nativecode)
-    {
-        if (isset($this->errorcode_map[$nativecode])) {
-            return $this->errorcode_map[$nativecode];
-        }
-        // Fall back to DB_ERROR if there was no mapping.
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ errorMessage()
-
-    /**
-     * Maps a DB error code to a textual message
-     *
-     * @param integer $dbcode  the DB error code
-     *
-     * @return string  the error message corresponding to the error code
-     *                  submitted.  FALSE if the error code is unknown.
-     *
-     * @see DB::errorMessage()
-     */
-    function errorMessage($dbcode)
-    {
-        return DB::errorMessage($this->errorcode_map[$dbcode]);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * The format of the resulting array depends on which $mode
-     * you select.  The sample output below is based on this query:
-     * 
      -     *    SELECT tblFoo.fldID, tblFoo.fldPhone, tblBar.fldId
-     *    FROM tblFoo
-     *    JOIN tblBar ON tblFoo.fldId = tblBar.fldId
-     * 
      
-     *
-     * 
        
-     * 
      • 
-     *
-     * null (default)
-     *   
        -     *   [0] => Array (
-     *       [table] => tblFoo
-     *       [name] => fldId
-     *       [type] => int
-     *       [len] => 11
-     *       [flags] => primary_key not_null
-     *   )
-     *   [1] => Array (
-     *       [table] => tblFoo
-     *       [name] => fldPhone
-     *       [type] => string
-     *       [len] => 20
-     *       [flags] =>
-     *   )
-     *   [2] => Array (
-     *       [table] => tblBar
-     *       [name] => fldId
-     *       [type] => int
-     *       [len] => 11
-     *       [flags] => primary_key not_null
-     *   )
-     *   
        
-     *
-     * 
      • 
-     *
-     * DB_TABLEINFO_ORDER
-     *
-     *   
        In addition to the information found in the default output,
-     *   a notation of the number of columns is provided by the
-     *   num_fields element while the order
-     *   element provides an array with the column names as the keys and
-     *   their location index number (corresponding to the keys in the
-     *   the default output) as the values.
        
-     *
-     *   
        If a result set has identical field names, the last one is
-     *   used.
        
-     *
-     *   
        -     *   [num_fields] => 3
-     *   [order] => Array (
-     *       [fldId] => 2
-     *       [fldTrans] => 1
-     *   )
-     *   
        
-     *
-     * 
      • 
-     *
-     * DB_TABLEINFO_ORDERTABLE
-     *
-     *   
        Similar to DB_TABLEINFO_ORDER but adds more
-     *   dimensions to the array in which the table names are keys and
-     *   the field names are sub-keys.  This is helpful for queries that
-     *   join tables which have identical field names.
        
-     *
-     *   
        -     *   [num_fields] => 3
-     *   [ordertable] => Array (
-     *       [tblFoo] => Array (
-     *           [fldId] => 0
-     *           [fldPhone] => 1
-     *       )
-     *       [tblBar] => Array (
-     *           [fldId] => 2
-     *       )
-     *   )
-     *   
        
-     *
-     * 
        • 
-     * 
      
-     *
-     * The flags element contains a space separated list
-     * of extra information about the field.  This data is inconsistent
-     * between DBMS's due to the way each DBMS works.
-     *   + primary_key
-     *   + unique_key
-     *   + multiple_key
-     *   + not_null
-     *
-     * Most DBMS's only provide the table and flags
-     * elements if $result is a table name.  The following DBMS's
-     * provide full information from queries:
-     *   + fbsql
-     *   + mysql
-     *
-     * If the 'portability' option has DB_PORTABILITY_LOWERCASE
-     * turned on, the names of tables and fields will be lowercased.
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                string containing the name of a table.
-     *                                While this also accepts a query result
-     *                                resource identifier, this behavior is
-     *                                deprecated.
-     * @param int  $mode   either unused or one of the tableInfo modes:
-     *                     DB_TABLEINFO_ORDERTABLE,
-     *                     DB_TABLEINFO_ORDER or
-     *                     DB_TABLEINFO_FULL (which does both).
-     *                     These are bitwise, so the first two can be
-     *                     combined using |.
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::setOption()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        /*
-         * If the DB_ class has a tableInfo() method, that one
-         * overrides this one.  But, if the driver doesn't have one,
-         * this method runs and tells users about that fact.
-         */
-        return $this->raiseError(DB_ERROR_NOT_CAPABLE);
-    }
-
-    // }}}
-    // {{{ getTables()
-
-    /**
-     * Lists the tables in the current database
-     *
-     * @return array  the list of tables.  A DB_Error object on failure.
-     *
-     * @deprecated Method deprecated some time before Release 1.2
-     */
-    function getTables()
-    {
-        return $this->getListOf('tables');
-    }
-
-    // }}}
-    // {{{ getListOf()
-
-    /**
-     * Lists internal database information
-     *
-     * @param string $type  type of information being sought.
-     *                       Common items being sought are:
-     *                       tables, databases, users, views, functions
-     *                       Each DBMS's has its own capabilities.
-     *
-     * @return array  an array listing the items sought.
-     *                 A DB DB_Error object on failure.
-     */
-    function getListOf($type)
-    {
-        $sql = $this->getSpecialQuery($type);
-        if ($sql === null) {
-            $this->last_query = '';
-            return $this->raiseError(DB_ERROR_UNSUPPORTED);
-        } elseif (is_int($sql) || DB::isError($sql)) {
-            // Previous error
-            return $this->raiseError($sql);
-        } elseif (is_array($sql)) {
-            // Already the result
-            return $sql;
-        }
-        // Launch this query
-        return $this->getCol($sql);
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        return $this->raiseError(DB_ERROR_UNSUPPORTED);
-    }
-
-    // }}}
-    // {{{ _rtrimArrayValues()
-
-    /**
-     * Right-trims all strings in an array
-     *
-     * @param array $array  the array to be trimmed (passed by reference)
-     *
-     * @return void
-     *
-     * @access protected
-     */
-    function _rtrimArrayValues(&$array)
-    {
-        foreach ($array as $key => $value) {
-            if (is_string($value)) {
-                $array[$key] = rtrim($value);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ _convertNullArrayValuesToEmpty()
-
-    /**
-     * Converts all null values in an array to empty strings
-     *
-     * @param array  $array  the array to be de-nullified (passed by reference)
-     *
-     * @return void
-     *
-     * @access protected
-     */
-    function _convertNullArrayValuesToEmpty(&$array)
-    {
-        foreach ($array as $key => $value) {
-            if (is_null($value)) {
-                $array[$key] = '';
-            }
-        }
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/lib/phpFlickr/PEAR/DB/mysql.php b/lib/phpFlickr/PEAR/DB/mysql.php
deleted file mode 100644
index 3ae0adf86..000000000
--- a/lib/phpFlickr/PEAR/DB/mysql.php
+++ /dev/null
@@ -1,1034 +0,0 @@
-
- * @author     Daniel Convissor 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: mysql.php 32 2005-08-01 06:21:02Z dancoulter $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's mysql extension
- * for interacting with MySQL databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken 
- * @author     Daniel Convissor 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/DB
- */
-class DB_mysql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'mysql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'mysql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'alter',
-        'new_link'      => '4.2.0',
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => false,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-        1004 => DB_ERROR_CANNOT_CREATE,
-        1005 => DB_ERROR_CANNOT_CREATE,
-        1006 => DB_ERROR_CANNOT_CREATE,
-        1007 => DB_ERROR_ALREADY_EXISTS,
-        1008 => DB_ERROR_CANNOT_DROP,
-        1022 => DB_ERROR_ALREADY_EXISTS,
-        1044 => DB_ERROR_ACCESS_VIOLATION,
-        1046 => DB_ERROR_NODBSELECTED,
-        1048 => DB_ERROR_CONSTRAINT,
-        1049 => DB_ERROR_NOSUCHDB,
-        1050 => DB_ERROR_ALREADY_EXISTS,
-        1051 => DB_ERROR_NOSUCHTABLE,
-        1054 => DB_ERROR_NOSUCHFIELD,
-        1061 => DB_ERROR_ALREADY_EXISTS,
-        1062 => DB_ERROR_ALREADY_EXISTS,
-        1064 => DB_ERROR_SYNTAX,
-        1091 => DB_ERROR_NOT_FOUND,
-        1100 => DB_ERROR_NOT_LOCKED,
-        1136 => DB_ERROR_VALUE_COUNT_ON_ROW,
-        1142 => DB_ERROR_ACCESS_VIOLATION,
-        1146 => DB_ERROR_NOSUCHTABLE,
-        1216 => DB_ERROR_CONSTRAINT,
-        1217 => DB_ERROR_CONSTRAINT,
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    var $transaction_opcount = 0;
-
-    /**
-     * The database specified in the DSN
-     *
-     * It's a fix to allow calls to different databases in the same script.
-     *
-     * @var string
-     * @access private
-     */
-    var $_db = '';
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls $this->DB_common()
-     *
-     * @return void
-     */
-    function DB_mysql()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's mysql driver supports the following extra DSN options:
-     *   + new_link      If set to true, causes subsequent calls to connect()
-     *                    to return a new connection link instead of the
-     *                    existing one.  WARNING: this is not portable to
-     *                    other DBMS's. Available since PEAR DB 1.7.0.
-     *   + client_flags  Any combination of MYSQL_CLIENT_* constants.
-     *                    Only used if PHP is at version 4.3.0 or greater.
-     *                    Available since PEAR DB 1.7.0.
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('mysql')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $params = array();
-        if ($dsn['protocol'] && $dsn['protocol'] == 'unix') {
-            $params[0] = ':' . $dsn['socket'];
-        } else {
-            $params[0] = $dsn['hostspec'] ? $dsn['hostspec']
-                         : 'localhost';
-            if ($dsn['port']) {
-                $params[0] .= ':' . $dsn['port'];
-            }
-        }
-        $params[] = $dsn['username'] ? $dsn['username'] : null;
-        $params[] = $dsn['password'] ? $dsn['password'] : null;
-
-        if (!$persistent) {
-            if (isset($dsn['new_link'])
-                && ($dsn['new_link'] == 'true' || $dsn['new_link'] === true))
-            {
-                $params[] = true;
-            } else {
-                $params[] = false;
-            }
-        }
-        if (version_compare(phpversion(), '4.3.0', '>=')) {
-            $params[] = isset($dsn['client_flags'])
-                        ? $dsn['client_flags'] : null;
-        }
-
-        $connect_function = $persistent ? 'mysql_pconnect' : 'mysql_connect';
-
-        $ini = ini_get('track_errors');
-        $php_errormsg = '';
-        if ($ini) {
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-        } else {
-            ini_set('track_errors', 1);
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-            ini_set('track_errors', $ini);
-        }
-
-        if (!$this->connection) {
-            if (($err = @mysql_error()) != '') {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null, 
-                                         $err);
-            } else {
-                return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                         null, null, null,
-                                         $php_errormsg);
-            }
-        }
-
-        if ($dsn['database']) {
-            if (!@mysql_select_db($dsn['database'], $this->connection)) {
-                return $this->mysqlRaiseError();
-            }
-            $this->_db = $dsn['database'];
-        }
-
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @mysql_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * Generally uses mysql_query().  If you want to use
-     * mysql_unbuffered_query() set the "result_buffering" option to 0 using
-     * setOptions().  This option was added in Release 1.7.0.
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = DB::isManip($query);
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        if ($this->_db) {
-            if (!@mysql_select_db($this->_db, $this->connection)) {
-                return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
-            }
-        }
-        if (!$this->autocommit && $ismanip) {
-            if ($this->transaction_opcount == 0) {
-                $result = @mysql_query('SET AUTOCOMMIT=0', $this->connection);
-                $result = @mysql_query('BEGIN', $this->connection);
-                if (!$result) {
-                    return $this->mysqlRaiseError();
-                }
-            }
-            $this->transaction_opcount++;
-        }
-        if (!$this->options['result_buffering']) {
-            $result = @mysql_unbuffered_query($query, $this->connection);
-        } else {
-            $result = @mysql_query($query, $this->connection);
-        }
-        if (!$result) {
-            return $this->mysqlRaiseError();
-        }
-        if (is_resource($result)) {
-            return $result;
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal mysql result pointer to the next available result
-     *
-     * This method has not been implemented yet.
-     *
-     * @param a valid sql result resource
-     *
-     * @return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        if ($rownum !== null) {
-            if (!@mysql_data_seek($result, $rownum)) {
-                return null;
-            }
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @mysql_fetch_array($result, MYSQL_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @mysql_fetch_row($result);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            /*
-             * Even though this DBMS already trims output, we do this because
-             * a field might have intentional whitespace at the end that
-             * gets removed by DB_PORTABILITY_RTRIM under another driver.
-             */
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        return @mysql_free_result($result);
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @mysql_num_fields($result);
-        if (!$cols) {
-            return $this->mysqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @mysql_num_rows($result);
-        if ($rows === null) {
-            return $this->mysqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db) {
-                if (!@mysql_select_db($this->_db, $this->connection)) {
-                    return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
-                }
-            }
-            $result = @mysql_query('COMMIT', $this->connection);
-            $result = @mysql_query('SET AUTOCOMMIT=1', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mysqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            if ($this->_db) {
-                if (!@mysql_select_db($this->_db, $this->connection)) {
-                    return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
-                }
-            }
-            $result = @mysql_query('ROLLBACK', $this->connection);
-            $result = @mysql_query('SET AUTOCOMMIT=1', $this->connection);
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->mysqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        if (DB::isManip($this->last_query)) {
-            return @mysql_affected_rows($this->connection);
-        } else {
-            return 0;
-        }
-     }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_mysql::createSequence(), DB_mysql::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        do {
-            $repeat = 0;
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result = $this->query("UPDATE ${seqname} ".
-                                   'SET id=LAST_INSERT_ID(id+1)');
-            $this->popErrorHandling();
-            if ($result === DB_OK) {
-                // COMMON CASE
-                $id = @mysql_insert_id($this->connection);
-                if ($id != 0) {
-                    return $id;
-                }
-                // EMPTY SEQ TABLE
-                // Sequence table must be empty for some reason, so fill
-                // it and return 1 and obtain a user-level lock
-                $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                if ($result == 0) {
-                    // Failed to get the lock
-                    return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
-                }
-
-                // add the default value
-                $result = $this->query("REPLACE INTO ${seqname} (id) VALUES (0)");
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-
-                // Release the lock
-                $result = $this->getOne('SELECT RELEASE_LOCK('
-                                        . "'${seqname}_lock')");
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                // We know what the result will be, so no need to try again
-                return 1;
-
-            } elseif ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE)
-            {
-                // ONDEMAND TABLE CREATION
-                $result = $this->createSequence($seq_name);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                } else {
-                    $repeat = 1;
-                }
-
-            } elseif (DB::isError($result) &&
-                      $result->getCode() == DB_ERROR_ALREADY_EXISTS)
-            {
-                // BACKWARDS COMPAT
-                // see _BCsequence() comment
-                $result = $this->_BCsequence($seqname);
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-                $repeat = 1;
-            }
-        } while ($repeat);
-
-        return $this->raiseError($result);
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_mysql::nextID(), DB_mysql::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $res = $this->query('CREATE TABLE ' . $seqname
-                            . ' (id INTEGER UNSIGNED AUTO_INCREMENT NOT NULL,'
-                            . ' PRIMARY KEY(id))');
-        if (DB::isError($res)) {
-            return $res;
-        }
-        // insert yields value 1, nextId call will generate ID 2
-        $res = $this->query("INSERT INTO ${seqname} (id) VALUES (0)");
-        if (DB::isError($res)) {
-            return $res;
-        }
-        // so reset to zero
-        return $this->query("UPDATE ${seqname} SET id = 0");
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_mysql::nextID(), DB_mysql::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP TABLE ' . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ _BCsequence()
-
-    /**
-     * Backwards compatibility with old sequence emulation implementation
-     * (clean up the dupes)
-     *
-     * @param string $seqname  the sequence name to clean up
-     *
-     * @return bool  true on success.  A DB_Error object on failure.
-     *
-     * @access private
-     */
-    function _BCsequence($seqname)
-    {
-        // Obtain a user-level lock... this will release any previous
-        // application locks, but unlike LOCK TABLES, it does not abort
-        // the current transaction and is much less frequently used.
-        $result = $this->getOne("SELECT GET_LOCK('${seqname}_lock',10)");
-        if (DB::isError($result)) {
-            return $result;
-        }
-        if ($result == 0) {
-            // Failed to get the lock, can't do the conversion, bail
-            // with a DB_ERROR_NOT_LOCKED error
-            return $this->mysqlRaiseError(DB_ERROR_NOT_LOCKED);
-        }
-
-        $highest_id = $this->getOne("SELECT MAX(id) FROM ${seqname}");
-        if (DB::isError($highest_id)) {
-            return $highest_id;
-        }
-        // This should kill all rows except the highest
-        // We should probably do something if $highest_id isn't
-        // numeric, but I'm at a loss as how to handle that...
-        $result = $this->query('DELETE FROM ' . $seqname
-                               . " WHERE id <> $highest_id");
-        if (DB::isError($result)) {
-            return $result;
-        }
-
-        // If another thread has been waiting for this lock,
-        // it will go thru the above procedure, but will have no
-        // real effect
-        $result = $this->getOne("SELECT RELEASE_LOCK('${seqname}_lock')");
-        if (DB::isError($result)) {
-            return $result;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ quoteIdentifier()
-
-    /**
-     * Quotes a string so it can be safely used as a table or column name
-     *
-     * MySQL can't handle the backtick character (`) in
-     * table or column names.
-     *
-     * @param string $str  identifier name to be quoted
-     *
-     * @return string  quoted identifier string
-     *
-     * @see DB_common::quoteIdentifier()
-     * @since Method available since Release 1.6.0
-     */
-    function quoteIdentifier($str)
-    {
-        return '`' . $str . '`';
-    }
-
-    // }}}
-    // {{{ quote()
-
-    /**
-     * @deprecated  Deprecated in release 1.6.0
-     */
-    function quote($str)
-    {
-        return $this->quoteSmart($str);
-    }
-
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * @param string $str  the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.6.0
-     */
-    function escapeSimple($str)
-    {
-        if (function_exists('mysql_real_escape_string')) {
-            return @mysql_real_escape_string($str, $this->connection);
-        } else {
-            return @mysql_escape_string($str);
-        }
-    }
-
-    // }}}
-    // {{{ modifyQuery()
-
-    /**
-     * Changes a query string for various DBMS specific reasons
-     *
-     * This little hack lets you know how many rows were deleted
-     * when running a "DELETE FROM table" query.  Only implemented
-     * if the DB_PORTABILITY_DELETE_COUNT portability option is on.
-     *
-     * @param string $query  the query string to modify
-     *
-     * @return string  the modified query string
-     *
-     * @access protected
-     * @see DB_common::setOption()
-     */
-    function modifyQuery($query)
-    {
-        if ($this->options['portability'] & DB_PORTABILITY_DELETE_COUNT) {
-            // "DELETE FROM table" gives 0 affected rows in MySQL.
-            // This little hack lets you know how many rows were deleted.
-            if (preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $query)) {
-                $query = preg_replace('/^\s*DELETE\s+FROM\s+(\S+)\s*$/',
-                                      'DELETE FROM \1 WHERE 1=1', $query);
-            }
-        }
-        return $query;
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        if (DB::isManip($query)) {
-            return $query . " LIMIT $count";
-        } else {
-            return $query . " LIMIT $from, $count";
-        }
-    }
-
-    // }}}
-    // {{{ mysqlRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_mysql::errorNative(), DB_common::errorCode()
-     */
-    function mysqlRaiseError($errno = null)
-    {
-        if ($errno === null) {
-            if ($this->options['portability'] & DB_PORTABILITY_ERRORS) {
-                $this->errorcode_map[1022] = DB_ERROR_CONSTRAINT;
-                $this->errorcode_map[1048] = DB_ERROR_CONSTRAINT_NOT_NULL;
-                $this->errorcode_map[1062] = DB_ERROR_CONSTRAINT;
-            } else {
-                // Doing this in case mode changes during runtime.
-                $this->errorcode_map[1022] = DB_ERROR_ALREADY_EXISTS;
-                $this->errorcode_map[1048] = DB_ERROR_CONSTRAINT;
-                $this->errorcode_map[1062] = DB_ERROR_ALREADY_EXISTS;
-            }
-            $errno = $this->errorCode(mysql_errno($this->connection));
-        }
-        return $this->raiseError($errno, null, null, null,
-                                 @mysql_errno($this->connection) . ' ** ' .
-                                 @mysql_error($this->connection));
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error code produced by the last query
-     *
-     * @return int  the DBMS' error code
-     */
-    function errorNative()
-    {
-        return @mysql_errno($this->connection);
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @mysql_list_fields($this->dsn['database'],
-                                     $result, $this->connection);
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->mysqlRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @mysql_num_fields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => $case_func(@mysql_field_table($id, $i)),
-                'name'  => $case_func(@mysql_field_name($id, $i)),
-                'type'  => @mysql_field_type($id, $i),
-                'len'   => @mysql_field_len($id, $i),
-                'flags' => @mysql_field_flags($id, $i),
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @mysql_free_result($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SHOW TABLES';
-            case 'users':
-                return 'SELECT DISTINCT User FROM mysql.user';
-            case 'databases':
-                return 'SHOW DATABASES';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/lib/phpFlickr/PEAR/DB/pgsql.php b/lib/phpFlickr/PEAR/DB/pgsql.php
deleted file mode 100644
index 1e58f48d6..000000000
--- a/lib/phpFlickr/PEAR/DB/pgsql.php
+++ /dev/null
@@ -1,1097 +0,0 @@
-
- * @author     Stig Bakken 
- * @author     Daniel Convissor 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: pgsql.php 32 2005-08-01 06:21:02Z dancoulter $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB_common class so it can be extended from
- */
-require_once 'DB/common.php';
-
-/**
- * The methods PEAR DB uses to interact with PHP's pgsql extension
- * for interacting with PostgreSQL databases
- *
- * These methods overload the ones declared in DB_common.
- *
- * @category   Database
- * @package    DB
- * @author     Rui Hirokawa 
- * @author     Stig Bakken 
- * @author     Daniel Convissor 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/DB
- */
-class DB_pgsql extends DB_common
-{
-    // {{{ properties
-
-    /**
-     * The DB driver type (mysql, oci8, odbc, etc.)
-     * @var string
-     */
-    var $phptype = 'pgsql';
-
-    /**
-     * The database syntax variant to be used (db2, access, etc.), if any
-     * @var string
-     */
-    var $dbsyntax = 'pgsql';
-
-    /**
-     * The capabilities of this DB implementation
-     *
-     * The 'new_link' element contains the PHP version that first provided
-     * new_link support for this DBMS.  Contains false if it's unsupported.
-     *
-     * Meaning of the 'limit' element:
-     *   + 'emulate' = emulate with fetch row by number
-     *   + 'alter'   = alter the query
-     *   + false     = skip rows
-     *
-     * @var array
-     */
-    var $features = array(
-        'limit'         => 'alter',
-        'new_link'      => '4.3.0',
-        'numrows'       => true,
-        'pconnect'      => true,
-        'prepare'       => false,
-        'ssl'           => true,
-        'transactions'  => true,
-    );
-
-    /**
-     * A mapping of native error codes to DB error codes
-     * @var array
-     */
-    var $errorcode_map = array(
-    );
-
-    /**
-     * The raw database connection created by PHP
-     * @var resource
-     */
-    var $connection;
-
-    /**
-     * The DSN information for connecting to a database
-     * @var array
-     */
-    var $dsn = array();
-
-
-    /**
-     * Should data manipulation queries be committed automatically?
-     * @var bool
-     * @access private
-     */
-    var $autocommit = true;
-
-    /**
-     * The quantity of transactions begun
-     *
-     * {@internal  While this is private, it can't actually be designated
-     * private in PHP 5 because it is directly accessed in the test suite.}}
-     *
-     * @var integer
-     * @access private
-     */
-    var $transaction_opcount = 0;
-
-    /**
-     * The number of rows affected by a data manipulation query
-     * @var integer
-     */
-    var $affected = 0;
-
-    /**
-     * The current row being looked at in fetchInto()
-     * @var array
-     * @access private
-     */
-    var $row = array();
-
-    /**
-     * The number of rows in a given result set
-     * @var array
-     * @access private
-     */
-    var $_num_rows = array();
-
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * This constructor calls $this->DB_common()
-     *
-     * @return void
-     */
-    function DB_pgsql()
-    {
-        $this->DB_common();
-    }
-
-    // }}}
-    // {{{ connect()
-
-    /**
-     * Connect to the database server, log in and open the database
-     *
-     * Don't call this method directly.  Use DB::connect() instead.
-     *
-     * PEAR DB's pgsql driver supports the following extra DSN options:
-     *   + connect_timeout  How many seconds to wait for a connection to
-     *                       be established.  Available since PEAR DB 1.7.0.
-     *   + new_link         If set to true, causes subsequent calls to
-     *                       connect() to return a new connection link
-     *                       instead of the existing one.  WARNING: this is
-     *                       not portable to other DBMS's.  Available only
-     *                       if PHP is >= 4.3.0 and PEAR DB is >= 1.7.0.
-     *   + options          Command line options to be sent to the server.
-     *                       Available since PEAR DB 1.6.4.
-     *   + service          Specifies a service name in pg_service.conf that
-     *                       holds additional connection parameters.
-     *                       Available since PEAR DB 1.7.0.
-     *   + sslmode          How should SSL be used when connecting?  Values:
-     *                       disable, allow, prefer or require.
-     *                       Available since PEAR DB 1.7.0.
-     *   + tty              This was used to specify where to send server
-     *                       debug output.  Available since PEAR DB 1.6.4.
-     *
-     * Example of connecting to a new link via a socket:
-     * 
-     * require_once 'DB.php';
-     * 
-     * $dsn = 'pgsql://user:pass@unix(/tmp)/dbname?new_link=true';
-     * $options = array(
-     *     'portability' => DB_PORTABILITY_ALL,
-     * );
-     * 
-     * $db =& DB::connect($dsn, $options);
-     * if (PEAR::isError($db)) {
-     *     die($db->getMessage());
-     * }
-     * 
-     *
-     * @param array $dsn         the data source name
-     * @param bool  $persistent  should the connection be persistent?
-     *
-     * @return int  DB_OK on success. A DB_Error object on failure.
-     *
-     * @link http://www.postgresql.org/docs/current/static/libpq.html#LIBPQ-CONNECT
-     */
-    function connect($dsn, $persistent = false)
-    {
-        if (!PEAR::loadExtension('pgsql')) {
-            return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND);
-        }
-
-        $this->dsn = $dsn;
-        if ($dsn['dbsyntax']) {
-            $this->dbsyntax = $dsn['dbsyntax'];
-        }
-
-        $protocol = $dsn['protocol'] ? $dsn['protocol'] : 'tcp';
-
-        $params = array('');
-        if ($protocol == 'tcp') {
-            if ($dsn['hostspec']) {
-                $params[0] .= 'host=' . $dsn['hostspec'];
-            }
-            if ($dsn['port']) {
-                $params[0] .= ' port=' . $dsn['port'];
-            }
-        } elseif ($protocol == 'unix') {
-            // Allow for pg socket in non-standard locations.
-            if ($dsn['socket']) {
-                $params[0] .= 'host=' . $dsn['socket'];
-            }
-            if ($dsn['port']) {
-                $params[0] .= ' port=' . $dsn['port'];
-            }
-        }
-        if ($dsn['database']) {
-            $params[0] .= ' dbname=\'' . addslashes($dsn['database']) . '\'';
-        }
-        if ($dsn['username']) {
-            $params[0] .= ' user=\'' . addslashes($dsn['username']) . '\'';
-        }
-        if ($dsn['password']) {
-            $params[0] .= ' password=\'' . addslashes($dsn['password']) . '\'';
-        }
-        if (!empty($dsn['options'])) {
-            $params[0] .= ' options=' . $dsn['options'];
-        }
-        if (!empty($dsn['tty'])) {
-            $params[0] .= ' tty=' . $dsn['tty'];
-        }
-        if (!empty($dsn['connect_timeout'])) {
-            $params[0] .= ' connect_timeout=' . $dsn['connect_timeout'];
-        }
-        if (!empty($dsn['sslmode'])) {
-            $params[0] .= ' sslmode=' . $dsn['sslmode'];
-        }
-        if (!empty($dsn['service'])) {
-            $params[0] .= ' service=' . $dsn['service'];
-        }
-
-        if (isset($dsn['new_link'])
-            && ($dsn['new_link'] == 'true' || $dsn['new_link'] === true))
-        {
-            if (version_compare(phpversion(), '4.3.0', '>=')) {
-                $params[] = PGSQL_CONNECT_FORCE_NEW;
-            }
-        }
-
-        $connect_function = $persistent ? 'pg_pconnect' : 'pg_connect';
-
-        $ini = ini_get('track_errors');
-        $php_errormsg = '';
-        if ($ini) {
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-        } else {
-            ini_set('track_errors', 1);
-            $this->connection = @call_user_func_array($connect_function,
-                                                      $params);
-            ini_set('track_errors', $ini);
-        }
-
-        if (!$this->connection) {
-            return $this->raiseError(DB_ERROR_CONNECT_FAILED,
-                                     null, null, null,
-                                     $php_errormsg);
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ disconnect()
-
-    /**
-     * Disconnects from the database server
-     *
-     * @return bool  TRUE on success, FALSE on failure
-     */
-    function disconnect()
-    {
-        $ret = @pg_close($this->connection);
-        $this->connection = null;
-        return $ret;
-    }
-
-    // }}}
-    // {{{ simpleQuery()
-
-    /**
-     * Sends a query to the database server
-     *
-     * @param string  the SQL query string
-     *
-     * @return mixed  + a PHP result resrouce for successful SELECT queries
-     *                + the DB_OK constant for other successful queries
-     *                + a DB_Error object on failure
-     */
-    function simpleQuery($query)
-    {
-        $ismanip = DB::isManip($query);
-        $this->last_query = $query;
-        $query = $this->modifyQuery($query);
-        if (!$this->autocommit && $ismanip) {
-            if ($this->transaction_opcount == 0) {
-                $result = @pg_exec($this->connection, 'begin;');
-                if (!$result) {
-                    return $this->pgsqlRaiseError();
-                }
-            }
-            $this->transaction_opcount++;
-        }
-        $result = @pg_exec($this->connection, $query);
-        if (!$result) {
-            return $this->pgsqlRaiseError();
-        }
-        // Determine which queries that should return data, and which
-        // should return an error code only.
-        if ($ismanip) {
-            $this->affected = @pg_affected_rows($result);
-            return DB_OK;
-        } elseif (preg_match('/^\s*\(*\s*(SELECT|EXPLAIN|SHOW)\s/si', $query)) {
-            /* PostgreSQL commands:
-               ABORT, ALTER, BEGIN, CLOSE, CLUSTER, COMMIT, COPY,
-               CREATE, DECLARE, DELETE, DROP TABLE, EXPLAIN, FETCH,
-               GRANT, INSERT, LISTEN, LOAD, LOCK, MOVE, NOTIFY, RESET,
-               REVOKE, ROLLBACK, SELECT, SELECT INTO, SET, SHOW,
-               UNLISTEN, UPDATE, VACUUM
-            */
-            $this->row[(int)$result] = 0; // reset the row counter.
-            $numrows = $this->numRows($result);
-            if (is_object($numrows)) {
-                return $numrows;
-            }
-            $this->_num_rows[(int)$result] = $numrows;
-            $this->affected = 0;
-            return $result;
-        } else {
-            $this->affected = 0;
-            return DB_OK;
-        }
-    }
-
-    // }}}
-    // {{{ nextResult()
-
-    /**
-     * Move the internal pgsql result pointer to the next available result
-     *
-     * @param a valid fbsql result resource
-     *
-     * @access public
-     *
-     * @return true if a result is available otherwise return false
-     */
-    function nextResult($result)
-    {
-        return false;
-    }
-
-    // }}}
-    // {{{ fetchInto()
-
-    /**
-     * Places a row from the result set into the given array
-     *
-     * Formating of the array and the data therein are configurable.
-     * See DB_result::fetchInto() for more information.
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::fetchInto() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result    the query result resource
-     * @param array    $arr       the referenced array to put the data in
-     * @param int      $fetchmode how the resulting array should be indexed
-     * @param int      $rownum    the row number to fetch (0 = first row)
-     *
-     * @return mixed  DB_OK on success, NULL when the end of a result set is
-     *                 reached or on failure
-     *
-     * @see DB_result::fetchInto()
-     */
-    function fetchInto($result, &$arr, $fetchmode, $rownum = null)
-    {
-        $result_int = (int)$result;
-        $rownum = ($rownum !== null) ? $rownum : $this->row[$result_int];
-        if ($rownum >= $this->_num_rows[$result_int]) {
-            return null;
-        }
-        if ($fetchmode & DB_FETCHMODE_ASSOC) {
-            $arr = @pg_fetch_array($result, $rownum, PGSQL_ASSOC);
-            if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
-                $arr = array_change_key_case($arr, CASE_LOWER);
-            }
-        } else {
-            $arr = @pg_fetch_row($result, $rownum);
-        }
-        if (!$arr) {
-            return null;
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_RTRIM) {
-            $this->_rtrimArrayValues($arr);
-        }
-        if ($this->options['portability'] & DB_PORTABILITY_NULL_TO_EMPTY) {
-            $this->_convertNullArrayValuesToEmpty($arr);
-        }
-        $this->row[$result_int] = ++$rownum;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ freeResult()
-
-    /**
-     * Deletes the result set and frees the memory occupied by the result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::free() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return bool  TRUE on success, FALSE if $result is invalid
-     *
-     * @see DB_result::free()
-     */
-    function freeResult($result)
-    {
-        if (is_resource($result)) {
-            unset($this->row[(int)$result]);
-            unset($this->_num_rows[(int)$result]);
-            $this->affected = 0;
-            return @pg_freeresult($result);
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ quote()
-
-    /**
-     * @deprecated  Deprecated in release 1.6.0
-     * @internal
-     */
-    function quote($str)
-    {
-        return $this->quoteSmart($str);
-    }
-
-    // }}}
-    // {{{ quoteSmart()
-
-    /**
-     * Formats input so it can be safely used in a query
-     *
-     * @param mixed $in  the data to be formatted
-     *
-     * @return mixed  the formatted data.  The format depends on the input's
-     *                 PHP type:
-     *                 + null = the string NULL
-     *                 + boolean = string TRUE or FALSE
-     *                 + integer or double = the unquoted number
-     *                 + other (including strings and numeric strings) =
-     *                   the data escaped according to MySQL's settings
-     *                   then encapsulated between single quotes
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.6.0
-     */
-    function quoteSmart($in)
-    {
-        if (is_int($in) || is_double($in)) {
-            return $in;
-        } elseif (is_bool($in)) {
-            return $in ? 'TRUE' : 'FALSE';
-        } elseif (is_null($in)) {
-            return 'NULL';
-        } else {
-            return "'" . $this->escapeSimple($in) . "'";
-        }
-    }
-
-    // }}}
-    // {{{ escapeSimple()
-
-    /**
-     * Escapes a string according to the current DBMS's standards
-     *
-     * {@internal PostgreSQL treats a backslash as an escape character,
-     * so they are escaped as well.
-     *
-     * Not using pg_escape_string() yet because it requires PostgreSQL
-     * to be at version 7.2 or greater.}}
-     *
-     * @param string $str  the string to be escaped
-     *
-     * @return string  the escaped string
-     *
-     * @see DB_common::quoteSmart()
-     * @since Method available since Release 1.6.0
-     */
-    function escapeSimple($str)
-    {
-        return str_replace("'", "''", str_replace('\\', '\\\\', $str));
-    }
-
-    // }}}
-    // {{{ numCols()
-
-    /**
-     * Gets the number of columns in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numCols() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of columns.  A DB_Error object on failure.
-     *
-     * @see DB_result::numCols()
-     */
-    function numCols($result)
-    {
-        $cols = @pg_numfields($result);
-        if (!$cols) {
-            return $this->pgsqlRaiseError();
-        }
-        return $cols;
-    }
-
-    // }}}
-    // {{{ numRows()
-
-    /**
-     * Gets the number of rows in a result set
-     *
-     * This method is not meant to be called directly.  Use
-     * DB_result::numRows() instead.  It can't be declared "protected"
-     * because DB_result is a separate object.
-     *
-     * @param resource $result  PHP's query result resource
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     *
-     * @see DB_result::numRows()
-     */
-    function numRows($result)
-    {
-        $rows = @pg_numrows($result);
-        if ($rows === null) {
-            return $this->pgsqlRaiseError();
-        }
-        return $rows;
-    }
-
-    // }}}
-    // {{{ autoCommit()
-
-    /**
-     * Enables or disables automatic commits
-     *
-     * @param bool $onoff  true turns it on, false turns it off
-     *
-     * @return int  DB_OK on success.  A DB_Error object if the driver
-     *               doesn't support auto-committing transactions.
-     */
-    function autoCommit($onoff = false)
-    {
-        // XXX if $this->transaction_opcount > 0, we should probably
-        // issue a warning here.
-        $this->autocommit = $onoff ? true : false;
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ commit()
-
-    /**
-     * Commits the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function commit()
-    {
-        if ($this->transaction_opcount > 0) {
-            // (disabled) hack to shut up error messages from libpq.a
-            //@fclose(@fopen("php://stderr", "w"));
-            $result = @pg_exec($this->connection, 'end;');
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->pgsqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ rollback()
-
-    /**
-     * Reverts the current transaction
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     */
-    function rollback()
-    {
-        if ($this->transaction_opcount > 0) {
-            $result = @pg_exec($this->connection, 'abort;');
-            $this->transaction_opcount = 0;
-            if (!$result) {
-                return $this->pgsqlRaiseError();
-            }
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ affectedRows()
-
-    /**
-     * Determines the number of rows affected by a data maniuplation query
-     *
-     * 0 is returned for queries that don't manipulate data.
-     *
-     * @return int  the number of rows.  A DB_Error object on failure.
-     */
-    function affectedRows()
-    {
-        return $this->affected;
-    }
-
-    // }}}
-    // {{{ nextId()
-
-    /**
-     * Returns the next free id in a sequence
-     *
-     * @param string  $seq_name  name of the sequence
-     * @param boolean $ondemand  when true, the seqence is automatically
-     *                            created if it does not exist
-     *
-     * @return int  the next id number in the sequence.
-     *               A DB_Error object on failure.
-     *
-     * @see DB_common::nextID(), DB_common::getSequenceName(),
-     *      DB_pgsql::createSequence(), DB_pgsql::dropSequence()
-     */
-    function nextId($seq_name, $ondemand = true)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $repeat = false;
-        do {
-            $this->pushErrorHandling(PEAR_ERROR_RETURN);
-            $result =& $this->query("SELECT NEXTVAL('${seqname}')");
-            $this->popErrorHandling();
-            if ($ondemand && DB::isError($result) &&
-                $result->getCode() == DB_ERROR_NOSUCHTABLE) {
-                $repeat = true;
-                $this->pushErrorHandling(PEAR_ERROR_RETURN);
-                $result = $this->createSequence($seq_name);
-                $this->popErrorHandling();
-                if (DB::isError($result)) {
-                    return $this->raiseError($result);
-                }
-            } else {
-                $repeat = false;
-            }
-        } while ($repeat);
-        if (DB::isError($result)) {
-            return $this->raiseError($result);
-        }
-        $arr = $result->fetchRow(DB_FETCHMODE_ORDERED);
-        $result->free();
-        return $arr[0];
-    }
-
-    // }}}
-    // {{{ createSequence()
-
-    /**
-     * Creates a new sequence
-     *
-     * @param string $seq_name  name of the new sequence
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::createSequence(), DB_common::getSequenceName(),
-     *      DB_pgsql::nextID(), DB_pgsql::dropSequence()
-     */
-    function createSequence($seq_name)
-    {
-        $seqname = $this->getSequenceName($seq_name);
-        $result = $this->query("CREATE SEQUENCE ${seqname}");
-        return $result;
-    }
-
-    // }}}
-    // {{{ dropSequence()
-
-    /**
-     * Deletes a sequence
-     *
-     * @param string $seq_name  name of the sequence to be deleted
-     *
-     * @return int  DB_OK on success.  A DB_Error object on failure.
-     *
-     * @see DB_common::dropSequence(), DB_common::getSequenceName(),
-     *      DB_pgsql::nextID(), DB_pgsql::createSequence()
-     */
-    function dropSequence($seq_name)
-    {
-        return $this->query('DROP SEQUENCE '
-                            . $this->getSequenceName($seq_name));
-    }
-
-    // }}}
-    // {{{ modifyLimitQuery()
-
-    /**
-     * Adds LIMIT clauses to a query string according to current DBMS standards
-     *
-     * @param string $query   the query to modify
-     * @param int    $from    the row to start to fetching (0 = the first row)
-     * @param int    $count   the numbers of rows to fetch
-     * @param mixed  $params  array, string or numeric data to be used in
-     *                         execution of the statement.  Quantity of items
-     *                         passed must match quantity of placeholders in
-     *                         query:  meaning 1 placeholder for non-array
-     *                         parameters or 1 placeholder per array element.
-     *
-     * @return string  the query string with LIMIT clauses added
-     *
-     * @access protected
-     */
-    function modifyLimitQuery($query, $from, $count, $params = array())
-    {
-        return "$query LIMIT $count OFFSET $from";
-    }
-
-    // }}}
-    // {{{ pgsqlRaiseError()
-
-    /**
-     * Produces a DB_Error object regarding the current problem
-     *
-     * @param int $errno  if the error is being manually raised pass a
-     *                     DB_ERROR* constant here.  If this isn't passed
-     *                     the error information gathered from the DBMS.
-     *
-     * @return object  the DB_Error object
-     *
-     * @see DB_common::raiseError(),
-     *      DB_pgsql::errorNative(), DB_pgsql::errorCode()
-     */
-    function pgsqlRaiseError($errno = null)
-    {
-        $native = $this->errorNative();
-        if ($errno === null) {
-            $errno = $this->errorCode($native);
-        }
-        return $this->raiseError($errno, null, null, null, $native);
-    }
-
-    // }}}
-    // {{{ errorNative()
-
-    /**
-     * Gets the DBMS' native error message produced by the last query
-     *
-     * {@internal Error messages are used instead of error codes 
-     * in order to support older versions of PostgreSQL.}}
-     *
-     * @return string  the DBMS' error message
-     */
-    function errorNative()
-    {
-        return @pg_errormessage($this->connection);
-    }
-
-    // }}}
-    // {{{ errorCode()
-
-    /**
-     * Determines PEAR::DB error code from the database's text error message.
-     *
-     * @param  string  $errormsg  error message returned from the database
-     * @return integer  an error number from a DB error constant
-     */
-    function errorCode($errormsg)
-    {
-        static $error_regexps;
-        if (!isset($error_regexps)) {
-            $error_regexps = array(
-                '/(relation|sequence|table).*does not exist|class .* not found/i'
-                    => DB_ERROR_NOSUCHTABLE,
-                '/index .* does not exist/'
-                    => DB_ERROR_NOT_FOUND,
-                '/column .* does not exist/i'
-                    => DB_ERROR_NOSUCHFIELD,
-                '/relation .* already exists/i'
-                    => DB_ERROR_ALREADY_EXISTS,
-                '/(divide|division) by zero$/i'
-                    => DB_ERROR_DIVZERO,
-                '/pg_atoi: error in .*: can\'t parse /i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/invalid input syntax for( type)? (integer|numeric)/i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/value .* is out of range for type \w*int/i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/integer out of range/i'
-                    => DB_ERROR_INVALID_NUMBER,
-                '/value too long for type character/i'
-                    => DB_ERROR_INVALID,
-                '/attribute .* not found|relation .* does not have attribute/i'
-                    => DB_ERROR_NOSUCHFIELD,
-                '/column .* specified in USING clause does not exist in (left|right) table/i'
-                    => DB_ERROR_NOSUCHFIELD,
-                '/parser: parse error at or near/i'
-                    => DB_ERROR_SYNTAX,
-                '/syntax error at/'
-                    => DB_ERROR_SYNTAX,
-                '/column reference .* is ambiguous/i'
-                    => DB_ERROR_SYNTAX,
-                '/permission denied/'
-                    => DB_ERROR_ACCESS_VIOLATION,
-                '/violates not-null constraint/'
-                    => DB_ERROR_CONSTRAINT_NOT_NULL,
-                '/violates [\w ]+ constraint/'
-                    => DB_ERROR_CONSTRAINT,
-                '/referential integrity violation/'
-                    => DB_ERROR_CONSTRAINT,
-                '/more expressions than target columns/i'
-                    => DB_ERROR_VALUE_COUNT_ON_ROW,
-            );
-        }
-        foreach ($error_regexps as $regexp => $code) {
-            if (preg_match($regexp, $errormsg)) {
-                return $code;
-            }
-        }
-        // Fall back to DB_ERROR if there was no mapping.
-        return DB_ERROR;
-    }
-
-    // }}}
-    // {{{ tableInfo()
-
-    /**
-     * Returns information about a table or a result set
-     *
-     * NOTE: only supports 'table' and 'flags' if $result
-     * is a table name.
-     *
-     * @param object|string  $result  DB_result object from a query or a
-     *                                 string containing the name of a table.
-     *                                 While this also accepts a query result
-     *                                 resource identifier, this behavior is
-     *                                 deprecated.
-     * @param int            $mode    a valid tableInfo mode
-     *
-     * @return array  an associative array with the information requested.
-     *                 A DB_Error object on failure.
-     *
-     * @see DB_common::tableInfo()
-     */
-    function tableInfo($result, $mode = null)
-    {
-        if (is_string($result)) {
-            /*
-             * Probably received a table name.
-             * Create a result resource identifier.
-             */
-            $id = @pg_exec($this->connection, "SELECT * FROM $result LIMIT 0");
-            $got_string = true;
-        } elseif (isset($result->result)) {
-            /*
-             * Probably received a result object.
-             * Extract the result resource identifier.
-             */
-            $id = $result->result;
-            $got_string = false;
-        } else {
-            /*
-             * Probably received a result resource identifier.
-             * Copy it.
-             * Deprecated.  Here for compatibility only.
-             */
-            $id = $result;
-            $got_string = false;
-        }
-
-        if (!is_resource($id)) {
-            return $this->pgsqlRaiseError(DB_ERROR_NEED_MORE_DATA);
-        }
-
-        if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE) {
-            $case_func = 'strtolower';
-        } else {
-            $case_func = 'strval';
-        }
-
-        $count = @pg_numfields($id);
-        $res   = array();
-
-        if ($mode) {
-            $res['num_fields'] = $count;
-        }
-
-        for ($i = 0; $i < $count; $i++) {
-            $res[$i] = array(
-                'table' => $got_string ? $case_func($result) : '',
-                'name'  => $case_func(@pg_fieldname($id, $i)),
-                'type'  => @pg_fieldtype($id, $i),
-                'len'   => @pg_fieldsize($id, $i),
-                'flags' => $got_string
-                           ? $this->_pgFieldFlags($id, $i, $result)
-                           : '',
-            );
-            if ($mode & DB_TABLEINFO_ORDER) {
-                $res['order'][$res[$i]['name']] = $i;
-            }
-            if ($mode & DB_TABLEINFO_ORDERTABLE) {
-                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
-            }
-        }
-
-        // free the result only if we were called on a table
-        if ($got_string) {
-            @pg_freeresult($id);
-        }
-        return $res;
-    }
-
-    // }}}
-    // {{{ _pgFieldFlags()
-
-    /**
-     * Get a column's flags
-     *
-     * Supports "not_null", "default_value", "primary_key", "unique_key"
-     * and "multiple_key".  The default value is passed through
-     * rawurlencode() in case there are spaces in it.
-     *
-     * @param int $resource   the PostgreSQL result identifier
-     * @param int $num_field  the field number
-     *
-     * @return string  the flags
-     *
-     * @access private
-     */
-    function _pgFieldFlags($resource, $num_field, $table_name)
-    {
-        $field_name = @pg_fieldname($resource, $num_field);
-
-        $result = @pg_exec($this->connection, "SELECT f.attnotnull, f.atthasdef
-                                FROM pg_attribute f, pg_class tab, pg_type typ
-                                WHERE tab.relname = typ.typname
-                                AND typ.typrelid = f.attrelid
-                                AND f.attname = '$field_name'
-                                AND tab.relname = '$table_name'");
-        if (@pg_numrows($result) > 0) {
-            $row = @pg_fetch_row($result, 0);
-            $flags  = ($row[0] == 't') ? 'not_null ' : '';
-
-            if ($row[1] == 't') {
-                $result = @pg_exec($this->connection, "SELECT a.adsrc
-                                    FROM pg_attribute f, pg_class tab, pg_type typ, pg_attrdef a
-                                    WHERE tab.relname = typ.typname AND typ.typrelid = f.attrelid
-                                    AND f.attrelid = a.adrelid AND f.attname = '$field_name'
-                                    AND tab.relname = '$table_name' AND f.attnum = a.adnum");
-                $row = @pg_fetch_row($result, 0);
-                $num = preg_replace("/'(.*)'::\w+/", "\\1", $row[0]);
-                $flags .= 'default_' . rawurlencode($num) . ' ';
-            }
-        } else {
-            $flags = '';
-        }
-        $result = @pg_exec($this->connection, "SELECT i.indisunique, i.indisprimary, i.indkey
-                                FROM pg_attribute f, pg_class tab, pg_type typ, pg_index i
-                                WHERE tab.relname = typ.typname
-                                AND typ.typrelid = f.attrelid
-                                AND f.attrelid = i.indrelid
-                                AND f.attname = '$field_name'
-                                AND tab.relname = '$table_name'");
-        $count = @pg_numrows($result);
-
-        for ($i = 0; $i < $count ; $i++) {
-            $row = @pg_fetch_row($result, $i);
-            $keys = explode(' ', $row[2]);
-
-            if (in_array($num_field + 1, $keys)) {
-                $flags .= ($row[0] == 't' && $row[1] == 'f') ? 'unique_key ' : '';
-                $flags .= ($row[1] == 't') ? 'primary_key ' : '';
-                if (count($keys) > 1)
-                    $flags .= 'multiple_key ';
-            }
-        }
-
-        return trim($flags);
-    }
-
-    // }}}
-    // {{{ getSpecialQuery()
-
-    /**
-     * Obtains the query string needed for listing a given type of objects
-     *
-     * @param string $type  the kind of objects you want to retrieve
-     *
-     * @return string  the SQL query string or null if the driver doesn't
-     *                  support the object type requested
-     *
-     * @access protected
-     * @see DB_common::getListOf()
-     */
-    function getSpecialQuery($type)
-    {
-        switch ($type) {
-            case 'tables':
-                return 'SELECT c.relname AS "Name"'
-                        . ' FROM pg_class c, pg_user u'
-                        . ' WHERE c.relowner = u.usesysid'
-                        . " AND c.relkind = 'r'"
-                        . ' AND NOT EXISTS'
-                        . ' (SELECT 1 FROM pg_views'
-                        . '  WHERE viewname = c.relname)'
-                        . " AND c.relname !~ '^(pg_|sql_)'"
-                        . ' UNION'
-                        . ' SELECT c.relname AS "Name"'
-                        . ' FROM pg_class c'
-                        . " WHERE c.relkind = 'r'"
-                        . ' AND NOT EXISTS'
-                        . ' (SELECT 1 FROM pg_views'
-                        . '  WHERE viewname = c.relname)'
-                        . ' AND NOT EXISTS'
-                        . ' (SELECT 1 FROM pg_user'
-                        . '  WHERE usesysid = c.relowner)'
-                        . " AND c.relname !~ '^pg_'";
-            case 'schema.tables':
-                return "SELECT schemaname || '.' || tablename"
-                        . ' AS "Name"'
-                        . ' FROM pg_catalog.pg_tables'
-                        . ' WHERE schemaname NOT IN'
-                        . " ('pg_catalog', 'information_schema', 'pg_toast')";
-            case 'views':
-                // Table cols: viewname | viewowner | definition
-                return 'SELECT viewname from pg_views WHERE schemaname'
-                        . " NOT IN ('information_schema', 'pg_catalog')";
-            case 'users':
-                // cols: usename |usesysid|usecreatedb|usetrace|usesuper|usecatupd|passwd  |valuntil
-                return 'SELECT usename FROM pg_user';
-            case 'databases':
-                return 'SELECT datname FROM pg_database';
-            case 'functions':
-            case 'procedures':
-                return 'SELECT proname FROM pg_proc WHERE proowner <> 1';
-            default:
-                return null;
-        }
-    }
-
-    // }}}
-
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/lib/phpFlickr/PEAR/DB/storage.php b/lib/phpFlickr/PEAR/DB/storage.php
deleted file mode 100644
index f597b36d7..000000000
--- a/lib/phpFlickr/PEAR/DB/storage.php
+++ /dev/null
@@ -1,504 +0,0 @@
-
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: storage.php 32 2005-08-01 06:21:02Z dancoulter $
- * @link       http://pear.php.net/package/DB
- */
-
-/**
- * Obtain the DB class so it can be extended from
- */
-require_once 'DB.php';
-
-/**
- * Provides an object interface to a table row
- *
- * It lets you add, delete and change rows using objects rather than SQL
- * statements.
- *
- * @category   Database
- * @package    DB
- * @author     Stig Bakken 
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/DB
- */
-class DB_storage extends PEAR
-{
-    // {{{ properties
-
-    /** the name of the table (or view, if the backend database supports
-        updates in views) we hold data from */
-    var $_table = null;
-
-    /** which column(s) in the table contains primary keys, can be a
-        string for single-column primary keys, or an array of strings
-        for multiple-column primary keys */
-    var $_keycolumn = null;
-
-    /** DB connection handle used for all transactions */
-    var $_dbh = null;
-
-    /** an assoc with the names of database fields stored as properties
-        in this object */
-    var $_properties = array();
-
-    /** an assoc with the names of the properties in this object that
-        have been changed since they were fetched from the database */
-    var $_changes = array();
-
-    /** flag that decides if data in this object can be changed.
-        objects that don't have their table's key column in their
-        property lists will be flagged as read-only. */
-    var $_readonly = false;
-
-    /** function or method that implements a validator for fields that
-        are set, this validator function returns true if the field is
-        valid, false if not */
-    var $_validator = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Constructor
-     *
-     * @param $table string the name of the database table
-     *
-     * @param $keycolumn mixed string with name of key column, or array of
-     * strings if the table has a primary key of more than one column
-     *
-     * @param $dbh object database connection object
-     *
-     * @param $validator mixed function or method used to validate
-     * each new value, called with three parameters: the name of the
-     * field/column that is changing, a reference to the new value and
-     * a reference to this object
-     *
-     */
-    function DB_storage($table, $keycolumn, &$dbh, $validator = null)
-    {
-        $this->PEAR('DB_Error');
-        $this->_table = $table;
-        $this->_keycolumn = $keycolumn;
-        $this->_dbh = $dbh;
-        $this->_readonly = false;
-        $this->_validator = $validator;
-    }
-
-    // }}}
-    // {{{ _makeWhere()
-
-    /**
-     * Utility method to build a "WHERE" clause to locate ourselves in
-     * the table.
-     *
-     * XXX future improvement: use rowids?
-     *
-     * @access private
-     */
-    function _makeWhere($keyval = null)
-    {
-        if (is_array($this->_keycolumn)) {
-            if ($keyval === null) {
-                for ($i = 0; $i < sizeof($this->_keycolumn); $i++) {
-                    $keyval[] = $this->{$this->_keycolumn[$i]};
-                }
-            }
-            $whereclause = '';
-            for ($i = 0; $i < sizeof($this->_keycolumn); $i++) {
-                if ($i > 0) {
-                    $whereclause .= ' AND ';
-                }
-                $whereclause .= $this->_keycolumn[$i];
-                if (is_null($keyval[$i])) {
-                    // there's not much point in having a NULL key,
-                    // but we support it anyway
-                    $whereclause .= ' IS NULL';
-                } else {
-                    $whereclause .= ' = ' . $this->_dbh->quote($keyval[$i]);
-                }
-            }
-        } else {
-            if ($keyval === null) {
-                $keyval = @$this->{$this->_keycolumn};
-            }
-            $whereclause = $this->_keycolumn;
-            if (is_null($keyval)) {
-                // there's not much point in having a NULL key,
-                // but we support it anyway
-                $whereclause .= ' IS NULL';
-            } else {
-                $whereclause .= ' = ' . $this->_dbh->quote($keyval);
-            }
-        }
-        return $whereclause;
-    }
-
-    // }}}
-    // {{{ setup()
-
-    /**
-     * Method used to initialize a DB_storage object from the
-     * configured table.
-     *
-     * @param $keyval mixed the key[s] of the row to fetch (string or array)
-     *
-     * @return int DB_OK on success, a DB error if not
-     */
-    function setup($keyval)
-    {
-        $whereclause = $this->_makeWhere($keyval);
-        $query = 'SELECT * FROM ' . $this->_table . ' WHERE ' . $whereclause;
-        $sth = $this->_dbh->query($query);
-        if (DB::isError($sth)) {
-            return $sth;
-        }
-        $row = $sth->fetchRow(DB_FETCHMODE_ASSOC);
-        if (DB::isError($row)) {
-            return $row;
-        }
-        if (!$row) {
-            return $this->raiseError(null, DB_ERROR_NOT_FOUND, null, null,
-                                     $query, null, true);
-        }
-        foreach ($row as $key => $value) {
-            $this->_properties[$key] = true;
-            $this->$key = $value;
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ insert()
-
-    /**
-     * Create a new (empty) row in the configured table for this
-     * object.
-     */
-    function insert($newpk)
-    {
-        if (is_array($this->_keycolumn)) {
-            $primarykey = $this->_keycolumn;
-        } else {
-            $primarykey = array($this->_keycolumn);
-        }
-        settype($newpk, "array");
-        for ($i = 0; $i < sizeof($primarykey); $i++) {
-            $pkvals[] = $this->_dbh->quote($newpk[$i]);
-        }
-
-        $sth = $this->_dbh->query("INSERT INTO $this->_table (" .
-                                  implode(",", $primarykey) . ") VALUES(" .
-                                  implode(",", $pkvals) . ")");
-        if (DB::isError($sth)) {
-            return $sth;
-        }
-        if (sizeof($newpk) == 1) {
-            $newpk = $newpk[0];
-        }
-        $this->setup($newpk);
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Output a simple description of this DB_storage object.
-     * @return string object description
-     */
-    function toString()
-    {
-        $info = strtolower(get_class($this));
-        $info .= " (table=";
-        $info .= $this->_table;
-        $info .= ", keycolumn=";
-        if (is_array($this->_keycolumn)) {
-            $info .= "(" . implode(",", $this->_keycolumn) . ")";
-        } else {
-            $info .= $this->_keycolumn;
-        }
-        $info .= ", dbh=";
-        if (is_object($this->_dbh)) {
-            $info .= $this->_dbh->toString();
-        } else {
-            $info .= "null";
-        }
-        $info .= ")";
-        if (sizeof($this->_properties)) {
-            $info .= " [loaded, key=";
-            $keyname = $this->_keycolumn;
-            if (is_array($keyname)) {
-                $info .= "(";
-                for ($i = 0; $i < sizeof($keyname); $i++) {
-                    if ($i > 0) {
-                        $info .= ",";
-                    }
-                    $info .= $this->$keyname[$i];
-                }
-                $info .= ")";
-            } else {
-                $info .= $this->$keyname;
-            }
-            $info .= "]";
-        }
-        if (sizeof($this->_changes)) {
-            $info .= " [modified]";
-        }
-        return $info;
-    }
-
-    // }}}
-    // {{{ dump()
-
-    /**
-     * Dump the contents of this object to "standard output".
-     */
-    function dump()
-    {
-        foreach ($this->_properties as $prop => $foo) {
-            print "$prop = ";
-            print htmlentities($this->$prop);
-            print "
      \n";
-        }
-    }
-
-    // }}}
-    // {{{ &create()
-
-    /**
-     * Static method used to create new DB storage objects.
-     * @param $data assoc. array where the keys are the names
-     *              of properties/columns
-     * @return object a new instance of DB_storage or a subclass of it
-     */
-    function &create($table, &$data)
-    {
-        $classname = strtolower(get_class($this));
-        $obj =& new $classname($table);
-        foreach ($data as $name => $value) {
-            $obj->_properties[$name] = true;
-            $obj->$name = &$value;
-        }
-        return $obj;
-    }
-
-    // }}}
-    // {{{ loadFromQuery()
-
-    /**
-     * Loads data into this object from the given query.  If this
-     * object already contains table data, changes will be saved and
-     * the object re-initialized first.
-     *
-     * @param $query SQL query
-     *
-     * @param $params parameter list in case you want to use
-     * prepare/execute mode
-     *
-     * @return int DB_OK on success, DB_WARNING_READ_ONLY if the
-     * returned object is read-only (because the object's specified
-     * key column was not found among the columns returned by $query),
-     * or another DB error code in case of errors.
-     */
-// XXX commented out for now
-/*
-    function loadFromQuery($query, $params = null)
-    {
-        if (sizeof($this->_properties)) {
-            if (sizeof($this->_changes)) {
-                $this->store();
-                $this->_changes = array();
-            }
-            $this->_properties = array();
-        }
-        $rowdata = $this->_dbh->getRow($query, DB_FETCHMODE_ASSOC, $params);
-        if (DB::isError($rowdata)) {
-            return $rowdata;
-        }
-        reset($rowdata);
-        $found_keycolumn = false;
-        while (list($key, $value) = each($rowdata)) {
-            if ($key == $this->_keycolumn) {
-                $found_keycolumn = true;
-            }
-            $this->_properties[$key] = true;
-            $this->$key = &$value;
-            unset($value); // have to unset, or all properties will
-                           // refer to the same value
-        }
-        if (!$found_keycolumn) {
-            $this->_readonly = true;
-            return DB_WARNING_READ_ONLY;
-        }
-        return DB_OK;
-    }
- */
-
-    // }}}
-    // {{{ set()
-
-    /**
-     * Modify an attriute value.
-     */
-    function set($property, $newvalue)
-    {
-        // only change if $property is known and object is not
-        // read-only
-        if ($this->_readonly) {
-            return $this->raiseError(null, DB_WARNING_READ_ONLY, null,
-                                     null, null, null, true);
-        }
-        if (@isset($this->_properties[$property])) {
-            if (empty($this->_validator)) {
-                $valid = true;
-            } else {
-                $valid = @call_user_func($this->_validator,
-                                         $this->_table,
-                                         $property,
-                                         $newvalue,
-                                         $this->$property,
-                                         $this);
-            }
-            if ($valid) {
-                $this->$property = $newvalue;
-                if (empty($this->_changes[$property])) {
-                    $this->_changes[$property] = 0;
-                } else {
-                    $this->_changes[$property]++;
-                }
-            } else {
-                return $this->raiseError(null, DB_ERROR_INVALID, null,
-                                         null, "invalid field: $property",
-                                         null, true);
-            }
-            return true;
-        }
-        return $this->raiseError(null, DB_ERROR_NOSUCHFIELD, null,
-                                 null, "unknown field: $property",
-                                 null, true);
-    }
-
-    // }}}
-    // {{{ &get()
-
-    /**
-     * Fetch an attribute value.
-     *
-     * @param string attribute name
-     *
-     * @return attribute contents, or null if the attribute name is
-     * unknown
-     */
-    function &get($property)
-    {
-        // only return if $property is known
-        if (isset($this->_properties[$property])) {
-            return $this->$property;
-        }
-        $tmp = null;
-        return $tmp;
-    }
-
-    // }}}
-    // {{{ _DB_storage()
-
-    /**
-     * Destructor, calls DB_storage::store() if there are changes
-     * that are to be kept.
-     */
-    function _DB_storage()
-    {
-        if (sizeof($this->_changes)) {
-            $this->store();
-        }
-        $this->_properties = array();
-        $this->_changes = array();
-        $this->_table = null;
-    }
-
-    // }}}
-    // {{{ store()
-
-    /**
-     * Stores changes to this object in the database.
-     *
-     * @return DB_OK or a DB error
-     */
-    function store()
-    {
-        foreach ($this->_changes as $name => $foo) {
-            $params[] = &$this->$name;
-            $vars[] = $name . ' = ?';
-        }
-        if ($vars) {
-            $query = 'UPDATE ' . $this->_table . ' SET ' .
-                implode(', ', $vars) . ' WHERE ' .
-                $this->_makeWhere();
-            $stmt = $this->_dbh->prepare($query);
-            $res = $this->_dbh->execute($stmt, $params);
-            if (DB::isError($res)) {
-                return $res;
-            }
-            $this->_changes = array();
-        }
-        return DB_OK;
-    }
-
-    // }}}
-    // {{{ remove()
-
-    /**
-     * Remove the row represented by this object from the database.
-     *
-     * @return mixed DB_OK or a DB error
-     */
-    function remove()
-    {
-        if ($this->_readonly) {
-            return $this->raiseError(null, DB_WARNING_READ_ONLY, null,
-                                     null, null, null, true);
-        }
-        $query = 'DELETE FROM ' . $this->_table .' WHERE '.
-            $this->_makeWhere();
-        $res = $this->_dbh->query($query);
-        if (DB::isError($res)) {
-            return $res;
-        }
-        foreach ($this->_properties as $prop => $foo) {
-            unset($this->$prop);
-        }
-        $this->_properties = array();
-        $this->_changes = array();
-        return DB_OK;
-    }
-
-    // }}}
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-
-?>
diff --git a/lib/phpFlickr/PEAR/HTTP/Request.php b/lib/phpFlickr/PEAR/HTTP/Request.php
deleted file mode 100644
index 55e227b3a..000000000
--- a/lib/phpFlickr/PEAR/HTTP/Request.php
+++ /dev/null
@@ -1,1484 +0,0 @@
-
- * @author      Alexey Borzov 
- * @copyright   2002-2007 Richard Heyes
- * @license     http://opensource.org/licenses/bsd-license.php New BSD License
- * @version     CVS: $Id: Request.php 127 2008-01-17 20:21:37Z dcoulter $
- * @link        http://pear.php.net/package/HTTP_Request/ 
- */
-
-/**
- * PEAR and PEAR_Error classes (for error handling)
- */
-require_once 'PEAR.php';
-/**
- * Socket class
- */
-require_once 'Net/Socket.php';
-/**
- * URL handling class
- */ 
-require_once 'Net/URL.php';
-
-/**#@+
- * Constants for HTTP request methods
- */ 
-define('HTTP_REQUEST_METHOD_GET',     'GET',     true);
-define('HTTP_REQUEST_METHOD_HEAD',    'HEAD',    true);
-define('HTTP_REQUEST_METHOD_POST',    'POST',    true);
-define('HTTP_REQUEST_METHOD_PUT',     'PUT',     true);
-define('HTTP_REQUEST_METHOD_DELETE',  'DELETE',  true);
-define('HTTP_REQUEST_METHOD_OPTIONS', 'OPTIONS', true);
-define('HTTP_REQUEST_METHOD_TRACE',   'TRACE',   true);
-/**#@-*/
-
-/**#@+
- * Constants for HTTP request error codes
- */ 
-define('HTTP_REQUEST_ERROR_FILE',             1);
-define('HTTP_REQUEST_ERROR_URL',              2);
-define('HTTP_REQUEST_ERROR_PROXY',            4);
-define('HTTP_REQUEST_ERROR_REDIRECTS',        8);
-define('HTTP_REQUEST_ERROR_RESPONSE',        16);  
-define('HTTP_REQUEST_ERROR_GZIP_METHOD',     32);
-define('HTTP_REQUEST_ERROR_GZIP_READ',       64);
-define('HTTP_REQUEST_ERROR_GZIP_DATA',      128);
-define('HTTP_REQUEST_ERROR_GZIP_CRC',       256);
-/**#@-*/
-
-/**#@+
- * Constants for HTTP protocol versions
- */
-define('HTTP_REQUEST_HTTP_VER_1_0', '1.0', true);
-define('HTTP_REQUEST_HTTP_VER_1_1', '1.1', true);
-/**#@-*/
-
-if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-   /**
-    * Whether string functions are overloaded by their mbstring equivalents 
-    */
-    define('HTTP_REQUEST_MBSTRING', true);
-} else {
-   /**
-    * @ignore
-    */
-    define('HTTP_REQUEST_MBSTRING', false);
-}
-
-/**
- * Class for performing HTTP requests
- *
- * Simple example (fetches yahoo.com and displays it):
- * 
- * $a = &new HTTP_Request('http://www.yahoo.com/');
- * $a->sendRequest();
- * echo $a->getResponseBody();
- * 
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Richard Heyes 
- * @author      Alexey Borzov 
- * @version     Release: 1.4.2
- */
-class HTTP_Request
-{
-   /**#@+
-    * @access private
-    */
-    /**
-    * Instance of Net_URL
-    * @var Net_URL
-    */
-    var $_url;
-
-    /**
-    * Type of request
-    * @var string
-    */
-    var $_method;
-
-    /**
-    * HTTP Version
-    * @var string
-    */
-    var $_http;
-
-    /**
-    * Request headers
-    * @var array
-    */
-    var $_requestHeaders;
-
-    /**
-    * Basic Auth Username
-    * @var string
-    */
-    var $_user;
-    
-    /**
-    * Basic Auth Password
-    * @var string
-    */
-    var $_pass;
-
-    /**
-    * Socket object
-    * @var Net_Socket
-    */
-    var $_sock;
-    
-    /**
-    * Proxy server
-    * @var string
-    */
-    var $_proxy_host;
-    
-    /**
-    * Proxy port
-    * @var integer
-    */
-    var $_proxy_port;
-    
-    /**
-    * Proxy username
-    * @var string
-    */
-    var $_proxy_user;
-    
-    /**
-    * Proxy password
-    * @var string
-    */
-    var $_proxy_pass;
-
-    /**
-    * Post data
-    * @var array
-    */
-    var $_postData;
-
-   /**
-    * Request body  
-    * @var string
-    */
-    var $_body;
-
-   /**
-    * A list of methods that MUST NOT have a request body, per RFC 2616
-    * @var array
-    */
-    var $_bodyDisallowed = array('TRACE');
-
-   /**
-    * Files to post 
-    * @var array
-    */
-    var $_postFiles = array();
-
-    /**
-    * Connection timeout.
-    * @var float
-    */
-    var $_timeout;
-    
-    /**
-    * HTTP_Response object
-    * @var HTTP_Response
-    */
-    var $_response;
-    
-    /**
-    * Whether to allow redirects
-    * @var boolean
-    */
-    var $_allowRedirects;
-    
-    /**
-    * Maximum redirects allowed
-    * @var integer
-    */
-    var $_maxRedirects;
-    
-    /**
-    * Current number of redirects
-    * @var integer
-    */
-    var $_redirects;
-
-   /**
-    * Whether to append brackets [] to array variables
-    * @var bool
-    */
-    var $_useBrackets = true;
-
-   /**
-    * Attached listeners
-    * @var array
-    */
-    var $_listeners = array();
-
-   /**
-    * Whether to save response body in response object property  
-    * @var bool
-    */
-    var $_saveBody = true;
-
-   /**
-    * Timeout for reading from socket (array(seconds, microseconds))
-    * @var array
-    */
-    var $_readTimeout = null;
-
-   /**
-    * Options to pass to Net_Socket::connect. See stream_context_create
-    * @var array
-    */
-    var $_socketOptions = null;
-   /**#@-*/
-
-    /**
-    * Constructor
-    *
-    * Sets up the object
-    * @param    string  The url to fetch/access
-    * @param    array   Associative array of parameters which can have the following keys:
-    * 
        
-    *   
      • method         - Method to use, GET, POST etc (string)
        • 
-    *   
      • http           - HTTP Version to use, 1.0 or 1.1 (string)
        • 
-    *   
      • user           - Basic Auth username (string)
        • 
-    *   
      • pass           - Basic Auth password (string)
        • 
-    *   
      • proxy_host     - Proxy server host (string)
        • 
-    *   
      • proxy_port     - Proxy server port (integer)
        • 
-    *   
      • proxy_user     - Proxy auth username (string)
        • 
-    *   
      • proxy_pass     - Proxy auth password (string)
        • 
-    *   
      • timeout        - Connection timeout in seconds (float)
        • 
-    *   
      • allowRedirects - Whether to follow redirects or not (bool)
        • 
-    *   
      • maxRedirects   - Max number of redirects to follow (integer)
        • 
-    *   
      • useBrackets    - Whether to append [] to array variable names (bool)
        • 
-    *   
      • saveBody       - Whether to save response body in response object property (bool)
        • 
-    *   
      • readTimeout    - Timeout for reading / writing data over the socket (array (seconds, microseconds))
        • 
-    *   
      • socketOptions  - Options to pass to Net_Socket object (array)
        • 
-    * 
      
-    * @access public
-    */
-    function HTTP_Request($url = '', $params = array())
-    {
-        $this->_method         =  HTTP_REQUEST_METHOD_GET;
-        $this->_http           =  HTTP_REQUEST_HTTP_VER_1_1;
-        $this->_requestHeaders = array();
-        $this->_postData       = array();
-        $this->_body           = null;
-
-        $this->_user = null;
-        $this->_pass = null;
-
-        $this->_proxy_host = null;
-        $this->_proxy_port = null;
-        $this->_proxy_user = null;
-        $this->_proxy_pass = null;
-
-        $this->_allowRedirects = false;
-        $this->_maxRedirects   = 3;
-        $this->_redirects      = 0;
-
-        $this->_timeout  = null;
-        $this->_response = null;
-
-        foreach ($params as $key => $value) {
-            $this->{'_' . $key} = $value;
-        }
-
-        if (!empty($url)) {
-            $this->setURL($url);
-        }
-
-        // Default useragent
-        $this->addHeader('User-Agent', 'PEAR HTTP_Request class ( http://pear.php.net/ )');
-
-        // We don't do keep-alives by default
-        $this->addHeader('Connection', 'close');
-
-        // Basic authentication
-        if (!empty($this->_user)) {
-            $this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
-        }
-
-        // Proxy authentication (see bug #5913)
-        if (!empty($this->_proxy_user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
-        }
-
-        // Use gzip encoding if possible
-        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib')) {
-            $this->addHeader('Accept-Encoding', 'gzip');
-        }
-    }
-    
-    /**
-    * Generates a Host header for HTTP/1.1 requests
-    *
-    * @access private
-    * @return string
-    */
-    function _generateHostHeader()
-    {
-        if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-
-        } elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-
-        } elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-        
-        } else {
-            $host = $this->_url->host;
-        }
-
-        return $host;
-    }
-    
-    /**
-    * Resets the object to its initial state (DEPRECATED).
-    * Takes the same parameters as the constructor.
-    *
-    * @param  string $url    The url to be requested
-    * @param  array  $params Associative array of parameters
-    *                        (see constructor for details)
-    * @access public
-    * @deprecated deprecated since 1.2, call the constructor if this is necessary
-    */
-    function reset($url, $params = array())
-    {
-        $this->HTTP_Request($url, $params);
-    }
-
-    /**
-    * Sets the URL to be requested
-    *
-    * @param  string The url to be requested
-    * @access public
-    */
-    function setURL($url)
-    {
-        $this->_url = &new Net_URL($url, $this->_useBrackets);
-
-        if (!empty($this->_url->user) || !empty($this->_url->pass)) {
-            $this->setBasicAuth($this->_url->user, $this->_url->pass);
-        }
-
-        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http) {
-            $this->addHeader('Host', $this->_generateHostHeader());
-        }
-
-        // set '/' instead of empty path rather than check later (see bug #8662)
-        if (empty($this->_url->path)) {
-            $this->_url->path = '/';
-        } 
-    }
-    
-   /**
-    * Returns the current request URL  
-    *
-    * @return   string  Current request URL
-    * @access   public
-    */
-    function getUrl()
-    {
-        return empty($this->_url)? '': $this->_url->getUrl();
-    }
-
-    /**
-    * Sets a proxy to be used
-    *
-    * @param string     Proxy host
-    * @param int        Proxy port
-    * @param string     Proxy username
-    * @param string     Proxy password
-    * @access public
-    */
-    function setProxy($host, $port = 8080, $user = null, $pass = null)
-    {
-        $this->_proxy_host = $host;
-        $this->_proxy_port = $port;
-        $this->_proxy_user = $user;
-        $this->_proxy_pass = $pass;
-
-        if (!empty($user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
-        }
-    }
-
-    /**
-    * Sets basic authentication parameters
-    *
-    * @param string     Username
-    * @param string     Password
-    */
-    function setBasicAuth($user, $pass)
-    {
-        $this->_user = $user;
-        $this->_pass = $pass;
-
-        $this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
-    }
-
-    /**
-    * Sets the method to be used, GET, POST etc.
-    *
-    * @param string     Method to use. Use the defined constants for this
-    * @access public
-    */
-    function setMethod($method)
-    {
-        $this->_method = $method;
-    }
-
-    /**
-    * Sets the HTTP version to use, 1.0 or 1.1
-    *
-    * @param string     Version to use. Use the defined constants for this
-    * @access public
-    */
-    function setHttpVer($http)
-    {
-        $this->_http = $http;
-    }
-
-    /**
-    * Adds a request header
-    *
-    * @param string     Header name
-    * @param string     Header value
-    * @access public
-    */
-    function addHeader($name, $value)
-    {
-        $this->_requestHeaders[strtolower($name)] = $value;
-    }
-
-    /**
-    * Removes a request header
-    *
-    * @param string     Header name to remove
-    * @access public
-    */
-    function removeHeader($name)
-    {
-        if (isset($this->_requestHeaders[strtolower($name)])) {
-            unset($this->_requestHeaders[strtolower($name)]);
-        }
-    }
-
-    /**
-    * Adds a querystring parameter
-    *
-    * @param string     Querystring parameter name
-    * @param string     Querystring parameter value
-    * @param bool       Whether the value is already urlencoded or not, default = not
-    * @access public
-    */
-    function addQueryString($name, $value, $preencoded = false)
-    {
-        $this->_url->addQueryString($name, $value, $preencoded);
-    }    
-    
-    /**
-    * Sets the querystring to literally what you supply
-    *
-    * @param string     The querystring data. Should be of the format foo=bar&x=y etc
-    * @param bool       Whether data is already urlencoded or not, default = already encoded
-    * @access public
-    */
-    function addRawQueryString($querystring, $preencoded = true)
-    {
-        $this->_url->addRawQueryString($querystring, $preencoded);
-    }
-
-    /**
-    * Adds postdata items
-    *
-    * @param string     Post data name
-    * @param string     Post data value
-    * @param bool       Whether data is already urlencoded or not, default = not
-    * @access public
-    */
-    function addPostData($name, $value, $preencoded = false)
-    {
-        if ($preencoded) {
-            $this->_postData[$name] = $value;
-        } else {
-            $this->_postData[$name] = $this->_arrayMapRecursive('urlencode', $value);
-        }
-    }
-
-   /**
-    * Recursively applies the callback function to the value
-    * 
-    * @param    mixed   Callback function
-    * @param    mixed   Value to process
-    * @access   private
-    * @return   mixed   Processed value
-    */
-    function _arrayMapRecursive($callback, $value)
-    {
-        if (!is_array($value)) {
-            return call_user_func($callback, $value);
-        } else {
-            $map = array();
-            foreach ($value as $k => $v) {
-                $map[$k] = $this->_arrayMapRecursive($callback, $v);
-            }
-            return $map;
-        }
-    }
-
-   /**
-    * Adds a file to upload
-    * 
-    * This also changes content-type to 'multipart/form-data' for proper upload
-    * 
-    * @access public
-    * @param  string    name of file-upload field
-    * @param  mixed     file name(s)
-    * @param  mixed     content-type(s) of file(s) being uploaded
-    * @return bool      true on success
-    * @throws PEAR_Error
-    */
-    function addFile($inputName, $fileName, $contentType = 'application/octet-stream')
-    {
-        if (!is_array($fileName) && !is_readable($fileName)) {
-            return PEAR::raiseError("File '{$fileName}' is not readable", HTTP_REQUEST_ERROR_FILE);
-        } elseif (is_array($fileName)) {
-            foreach ($fileName as $name) {
-                if (!is_readable($name)) {
-                    return PEAR::raiseError("File '{$name}' is not readable", HTTP_REQUEST_ERROR_FILE);
-                }
-            }
-        }
-        $this->addHeader('Content-Type', 'multipart/form-data');
-        $this->_postFiles[$inputName] = array(
-            'name' => $fileName,
-            'type' => $contentType
-        );
-        return true;
-    }
-
-    /**
-    * Adds raw postdata (DEPRECATED)
-    *
-    * @param string     The data
-    * @param bool       Whether data is preencoded or not, default = already encoded
-    * @access public
-    * @deprecated       deprecated since 1.3.0, method setBody() should be used instead
-    */
-    function addRawPostData($postdata, $preencoded = true)
-    {
-        $this->_body = $preencoded ? $postdata : urlencode($postdata);
-    }
-
-   /**
-    * Sets the request body (for POST, PUT and similar requests)
-    *
-    * @param    string  Request body
-    * @access   public
-    */
-    function setBody($body)
-    {
-        $this->_body = $body;
-    }
-
-    /**
-    * Clears any postdata that has been added (DEPRECATED). 
-    * 
-    * Useful for multiple request scenarios.
-    *
-    * @access public
-    * @deprecated deprecated since 1.2
-    */
-    function clearPostData()
-    {
-        $this->_postData = null;
-    }
-
-    /**
-    * Appends a cookie to "Cookie:" header
-    * 
-    * @param string $name cookie name
-    * @param string $value cookie value
-    * @access public
-    */
-    function addCookie($name, $value)
-    {
-        $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
-        $this->addHeader('Cookie', $cookies . $name . '=' . $value);
-    }
-    
-    /**
-    * Clears any cookies that have been added (DEPRECATED). 
-    * 
-    * Useful for multiple request scenarios
-    *
-    * @access public
-    * @deprecated deprecated since 1.2
-    */
-    function clearCookies()
-    {
-        $this->removeHeader('Cookie');
-    }
-
-    /**
-    * Sends the request
-    *
-    * @access public
-    * @param  bool   Whether to store response body in Response object property,
-    *                set this to false if downloading a LARGE file and using a Listener
-    * @return mixed  PEAR error on error, true otherwise
-    */
-    function sendRequest($saveBody = true)
-    {
-        if (!is_a($this->_url, 'Net_URL')) {
-            return PEAR::raiseError('No URL given', HTTP_REQUEST_ERROR_URL);
-        }
-
-        $host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
-        $port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
-
-        // 4.3.0 supports SSL connections using OpenSSL. The function test determines
-        // we running on at least 4.3.0
-        if (strcasecmp($this->_url->protocol, 'https') == 0 AND function_exists('file_get_contents') AND extension_loaded('openssl')) {
-            if (isset($this->_proxy_host)) {
-                return PEAR::raiseError('HTTPS proxies are not supported', HTTP_REQUEST_ERROR_PROXY);
-            }
-            $host = 'ssl://' . $host;
-        }
-
-        // magic quotes may fuck up file uploads and chunked response processing
-        $magicQuotes = ini_get('magic_quotes_runtime');
-        ini_set('magic_quotes_runtime', false);
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive 
-        // connection token to a proxy server...
-        if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
-            'Keep-Alive' == $this->_requestHeaders['connection'])
-        {
-            $this->removeHeader('connection');
-        }
-
-        $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
-                     (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
-        $sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
-        $sockKey   = $host . ':' . $port;
-        unset($this->_sock);
-
-        // There is a connected socket in the "static" property?
-        if ($keepAlive && !empty($sockets[$sockKey]) &&
-            !empty($sockets[$sockKey]->fp)) 
-        {
-            $this->_sock =& $sockets[$sockKey];
-            $err = null;
-        } else {
-            $this->_notify('connect');
-            $this->_sock =& new Net_Socket();
-            $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
-        }
-        PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
-
-        if (!PEAR::isError($err)) {
-            if (!empty($this->_readTimeout)) {
-                $this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
-            }
-
-            $this->_notify('sentRequest');
-
-            // Read the response
-            $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
-            $err = $this->_response->process(
-                $this->_saveBody && $saveBody,
-                HTTP_REQUEST_METHOD_HEAD != $this->_method
-            );
-
-            if ($keepAlive) {
-                $keepAlive = (isset($this->_response->_headers['content-length'])
-                              || (isset($this->_response->_headers['transfer-encoding'])
-                                  && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
-                if ($keepAlive) {
-                    if (isset($this->_response->_headers['connection'])) {
-                        $keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
-                    } else {
-                        $keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
-                    }
-                }
-            }
-        }
-
-        ini_set('magic_quotes_runtime', $magicQuotes);
-
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        if (!$keepAlive) {
-            $this->disconnect();
-        // Store the connected socket in "static" property
-        } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
-            $sockets[$sockKey] =& $this->_sock;
-        }
-
-        // Check for redirection
-        if (    $this->_allowRedirects
-            AND $this->_redirects <= $this->_maxRedirects
-            AND $this->getResponseCode() > 300
-            AND $this->getResponseCode() < 399
-            AND !empty($this->_response->_headers['location'])) {
-
-            
-            $redirect = $this->_response->_headers['location'];
-
-            // Absolute URL
-            if (preg_match('/^https?:\/\//i', $redirect)) {
-                $this->_url = &new Net_URL($redirect);
-                $this->addHeader('Host', $this->_generateHostHeader());
-            // Absolute path
-            } elseif ($redirect{0} == '/') {
-                $this->_url->path = $redirect;
-            
-            // Relative path
-            } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
-                if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
-                } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
-                }
-                $redirect = Net_URL::resolvePath($redirect);
-                $this->_url->path = $redirect;
-                
-            // Filename, no path
-            } else {
-                if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
-                } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
-                }
-                $this->_url->path = $redirect;
-            }
-
-            $this->_redirects++;
-            return $this->sendRequest($saveBody);
-
-        // Too many redirects
-        } elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
-            return PEAR::raiseError('Too many redirects', HTTP_REQUEST_ERROR_REDIRECTS);
-        }
-
-        return true;
-    }
-
-    /**
-     * Disconnect the socket, if connected. Only useful if using Keep-Alive.
-     *
-     * @access public
-     */
-    function disconnect()
-    {
-        if (!empty($this->_sock) && !empty($this->_sock->fp)) {
-            $this->_notify('disconnect');
-            $this->_sock->disconnect();
-        }
-    }
-
-    /**
-    * Returns the response code
-    *
-    * @access public
-    * @return mixed     Response code, false if not set
-    */
-    function getResponseCode()
-    {
-        return isset($this->_response->_code) ? $this->_response->_code : false;
-    }
-
-    /**
-    * Returns either the named header or all if no name given
-    *
-    * @access public
-    * @param string     The header name to return, do not set to get all headers
-    * @return mixed     either the value of $headername (false if header is not present)
-    *                   or an array of all headers
-    */
-    function getResponseHeader($headername = null)
-    {
-        if (!isset($headername)) {
-            return isset($this->_response->_headers)? $this->_response->_headers: array();
-        } else {
-            $headername = strtolower($headername);
-            return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
-        }
-    }
-
-    /**
-    * Returns the body of the response
-    *
-    * @access public
-    * @return mixed     response body, false if not set
-    */
-    function getResponseBody()
-    {
-        return isset($this->_response->_body) ? $this->_response->_body : false;
-    }
-
-    /**
-    * Returns cookies set in response
-    * 
-    * @access public
-    * @return mixed     array of response cookies, false if none are present
-    */
-    function getResponseCookies()
-    {
-        return isset($this->_response->_cookies) ? $this->_response->_cookies : false;
-    }
-
-    /**
-    * Builds the request string
-    *
-    * @access private
-    * @return string The request string
-    */
-    function _buildRequest()
-    {
-        $separator = ini_get('arg_separator.output');
-        ini_set('arg_separator.output', '&');
-        $querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
-        ini_set('arg_separator.output', $separator);
-
-        $host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
-        $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
-        $path = $this->_url->path . $querystring;
-        $url  = $host . $port . $path;
-
-        if (!strlen($url)) {
-            $url = '/';
-        }
-
-        $request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
-
-        if (in_array($this->_method, $this->_bodyDisallowed) ||
-            (0 == strlen($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method ||
-             (empty($this->_postData) && empty($this->_postFiles)))))
-        {
-            $this->removeHeader('Content-Type');
-        } else {
-            if (empty($this->_requestHeaders['content-type'])) {
-                // Add default content-type
-                $this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
-            } elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
-                $boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
-                $this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
-            }
-        }
-
-        // Request Headers
-        if (!empty($this->_requestHeaders)) {
-            foreach ($this->_requestHeaders as $name => $value) {
-                $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-                $request      .= $canonicalName . ': ' . $value . "\r\n";
-            }
-        }
-
-        // No post data or wrong method, so simply add a final CRLF
-        if (in_array($this->_method, $this->_bodyDisallowed) || 
-            (HTTP_REQUEST_METHOD_POST != $this->_method && 0 == strlen($this->_body))) {
-
-            $request .= "\r\n";
-
-        // Post data if it's an array
-        } elseif (HTTP_REQUEST_METHOD_POST == $this->_method && 
-                  (!empty($this->_postData) || !empty($this->_postFiles))) {
-
-            // "normal" POST request
-            if (!isset($boundary)) {
-                $postdata = implode('&', array_map(
-                    create_function('$a', 'return $a[0] . \'=\' . $a[1];'), 
-                    $this->_flattenArray('', $this->_postData)
-                ));
-
-            // multipart request, probably with file uploads
-            } else {
-                $postdata = '';
-                if (!empty($this->_postData)) {
-                    $flatData = $this->_flattenArray('', $this->_postData);
-                    foreach ($flatData as $item) {
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
-                        $postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
-                    }
-                }
-                foreach ($this->_postFiles as $name => $value) {
-                    if (is_array($value['name'])) {
-                        $varname       = $name . ($this->_useBrackets? '[]': '');
-                    } else {
-                        $varname       = $name;
-                        $value['name'] = array($value['name']);
-                    }
-                    foreach ($value['name'] as $key => $filename) {
-                        $fp   = fopen($filename, 'r');
-                        $data = fread($fp, filesize($filename));
-                        fclose($fp);
-                        $basename = basename($filename);
-                        $type     = is_array($value['type'])? @$value['type'][$key]: $value['type'];
-
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
-                        $postdata .= "\r\nContent-Type: " . $type;
-                        $postdata .= "\r\n\r\n" . $data . "\r\n";
-                    }
-                }
-                $postdata .= '--' . $boundary . "--\r\n";
-            }
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
-                        "\r\n\r\n";
-            $request .= $postdata;
-
-        // Explicitly set request body
-        } elseif (0 < strlen($this->_body)) {
-
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
-                        "\r\n\r\n";
-            $request .= $this->_body;
-
-        // Terminate headers with CRLF on POST request with no body, too
-        } else {
-
-            $request .= "\r\n";
-        }
-        
-        return $request;
-    }
-
-   /**
-    * Helper function to change the (probably multidimensional) associative array
-    * into the simple one.
-    *
-    * @param    string  name for item
-    * @param    mixed   item's values
-    * @return   array   array with the following items: array('item name', 'item value');
-    * @access   private
-    */
-    function _flattenArray($name, $values)
-    {
-        if (!is_array($values)) {
-            return array(array($name, $values));
-        } else {
-            $ret = array();
-            foreach ($values as $k => $v) {
-                if (empty($name)) {
-                    $newName = $k;
-                } elseif ($this->_useBrackets) {
-                    $newName = $name . '[' . $k . ']';
-                } else {
-                    $newName = $name;
-                }
-                $ret = array_merge($ret, $this->_flattenArray($newName, $v));
-            }
-            return $ret;
-        }
-    }
-
-
-   /**
-    * Adds a Listener to the list of listeners that are notified of
-    * the object's events
-    * 
-    * Events sent by HTTP_Request object
-    * - 'connect': on connection to server
-    * - 'sentRequest': after the request was sent
-    * - 'disconnect': on disconnection from server
-    *
-    * Events sent by HTTP_Response object
-    * - 'gotHeaders': after receiving response headers (headers are passed in $data)
-    * - 'tick': on receiving a part of response body (the part is passed in $data)
-    * - 'gzTick': on receiving a gzip-encoded part of response body (ditto)
-    * - 'gotBody': after receiving the response body (passes the decoded body in $data if it was gzipped)
-    *
-    * @param    HTTP_Request_Listener   listener to attach
-    * @return   boolean                 whether the listener was successfully attached
-    * @access   public
-    */
-    function attach(&$listener)
-    {
-        if (!is_a($listener, 'HTTP_Request_Listener')) {
-            return false;
-        }
-        $this->_listeners[$listener->getId()] =& $listener;
-        return true;
-    }
-
-
-   /**
-    * Removes a Listener from the list of listeners 
-    * 
-    * @param    HTTP_Request_Listener   listener to detach
-    * @return   boolean                 whether the listener was successfully detached
-    * @access   public
-    */
-    function detach(&$listener)
-    {
-        if (!is_a($listener, 'HTTP_Request_Listener') || 
-            !isset($this->_listeners[$listener->getId()])) {
-            return false;
-        }
-        unset($this->_listeners[$listener->getId()]);
-        return true;
-    }
-
-
-   /**
-    * Notifies all registered listeners of an event.
-    * 
-    * @param    string  Event name
-    * @param    mixed   Additional data
-    * @access   private
-    * @see      HTTP_Request::attach()
-    */
-    function _notify($event, $data = null)
-    {
-        foreach (array_keys($this->_listeners) as $id) {
-            $this->_listeners[$id]->update($this, $event, $data);
-        }
-    }
-}
-
-
-/**
- * Response class to complement the Request class
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Richard Heyes 
- * @author      Alexey Borzov 
- * @version     Release: 1.4.2
- */
-class HTTP_Response
-{
-    /**
-    * Socket object
-    * @var Net_Socket
-    */
-    var $_sock;
-
-    /**
-    * Protocol
-    * @var string
-    */
-    var $_protocol;
-    
-    /**
-    * Return code
-    * @var string
-    */
-    var $_code;
-    
-    /**
-    * Response headers
-    * @var array
-    */
-    var $_headers;
-
-    /**
-    * Cookies set in response  
-    * @var array
-    */
-    var $_cookies;
-
-    /**
-    * Response body
-    * @var string
-    */
-    var $_body = '';
-
-   /**
-    * Used by _readChunked(): remaining length of the current chunk
-    * @var string
-    */
-    var $_chunkLength = 0;
-
-   /**
-    * Attached listeners
-    * @var array
-    */
-    var $_listeners = array();
-
-   /**
-    * Bytes left to read from message-body
-    * @var null|int
-    */
-    var $_toRead;
-
-    /**
-    * Constructor
-    *
-    * @param  Net_Socket    socket to read the response from
-    * @param  array         listeners attached to request
-    */
-    function HTTP_Response(&$sock, &$listeners)
-    {
-        $this->_sock      =& $sock;
-        $this->_listeners =& $listeners;
-    }
-
-
-   /**
-    * Processes a HTTP response
-    * 
-    * This extracts response code, headers, cookies and decodes body if it 
-    * was encoded in some way
-    *
-    * @access public
-    * @param  bool      Whether to store response body in object property, set
-    *                   this to false if downloading a LARGE file and using a Listener.
-    *                   This is assumed to be true if body is gzip-encoded.
-    * @param  bool      Whether the response can actually have a message-body.
-    *                   Will be set to false for HEAD requests.
-    * @throws PEAR_Error
-    * @return mixed     true on success, PEAR_Error in case of malformed response
-    */
-    function process($saveBody = true, $canHaveBody = true)
-    {
-        do {
-            $line = $this->_sock->readLine();
-            if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
-                return PEAR::raiseError('Malformed response', HTTP_REQUEST_ERROR_RESPONSE);
-            } else {
-                $this->_protocol = 'HTTP/' . $http_version;
-                $this->_code     = intval($returncode);
-            }
-            while ('' !== ($header = $this->_sock->readLine())) {
-                $this->_processHeader($header);
-            }
-        } while (100 == $this->_code);
-
-        $this->_notify('gotHeaders', $this->_headers);
-
-        // RFC 2616, section 4.4:
-        // 1. Any response message which "MUST NOT" include a message-body ... 
-        // is always terminated by the first empty line after the header fields 
-        // 3. ... If a message is received with both a
-        // Transfer-Encoding header field and a Content-Length header field,
-        // the latter MUST be ignored.
-        $canHaveBody = $canHaveBody && $this->_code >= 200 && 
-                       $this->_code != 204 && $this->_code != 304;
-
-        // If response body is present, read it and decode
-        $chunked = isset($this->_headers['transfer-encoding']) && ('chunked' == $this->_headers['transfer-encoding']);
-        $gzipped = isset($this->_headers['content-encoding']) && ('gzip' == $this->_headers['content-encoding']);
-        $hasBody = false;
-        if ($canHaveBody && ($chunked || !isset($this->_headers['content-length']) || 
-                0 != $this->_headers['content-length']))
-        {
-            if ($chunked || !isset($this->_headers['content-length'])) {
-                $this->_toRead = null;
-            } else {
-                $this->_toRead = $this->_headers['content-length'];
-            }
-            while (!$this->_sock->eof() && (is_null($this->_toRead) || 0 < $this->_toRead)) {
-                if ($chunked) {
-                    $data = $this->_readChunked();
-                } elseif (is_null($this->_toRead)) {
-                    $data = $this->_sock->read(4096);
-                } else {
-                    $data = $this->_sock->read(min(4096, $this->_toRead));
-                    $this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
-                }
-                if ('' == $data) {
-                    break;
-                } else {
-                    $hasBody = true;
-                    if ($saveBody || $gzipped) {
-                        $this->_body .= $data;
-                    }
-                    $this->_notify($gzipped? 'gzTick': 'tick', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            // Uncompress the body if needed
-            if ($gzipped) {
-                $body = $this->_decodeGzip($this->_body);
-                if (PEAR::isError($body)) {
-                    return $body;
-                }
-                $this->_body = $body;
-                $this->_notify('gotBody', $this->_body);
-            } else {
-                $this->_notify('gotBody');
-            }
-        }
-        return true;
-    }
-
-
-   /**
-    * Processes the response header
-    *
-    * @access private
-    * @param  string    HTTP header
-    */
-    function _processHeader($header)
-    {
-        if (false === strpos($header, ':')) {
-            return;
-        }
-        list($headername, $headervalue) = explode(':', $header, 2);
-        $headername  = strtolower($headername);
-        $headervalue = ltrim($headervalue);
-        
-        if ('set-cookie' != $headername) {
-            if (isset($this->_headers[$headername])) {
-                $this->_headers[$headername] .= ',' . $headervalue;
-            } else {
-                $this->_headers[$headername]  = $headervalue;
-            }
-        } else {
-            $this->_parseCookie($headervalue);
-        }
-    }
-
-
-   /**
-    * Parse a Set-Cookie header to fill $_cookies array
-    *
-    * @access private
-    * @param  string    value of Set-Cookie header
-    */
-    function _parseCookie($headervalue)
-    {
-        $cookie = array(
-            'expires' => null,
-            'domain'  => null,
-            'path'    => null,
-            'secure'  => false
-        );
-
-        // Only a name=value pair
-        if (!strpos($headervalue, ';')) {
-            $pos = strpos($headervalue, '=');
-            $cookie['name']  = trim(substr($headervalue, 0, $pos));
-            $cookie['value'] = trim(substr($headervalue, $pos + 1));
-
-        // Some optional parameters are supplied
-        } else {
-            $elements = explode(';', $headervalue);
-            $pos = strpos($elements[0], '=');
-            $cookie['name']  = trim(substr($elements[0], 0, $pos));
-            $cookie['value'] = trim(substr($elements[0], $pos + 1));
-
-            for ($i = 1; $i < count($elements); $i++) {
-                if (false === strpos($elements[$i], '=')) {
-                    $elName  = trim($elements[$i]);
-                    $elValue = null;
-                } else {
-                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
-                }
-                $elName = strtolower($elName);
-                if ('secure' == $elName) {
-                    $cookie['secure'] = true;
-                } elseif ('expires' == $elName) {
-                    $cookie['expires'] = str_replace('"', '', $elValue);
-                } elseif ('path' == $elName || 'domain' == $elName) {
-                    $cookie[$elName] = urldecode($elValue);
-                } else {
-                    $cookie[$elName] = $elValue;
-                }
-            }
-        }
-        $this->_cookies[] = $cookie;
-    }
-
-
-   /**
-    * Read a part of response body encoded with chunked Transfer-Encoding
-    * 
-    * @access private
-    * @return string
-    */
-    function _readChunked()
-    {
-        // at start of the next chunk?
-        if (0 == $this->_chunkLength) {
-            $line = $this->_sock->readLine();
-            if (preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                $this->_chunkLength = hexdec($matches[1]); 
-                // Chunk with zero length indicates the end
-                if (0 == $this->_chunkLength) {
-                    $this->_sock->readLine(); // make this an eof()
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        }
-        $data = $this->_sock->read($this->_chunkLength);
-        $this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
-        if (0 == $this->_chunkLength) {
-            $this->_sock->readLine(); // Trailing CRLF
-        }
-        return $data;
-    }
-
-
-   /**
-    * Notifies all registered listeners of an event.
-    * 
-    * @param    string  Event name
-    * @param    mixed   Additional data
-    * @access   private
-    * @see HTTP_Request::_notify()
-    */
-    function _notify($event, $data = null)
-    {
-        foreach (array_keys($this->_listeners) as $id) {
-            $this->_listeners[$id]->update($this, $event, $data);
-        }
-    }
-
-
-   /**
-    * Decodes the message-body encoded by gzip
-    *
-    * The real decoding work is done by gzinflate() built-in function, this
-    * method only parses the header and checks data for compliance with
-    * RFC 1952  
-    *
-    * @access   private
-    * @param    string  gzip-encoded data
-    * @return   string  decoded data
-    */
-    function _decodeGzip($data)
-    {
-        if (HTTP_REQUEST_MBSTRING) {
-            $oldEncoding = mb_internal_encoding();
-            mb_internal_encoding('iso-8859-1');
-        }
-        $length = strlen($data);
-        // If it doesn't look like gzip-encoded data, don't bother
-        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
-            return $data;
-        }
-        $method = ord(substr($data, 2, 1));
-        if (8 != $method) {
-            return PEAR::raiseError('_decodeGzip(): unknown compression method', HTTP_REQUEST_ERROR_GZIP_METHOD);
-        }
-        $flags = ord(substr($data, 3, 1));
-        if ($flags & 224) {
-            return PEAR::raiseError('_decodeGzip(): reserved bits are set', HTTP_REQUEST_ERROR_GZIP_DATA);
-        }
-
-        // header is 10 bytes minimum. may be longer, though.
-        $headerLength = 10;
-        // extra fields, need to skip 'em
-        if ($flags & 4) {
-            if ($length - $headerLength - 2 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $extraLength = unpack('v', substr($data, 10, 2));
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $headerLength += $extraLength[1] + 2;
-        }
-        // file name, need to skip that
-        if ($flags & 8) {
-            if ($length - $headerLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $headerLength += $filenameLength + 1;
-        }
-        // comment, need to skip that also
-        if ($flags & 16) {
-            if ($length - $headerLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $headerLength += $commentLength + 1;
-        }
-        // have a CRC for header. let's check
-        if ($flags & 1) {
-            if ($length - $headerLength - 2 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
-            if ($crcReal != $crcStored[1]) {
-                return PEAR::raiseError('_decodeGzip(): header CRC check failed', HTTP_REQUEST_ERROR_GZIP_CRC);
-            }
-            $headerLength += 2;
-        }
-        // unpacked data CRC and size at the end of encoded data
-        $tmp = unpack('V2', substr($data, -8));
-        $dataCrc  = $tmp[1];
-        $dataSize = $tmp[2];
-
-        // finally, call the gzinflate() function
-        $unpacked = @gzinflate(substr($data, $headerLength, -8), $dataSize);
-        if (false === $unpacked) {
-            return PEAR::raiseError('_decodeGzip(): gzinflate() call failed', HTTP_REQUEST_ERROR_GZIP_READ);
-        } elseif ($dataSize != strlen($unpacked)) {
-            return PEAR::raiseError('_decodeGzip(): data size check failed', HTTP_REQUEST_ERROR_GZIP_READ);
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            return PEAR::raiseError('_decodeGzip(): data CRC check failed', HTTP_REQUEST_ERROR_GZIP_CRC);
-        }
-        if (HTTP_REQUEST_MBSTRING) {
-            mb_internal_encoding($oldEncoding);
-        }
-        return $unpacked;
-    }
-} // End class HTTP_Response
-?>
diff --git a/lib/phpFlickr/PEAR/HTTP/Request/Listener.php b/lib/phpFlickr/PEAR/HTTP/Request/Listener.php
deleted file mode 100644
index b00514206..000000000
--- a/lib/phpFlickr/PEAR/HTTP/Request/Listener.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
- * @copyright   2002-2007 Richard Heyes
- * @license     http://opensource.org/licenses/bsd-license.php New BSD License
- * @version     CVS: $Id: Listener.php 127 2008-01-17 20:21:37Z dcoulter $
- * @link        http://pear.php.net/package/HTTP_Request/ 
- */
-
-/**
- * Listener for HTTP_Request and HTTP_Response objects
- *
- * This class implements the Observer part of a Subject-Observer
- * design pattern.
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Alexey Borzov 
- * @version     Release: 1.4.2
- */
-class HTTP_Request_Listener 
-{
-   /**
-    * A listener's identifier
-    * @var string
-    */
-    var $_id;
-
-   /**
-    * Constructor, sets the object's identifier
-    *
-    * @access public
-    */
-    function HTTP_Request_Listener()
-    {
-        $this->_id = md5(uniqid('http_request_', 1));
-    }
-
-
-   /**
-    * Returns the listener's identifier
-    *
-    * @access public
-    * @return string
-    */
-    function getId()
-    {
-        return $this->_id;
-    }
-
-
-   /**
-    * This method is called when Listener is notified of an event
-    *
-    * @access   public
-    * @param    object  an object the listener is attached to
-    * @param    string  Event name
-    * @param    mixed   Additional data
-    * @abstract
-    */
-    function update(&$subject, $event, $data = null)
-    {
-        echo "Notified of event: '$event'\n";
-        if (null !== $data) {
-            echo "Additional data: ";
-            var_dump($data);
-        }
-    }
-}
-?>
diff --git a/lib/phpFlickr/PEAR/Net/Socket.php b/lib/phpFlickr/PEAR/Net/Socket.php
deleted file mode 100644
index 96f2c4bf1..000000000
--- a/lib/phpFlickr/PEAR/Net/Socket.php
+++ /dev/null
@@ -1,528 +0,0 @@
-                                   |
-// |          Chuck Hagenbuch                            |
-// +----------------------------------------------------------------------+
-//
-// $Id: Socket.php 32 2005-08-01 06:21:02Z dancoulter $
-
-require_once 'PEAR.php';
-
-define('NET_SOCKET_READ',  1);
-define('NET_SOCKET_WRITE', 2);
-define('NET_SOCKET_ERROR', 3);
-
-/**
- * Generalized Socket class.
- *
- * @version 1.1
- * @author Stig Bakken 
- * @author Chuck Hagenbuch 
- */
-class Net_Socket extends PEAR {
-
-    /**
-     * Socket file pointer.
-     * @var resource $fp
-     */
-    var $fp = null;
-
-    /**
-     * Whether the socket is blocking. Defaults to true.
-     * @var boolean $blocking
-     */
-    var $blocking = true;
-
-    /**
-     * Whether the socket is persistent. Defaults to false.
-     * @var boolean $persistent
-     */
-    var $persistent = false;
-
-    /**
-     * The IP address to connect to.
-     * @var string $addr
-     */
-    var $addr = '';
-
-    /**
-     * The port number to connect to.
-     * @var integer $port
-     */
-    var $port = 0;
-
-    /**
-     * Number of seconds to wait on socket connections before assuming
-     * there's no more data. Defaults to no timeout.
-     * @var integer $timeout
-     */
-    var $timeout = false;
-
-    /**
-     * Number of bytes to read at a time in readLine() and
-     * readAll(). Defaults to 2048.
-     * @var integer $lineLength
-     */
-    var $lineLength = 2048;
-
-    /**
-     * Connect to the specified port. If called when the socket is
-     * already connected, it disconnects and connects again.
-     *
-     * @param string  $addr        IP address or host name.
-     * @param integer $port        TCP port number.
-     * @param boolean $persistent  (optional) Whether the connection is
-     *                             persistent (kept open between requests
-     *                             by the web server).
-     * @param integer $timeout     (optional) How long to wait for data.
-     * @param array   $options     See options for stream_context_create.
-     *
-     * @access public
-     *
-     * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
-     */
-    function connect($addr, $port = 0, $persistent = null, $timeout = null, $options = null)
-    {
-        if (is_resource($this->fp)) {
-            @fclose($this->fp);
-            $this->fp = null;
-        }
-
-        if (!$addr) {
-            return $this->raiseError('$addr cannot be empty');
-        } elseif (strspn($addr, '.0123456789') == strlen($addr) ||
-                  strstr($addr, '/') !== false) {
-            $this->addr = $addr;
-        } else {
-            $this->addr = @gethostbyname($addr);
-        }
-
-        $this->port = $port % 65536;
-
-        if ($persistent !== null) {
-            $this->persistent = $persistent;
-        }
-
-        if ($timeout !== null) {
-            $this->timeout = $timeout;
-        }
-
-        $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
-        $errno = 0;
-        $errstr = '';
-        if ($options && function_exists('stream_context_create')) {
-            if ($this->timeout) {
-                $timeout = $this->timeout;
-            } else {
-                $timeout = 0;
-            }
-            $context = stream_context_create($options);
-            $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $timeout, $context);
-        } else {
-            if ($this->timeout) {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $this->timeout);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
-            }
-        }
-
-        if (!$fp) {
-            return $this->raiseError($errstr, $errno);
-        }
-
-        $this->fp = $fp;
-
-        return $this->setBlocking($this->blocking);
-    }
-
-    /**
-     * Disconnects from the peer, closes the socket.
-     *
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function disconnect()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        @fclose($this->fp);
-        $this->fp = null;
-        return true;
-    }
-
-    /**
-     * Find out if the socket is in blocking mode.
-     *
-     * @access public
-     * @return boolean  The current blocking mode.
-     */
-    function isBlocking()
-    {
-        return $this->blocking;
-    }
-
-    /**
-     * Sets whether the socket connection should be blocking or
-     * not. A read call to a non-blocking socket will return immediately
-     * if there is no data available, whereas it will block until there
-     * is data for blocking sockets.
-     *
-     * @param boolean $mode  True for blocking sockets, false for nonblocking.
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function setBlocking($mode)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $this->blocking = $mode;
-        socket_set_blocking($this->fp, $this->blocking);
-        return true;
-    }
-
-    /**
-     * Sets the timeout value on socket descriptor,
-     * expressed in the sum of seconds and microseconds
-     *
-     * @param integer $seconds  Seconds.
-     * @param integer $microseconds  Microseconds.
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function setTimeout($seconds, $microseconds)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_set_timeout($this->fp, $seconds, $microseconds);
-    }
-
-    /**
-     * Returns information about an existing socket resource.
-     * Currently returns four entries in the result array:
-     *
-     * 
      
-     * timed_out (bool) - The socket timed out waiting for data
      
-     * blocked (bool) - The socket was blocked
      
-     * eof (bool) - Indicates EOF event
      
-     * unread_bytes (int) - Number of bytes left in the socket buffer
      
-     * 
      
-     *
-     * @access public
-     * @return mixed Array containing information about existing socket resource or an error object otherwise
-     */
-    function getStatus()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_get_status($this->fp);
-    }
-
-    /**
-     * Get a specified line of data
-     *
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function gets($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fgets($this->fp, $size);
-    }
-
-    /**
-     * Read a specified amount of data. This is guaranteed to return,
-     * and has the added benefit of getting everything in one fread()
-     * chunk; if you know the size of the data you're getting
-     * beforehand, this is definitely the way to go.
-     *
-     * @param integer $size  The number of bytes to read from the socket.
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function read($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fread($this->fp, $size);
-    }
-
-    /**
-     * Write a specified amount of data.
-     *
-     * @param string  $data       Data to write.
-     * @param integer $blocksize  Amount of data to write at once.
-     *                            NULL means all at once.
-     *
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function write($data, $blocksize = null)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        if (is_null($blocksize) && !OS_WINDOWS) {
-            return fwrite($this->fp, $data);
-        } else {
-            if (is_null($blocksize)) {
-                $blocksize = 1024;
-            }
-
-            $pos = 0;
-            $size = strlen($data);
-            while ($pos < $size) {
-                $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
-                if ($written === false) {
-                    return false;
-                }
-                $pos += $written;
-            }
-
-            return $pos;
-        }
-    }
-
-    /**
-     * Write a line of data to the socket, followed by a trailing "\r\n".
-     *
-     * @access public
-     * @return mixed fputs result, or an error
-     */
-    function writeLine($data)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return fwrite($this->fp, $data . "\r\n");
-    }
-
-    /**
-     * Tests for end-of-file on a socket descriptor.
-     *
-     * @access public
-     * @return bool
-     */
-    function eof()
-    {
-        return (is_resource($this->fp) && feof($this->fp));
-    }
-
-    /**
-     * Reads a byte of data
-     *
-     * @access public
-     * @return 1 byte of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readByte()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return ord(@fread($this->fp, 1));
-    }
-
-    /**
-     * Reads a word of data
-     *
-     * @access public
-     * @return 1 word of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readWord()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 2);
-        return (ord($buf[0]) + (ord($buf[1]) << 8));
-    }
-
-    /**
-     * Reads an int of data
-     *
-     * @access public
-     * @return integer  1 int of data from the socket, or a PEAR_Error if
-     *                  not connected.
-     */
-    function readInt()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return (ord($buf[0]) + (ord($buf[1]) << 8) +
-                (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
-    }
-
-    /**
-     * Reads a zero-terminated string of data
-     *
-     * @access public
-     * @return string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readString()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $string = '';
-        while (($char = @fread($this->fp, 1)) != "\x00")  {
-            $string .= $char;
-        }
-        return $string;
-    }
-
-    /**
-     * Reads an IP Address and returns it in a dot formated string
-     *
-     * @access public
-     * @return Dot formated string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readIPAddress()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return sprintf("%s.%s.%s.%s", ord($buf[0]), ord($buf[1]),
-                       ord($buf[2]), ord($buf[3]));
-    }
-
-    /**
-     * Read until either the end of the socket or a newline, whichever
-     * comes first. Strips the trailing newline from the returned data.
-     *
-     * @access public
-     * @return All available data up to a newline, without that
-     *         newline, or until the end of the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readLine()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $line = '';
-        $timeout = time() + $this->timeout;
-        while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
-            $line .= @fgets($this->fp, $this->lineLength);
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
-
-    /**
-     * Read until the socket closes, or until there is no more data in
-     * the inner PHP buffer. If the inner buffer is empty, in blocking
-     * mode we wait for at least 1 byte of data. Therefore, in
-     * blocking mode, if there is no data at all to be read, this
-     * function will never exit (unless the socket is closed on the
-     * remote end).
-     *
-     * @access public
-     *
-     * @return string  All data until the socket closes, or a PEAR_Error if
-     *                 not connected.
-     */
-    function readAll()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $data = '';
-        while (!feof($this->fp)) {
-            $data .= @fread($this->fp, $this->lineLength);
-        }
-        return $data;
-    }
-
-    /**
-     * Runs the equivalent of the select() system call on the socket
-     * with a timeout specified by tv_sec and tv_usec.
-     *
-     * @param integer $state    Which of read/write/error to check for.
-     * @param integer $tv_sec   Number of seconds for timeout.
-     * @param integer $tv_usec  Number of microseconds for timeout.
-     *
-     * @access public
-     * @return False if select fails, integer describing which of read/write/error
-     *         are ready, or PEAR_Error if not connected.
-     */
-    function select($state, $tv_sec, $tv_usec = 0)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $read = null;
-        $write = null;
-        $except = null;
-        if ($state & NET_SOCKET_READ) {
-            $read[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_WRITE) {
-            $write[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_ERROR) {
-            $except[] = $this->fp;
-        }
-        if (false === ($sr = stream_select($read, $write, $except, $tv_sec, $tv_usec))) {
-            return false;
-        }
-
-        $result = 0;
-        if (count($read)) {
-            $result |= NET_SOCKET_READ;
-        }
-        if (count($write)) {
-            $result |= NET_SOCKET_WRITE;
-        }
-        if (count($except)) {
-            $result |= NET_SOCKET_ERROR;
-        }
-        return $result;
-    }
-
-}
diff --git a/lib/phpFlickr/PEAR/Net/URL.php b/lib/phpFlickr/PEAR/Net/URL.php
deleted file mode 100644
index 38e26fd15..000000000
--- a/lib/phpFlickr/PEAR/Net/URL.php
+++ /dev/null
@@ -1,410 +0,0 @@
-                            |
-// +-----------------------------------------------------------------------+
-//
-// $Id: URL.php 32 2005-08-01 06:21:02Z dancoulter $
-//
-// Net_URL Class
-
-class Net_URL
-{
-    /**
-    * Full url
-    * @var string
-    */
-    var $url;
-
-    /**
-    * Protocol
-    * @var string
-    */
-    var $protocol;
-
-    /**
-    * Username
-    * @var string
-    */
-    var $username;
-
-    /**
-    * Password
-    * @var string
-    */
-    var $password;
-
-    /**
-    * Host
-    * @var string
-    */
-    var $host;
-
-    /**
-    * Port
-    * @var integer
-    */
-    var $port;
-
-    /**
-    * Path
-    * @var string
-    */
-    var $path;
-
-    /**
-    * Query string
-    * @var array
-    */
-    var $querystring;
-
-    /**
-    * Anchor
-    * @var string
-    */
-    var $anchor;
-
-    /**
-    * Whether to use []
-    * @var bool
-    */
-    var $useBrackets;
-
-    /**
-    * PHP4 Constructor
-    *
-    * @see __construct()
-    */
-    function Net_URL($url = null, $useBrackets = true)
-    {
-        $this->__construct($url, $useBrackets);
-    }
-
-    /**
-    * PHP5 Constructor
-    *
-    * Parses the given url and stores the various parts
-    * Defaults are used in certain cases
-    *
-    * @param string $url         Optional URL
-    * @param bool   $useBrackets Whether to use square brackets when
-    *                            multiple querystrings with the same name
-    *                            exist
-    */
-    function __construct($url = null, $useBrackets = true)
-    {
-        $HTTP_SERVER_VARS  = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
-
-        $this->useBrackets = $useBrackets;
-        $this->url         = $url;
-        $this->user        = '';
-        $this->pass        = '';
-        $this->host        = '';
-        $this->port        = 80;
-        $this->path        = '';
-        $this->querystring = array();
-        $this->anchor      = '';
-
-        // Only use defaults if not an absolute URL given
-        if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
-
-            $this->protocol    = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
-
-            /**
-            * Figure out host/port
-            */
-            if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) AND preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) {
-                $host = $matches[1];
-                if (!empty($matches[3])) {
-                    $port = $matches[3];
-                } else {
-                    $port = $this->getStandardPort($this->protocol);
-                }
-            }
-
-            $this->user        = '';
-            $this->pass        = '';
-            $this->host        = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
-            $this->port        = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
-            $this->path        = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
-            $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
-            $this->anchor      = '';
-        }
-
-        // Parse the url and store the various parts
-        if (!empty($url)) {
-            $urlinfo = parse_url($url);
-
-            // Default querystring
-            $this->querystring = array();
-
-            foreach ($urlinfo as $key => $value) {
-                switch ($key) {
-                    case 'scheme':
-                        $this->protocol = $value;
-                        $this->port     = $this->getStandardPort($value);
-                        break;
-
-                    case 'user':
-                    case 'pass':
-                    case 'host':
-                    case 'port':
-                        $this->$key = $value;
-                        break;
-
-                    case 'path':
-                        if ($value{0} == '/') {
-                            $this->path = $value;
-                        } else {
-                            $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
-                            $this->path = sprintf('%s/%s', $path, $value);
-                        }
-                        break;
-
-                    case 'query':
-                        $this->querystring = $this->_parseRawQueryString($value);
-                        break;
-
-                    case 'fragment':
-                        $this->anchor = $value;
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-    * Returns full url
-    *
-    * @return string Full url
-    * @access public
-    */
-    function getURL()
-    {
-        $querystring = $this->getQueryString();
-
-        $this->url = $this->protocol . '://'
-                   . $this->user . (!empty($this->pass) ? ':' : '')
-                   . $this->pass . (!empty($this->user) ? '@' : '')
-                   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
-                   . $this->path
-                   . (!empty($querystring) ? '?' . $querystring : '')
-                   . (!empty($this->anchor) ? '#' . $this->anchor : '');
-
-        return $this->url;
-    }
-
-    /**
-    * Adds a querystring item
-    *
-    * @param  string $name       Name of item
-    * @param  string $value      Value of item
-    * @param  bool   $preencoded Whether value is urlencoded or not, default = not
-    * @access public
-    */
-    function addQueryString($name, $value, $preencoded = false)
-    {
-        if ($preencoded) {
-            $this->querystring[$name] = $value;
-        } else {
-            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
-        }
-    }
-
-    /**
-    * Removes a querystring item
-    *
-    * @param  string $name Name of item
-    * @access public
-    */
-    function removeQueryString($name)
-    {
-        if (isset($this->querystring[$name])) {
-            unset($this->querystring[$name]);
-        }
-    }
-
-    /**
-    * Sets the querystring to literally what you supply
-    *
-    * @param  string $querystring The querystring data. Should be of the format foo=bar&x=y etc
-    * @access public
-    */
-    function addRawQueryString($querystring)
-    {
-        $this->querystring = $this->_parseRawQueryString($querystring);
-    }
-
-    /**
-    * Returns flat querystring
-    *
-    * @return string Querystring
-    * @access public
-    */
-    function getQueryString()
-    {
-        if (!empty($this->querystring)) {
-            foreach ($this->querystring as $name => $value) {
-                if (is_array($value)) {
-                    foreach ($value as $k => $v) {
-                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
-                    }
-                } elseif (!is_null($value)) {
-                    $querystring[] = $name . '=' . $value;
-                } else {
-                    $querystring[] = $name;
-                }
-            }
-            $querystring = implode(ini_get('arg_separator.output'), $querystring);
-        } else {
-            $querystring = '';
-        }
-
-        return $querystring;
-    }
-
-    /**
-    * Parses raw querystring and returns an array of it
-    *
-    * @param  string  $querystring The querystring to parse
-    * @return array                An array of the querystring data
-    * @access private
-    */
-    function _parseRawQuerystring($querystring)
-    {
-        $parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
-        $return = array();
-
-        foreach ($parts as $part) {
-            if (strpos($part, '=') !== false) {
-                $value = substr($part, strpos($part, '=') + 1);
-                $key   = substr($part, 0, strpos($part, '='));
-            } else {
-                $value = null;
-                $key   = $part;
-            }
-            if (substr($key, -2) == '[]') {
-                $key = substr($key, 0, -2);
-                if (@!is_array($return[$key])) {
-                    $return[$key]   = array();
-                    $return[$key][] = $value;
-                } else {
-                    $return[$key][] = $value;
-                }
-            } elseif (!$this->useBrackets AND !empty($return[$key])) {
-                $return[$key]   = (array)$return[$key];
-                $return[$key][] = $value;
-            } else {
-                $return[$key] = $value;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-    * Resolves //, ../ and ./ from a path and returns
-    * the result. Eg:
-    *
-    * /foo/bar/../boo.php    => /foo/boo.php
-    * /foo/bar/../../boo.php => /boo.php
-    * /foo/bar/.././/boo.php => /foo/boo.php
-    *
-    * This method can also be called statically.
-    *
-    * @param  string $url URL path to resolve
-    * @return string      The result
-    */
-    function resolvePath($path)
-    {
-        $path = explode('/', str_replace('//', '/', $path));
-
-        for ($i=0; $i 1 OR ($i == 1 AND $path[0] != '') ) ) {
-                unset($path[$i]);
-                unset($path[$i-1]);
-                $path = array_values($path);
-                $i -= 2;
-
-            } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
-                unset($path[$i]);
-                $path = array_values($path);
-                $i--;
-
-            } else {
-                continue;
-            }
-        }
-
-        return implode('/', $path);
-    }
-
-    /**
-    * Returns the standard port number for a protocol
-    *
-    * @param  string  $scheme The protocol to lookup
-    * @return integer         Port number or NULL if no scheme matches
-    *
-    * @author Philippe Jausions 
-    */
-    function getStandardPort($scheme)
-    {
-        switch (strtolower($scheme)) {
-            case 'http':    return 80;
-            case 'https':   return 443;
-            case 'ftp':     return 21;
-            case 'imap':    return 143;
-            case 'imaps':   return 993;
-            case 'pop3':    return 110;
-            case 'pop3s':   return 995;
-            default:        return null;
-       }
-    }
-
-    /**
-    * Forces the URL to a particular protocol
-    *
-    * @param string  $protocol Protocol to force the URL to
-    * @param integer $port     Optional port (standard port is used by default)
-    */
-    function setProtocol($protocol, $port = null)
-    {
-        $this->protocol = $protocol;
-        $this->port = is_null($port) ? $this->getStandardPort() : $port;
-    }
-
-}
-?>
diff --git a/lib/phpFlickr/PEAR/PEAR.php b/lib/phpFlickr/PEAR/PEAR.php
deleted file mode 100644
index e442d8c7a..000000000
--- a/lib/phpFlickr/PEAR/PEAR.php
+++ /dev/null
@@ -1,1108 +0,0 @@
-
- * @author     Stig Bakken 
- * @author     Tomas V.V.Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: PEAR.php 127 2008-01-17 20:21:37Z dcoulter $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**#@+
- * ERROR constants
- */
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
-} else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
-}
-
-// instant backwards compatibility
-if (!defined('PATH_SEPARATOR')) {
-    if (OS_WINDOWS) {
-        define('PATH_SEPARATOR', ';');
-    } else {
-        define('PATH_SEPARATOR', ':');
-    }
-}
-
-$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs']         = array();
-$GLOBALS['_PEAR_error_handler_stack']    = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes.  Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix).  Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters.  Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded.  If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V.V. Cox 
- * @author     Greg Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.6.2
- * @link       http://pear.php.net/package/PEAR
- * @see        PEAR_Error
- * @since      Class available since PHP 4.0.2
- * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
- */
-class PEAR
-{
-    // {{{ properties
-
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    // }}}
-    // {{{ getStaticProperty()
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-        return $properties[$class][$var];
-    }
-
-    // }}}
-    // {{{ registerShutdownFunc()
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        // if we are called statically, there is a potential
-        // that no shutdown func is registered.  Bug #6445
-        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-            register_shutdown_function("_PEAR_call_destructors");
-            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    function isError($data, $code = null)
-    {
-        if (is_a($data, 'PEAR_Error')) {
-            if (is_null($code)) {
-                return true;
-            } elseif (is_string($code)) {
-                return $data->getMessage() == $code;
-            } else {
-                return $data->getCode() == $code;
-            }
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ setErrorHandling()
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ expectError()
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return sizeof($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ popExpect()
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ _checkDelExpect()
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-        return $deleted;
-    }
-
-    // }}}
-    // {{{ delExpect()
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
-            }
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-            }
-        } else {
-            // $error_code is empty
-            return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-        }
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function &raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-        if ($skipmsg) {
-            $a = &new $ec($code, $mode, $options, $userinfo);
-            return $a;
-        } else {
-            $a = &new $ec($message, $code, $mode, $options, $userinfo);
-            return $a;
-        }
-    }
-
-    // }}}
-    // {{{ throwError()
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param string $message
-     *
-     */
-    function &throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        } else {
-            $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        }
-    }
-
-    // }}}
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    // {{{ pushErrorHandling()
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    // }}}
-    // {{{ popErrorHandling()
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ loadExtension()
-
-    /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-        }
-        return true;
-    }
-
-    // }}}
-}
-
-// {{{ _PEAR_call_destructors()
-
-function _PEAR_call_destructors()
-{
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (PEAR::getStaticProperty('PEAR', 'destructlifo')) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
-}
-
-// }}}
-/**
- * Standard PEAR error class for PHP 4
- *
- * This class is supserseded by {@link PEAR_Exception} in PHP 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken 
- * @author     Tomas V.V. Cox 
- * @author     Gregory Beaver 
- * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.6.2
- * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
- * @see        PEAR::raiseError(), PEAR::throwError()
- * @since      Class available since PHP 4.0.2
- */
-class PEAR_Error
-{
-    // {{{ properties
-
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-        if (!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {
-            $this->backtrace = debug_backtrace();
-            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
-                unset($this->backtrace[0]['object']);
-            }
-        }
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-            $this->level = $options;
-            $this->callback = null;
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-            printf($format, $this->getMessage());
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
-        }
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);throw($e);');
-        }
-    }
-
-    // }}}
-    // {{{ getMode()
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode() {
-        return $this->mode;
-    }
-
-    // }}}
-    // {{{ getCallback()
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback() {
-        return $this->callback;
-    }
-
-    // }}}
-    // {{{ getMessage()
-
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-
-    // }}}
-    // {{{ getCode()
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    // }}}
-    // {{{ getUserInfo()
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    // }}}
-    // {{{ getDebugInfo()
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    // }}}
-    // {{{ getBacktrace()
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if (defined('PEAR_IGNORE_BACKTRACE')) {
-            return null;
-        }
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    // }}}
-    // {{{ addUserInfo()
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString() {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
-
-    // }}}
-}
-
-/*
- * Local Variables:
- * mode: php
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
-?>
diff --git a/lib/phpFlickr/README.txt b/lib/phpFlickr/README.txt
deleted file mode 100644
index df0a56d98..000000000
--- a/lib/phpFlickr/README.txt
+++ /dev/null
@@ -1,215 +0,0 @@
-phpFlickr Class 2.3.1
-Written by Dan Coulter (dancoulter@users.sourceforge.net)
-Project Homepage: http://www.phpflickr.com/
-Google Code Project Page: http://code.google.com/p/phpflickr/
-Released under GNU Lesser General Public License (http://www.gnu.org/copyleft/lgpl.html)
-For more information about the class and upcoming tools and applications using it,
-visit http://www.phpflickr.com/ or http://code.google.com/p/phpflickr/
-
-If you are interested in hiring me for a project (involving phpFlickr
-or not), feel free to email me.
-
-Installation instructions:
-1.  Copy the files from the installation package into a folder on your
-    server.  They need to be readible by your web server.  You can put 
-    them into an include folder defined in your php.ini file, if you 
-    like, though it's not required. 
-    
-2.  All you have to do now is include the file in your PHP scripts and 
-    create an instance.  For example:
-    $f = new phpFlickr();
-
-    The constructor has three arguments:
-    A.  $api_key - This is the API key given to you by flickr.com. This 
-        argument is required and you can get an API Key at:
-        http://www.flickr.com/services/api/key.gne
-        
-    B.  $secret - The "secret" is optional because is not required to 
-        make unauthenticated calls, but is absolutely required for the 
-        new authentication API (see Authentication section below).  You 
-        will get one assigned alongside your api key.
-    
-    C.  $die_on_error - This takes a boolean value and determines 
-        whether the class will die (aka cease operation) if the API 
-        returns an error statement.  It defaults to false.  Every method 
-        will return false if the API returns an error.  You can access 
-        error messages using the getErrorCode() and getErrorMsg() 
-        methods.
-        
-3.  All of the API methods have been implemented in my class.  You can 
-    see a full list and documentation here: 
-        http://www.flickr.com/services/api/
-    To call a method, remove the "flickr." part of the name and replace 
-    any periods with underscores. For example, instead of 
-    flickr.photos.search, you would call $f->photos_search() or instead 
-    of flickr.photos.licenses.getInfo, you would call 
-    $f->photos_licenses_getInfo() (yes, it is case sensitive).
-    
-    All functions have their arguments implemented in the list order on 
-    their documentation page (a link to which is included with each 
-    method in the phpFlickr clasS). The only exceptions to this are 
-    photos_search(), photos_getWithoutGeodata() and 
-    photos_getWithoutGeodata() which have so many optional arguments
-    that it's easier for everyone if you just have to pass an 
-    associative array of arguments.  See the comment in the 
-    photos_search() definition in phpFlickr.php for more information.
-    
-
-    
-Authentication:
-    As of this release of the phpFlickr class there is only one authentication method
-    available to the API.  This method is somewhat complex, but is far more secure and
-    allows your users to feel a little safer authenticating to your application.  You'll
-    no longer have to ask for their username and password.
-    
-    Authentication API - http://www.flickr.com/services/api/auth.spec.html
-        
-        I know how complicated this API looks at first glance, so I've tried to
-        make this as transparent to the coding process.  I'll go through the steps
-        you'll need to use this.  Both the auth.php and getToken.php file will
-        need your API Key and Secret entered before you can use them.
-        
-        To have end users authenticate their accounts:
-            First, setup a callback script.  I've included a callback script that 
-            is pretty flexible.  You'll find it in the package entitled "auth.php".  
-            You'll need to go to flickr and point your api key to this file as the 
-            callback script.  Once you've done this, on any page that you want to 
-            require the end user end user to authenticate their flickr account to 
-            your app, just call the phpFlickr::auth() function with whatever 
-            permission you need to use.
-            For example:
-                $f->auth("write");
-            The three permissions are "read", "write" and "delete".  The function
-            defaults to "read", if you leave it blank.  
-            
-            Calling this function will send the user's browser to Flickr's page to 
-            authenticate to your app.  Once they have logged in, it will bounce
-            them back to your callback script which will redirect back to the
-            original page that you called the auth() function from after setting
-            a session variable to save their authentication token.  If that session
-            variable exists, calling the auth() function will return the permissions
-            that the user granted your app on the Flickr page instead of redirecting
-            to an external page.
-        
-        To authenticate the app to your account to show your private pictures (for example)
-            This method will allow you to have the app authenticate to one specific
-            account, no matter who views your website.  This is useful to display
-            private photos or photosets (among other things).
-            
-            *Note*: The method below is a little hard to understand, so I've setup a tool
-            to help you through this: http://www.phpflickr.com/tools/auth/.
-                        
-            First, you'll have to setup a callback script with Flickr.  Once you've
-            done that, edit line 12 of the included getToken.php file to reflect 
-            which permissions you'll need for the app.  Then browse to the page.
-            Once you've authorized the app with Flickr, it'll send you back to that
-            page which will give you a token which will look something like this:
-                1234-567890abcdef1234
-            Go to the file where you are creating an instance of phpFlickr (I suggest
-            an include file) and after you've created it set the token to use:
-                $f->setToken("");
-            This token never expires, so you don't have to worry about having to
-            login periodically.
-            
-
-Using Caching:
-    Caching can be very important to a project.  Just a few calls to the Flickr API
-    can take long enough to bore your average web user (depending on the calls you
-    are making).  I've built in caching that will access either a database or files
-    in your filesystem.  To enable caching, use the phpFlickr::enableCache() function.
-    This function requires at least two arguments. The first will be the type of
-    cache you're using (either "db" or "fs")
-    
-    1.  If you're using database caching, you'll need to supply a PEAR::DB connection
-        string. For example: 
-        $flickr->enableCache("db", "mysql://user:password@server/database");
-        The third (optional) argument is expiration of the cache in seconds (defaults 
-        to 600).  The fourth (optional) argument is the table where you want to store
-        the cache.  This defaults to flickr_cache and will attempt to create the table
-        if it does not already exist.
-    
-    2.  If you're using filesystem caching, you'll need to supply a folder where the
-        web server has write access. For example: 
-        $flickr->enableCache("fs", "/var/www/phpFlickrCache");
-        The third (optional) argument is, the same as in the Database caching, an
-        expiration in seconds for the cache.
-        Note: filesystem caching will probably be slower than database caching. I
-        haven't done any tests of this, but if you get large amounts of calls, the
-        process of cleaning out old calls may get hard on your server.
-        
-        You may not want to allow the world to view the files that are created during
-        caching.  If you want to hide this information, either make sure that your
-        permissions are set correctly, or disable the webserver from displaying 
-        *.cache files.  In Apache, you can specify this in the configuration files
-        or in a .htaccess file with the following directives:
-        
-        
-            Deny from all
-        
-        
-        Alternatively, you can specify a directory that is outside of the web server's
-        document root.
-        
-Uploading
-    Uploading is pretty simple. Aside from being authenticated (see Authentication 
-    section) the very minimum that you'll have to pass is a path to an image file on 
-    your php server. You can do either synchronous or asynchronous uploading as follows:
-        synchronous:    sync_upload("photo.jpg");
-        asynchronous:   async_upload("photo.jpg");
-    
-    The basic difference is that synchronous uploading waits around until Flickr
-    processes the photo and returns a PhotoID.  Asynchronous just uploads the
-    picture and gets a "ticketid" that you can use to check on the status of your 
-    upload. Asynchronous is much faster, though the photoid won't be instantly
-    available for you. You can read more about asynchronous uploading here:
-        http://www.flickr.com/services/api/upload.async.html
-        
-    Both of the functions take the same arguments which are:
-        Photo: The path of the file to upload.
-        Title: The title of the photo.
-        Description: A description of the photo. May contain some limited HTML.
-        Tags: A space-separated list of tags to apply to the photo.
-        is_public: Set to 0 for no, 1 for yes.
-        is_friend: Set to 0 for no, 1 for yes.
-        is_family: Set to 0 for no, 1 for yes.
-        
-Replacing Photos
-    Flickr has released API support for uploading a replacement photo.  To use this
-    new method, just use the "replace" function in phpFlickr.  You'll be required
-    to pass the file name and Flickr's photo ID.  You need to authenticate your script
-    with "write" permissions before you can replace a photo.  The arguments are:
-        Photo: The path of the file to upload.
-        Photo ID: The numeric Flickr ID of the photo you want to replace.
-        Async (optional): Set to 0 for a synchronous call, 1 for asynchronous.
-    If you use the asynchronous call, it will return a ticketid instead
-    of photoid.
-
-Other Notes:
-    1.  Many of the methods have optional arguments.  For these, I have implemented 
-        them in the same order that the Flickr API documentation lists them. PHP
-        allows for optional arguments in function calls, but if you want to use the
-        third optional argument, you have to fill in the others to the left first.
-        You can use the "NULL" value (without quotes) in the place of an actual
-        argument.  For example:
-        $f->groups_pools_getPhotos($group_id, NULL, NULL, 10);
-        This will get the first ten photos from a specific group's pool.  If you look
-        at the documentation, you will see that there is another argument, "page". I've
-        left it off because it appears after "per_page".
-    2.  Some people will need to ues phpFlickr from behind a proxy server.  I've
-        implemented a method that will allow you to use an HTTP proxy for all of your
-        traffic.  Let's say that you have a proxy server on your local server running
-        at port 8181.  This is the code you would use:
-            $f = new phpFlickr("[api key]");
-            $f->setProxy("localhost", "8181");
-        After that, all of your calls will be automatically made through your proxy server.
-            
-
-That's it! Enjoy the class.  Check out the project page (listed above) for updates
-and news.  I plan to implement file uploads and functions to aggregate data from
-several different methods for easier use in a web application.  Thanks for your
-interest in this project!
-
-    Please email me if you have any questions or problems. You'll find my email
-	at the top of this file.
-
- 
diff --git a/lib/phpFlickr/auth.php b/lib/phpFlickr/auth.php
deleted file mode 100644
index d272d49bf..000000000
--- a/lib/phpFlickr/auth.php
+++ /dev/null
@@ -1,37 +0,0 @@
-auth($permissions, false);
-    } else {
-        $f->auth_getToken($_GET['frob']);
-	}
-    
-    if (empty($redirect)) {
-		header("Location: " . $default_redirect);
-    } else {
-		header("Location: " . $redirect);
-    }
- 
-?>
\ No newline at end of file
diff --git a/lib/phpFlickr/example.php b/lib/phpFlickr/example.php
deleted file mode 100644
index 8b409b425..000000000
--- a/lib/phpFlickr/example.php
+++ /dev/null
@@ -1,30 +0,0 @@
-" with one provided 
- * by Flickr: http://www.flickr.com/services/api/key.gne
- */
-
-require_once("phpFlickr.php");
-$f = new phpFlickr("");
-
-$recent = $f->photos_getRecent();
-
-foreach ($recent['photo'] as $photo) {
-    $owner = $f->people_getInfo($photo['owner']);
-    echo "";
-    echo $photo['title'];
-    echo " Owner: ";
-    echo "";
-    echo $owner['username'];
-    echo "
      ";
-}
-?>
diff --git a/lib/phpFlickr/getToken.php b/lib/phpFlickr/getToken.php
deleted file mode 100644
index 55180ea29..000000000
--- a/lib/phpFlickr/getToken.php
+++ /dev/null
@@ -1,19 +0,0 @@
-auth("read");
-    
-    echo "Copy this token into your code: " . $_SESSION['phpFlickr_auth_token'];
-    
-?>
\ No newline at end of file
diff --git a/lib/phpFlickr/phpFlickr.php b/lib/phpFlickr/phpFlickr.php
deleted file mode 100644
index 8ef65c581..000000000
--- a/lib/phpFlickr/phpFlickr.php
+++ /dev/null
@@ -1,1453 +0,0 @@
-api_key = $api_key;
-		$this->secret = $secret;
-		$this->die_on_error = $die_on_error;
-		$this->service = "flickr";
-
-		//Find the PHP version and store it for future reference
-		$this->php_version = explode("-", phpversion());
-		$this->php_version = explode(".", $this->php_version[0]);
-
-		//All calls to the API are done via the POST method using the PEAR::HTTP_Request package.
-		require_once 'HTTP/Request.php';
-		$this->req =& new HTTP_Request();
-		$this->req->setMethod(HTTP_REQUEST_METHOD_POST);
-	}
-
-	function enableCache ($type, $connection, $cache_expire = 600, $table = 'flickr_cache') {
-		// Turns on caching.  $type must be either "db" (for database caching) or "fs" (for filesystem).
-		// When using db, $connection must be a PEAR::DB connection string. Example:
-		//	  "mysql://user:password@server/database"
-		// If the $table, doesn't exist, it will attempt to create it.
-		// When using file system, caching, the $connection is the folder that the web server has write
-		// access to. Use absolute paths for best results.  Relative paths may have unexpected behavior
-		// when you include this.  They'll usually work, you'll just want to test them.
-		if ($type == 'db') {
-			require_once 'DB.php';
-			$db =& DB::connect($connection);
-			if (PEAR::isError($db)) {
-				die($db->getMessage());
-			}
-
-			/*
-			 * If high performance is crucial, you can easily comment
-			 * out this query once you've created your database table.
-			 */
-
-			$db->query("
-				CREATE TABLE IF NOT EXISTS `$table` (
-					`request` CHAR( 35 ) NOT NULL ,
-					`response` MEDIUMTEXT NOT NULL ,
-					`expiration` DATETIME NOT NULL ,
-					INDEX ( `request` )
-				) TYPE = MYISAM");
-
-			if ($db->getOne("SELECT COUNT(*) FROM $table") > $this->max_cache_rows) {
-				$db->query("DELETE FROM $table WHERE expiration < DATE_SUB(NOW(), INTERVAL $cache_expire second)");
-				$db->query('OPTIMIZE TABLE ' . $this->cache_table);
-			}
-
-			$this->cache = 'db';
-			$this->cache_db = $db;
-			$this->cache_table = $table;
-		} elseif ($type == 'fs') {
-			$this->cache = 'fs';
-			$connection = realpath($connection);
-			$this->cache_dir = $connection;
-			if ($dir = opendir($this->cache_dir)) {
-				while ($file = readdir($dir)) {
-					if (substr($file, -6) == '.cache' && ((filemtime($this->cache_dir . '/' . $file) + $cache_expire) < time()) ) {
-						unlink($this->cache_dir . '/' . $file);
-					}
-				}
-			}
-		}
-		$this->cache_expire = $cache_expire;
-	}
-
-	function getCached ($request) {
-		//Checks the database or filesystem for a cached result to the request.
-		//If there is no cache result, it returns a value of false. If it finds one,
-		//it returns the unparsed XML.
-		$reqhash = md5(serialize($request));
-		if ($this->cache == 'db') {
-			$result = $this->cache_db->getOne("SELECT response FROM " . $this->cache_table . " WHERE request = ? AND DATE_SUB(NOW(), INTERVAL " . (int) $this->cache_expire . " SECOND) < expiration", $reqhash);
-			if (!empty($result)) {
-				return $result;
-			}
-		} elseif ($this->cache == 'fs') {
-			$file = $this->cache_dir . '/' . $reqhash . '.cache';
-			if (file_exists($file)) {
-				if ($this->php_version[0] > 4 || ($this->php_version[0] == 4 && $this->php_version[1] >= 3)) {
-					return file_get_contents($file);
-				} else {
-					return implode('', file($file));
-				}
-			}
-		}
-		return false;
-	}
-
-	function cache ($request, $response) {
-		//Caches the unparsed XML of a request.
-		$reqhash = md5(serialize($request));
-		if ($this->cache == 'db') {
-			//$this->cache_db->query("DELETE FROM $this->cache_table WHERE request = '$reqhash'");
-			if ($this->cache_db->getOne("SELECT COUNT(*) FROM {$this->cache_table} WHERE request = '$reqhash'")) {
-				$sql = "UPDATE " . $this->cache_table . " SET response = ?, expiration = ? WHERE request = ?";
-				$this->cache_db->query($sql, array($response, strftime("%Y-%m-%d %H:%M:%S"), $reqhash));
-			} else {
-				$sql = "INSERT INTO " . $this->cache_table . " (request, response, expiration) VALUES ('$reqhash', '" . str_replace("'", "''", $response) . "', '" . strftime("%Y-%m-%d %H:%M:%S") . "')";
-				$this->cache_db->query($sql);
-			}
-		} elseif ($this->cache == "fs") {
-			$file = $this->cache_dir . "/" . $reqhash . ".cache";
-			$fstream = fopen($file, "w");
-			$result = fwrite($fstream,$response);
-			fclose($fstream);
-			return $result;
-		}
-		return false;
-	}
-
-	function request ($command, $args = array(), $nocache = false) {
-		//Sends a request to Flickr's REST endpoint via POST.
-		$this->req->setURL($this->REST);
-		$this->req->clearPostData();
-		if (substr($command,0,7) != "flickr.") {
-			$command = "flickr." . $command;
-		}
-
-		//Process arguments, including method and login data.
-		$args = array_merge(array("method" => $command, "format" => "php_serial", "api_key" => $this->api_key), $args);
-		if (!empty($this->token)) {
-			$args = array_merge($args, array("auth_token" => $this->token));
-		} elseif (!empty($_SESSION['phpFlickr_auth_token'])) {
-			$args = array_merge($args, array("auth_token" => $_SESSION['phpFlickr_auth_token']));
-		}
-		ksort($args);
-		$auth_sig = "";
-		if (!($this->response = $this->getCached($args)) || $nocache) {
-			foreach ($args as $key => $data) {
-				$auth_sig .= $key . $data;
-				$this->req->addPostData($key, $data);
-			}
-			if (!empty($this->secret)) {
-				$api_sig = md5($this->secret . $auth_sig);
-				$this->req->addPostData("api_sig", $api_sig);
-			}
-
-			$this->req->addHeader("Connection", "Keep-Alive");
-			
-			//Send Requests
-			if ($this->req->sendRequest()) {
-				$this->response = $this->req->getResponseBody();
-				$this->cache($args, $this->response);
-			} else {
-				die("There has been a problem sending your command to the server.");
-			}
-		}
-		/*
-		 * Uncomment this line (and comment out the next one) if you're doing large queries
-		 * and you're concerned about time.  This will, however, change the structure of
-		 * the result, so be sure that you look at the results.
-		 */
-		//$this->parsed_response = unserialize($this->response);
-		$this->parsed_response = $this->clean_text_nodes(unserialize($this->response));
-		if ($this->parsed_response['stat'] == 'fail') {
-			if ($this->die_on_error) die("The Flickr API returned the following error: #{$this->parsed_response['code']} - {$this->parsed_response['message']}");
-			else {
-				$this->error_code = $this->parsed_response['code'];
-				$this->error_msg = $this->parsed_response['message'];
-				$this->parsed_response = false;
-			}
-		} else {
-			$this->error_code = false;
-			$this->error_msg = false;
-		}
-		return $this->response;
-	}
-
-	function clean_text_nodes ($arr) {
-		if (!is_array($arr)) {
-			return $arr;
-		} elseif (count($arr) == 0) {
-			return $arr;
-		} elseif (count($arr) == 1 && array_key_exists('_content', $arr)) {
-			return $arr['_content'];
-		} else {
-			foreach ($arr as $key => $element) {
-				$arr[$key] = $this->clean_text_nodes($element);
-			}
-			return($arr);
-		}
-	}
-
-	function setToken ($token) {
-		// Sets an authentication token to use instead of the session variable
-		$this->token = $token;
-	}
-
-	function setProxy ($server, $port) {
-		// Sets the proxy for all phpFlickr calls.
-		$this->req->setProxy($server, $port);
-	}
-
-	function getErrorCode () {
-		// Returns the error code of the last call.  If the last call did not
-		// return an error. This will return a false boolean.
-		return $this->error_code;
-	}
-
-	function getErrorMsg () {
-		// Returns the error message of the last call.  If the last call did not
-		// return an error. This will return a false boolean.
-		return $this->error_msg;
-	}
-
-	/* These functions are front ends for the flickr calls */
-
-	function buildPhotoURL ($photo, $size = "Medium") {
-		//receives an array (can use the individual photo data returned
-		//from an API call) and returns a URL (doesn't mean that the
-		//file size exists)
-		$sizes = array(
-			"square" => "_s",
-			"thumbnail" => "_t",
-			"small" => "_m",
-			"medium" => "",
-			"large" => "_b",
-			"original" => "_o"
-		);
-		
-		$size = strtolower($size);
-		if (!array_key_exists($size, $sizes)) {
-			$size = "medium";
-		}
-		
-		if ($size == "original") {
-			$url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['originalsecret'] . "_o" . "." . $photo['originalformat'];
-		} else {
-			$url = "http://farm" . $photo['farm'] . ".static.flickr.com/" . $photo['server'] . "/" . $photo['id'] . "_" . $photo['secret'] . $sizes[$size] . ".jpg";
-		}
-		return $url;
-	}
-
-	function getFriendlyGeodata ($lat, $lon) {
-		/* I've added this method to get the friendly geodata (i.e. 'in New York, NY') that the
-		 * website provides, but isn't available in the API. I'm providing this service as long
-		 * as it doesn't flood my server with requests and crash it all the time.
-		 */
-		return unserialize(file_get_contents('http://phpflickr.com/geodata/?format=php&lat=' . $lat . '&lon=' . $lon));
-	}
-
-	function sync_upload ($photo, $title = null, $description = null, $tags = null, $is_public = null, $is_friend = null, $is_family = null) {
-		$upload_req =& new HTTP_Request();
-		$upload_req->setMethod(HTTP_REQUEST_METHOD_POST);
-
-
-		$upload_req->setURL($this->Upload);
-		$upload_req->clearPostData();
-
-		//Process arguments, including method and login data.
-		$args = array("api_key" => $this->api_key, "title" => $title, "description" => $description, "tags" => $tags, "is_public" => $is_public, "is_friend" => $is_friend, "is_family" => $is_family);
-		if (!empty($this->email)) {
-			$args = array_merge($args, array("email" => $this->email));
-		}
-		if (!empty($this->password)) {
-			$args = array_merge($args, array("password" => $this->password));
-		}
-		if (!empty($this->token)) {
-			$args = array_merge($args, array("auth_token" => $this->token));
-		} elseif (!empty($_SESSION['phpFlickr_auth_token'])) {
-			$args = array_merge($args, array("auth_token" => $_SESSION['phpFlickr_auth_token']));
-		}
-
-		ksort($args);
-		$auth_sig = "";
-		foreach ($args as $key => $data) {
-			if ($data !== null) {
-				$auth_sig .= $key . $data;
-				$upload_req->addPostData($key, $data);
-			}
-		}
-		if (!empty($this->secret)) {
-			$api_sig = md5($this->secret . $auth_sig);
-			$upload_req->addPostData("api_sig", $api_sig);
-		}
-
-		$photo = realpath($photo);
-
-		$result = $upload_req->addFile("photo", $photo);
-
-		if (PEAR::isError($result)) {
-			die($result->getMessage());
-		}
-
-		//Send Requests
-		if ($upload_req->sendRequest()) {
-			$this->response = $upload_req->getResponseBody();
-		} else {
-			die("There has been a problem sending your command to the server.");
-		}
-
-		$rsp = explode("\n", $this->response);
-		foreach ($rsp as $line) {
-			if (ereg('die_on_error)
-					die("The Flickr API returned the following error: #{$match[1]} - {$match[2]}");
-				else {
-					$this->error_code = $match[1];
-					$this->error_msg = $match[2];
-					$this->parsed_response = false;
-					return false;
-				}
-			} elseif (ereg("(.*)", $line, $match)) {
-				$this->error_code = false;
-				$this->error_msg = false;
-				return $match[1];
-			}
-		}
-	}
-
-	function async_upload ($photo, $title = null, $description = null, $tags = null, $is_public = null, $is_friend = null, $is_family = null) {
-		$upload_req =& new HTTP_Request();
-		$upload_req->setMethod(HTTP_REQUEST_METHOD_POST);
-
-		$upload_req->setURL($this->Upload);
-		$upload_req->clearPostData();
-
-		//Process arguments, including method and login data.
-		$args = array("async" => 1, "api_key" => $this->api_key, "title" => $title, "description" => $description, "tags" => $tags, "is_public" => $is_public, "is_friend" => $is_friend, "is_family" => $is_family);
-		if (!empty($this->email)) {
-			$args = array_merge($args, array("email" => $this->email));
-		}
-		if (!empty($this->password)) {
-			$args = array_merge($args, array("password" => $this->password));
-		}
-		if (!empty($this->token)) {
-			$args = array_merge($args, array("auth_token" => $this->token));
-		} elseif (!empty($_SESSION['phpFlickr_auth_token'])) {
-			$args = array_merge($args, array("auth_token" => $_SESSION['phpFlickr_auth_token']));
-		}
-
-		ksort($args);
-		$auth_sig = "";
-		foreach ($args as $key => $data) {
-			if ($data !== null) {
-				$auth_sig .= $key . $data;
-				$upload_req->addPostData($key, $data);
-			}
-		}
-		if (!empty($this->secret)) {
-			$api_sig = md5($this->secret . $auth_sig);
-			$upload_req->addPostData("api_sig", $api_sig);
-		}
-
-		$photo = realpath($photo);
-
-		$result = $upload_req->addFile("photo", $photo);
-
-		if (PEAR::isError($result)) {
-			die($result->getMessage());
-		}
-
-		//Send Requests
-		if ($upload_req->sendRequest()) {
-			$this->response = $upload_req->getResponseBody();
-		} else {
-			die("There has been a problem sending your command to the server.");
-		}
-
-		$rsp = explode("\n", $this->response);
-		foreach ($rsp as $line) {
-			if (ereg('die_on_error)
-					die("The Flickr API returned the following error: #{$match[1]} - {$match[2]}");
-				else {
-					$this->error_code = $match[1];
-					$this->error_msg = $match[2];
-					$this->parsed_response = false;
-					return false;
-				}
-			} elseif (ereg("(.*)error_code = false;
-				$this->error_msg = false;
-				return $match[1];
-			}
-		}
-	}
-
-	// Interface for new replace API method.
-	function replace ($photo, $photo_id, $async = null) {
-		$upload_req =& new HTTP_Request();
-		$upload_req->setMethod(HTTP_REQUEST_METHOD_POST);
-
-		$upload_req->setURL($this->Replace);
-		$upload_req->clearPostData();
-
-		//Process arguments, including method and login data.
-		$args = array("api_key" => $this->api_key, "photo_id" => $photo_id, "async" => $async);
-		if (!empty($this->email)) {
-			$args = array_merge($args, array("email" => $this->email));
-		}
-		if (!empty($this->password)) {
-			$args = array_merge($args, array("password" => $this->password));
-		}
-		if (!empty($this->token)) {
-			$args = array_merge($args, array("auth_token" => $this->token));
-		} elseif (!empty($_SESSION['phpFlickr_auth_token'])) {
-			$args = array_merge($args, array("auth_token" => $_SESSION['phpFlickr_auth_token']));
-		}
-
-		ksort($args);
-		$auth_sig = "";
-		foreach ($args as $key => $data) {
-			if ($data !== null) {
-				$auth_sig .= $key . $data;
-				$upload_req->addPostData($key, $data);
-			}
-		}
-		if (!empty($this->secret)) {
-			$api_sig = md5($this->secret . $auth_sig);
-			$upload_req->addPostData("api_sig", $api_sig);
-		}
-
-		$photo = realpath($photo);
-
-		$result = $upload_req->addFile("photo", $photo);
-
-		if (PEAR::isError($result)) {
-			die($result->getMessage());
-		}
-
-		//Send Requests
-		if ($upload_req->sendRequest()) {
-			$this->response = $upload_req->getResponseBody();
-		} else {
-			die("There has been a problem sending your command to the server.");
-		}
-		if ($async == 1)
-			$find = 'ticketid';
-		 else
-			$find = 'photoid';
-
-		$rsp = explode("\n", $this->response);
-		foreach ($rsp as $line) {
-			if (ereg('die_on_error)
-					die("The Flickr API returned the following error: #{$match[1]} - {$match[2]}");
-				else {
-					$this->error_code = $match[1];
-					$this->error_msg = $match[2];
-					$this->parsed_response = false;
-					return false;
-				}
-			} elseif (ereg("<" . $find . ">(.*)error_code = false;
-				$this->error_msg = false;
-				return $match[1];
-			}
-		}
-	}
-
-	function auth ($perms = "read", $remember_uri = true) {
-		// Redirects to Flickr's authentication piece if there is no valid token.
-		// If remember_uri is set to false, the callback script (included) will
-		// redirect to its default page.
-
-		if (empty($_SESSION['phpFlickr_auth_token']) && empty($this->token)) {
-			if ($remember_uri) {
-				$redirect = $_SERVER['REQUEST_URI'];
-			}
-			$api_sig = md5($this->secret . "api_key" . $this->api_key . "extra" . $redirect . "perms" . $perms);
-			if ($this->service == "23") {
-				header("Location: http://www.23hq.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
-			} else {
-				header("Location: http://www.flickr.com/services/auth/?api_key=" . $this->api_key . "&extra=" . $redirect . "&perms=" . $perms . "&api_sig=". $api_sig);
-			}
-			exit;
-		} else {
-			$tmp = $this->die_on_error;
-			$this->die_on_error = false;
-			$rsp = $this->auth_checkToken();
-			if ($this->error_code !== false) {
-				unset($_SESSION['phpFlickr_auth_token']);
-				$this->auth($perms, $remember_uri);
-			}
-			$this->die_on_error = $tmp;
-			return $rsp['perms'];
-		}
-	}
-
-	/*******************************
-
-	To use the phpFlickr::call method, pass a string containing the API method you want
-	to use and an associative array of arguments.  For example:
-		$result = $f->call("flickr.photos.comments.getList", array("photo_id"=>'34952612'));
-	This method will allow you to make calls to arbitrary methods that haven't been
-	implemented in phpFlickr yet.
-
-	*******************************/
-
-	function call ($method, $arguments) {
-		foreach ( $arguments as $key => $value ) {
-			if ( is_null($value) ) unset($arguments[$key]);
-		}
-		$this->request($method, $arguments);
-		return $this->parsed_response ? $this->parsed_response : false;
-	}
-
-	/*
-		These functions are the direct implementations of flickr calls.
-		For method documentation, including arguments, visit the address
-		included in a comment in the function.
-	*/
-
-	/* Activity methods */
-	function activity_userComments ($per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.activity.userComments.html */
-		$this->request('flickr.activity.userComments', array("per_page" => $per_page, "page" => $page));
-		return $this->parsed_response ? $this->parsed_response['items']['item'] : false;
-	}
-
-	function activity_userPhotos ($timeframe = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.activity.userPhotos.html */
-		$this->request('flickr.activity.userPhotos', array("timeframe" => $timeframe, "per_page" => $per_page, "page" => $page));
-		return $this->parsed_response ? $this->parsed_response['items']['item'] : false;
-	}
-
-	/* Authentication methods */
-	function auth_checkToken () {
-		/* http://www.flickr.com/services/api/flickr.auth.checkToken.html */
-		$this->request('flickr.auth.checkToken');
-		return $this->parsed_response ? $this->parsed_response['auth'] : false;
-	}
-
-	function auth_getFrob () {
-		/* http://www.flickr.com/services/api/flickr.auth.getFrob.html */
-		$this->request('flickr.auth.getFrob');
-		return $this->parsed_response ? $this->parsed_response['frob'] : false;
-	}
-
-	function auth_getFullToken ($mini_token) {
-		/* http://www.flickr.com/services/api/flickr.auth.getFullToken.html */
-		$this->request('flickr.auth.getFullToken', array('mini_token'=>$mini_token));
-		return $this->parsed_response ? $this->parsed_response['auth'] : false;
-	}
-
-	function auth_getToken ($frob) {
-		/* http://www.flickr.com/services/api/flickr.auth.getToken.html */
-		$this->request('flickr.auth.getToken', array('frob'=>$frob));
-		session_register('phpFlickr_auth_token');
-		$_SESSION['phpFlickr_auth_token'] = $this->parsed_response['auth']['token'];
-		return $this->parsed_response ? $this->parsed_response['auth'] : false;
-	}
-
-	/* Blogs methods */
-	function blogs_getList ($service = NULL) {
-		/* http://www.flickr.com/services/api/flickr.blogs.getList.html */
-		$rsp = $this->call('flickr.blogs.getList', array('service' => $service));
-		return $rsp['blogs']['blog'];
-	}
-	
-	function blogs_getServices () {
-		/* http://www.flickr.com/services/api/flickr.blogs.getServices.html */
-		return $this->call('flickr.blogs.getServices', array());
-	}
-
-	function blogs_postPhoto ($blog_id = NULL, $photo_id, $title, $description, $blog_password = NULL, $service = NULL) {
-		/* http://www.flickr.com/services/api/flickr.blogs.postPhoto.html */
-		return $this->call('flickr.blogs.postPhoto', array('blog_id' => $blog_id, 'photo_id' => $photo_id, 'title' => $title, 'description' => $description, 'blog_password' => $blog_password, 'service' => $service));
-	}
-
-	/* Collections Methods */
-	function collections_getInfo ($collection_id) {
-		/* http://www.flickr.com/services/api/flickr.collections.getInfo.html */
-		return $this->call('flickr.collections.getInfo', array('collection_id' => $collection_id));
-	}
-
-	function collections_getTree ($collection_id = NULL, $user_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.collections.getTree.html */
-		return $this->call('flickr.collections.getTree', array('collection_id' => $collection_id, 'user_id' => $user_id));
-	}
-	
-	/* Commons Methods */
-	function commons_getInstitutions () {
-		/* http://www.flickr.com/services/api/flickr.commons.getInstitutions.html */
-		return $this->call('flickr.commons.getInstitutions', array());
-	}
-	
-	/* Contacts Methods */
-	function contacts_getList ($filter = NULL, $page = NULL, $per_page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.contacts.getList.html */
-		$this->request('flickr.contacts.getList', array('filter'=>$filter, 'page'=>$page, 'per_page'=>$per_page));
-		return $this->parsed_response ? $this->parsed_response['contacts'] : false;
-	}
-
-	function contacts_getPublicList ($user_id, $page = NULL, $per_page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.contacts.getPublicList.html */
-		$this->request('flickr.contacts.getPublicList', array('user_id'=>$user_id, 'page'=>$page, 'per_page'=>$per_page));
-		return $this->parsed_response ? $this->parsed_response['contacts'] : false;
-	}
-	
-	function contacts_getListRecentlyUploaded ($date_lastupload = NULL, $filter = NULL) {
-		/* http://www.flickr.com/services/api/flickr.contacts.getListRecentlyUploaded.html */
-		return $this->call('flickr.contacts.getListRecentlyUploaded', array('date_lastupload' => $date_lastupload, 'filter' => $filter));
-	}
-
-	/* Favorites Methods */
-	function favorites_add ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.favorites.add.html */
-		$this->request('flickr.favorites.add', array('photo_id'=>$photo_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function favorites_getList ($user_id = NULL, $min_fave_date = NULL, $max_fave_date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.favorites.getList.html */
-		return $this->call('flickr.favorites.getList', array('user_id' => $user_id, 'min_fave_date' => $min_fave_date, 'max_fave_date' => $max_fave_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	function favorites_getPublicList ($user_id, $min_fave_date = NULL, $max_fave_date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.favorites.getPublicList.html */
-		return $this->call('flickr.favorites.getPublicList', array('user_id' => $user_id, 'min_fave_date' => $min_fave_date, 'max_fave_date' => $max_fave_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	function favorites_remove ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.favorites.remove.html */
-		$this->request("flickr.favorites.remove", array("photo_id"=>$photo_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	/* Groups Methods */
-	function groups_browse ($cat_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.groups.browse.html */
-		$this->request("flickr.groups.browse", array("cat_id"=>$cat_id));
-		return $this->parsed_response ? $this->parsed_response['category'] : false;
-	}
-
-	function groups_getInfo ($group_id, $lang = NULL) {
-		/* http://www.flickr.com/services/api/flickr.groups.getInfo.html */
-		return $this->call('flickr.groups.getInfo', array('group_id' => $group_id, 'lang' => $lang));
-	}
-
-	function groups_search ($text, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.groups.search.html */
-		$this->request("flickr.groups.search", array("text"=>$text,"per_page"=>$per_page,"page"=>$page));
-		return $this->parsed_response ? $this->parsed_response['groups'] : false;
-	}
-
-	/* Groups Members Methods */
-	function groups_members_getList ($group_id, $membertypes = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.groups.members.getList.html */
-		return $this->call('flickr.groups.members.getList', array('group_id' => $group_id, 'membertypes' => $membertypes, 'per_page' => $per_page, 'page' => $page));
-	}
-	
-	/* Groups Pools Methods */
-	function groups_pools_add ($photo_id, $group_id) {
-		/* http://www.flickr.com/services/api/flickr.groups.pools.add.html */
-		$this->request("flickr.groups.pools.add", array("photo_id"=>$photo_id, "group_id"=>$group_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function groups_pools_getContext ($photo_id, $group_id) {
-		/* http://www.flickr.com/services/api/flickr.groups.pools.getContext.html */
-		$this->request("flickr.groups.pools.getContext", array("photo_id"=>$photo_id, "group_id"=>$group_id));
-		return $this->parsed_response ? $this->parsed_response : false;
-	}
-
-	function groups_pools_getGroups ($page = NULL, $per_page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.groups.pools.getGroups.html */
-		$this->request("flickr.groups.pools.getGroups", array('page'=>$page, 'per_page'=>$per_page));
-		return $this->parsed_response ? $this->parsed_response['groups'] : false;
-	}
-
-	function groups_pools_getPhotos ($group_id, $tags = NULL, $user_id = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html */
-		if (is_array($extras)) {
-			$extras = implode(",", $extras);
-		}
-		$this->request("flickr.groups.pools.getPhotos", array("group_id"=>$group_id, "tags"=>$tags, "user_id"=>$user_id, "extras"=>$extras, "per_page"=>$per_page, "page"=>$page));
-		return $this->parsed_response ? $this->parsed_response['photos'] : false;
-	}
-
-	function groups_pools_remove ($photo_id, $group_id) {
-		/* http://www.flickr.com/services/api/flickr.groups.pools.remove.html */
-		$this->request("flickr.groups.pools.remove", array("photo_id"=>$photo_id, "group_id"=>$group_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	/* Interestingness methods */
-	function interestingness_getList ($date = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.interestingness.getList.html */
-		if (is_array($extras)) {
-			$extras = implode(",", $extras);
-		}
-
-		$this->request("flickr.interestingness.getList", array("date"=>$date, "extras"=>$extras, "per_page"=>$per_page, "page"=>$page));
-		return $this->parsed_response ? $this->parsed_response['photos'] : false;
-	}
-
-	/* Machine Tag methods */
-	function machinetags_getNamespaces ($predicate = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.machinetags.getNamespaces.html */
-		return $this->call('flickr.machinetags.getNamespaces', array('predicate' => $predicate, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	function machinetags_getPairs ($namespace = NULL, $predicate = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.machinetags.getPairs.html */
-		return $this->call('flickr.machinetags.getPairs', array('namespace' => $namespace, 'predicate' => $predicate, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	function machinetags_getPredicates ($namespace = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.machinetags.getPredicates.html */
-		return $this->call('flickr.machinetags.getPredicates', array('namespace' => $namespace, 'per_page' => $per_page, 'page' => $page));
-	}
-	
-	function machinetags_getRecentValues ($namespace = NULL, $predicate = NULL, $added_since = NULL) {
-		/* http://www.flickr.com/services/api/flickr.machinetags.getRecentValues.html */
-		return $this->call('flickr.machinetags.getRecentValues', array('namespace' => $namespace, 'predicate' => $predicate, 'added_since' => $added_since));
-	}
-
-	function machinetags_getValues ($namespace, $predicate, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.machinetags.getValues.html */
-		return $this->call('flickr.machinetags.getValues', array('namespace' => $namespace, 'predicate' => $predicate, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	/* Panda methods */
-	function panda_getList () {
-		/* http://www.flickr.com/services/api/flickr.panda.getList.html */
-		return $this->call('flickr.panda.getList', array());
-	}
-
-	function panda_getPhotos ($panda_name, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.panda.getPhotos.html */
-		return $this->call('flickr.panda.getPhotos', array('panda_name' => $panda_name, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	/* People methods */
-	function people_findByEmail ($find_email) {
-		/* http://www.flickr.com/services/api/flickr.people.findByEmail.html */
-		$this->request("flickr.people.findByEmail", array("find_email"=>$find_email));
-		return $this->parsed_response ? $this->parsed_response['user'] : false;
-	}
-
-	function people_findByUsername ($username) {
-		/* http://www.flickr.com/services/api/flickr.people.findByUsername.html */
-		$this->request("flickr.people.findByUsername", array("username"=>$username));
-		return $this->parsed_response ? $this->parsed_response['user'] : false;
-	}
-
-	function people_getInfo ($user_id) {
-		/* http://www.flickr.com/services/api/flickr.people.getInfo.html */
-		$this->request("flickr.people.getInfo", array("user_id"=>$user_id));
-		return $this->parsed_response ? $this->parsed_response['person'] : false;
-	}
-
-	function people_getPublicGroups ($user_id) {
-		/* http://www.flickr.com/services/api/flickr.people.getPublicGroups.html */
-		$this->request("flickr.people.getPublicGroups", array("user_id"=>$user_id));
-		return $this->parsed_response ? $this->parsed_response['groups']['group'] : false;
-	}
-
-	function people_getPublicPhotos ($user_id, $safe_search = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.people.getPublicPhotos.html */
-		return $this->call('flickr.people.getPublicPhotos', array('user_id' => $user_id, 'safe_search' => $safe_search, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	function people_getUploadStatus () {
-		/* http://www.flickr.com/services/api/flickr.people.getUploadStatus.html */
-		/* Requires Authentication */
-		$this->request("flickr.people.getUploadStatus");
-		return $this->parsed_response ? $this->parsed_response['user'] : false;
-	}
-
-
-	/* Photos Methods */
-	function photos_addTags ($photo_id, $tags) {
-		/* http://www.flickr.com/services/api/flickr.photos.addTags.html */
-		$this->request("flickr.photos.addTags", array("photo_id"=>$photo_id, "tags"=>$tags), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_delete ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.delete.html */
-		$this->request("flickr.photos.delete", array("photo_id"=>$photo_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_getAllContexts ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.getAllContexts.html */
-		$this->request("flickr.photos.getAllContexts", array("photo_id"=>$photo_id));
-		return $this->parsed_response ? $this->parsed_response : false;
-	}
-
-	function photos_getContactsPhotos ($count = NULL, $just_friends = NULL, $single_photo = NULL, $include_self = NULL, $extras = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.getContactsPhotos.html */
-		$this->request("flickr.photos.getContactsPhotos", array("count"=>$count, "just_friends"=>$just_friends, "single_photo"=>$single_photo, "include_self"=>$include_self, "extras"=>$extras));
-		return $this->parsed_response ? $this->parsed_response['photos']['photo'] : false;
-	}
-
-	function photos_getContactsPublicPhotos ($user_id, $count = NULL, $just_friends = NULL, $single_photo = NULL, $include_self = NULL, $extras = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.getContactsPublicPhotos.html */
-		$this->request("flickr.photos.getContactsPublicPhotos", array("user_id"=>$user_id, "count"=>$count, "just_friends"=>$just_friends, "single_photo"=>$single_photo, "include_self"=>$include_self, "extras"=>$extras));
-		return $this->parsed_response ? $this->parsed_response['photos']['photo'] : false;
-	}
-
-	function photos_getContext ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.getContext.html */
-		$this->request("flickr.photos.getContext", array("photo_id"=>$photo_id));
-		return $this->parsed_response ? $this->parsed_response : false;
-	}
-
-	function photos_getCounts ($dates = NULL, $taken_dates = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.getCounts.html */
-		$this->request("flickr.photos.getCounts", array("dates"=>$dates, "taken_dates"=>$taken_dates));
-		return $this->parsed_response ? $this->parsed_response['photocounts']['photocount'] : false;
-	}
-
-	function photos_getExif ($photo_id, $secret = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.getExif.html */
-		$this->request("flickr.photos.getExif", array("photo_id"=>$photo_id, "secret"=>$secret));
-		return $this->parsed_response ? $this->parsed_response['photo'] : false;
-	}
-	
-	function photos_getFavorites ($photo_id, $page = NULL, $per_page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.getFavorites.html */
-		$this->request("flickr.photos.getFavorites", array("photo_id"=>$photo_id, "page"=>$page, "per_page"=>$per_page));
-		return $this->parsed_response ? $this->parsed_response['photo'] : false;
-	}
-
-	function photos_getInfo ($photo_id, $secret = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.getInfo.html */
-		$this->request("flickr.photos.getInfo", array("photo_id"=>$photo_id, "secret"=>$secret));
-		return $this->parsed_response ? $this->parsed_response['photo'] : false;
-	}
-
-	function photos_getNotInSet ($min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL, $privacy_filter = NULL, $media = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.getNotInSet.html */
-		return $this->call('flickr.photos.getNotInSet', array('min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date, 'privacy_filter' => $privacy_filter, 'media' => $media, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	function photos_getPerms ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.getPerms.html */
-		$this->request("flickr.photos.getPerms", array("photo_id"=>$photo_id));
-		return $this->parsed_response ? $this->parsed_response['perms'] : false;
-	}
-
-	function photos_getRecent ($extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.getRecent.html */
-
-		if (is_array($extras)) {
-			$extras = implode(",", $extras);
-		}
-		$this->request("flickr.photos.getRecent", array("extras"=>$extras, "per_page"=>$per_page, "page"=>$page));
-		return $this->parsed_response ? $this->parsed_response['photos'] : false;
-	}
-
-	function photos_getSizes ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.getSizes.html */
-		$this->request("flickr.photos.getSizes", array("photo_id"=>$photo_id));
-		return $this->parsed_response ? $this->parsed_response['sizes']['size'] : false;
-	}
-
-	function photos_getUntagged ($min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL, $privacy_filter = NULL, $media = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.getUntagged.html */
-		return $this->call('flickr.photos.getUntagged', array('min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date, 'privacy_filter' => $privacy_filter, 'media' => $media, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	function photos_getWithGeoData ($args = array()) {
-		/* See the documentation included with the photos_search() function.
-		 * I'm using the same style of arguments for this function. The only
-		 * difference here is that this doesn't require any arguments. The
-		 * flickr.photos.search method requires at least one search parameter.
-		 */
-		/* http://www.flickr.com/services/api/flickr.photos.getWithGeoData.html */
-		$this->request("flickr.photos.getWithGeoData", $args);
-		return $this->parsed_response ? $this->parsed_response['photos'] : false;
-	}
-
-	function photos_getWithoutGeoData ($args = array()) {
-		/* See the documentation included with the photos_search() function.
-		 * I'm using the same style of arguments for this function. The only
-		 * difference here is that this doesn't require any arguments. The
-		 * flickr.photos.search method requires at least one search parameter.
-		 */
-		/* http://www.flickr.com/services/api/flickr.photos.getWithoutGeoData.html */
-		$this->request("flickr.photos.getWithoutGeoData", $args);
-		return $this->parsed_response ? $this->parsed_response['photos'] : false;
-	}
-
-	function photos_recentlyUpdated ($min_date, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.recentlyUpdated.html */
-		return $this->call('flickr.photos.recentlyUpdated', array('min_date' => $min_date, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	function photos_removeTag ($tag_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.removeTag.html */
-		$this->request("flickr.photos.removeTag", array("tag_id"=>$tag_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_search ($args = array()) {
-		/* This function strays from the method of arguments that I've
-		 * used in the other functions for the fact that there are just
-		 * so many arguments to this API method. What you'll need to do
-		 * is pass an associative array to the function containing the
-		 * arguments you want to pass to the API.  For example:
-		 *   $photos = $f->photos_search(array("tags"=>"brown,cow", "tag_mode"=>"any"));
-		 * This will return photos tagged with either "brown" or "cow"
-		 * or both. See the API documentation (link below) for a full
-		 * list of arguments.
-		 */
-
-		/* http://www.flickr.com/services/api/flickr.photos.search.html */
-		$this->request("flickr.photos.search", $args);
-		return $this->parsed_response ? $this->parsed_response['photos'] : false;
-	}
-
-	function photos_setContentType ($photo_id, $content_type) {
-		/* http://www.flickr.com/services/api/flickr.photos.setContentType.html */
-		return $this->call('flickr.photos.setContentType', array('photo_id' => $photo_id, 'content_type' => $content_type));
-	}
-	
-	function photos_setDates ($photo_id, $date_posted = NULL, $date_taken = NULL, $date_taken_granularity = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.setDates.html */
-		$this->request("flickr.photos.setDates", array("photo_id"=>$photo_id, "date_posted"=>$date_posted, "date_taken"=>$date_taken, "date_taken_granularity"=>$date_taken_granularity), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_setMeta ($photo_id, $title, $description) {
-		/* http://www.flickr.com/services/api/flickr.photos.setMeta.html */
-		$this->request("flickr.photos.setMeta", array("photo_id"=>$photo_id, "title"=>$title, "description"=>$description), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_setPerms ($photo_id, $is_public, $is_friend, $is_family, $perm_comment, $perm_addmeta) {
-		/* http://www.flickr.com/services/api/flickr.photos.setPerms.html */
-		$this->request("flickr.photos.setPerms", array("photo_id"=>$photo_id, "is_public"=>$is_public, "is_friend"=>$is_friend, "is_family"=>$is_family, "perm_comment"=>$perm_comment, "perm_addmeta"=>$perm_addmeta), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_setSafetyLevel ($photo_id, $safety_level = NULL, $hidden = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.setSafetyLevel.html */
-		return $this->call('flickr.photos.setSafetyLevel', array('photo_id' => $photo_id, 'safety_level' => $safety_level, 'hidden' => $hidden));
-	}
-	
-	function photos_setTags ($photo_id, $tags) {
-		/* http://www.flickr.com/services/api/flickr.photos.setTags.html */
-		$this->request("flickr.photos.setTags", array("photo_id"=>$photo_id, "tags"=>$tags), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	/* Photos - Comments Methods */
-	function photos_comments_addComment ($photo_id, $comment_text) {
-		/* http://www.flickr.com/services/api/flickr.photos.comments.addComment.html */
-		$this->request("flickr.photos.comments.addComment", array("photo_id" => $photo_id, "comment_text"=>$comment_text), TRUE);
-		return $this->parsed_response ? $this->parsed_response['comment'] : false;
-	}
-
-	function photos_comments_deleteComment ($comment_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.comments.deleteComment.html */
-		$this->request("flickr.photos.comments.deleteComment", array("comment_id" => $comment_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_comments_editComment ($comment_id, $comment_text) {
-		/* http://www.flickr.com/services/api/flickr.photos.comments.editComment.html */
-		$this->request("flickr.photos.comments.editComment", array("comment_id" => $comment_id, "comment_text"=>$comment_text), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_comments_getList ($photo_id, $min_comment_date = NULL, $max_comment_date = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.comments.getList.html */
-		return $this->call('flickr.photos.comments.getList', array('photo_id' => $photo_id, 'min_comment_date' => $min_comment_date, 'max_comment_date' => $max_comment_date));
-	}
-	
-	function photos_comments_getRecentForContacts ($date_lastcomment = NULL, $contacts_filter = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.comments.getRecentForContacts.html */
-		return $this->call('flickr.photos.comments.getRecentForContacts', array('date_lastcomment' => $date_lastcomment, 'contacts_filter' => $contacts_filter, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	/* Photos - Geo Methods */
-	function photos_geo_batchCorrectLocation ($lat, $lon, $accuracy, $place_id = NULL, $woe_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.geo.batchCorrectLocation.html */
-		return $this->call('flickr.photos.geo.batchCorrectLocation', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'place_id' => $place_id, 'woe_id' => $woe_id));
-	}
-
-	function photos_geo_correctLocation ($photo_id, $place_id = NULL, $woe_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.geo.correctLocation.html */
-		return $this->call('flickr.photos.geo.correctLocation', array('photo_id' => $photo_id, 'place_id' => $place_id, 'woe_id' => $woe_id));
-	}
-
-	function photos_geo_getLocation ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.geo.getLocation.html */
-		$this->request("flickr.photos.geo.getLocation", array("photo_id"=>$photo_id));
-		return $this->parsed_response ? $this->parsed_response['photo'] : false;
-	}
-
-	function photos_geo_getPerms ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.geo.getPerms.html */
-		$this->request("flickr.photos.geo.getPerms", array("photo_id"=>$photo_id));
-		return $this->parsed_response ? $this->parsed_response['perms'] : false;
-	}
-	
-	function photos_geo_photosForLocation ($lat, $lon, $accuracy = NULL, $extras = NULL, $per_page = NULL, $page = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.geo.photosForLocation.html */
-		return $this->call('flickr.photos.geo.photosForLocation', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'extras' => $extras, 'per_page' => $per_page, 'page' => $page));
-	}
-
-	function photos_geo_removeLocation ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.geo.removeLocation.html */
-		$this->request("flickr.photos.geo.removeLocation", array("photo_id"=>$photo_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_geo_setContext ($photo_id, $context) {
-		/* http://www.flickr.com/services/api/flickr.photos.geo.setContext.html */
-		return $this->call('flickr.photos.geo.setContext', array('photo_id' => $photo_id, 'context' => $context));
-	}
-
-	function photos_geo_setLocation ($photo_id, $lat, $lon, $accuracy = NULL, $context = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photos.geo.setLocation.html */
-		return $this->call('flickr.photos.geo.setLocation', array('photo_id' => $photo_id, 'lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy, 'context' => $context));
-	}
-
-	function photos_geo_setPerms ($is_public, $is_contact, $is_friend, $is_family, $photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.geo.setPerms.html */
-		return $this->call('flickr.photos.geo.setPerms', array('is_public' => $is_public, 'is_contact' => $is_contact, 'is_friend' => $is_friend, 'is_family' => $is_family, 'photo_id' => $photo_id));
-	}
-
-	/* Photos - Licenses Methods */
-	function photos_licenses_getInfo () {
-		/* http://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html */
-		$this->request("flickr.photos.licenses.getInfo");
-		return $this->parsed_response ? $this->parsed_response['licenses']['license'] : false;
-	}
-
-	function photos_licenses_setLicense ($photo_id, $license_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.licenses.setLicense.html */
-		/* Requires Authentication */
-		$this->request("flickr.photos.licenses.setLicense", array("photo_id"=>$photo_id, "license_id"=>$license_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	/* Photos - Notes Methods */
-	function photos_notes_add ($photo_id, $note_x, $note_y, $note_w, $note_h, $note_text) {
-		/* http://www.flickr.com/services/api/flickr.photos.notes.add.html */
-		$this->request("flickr.photos.notes.add", array("photo_id" => $photo_id, "note_x" => $note_x, "note_y" => $note_y, "note_w" => $note_w, "note_h" => $note_h, "note_text" => $note_text), TRUE);
-		return $this->parsed_response ? $this->parsed_response['note'] : false;
-	}
-
-	function photos_notes_delete ($note_id) {
-		/* http://www.flickr.com/services/api/flickr.photos.notes.delete.html */
-		$this->request("flickr.photos.notes.delete", array("note_id" => $note_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photos_notes_edit ($note_id, $note_x, $note_y, $note_w, $note_h, $note_text) {
-		/* http://www.flickr.com/services/api/flickr.photos.notes.edit.html */
-		$this->request("flickr.photos.notes.edit", array("note_id" => $note_id, "note_x" => $note_x, "note_y" => $note_y, "note_w" => $note_w, "note_h" => $note_h, "note_text" => $note_text), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	/* Photos - Transform Methods */
-	function photos_transform_rotate ($photo_id, $degrees) {
-		/* http://www.flickr.com/services/api/flickr.photos.transform.rotate.html */
-		$this->request("flickr.photos.transform.rotate", array("photo_id" => $photo_id, "degrees" => $degrees), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	/* Photos - Upload Methods */
-	function photos_upload_checkTickets ($tickets) {
-		/* http://www.flickr.com/services/api/flickr.photos.upload.checkTickets.html */
-		if (is_array($tickets)) {
-			$tickets = implode(",", $tickets);
-		}
-		$this->request("flickr.photos.upload.checkTickets", array("tickets" => $tickets), TRUE);
-		return $this->parsed_response ? $this->parsed_response['uploader']['ticket'] : false;
-	}
-
-	/* Photosets Methods */
-	function photosets_addPhoto ($photoset_id, $photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photosets.addPhoto.html */
-		$this->request("flickr.photosets.addPhoto", array("photoset_id" => $photoset_id, "photo_id" => $photo_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photosets_create ($title, $description, $primary_photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photosets.create.html */
-		$this->request("flickr.photosets.create", array("title" => $title, "primary_photo_id" => $primary_photo_id, "description" => $description), TRUE);
-		return $this->parsed_response ? $this->parsed_response['photoset'] : false;
-	}
-
-	function photosets_delete ($photoset_id) {
-		/* http://www.flickr.com/services/api/flickr.photosets.delete.html */
-		$this->request("flickr.photosets.delete", array("photoset_id" => $photoset_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photosets_editMeta ($photoset_id, $title, $description = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photosets.editMeta.html */
-		$this->request("flickr.photosets.editMeta", array("photoset_id" => $photoset_id, "title" => $title, "description" => $description), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photosets_editPhotos ($photoset_id, $primary_photo_id, $photo_ids) {
-		/* http://www.flickr.com/services/api/flickr.photosets.editPhotos.html */
-		$this->request("flickr.photosets.editPhotos", array("photoset_id" => $photoset_id, "primary_photo_id" => $primary_photo_id, "photo_ids" => $photo_ids), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photosets_getContext ($photo_id, $photoset_id) {
-		/* http://www.flickr.com/services/api/flickr.photosets.getContext.html */
-		$this->request("flickr.photosets.getContext", array("photo_id" => $photo_id, "photoset_id" => $photoset_id));
-		return $this->parsed_response ? $this->parsed_response : false;
-	}
-
-	function photosets_getInfo ($photoset_id) {
-		/* http://www.flickr.com/services/api/flickr.photosets.getInfo.html */
-		$this->request("flickr.photosets.getInfo", array("photoset_id" => $photoset_id));
-		return $this->parsed_response ? $this->parsed_response['photoset'] : false;
-	}
-
-	function photosets_getList ($user_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photosets.getList.html */
-		$this->request("flickr.photosets.getList", array("user_id" => $user_id));
-		return $this->parsed_response ? $this->parsed_response['photosets'] : false;
-	}
-
-	function photosets_getPhotos ($photoset_id, $extras = NULL, $privacy_filter = NULL, $per_page = NULL, $page = NULL, $media = NULL) {
-		/* http://www.flickr.com/services/api/flickr.photosets.getPhotos.html */
-		return $this->call('flickr.photosets.getPhotos', array('photoset_id' => $photoset_id, 'extras' => $extras, 'privacy_filter' => $privacy_filter, 'per_page' => $per_page, 'page' => $page, 'media' => $media));
-	}
-
-	function photosets_orderSets ($photoset_ids) {
-		/* http://www.flickr.com/services/api/flickr.photosets.orderSets.html */
-		if (is_array($photoset_ids)) {
-			$photoset_ids = implode(",", $photoset_ids);
-		}
-		$this->request("flickr.photosets.orderSets", array("photoset_ids" => $photoset_ids), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photosets_removePhoto ($photoset_id, $photo_id) {
-		/* http://www.flickr.com/services/api/flickr.photosets.removePhoto.html */
-		$this->request("flickr.photosets.removePhoto", array("photoset_id" => $photoset_id, "photo_id" => $photo_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	/* Photosets Comments Methods */
-	function photosets_comments_addComment ($photoset_id, $comment_text) {
-		/* http://www.flickr.com/services/api/flickr.photosets.comments.addComment.html */
-		$this->request("flickr.photosets.comments.addComment", array("photoset_id" => $photoset_id, "comment_text"=>$comment_text), TRUE);
-		return $this->parsed_response ? $this->parsed_response['comment'] : false;
-	}
-
-	function photosets_comments_deleteComment ($comment_id) {
-		/* http://www.flickr.com/services/api/flickr.photosets.comments.deleteComment.html */
-		$this->request("flickr.photosets.comments.deleteComment", array("comment_id" => $comment_id), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photosets_comments_editComment ($comment_id, $comment_text) {
-		/* http://www.flickr.com/services/api/flickr.photosets.comments.editComment.html */
-		$this->request("flickr.photosets.comments.editComment", array("comment_id" => $comment_id, "comment_text"=>$comment_text), TRUE);
-		return $this->parsed_response ? true : false;
-	}
-
-	function photosets_comments_getList ($photoset_id) {
-		/* http://www.flickr.com/services/api/flickr.photosets.comments.getList.html */
-		$this->request("flickr.photosets.comments.getList", array("photoset_id"=>$photoset_id));
-		return $this->parsed_response ? $this->parsed_response['comments'] : false;
-	}
-	
-	/* Places Methods */
-	function places_find ($query) {
-		/* http://www.flickr.com/services/api/flickr.places.find.html */
-		return $this->call('flickr.places.find', array('query' => $query));
-	}
-
-	function places_findByLatLon ($lat, $lon, $accuracy = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.findByLatLon.html */
-		return $this->call('flickr.places.findByLatLon', array('lat' => $lat, 'lon' => $lon, 'accuracy' => $accuracy));
-	}
-
-	function places_getChildrenWithPhotosPublic ($place_id = NULL, $woe_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.getChildrenWithPhotosPublic.html */
-		return $this->call('flickr.places.getChildrenWithPhotosPublic', array('place_id' => $place_id, 'woe_id' => $woe_id));
-	}
-
-	function places_getInfo ($place_id = NULL, $woe_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.getInfo.html */
-		return $this->call('flickr.places.getInfo', array('place_id' => $place_id, 'woe_id' => $woe_id));
-	}
-
-	function places_getInfoByUrl ($url) {
-		/* http://www.flickr.com/services/api/flickr.places.getInfoByUrl.html */
-		return $this->call('flickr.places.getInfoByUrl', array('url' => $url));
-	}
-	
-	function places_getPlaceTypes () {
-		/* http://www.flickr.com/services/api/flickr.places.getPlaceTypes.html */
-		return $this->call('flickr.places.getPlaceTypes', array());
-	}
-	
-	function places_getShapeHistory ($place_id = NULL, $woe_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.getShapeHistory.html */
-		return $this->call('flickr.places.getShapeHistory', array('place_id' => $place_id, 'woe_id' => $woe_id));
-	}
-
-	function places_getTopPlacesList ($place_type_id, $date = NULL, $woe_id = NULL, $place_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.getTopPlacesList.html */
-		return $this->call('flickr.places.getTopPlacesList', array('place_type_id' => $place_type_id, 'date' => $date, 'woe_id' => $woe_id, 'place_id' => $place_id));
-	}
-	
-	function places_placesForBoundingBox ($bbox, $place_type = NULL, $place_type_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.placesForBoundingBox.html */
-		return $this->call('flickr.places.placesForBoundingBox', array('bbox' => $bbox, 'place_type' => $place_type, 'place_type_id' => $place_type_id));
-	}
-
-	function places_placesForContacts ($place_type = NULL, $place_type_id = NULL, $woe_id = NULL, $place_id = NULL, $threshold = NULL, $contacts = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.placesForContacts.html */
-		return $this->call('flickr.places.placesForContacts', array('place_type' => $place_type, 'place_type_id' => $place_type_id, 'woe_id' => $woe_id, 'place_id' => $place_id, 'threshold' => $threshold, 'contacts' => $contacts, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
-	}
-
-	function places_placesForTags ($place_type_id, $woe_id = NULL, $place_id = NULL, $threshold = NULL, $tags = NULL, $tag_mode = NULL, $machine_tags = NULL, $machine_tag_mode = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.placesForTags.html */
-		return $this->call('flickr.places.placesForTags', array('place_type_id' => $place_type_id, 'woe_id' => $woe_id, 'place_id' => $place_id, 'threshold' => $threshold, 'tags' => $tags, 'tag_mode' => $tag_mode, 'machine_tags' => $machine_tags, 'machine_tag_mode' => $machine_tag_mode, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
-	}
-
-	function places_placesForUser ($place_type_id = NULL, $place_type = NULL, $woe_id = NULL, $place_id = NULL, $threshold = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.placesForUser.html */
-		return $this->call('flickr.places.placesForUser', array('place_type_id' => $place_type_id, 'place_type' => $place_type, 'woe_id' => $woe_id, 'place_id' => $place_id, 'threshold' => $threshold, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
-	}
-	
-	function places_resolvePlaceId ($place_id) {
-		/* http://www.flickr.com/services/api/flickr.places.resolvePlaceId.html */
-		$rsp = $this->call('flickr.places.resolvePlaceId', array('place_id' => $place_id));
-		return $rsp ? $rsp['location'] : $rsp;
-	}
-	
-	function places_resolvePlaceURL ($url) {
-		/* http://www.flickr.com/services/api/flickr.places.resolvePlaceURL.html */
-		$rsp = $this->call('flickr.places.resolvePlaceURL', array('url' => $url));
-		return $rsp ? $rsp['location'] : $rsp;
-	}
-	
-	function places_tagsForPlace ($woe_id = NULL, $place_id = NULL, $min_upload_date = NULL, $max_upload_date = NULL, $min_taken_date = NULL, $max_taken_date = NULL) {
-		/* http://www.flickr.com/services/api/flickr.places.tagsForPlace.html */
-		return $this->call('flickr.places.tagsForPlace', array('woe_id' => $woe_id, 'place_id' => $place_id, 'min_upload_date' => $min_upload_date, 'max_upload_date' => $max_upload_date, 'min_taken_date' => $min_taken_date, 'max_taken_date' => $max_taken_date));
-	}
-
-	/* Prefs Methods */
-	function prefs_getContentType () {
-		/* http://www.flickr.com/services/api/flickr.prefs.getContentType.html */
-		$rsp = $this->call('flickr.prefs.getContentType', array());
-		return $rsp ? $rsp['person'] : $rsp;
-	}
-	
-	function prefs_getGeoPerms () {
-		/* http://www.flickr.com/services/api/flickr.prefs.getGeoPerms.html */
-		return $this->call('flickr.prefs.getGeoPerms', array());
-	}
-	
-	function prefs_getHidden () {
-		/* http://www.flickr.com/services/api/flickr.prefs.getHidden.html */
-		$rsp = $this->call('flickr.prefs.getHidden', array());
-		return $rsp ? $rsp['person'] : $rsp;
-	}
-	
-	function prefs_getPrivacy () {
-		/* http://www.flickr.com/services/api/flickr.prefs.getPrivacy.html */
-		$rsp = $this->call('flickr.prefs.getPrivacy', array());
-		return $rsp ? $rsp['person'] : $rsp;
-	}
-	
-	function prefs_getSafetyLevel () {
-		/* http://www.flickr.com/services/api/flickr.prefs.getSafetyLevel.html */
-		$rsp = $this->call('flickr.prefs.getSafetyLevel', array());
-		return $rsp ? $rsp['person'] : $rsp;
-	}
-
-	/* Reflection Methods */
-	function reflection_getMethodInfo ($method_name) {
-		/* http://www.flickr.com/services/api/flickr.reflection.getMethodInfo.html */
-		$this->request("flickr.reflection.getMethodInfo", array("method_name" => $method_name));
-		return $this->parsed_response ? $this->parsed_response : false;
-	}
-
-	function reflection_getMethods () {
-		/* http://www.flickr.com/services/api/flickr.reflection.getMethods.html */
-		$this->request("flickr.reflection.getMethods");
-		return $this->parsed_response ? $this->parsed_response['methods']['method'] : false;
-	}
-
-	/* Tags Methods */
-	function tags_getClusterPhotos ($tag, $cluster_id) {
-		/* http://www.flickr.com/services/api/flickr.tags.getClusterPhotos.html */
-		return $this->call('flickr.tags.getClusterPhotos', array('tag' => $tag, 'cluster_id' => $cluster_id));
-	}
-
-	function tags_getClusters ($tag) {
-		/* http://www.flickr.com/services/api/flickr.tags.getClusters.html */
-		return $this->call('flickr.tags.getClusters', array('tag' => $tag));
-	}
-
-	function tags_getHotList ($period = NULL, $count = NULL) {
-		/* http://www.flickr.com/services/api/flickr.tags.getHotList.html */
-		$this->request("flickr.tags.getHotList", array("period" => $period, "count" => $count));
-		return $this->parsed_response ? $this->parsed_response['hottags'] : false;
-	}
-
-	function tags_getListPhoto ($photo_id) {
-		/* http://www.flickr.com/services/api/flickr.tags.getListPhoto.html */
-		$this->request("flickr.tags.getListPhoto", array("photo_id" => $photo_id));
-		return $this->parsed_response ? $this->parsed_response['photo']['tags']['tag'] : false;
-	}
-
-	function tags_getListUser ($user_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.tags.getListUser.html */
-		$this->request("flickr.tags.getListUser", array("user_id" => $user_id));
-		return $this->parsed_response ? $this->parsed_response['who']['tags']['tag'] : false;
-	}
-
-	function tags_getListUserPopular ($user_id = NULL, $count = NULL) {
-		/* http://www.flickr.com/services/api/flickr.tags.getListUserPopular.html */
-		$this->request("flickr.tags.getListUserPopular", array("user_id" => $user_id, "count" => $count));
-		return $this->parsed_response ? $this->parsed_response['who']['tags']['tag'] : false;
-	}
-
-	function tags_getListUserRaw ($tag = NULL) {
-		/* http://www.flickr.com/services/api/flickr.tags.getListUserRaw.html */
-		return $this->call('flickr.tags.getListUserRaw', array('tag' => $tag));
-	}
-	
-	function tags_getRelated ($tag) {
-		/* http://www.flickr.com/services/api/flickr.tags.getRelated.html */
-		$this->request("flickr.tags.getRelated", array("tag" => $tag));
-		return $this->parsed_response ? $this->parsed_response['tags'] : false;
-	}
-
-	function test_echo ($args = array()) {
-		/* http://www.flickr.com/services/api/flickr.test.echo.html */
-		$this->request("flickr.test.echo", $args);
-		return $this->parsed_response ? $this->parsed_response : false;
-	}
-
-	function test_login () {
-		/* http://www.flickr.com/services/api/flickr.test.login.html */
-		$this->request("flickr.test.login");
-		return $this->parsed_response ? $this->parsed_response['user'] : false;
-	}
-
-	function urls_getGroup ($group_id) {
-		/* http://www.flickr.com/services/api/flickr.urls.getGroup.html */
-		$this->request("flickr.urls.getGroup", array("group_id"=>$group_id));
-		return $this->parsed_response ? $this->parsed_response['group']['url'] : false;
-	}
-
-	function urls_getUserPhotos ($user_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.urls.getUserPhotos.html */
-		$this->request("flickr.urls.getUserPhotos", array("user_id"=>$user_id));
-		return $this->parsed_response ? $this->parsed_response['user']['url'] : false;
-	}
-
-	function urls_getUserProfile ($user_id = NULL) {
-		/* http://www.flickr.com/services/api/flickr.urls.getUserProfile.html */
-		$this->request("flickr.urls.getUserProfile", array("user_id"=>$user_id));
-		return $this->parsed_response ? $this->parsed_response['user']['url'] : false;
-	}
-
-	function urls_lookupGroup ($url) {
-		/* http://www.flickr.com/services/api/flickr.urls.lookupGroup.html */
-		$this->request("flickr.urls.lookupGroup", array("url"=>$url));
-		return $this->parsed_response ? $this->parsed_response['group'] : false;
-	}
-
-	function urls_lookupUser ($url) {
-		/* http://www.flickr.com/services/api/flickr.photos.notes.edit.html */
-		$this->request("flickr.urls.lookupUser", array("url"=>$url));
-		return $this->parsed_response ? $this->parsed_response['user'] : false;
-	}
-}
-
-
-?>
diff --git a/start.php b/start.php
index 270173fcf..b6d056517 100644
--- a/start.php
+++ b/start.php
@@ -187,11 +187,6 @@ function tidypics_submenus() {
 		add_submenu_item(	elgg_echo('tidypics:recentlycommented'),
 				$CONFIG->wwwroot . 'pg/photos/recentlycommented/',
 				'tidypics-z');
-		/*
-			add_submenu_item(	'Flickr Integration',
-								$CONFIG->wwwroot . 'mod/tidypics/pages/flickr/setup.php',
-								'tidypics-z');
-		*/
 	}
 
 }
@@ -359,13 +354,6 @@ function tidypics_page_handler($page) {
 				include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
 				break;
 
-			case "flickr":
-				if (isset($page[1])) {
-					set_input('username',$page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/flickr/setup.php");
-				break;
-
 			case "admin":
 				include ($CONFIG->pluginspath . "tidypics/pages/admin.php");
 				break;
@@ -555,6 +543,5 @@ register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/ac
 register_action("tidypics/addtag", false, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
 register_action("tidypics/deletetag", false, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
 
-register_action("tidypics/admin/flickrSetup", false, $CONFIG->pluginspath . "tidypics/actions/admin/flickrSetup.php", true);
 register_action("tidypics/admin/settings", false, $CONFIG->pluginspath . "tidypics/actions/admin/settings.php", true);
 register_action("tidypics/admin/upgrade", false, $CONFIG->pluginspath . "tidypics/actions/admin/upgrade.php", true);
-- 
cgit v1.2.3


From 59811d171349c3b903fef77a6ca7268d79b3edc4 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 10 Nov 2011 07:20:14 -0500
Subject: a little clean up of the start boot script

---
 start.php | 65 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/start.php b/start.php
index b6d056517..3543dede1 100644
--- a/start.php
+++ b/start.php
@@ -2,6 +2,7 @@
 /**
  * Elgg tidypics
  *
+ * @license GPL2
  */
 
 // set some simple defines
@@ -13,8 +14,12 @@ include dirname(__FILE__) . "/lib/tidypics.php";
 include dirname(__FILE__) . "/lib/image.php";
 include dirname(__FILE__) . "/lib/album.php";
 
+
+// Make sure tidypics_init is called on initialization
+register_elgg_event_handler('init', 'system', 'tidypics_init');
+
 /**
- * tidypics plugin initialisation functions.
+ * Tidypics plugin initialization
  */
 function tidypics_init() {
 	global $CONFIG;
@@ -40,6 +45,10 @@ function tidypics_init() {
 	// Register a page handler, so we can have nice URLs
 	register_page_handler('photos','tidypics_page_handler');
 
+	// register for menus
+	register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus');
+	register_elgg_event_handler('pagesetup', 'system', 'tidypics_adminmenu');
+
 	// Add a new tidypics widget
 	add_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile');
 	add_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile');
@@ -71,6 +80,22 @@ function tidypics_init() {
 
 	// ajax handler for uploads when use_only_cookies is set
 	register_plugin_hook('forward', 'system', 'tidypics_ajax_session_handler');
+
+	// Register actions
+	$base_dir = $CONFIG->pluginspath . "tidypics/actions";
+	register_action("tidypics/upload", false, "$base_dir/upload.php");
+	register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php");
+	register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php");
+	register_action("tidypics/addalbum", false, "$base_dir/addalbum.php");
+	register_action("tidypics/sortalbum", false, "$base_dir/sortalbum.php");
+	register_action("tidypics/edit", false, "$base_dir/edit.php");
+	register_action("tidypics/delete", false, "$base_dir/delete.php");
+	register_action("tidypics/edit_multi", false, "$base_dir/edit_multi.php");
+	register_action("tidypics/addtag", false, "$base_dir/addtag.php");
+	register_action("tidypics/deletetag", false, "$base_dir/deletetag.php");
+
+	register_action("tidypics/admin/settings", false, "$base_dir/admin/settings.php", true);
+	register_action("tidypics/admin/upgrade", false, "$base_dir/admin/upgrade.php", true);
 }
 
 /**
@@ -363,14 +388,20 @@ function tidypics_page_handler($page) {
 		// going to all site albums if something goes wrong with the page handler
 		include($CONFIG->pluginspath . "tidypics/pages/world.php");
 	}
-
+	
+	return true;
 }
 
 /**
  * Override permissions for group albums and images
  *
+ * @param string $hook
+ * @param string $type
+ * @param bool   $result
+ * @param array  $params
+ * @return mixed
  */
-function tidypics_permission_override($hook, $entity_type, $returnvalue, $params) {
+function tidypics_permission_override($hook, $type, $result, $params) {
 	$entity = $params['entity'];
 	$user   = $params['user'];
 
@@ -388,12 +419,18 @@ function tidypics_permission_override($hook, $entity_type, $returnvalue, $params
 
 /**
  * Notification message handler
+ * @param string $hook
+ * @param string $type
+ * @param bool   $result
+ * @param array  $params
+ * @return mixed
  */
-function tidypics_notify_message($hook, $entity_type, $returnvalue, $params) {
+function tidypics_notify_message($hook, $type, $result, $params) {
 	$entity = $params['entity'];
 	$to_entity = $params['to_entity'];
 	$method = $params['method'];
 	if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'album')) {
+		
 		// block notification message when the album doesn't have any photos
 		if ($entity->new_album == TP_NEW_ALBUM) {
 			return false;
@@ -525,23 +562,3 @@ function tidypics_ajax_session_handler($hook, $entity_type, $returnvalue, $param
 
 	exit;
 }
-
-// Make sure tidypics_init is called on initialization
-register_elgg_event_handler('init', 'system', 'tidypics_init');
-register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus');
-register_elgg_event_handler('pagesetup', 'system', 'tidypics_adminmenu');
-
-// Register actions
-register_action("tidypics/upload", false, $CONFIG->pluginspath . "tidypics/actions/upload.php");
-register_action("tidypics/ajax_upload", true, $CONFIG->pluginspath . "tidypics/actions/ajax_upload.php");
-register_action("tidypics/ajax_upload_complete", true, $CONFIG->pluginspath . "tidypics/actions/ajax_upload_complete.php");
-register_action("tidypics/addalbum", false, $CONFIG->pluginspath. "tidypics/actions/addalbum.php");
-register_action("tidypics/sortalbum", false, $CONFIG->pluginspath. "tidypics/actions/sortalbum.php");
-register_action("tidypics/edit", false, $CONFIG->pluginspath. "tidypics/actions/edit.php");
-register_action("tidypics/delete", false, $CONFIG->pluginspath. "tidypics/actions/delete.php");
-register_action("tidypics/edit_multi", false, $CONFIG->pluginspath. "tidypics/actions/edit_multi.php");
-register_action("tidypics/addtag", false, $CONFIG->pluginspath . "tidypics/actions/addtag.php");
-register_action("tidypics/deletetag", false, $CONFIG->pluginspath . "tidypics/actions/deletetag.php");
-
-register_action("tidypics/admin/settings", false, $CONFIG->pluginspath . "tidypics/actions/admin/settings.php", true);
-register_action("tidypics/admin/upgrade", false, $CONFIG->pluginspath . "tidypics/actions/admin/upgrade.php", true);
-- 
cgit v1.2.3


From ed5637b991ab341ead6a97276f313b84f263a145 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 10 Nov 2011 07:31:37 -0500
Subject: moved classes into classes directory

---
 classes/TidypicsAlbum.php | 243 +++++++++++++++++++++++++++++++++
 classes/TidypicsImage.php | 292 +++++++++++++++++++++++++++++++++++++++
 lib/album.php             | 243 ---------------------------------
 lib/image.php             | 337 ----------------------------------------------
 lib/tidypics.php          |  45 +++++++
 start.php                 |   6 +-
 6 files changed, 583 insertions(+), 583 deletions(-)
 create mode 100644 classes/TidypicsAlbum.php
 create mode 100644 classes/TidypicsImage.php
 delete mode 100644 lib/album.php
 delete mode 100644 lib/image.php

diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php
new file mode 100644
index 000000000..e178acd5d
--- /dev/null
+++ b/classes/TidypicsAlbum.php
@@ -0,0 +1,243 @@
+attributes['subtype'] = "album";
+	}
+
+	public function __construct($guid = null) {
+		parent::__construct($guid);
+	}
+
+	/**
+	 * Delete album
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+
+		$this->deleteImages();
+		$this->deleteAlbumDir();
+		
+		return parent::delete();
+	}
+
+	/**
+	 * Get an array of image objects
+	 *
+	 * @param int $limit
+	 * @param int $offset
+	 * @return array
+	 */
+	public function getImages($limit, $offset=0) {
+		$imageList = $this->getImageList();
+		if ($offset > count($imageList)) {
+			return array();
+		}
+
+		$imageList = array_slice($imageList, $offset, $limit);
+		
+		$images = array();
+		foreach ($imageList as $guid) {
+			$images[] = get_entity($guid);
+		}
+		return $images;
+	}
+
+	/**
+	 * View a list of images
+	 *
+	 * @param int $limit
+	 * @param int $offset
+	 * @return string
+	 */
+	public function viewImages($limit, $offset=0) {
+		$images = $this->getImages($limit, $offset);
+		if (count($images) == 0) {
+			return '';
+		}
+
+		$count = $this->getSize();
+
+		return elgg_view_entity_list($images, $count, $offset, $limit, false, false, true);
+	}
+
+	/**
+	 * Get the GUID of the album cover
+	 * 
+	 * @return int
+	 */
+	public function getCoverImageGuid() {
+		if ($this->getSize() == 0) {
+			return 0;
+		}
+
+		$guid = $this->cover;
+		$imageList = $this->getImageList();
+		if (!in_array($guid, $imageList)) {
+			// select random photo to be cover
+			$index = array_rand($imageList, 1);
+			$guid = $imageList[$index];
+			$this->cover = $guid;
+		}
+		return $guid;
+	}
+
+	/**
+	 * Set the GUID for the album cover
+	 *
+	 * @param int $guid
+	 * @return bool
+	 */
+	public function setCoverImageGuid($guid) {
+		$imageList = $this->getImageList();
+		if (!in_array($guid, $imageList)) {
+			return false;
+		}
+		$this->cover = $guid;
+		return true;
+	}
+
+	/**
+	 * Get the number of photos in the album
+	 *
+	 * @return int
+	 */
+	public function getSize() {
+		return count($this->getImageList());
+	}
+
+	/**
+	 * Returns an order list of image guids
+	 * 
+	 * @return array
+	 */
+	public function getImageList() {
+		$listString = $this->orderedImages;
+		if (!$listString) {
+			return array();
+		}
+		$list = unserialize($listString);
+		return $list;
+	}
+
+	/**
+	 * Sets the album image order
+	 *
+	 * @param array $list An indexed array of image guids 
+	 */
+	public function setImageList($list) {
+		$listString = serialize($list);
+		$this->orderedImages = $listString;
+	}
+
+	/**
+	 * Add new images to the front of the image list
+	 *
+	 * @param array $list An indexed array of image guids
+	 */
+	public function prependImageList($list) {
+		$currentList = $this->getImageList();
+		$list = array_merge($list, $currentList);
+		$this->setImageList($list);
+	}
+
+	/**
+	 * Get the GUID of the image before the current one
+	 *
+	 * @param int $currentGuid
+	 * @return int
+	 */
+	public function getPreviousImageGuid($currentGuid) {
+		$imageList = $this->getImageList();
+		$key = array_search($currentGuid, $imageList);
+		if ($key === FALSE) {
+			return 0;
+		}
+		$key--;
+		if ($key < 0) {
+			return 0;
+		}
+		return $imageList[$key];
+	}
+
+	/**
+	 * Get the GUID of the image after the current one
+	 *
+	 * @param int $currentGuid
+	 * @return int
+	 */
+	public function getNextImageGuid($currentGuid) {
+		$imageList = $this->getImageList();
+		$key = array_search($currentGuid, $imageList);
+		if ($key === FALSE) {
+			return 0;
+		}
+		$key++;
+		if ($key >= count($imageList)) {
+			return 0;
+		}
+		return $imageList[$key];
+	}
+
+	/**
+	 * Remove an image from the album list
+	 *
+	 * @param int $imageGuid
+	 * @return bool
+	 */
+	public function removeImage($imageGuid)  {
+		$imageList = $this->getImageList();
+		$key = array_search($imageGuid, $imageList);
+		if ($key === FALSE) {
+			return FALSE;
+		}
+		
+		unset($imageList[$key]);
+		$this->setImageList($imageList);
+
+		return TRUE;
+	}
+
+	protected function deleteImages() {
+		// get all the images from this album as long as less than 999 images
+		$images = elgg_get_entities(array(
+			"type=" => "object",
+			"subtype" => "image",
+			"container_guid" => $this->guid,
+			"limit" => ELGG_ENTITIES_NO_VALUE,
+		));
+		if ($images) {
+			foreach ($images as $image) {
+				if ($image) {
+					$image->delete();
+				}
+			}
+		}
+	}
+
+	protected function deleteAlbumDir() {
+		$tmpfile = new ElggFile();
+		$tmpfile->setFilename('image/' . $this->guid . '/._tmp_del_tidypics_album_');
+		$tmpfile->subtype = 'image';
+		$tmpfile->owner_guid = $this->owner_guid;
+		$tmpfile->container_guid = $this->guid;
+		$tmpfile->open("write");
+		$tmpfile->write('');
+		$tmpfile->close();
+		$tmpfile->save();
+		$albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore());
+		$tmpfile->delete();
+		if (is_dir($albumdir)) {
+			rmdir($albumdir);
+		}
+	}
+}
diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php
new file mode 100644
index 000000000..531d54912
--- /dev/null
+++ b/classes/TidypicsImage.php
@@ -0,0 +1,292 @@
+attributes['subtype'] = "image";
+	}
+
+	public function __construct($guid = null) {
+		parent::__construct($guid);
+	}
+
+	/**
+	 * delete image
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+
+		// check if batch should be deleted
+		$batch = elgg_get_entities_from_relationship(array(
+			'relationship' => 'belongs_to_batch',
+			'relationship_guid' => $this->guid,
+			'inverse_relationship' => false,
+		));
+		if ($batch) {
+			$batch = $batch[0];
+			$count = elgg_get_entities_from_relationship(array(
+				'relationship' => 'belongs_to_batch',
+				'relationship_guid' => $batch->guid,
+				'inverse_relationship' => true,
+				'count' => true,
+			));
+			if ($count == 1) {
+				// last image so delete batch
+				$batch->delete();
+			}
+		}
+
+		$album = get_entity($this->container_guid);
+		if ($album) {
+			$album->removeImage($this->guid);
+		}
+
+		$this->removeThumbnails();
+
+		// update quota
+		$owner = $this->getOwnerEntity();
+		$owner->image_repo_size = (int)$owner->image_repo_size - $this->size();
+
+		return parent::delete();
+	}
+
+	/**
+	 * Set the internal filenames
+	 * 
+	 * @warning container needs to be set first
+	 */
+	public function setOriginalFilename($originalName) {
+		$prefix = "image/" . $this->container_guid . "/";
+		$filestorename = elgg_strtolower(time() . $originalName);
+		$this->setFilename($prefix . $filestorename);
+		$this->originalfilename = $originalName;
+	}
+
+	/**
+	 * Save the uploaded image
+	 *
+	 * @warning filename needs to be set first
+	 * 
+	 * @param string $uploadedFilename name of the uploaded file
+	 * @param int $size
+	 */
+	public function saveImageFile($uploadedFilename, $size) {
+
+		// we need to make sure the directory for the album exists
+		// @note for group albums, the photos are distributed among the users
+		$dir = tp_get_img_dir() . $this->getContainer();
+		if (!file_exists($dir)) {
+			mkdir($dir, 0755, true);
+		}
+
+		$filename = $this->getFilenameOnFilestore();
+
+		$result = move_uploaded_file($uploadedFilename, $filename);
+		if (!$result) {
+			return false;
+		}
+
+		$owner = $this->getOwnerEntity();
+		$owner->image_repo_size = (int)$owner->image_repo_size + $size;
+
+		return true;
+	}
+
+	/**
+	 * Save the image thumbnails
+	 *
+	 * @warning container guid and filename must be set
+	 * 
+	 * @param string $imageLib
+	 */
+	public function saveThumbnails($imageLib) {
+		include_once dirname(dirname(__FILE__)) . "/lib/resize.php";
+		
+		$prefix = "image/" . $this->container_guid . "/";
+		$filename = $this->getFilename();
+		$filename = substr($filename, strrpos($filename, '/') + 1);
+		
+		if ($imageLib == 'ImageMagick') {
+			// ImageMagick command line
+			if (tp_create_im_cmdline_thumbnails($this, $prefix, $filename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
+			}
+		} else if ($imageLib == 'ImageMagickPHP') {
+			// imagick php extension
+			if (tp_create_imagick_thumbnails($this, $prefix, $filename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
+			}
+		} else {
+			if (tp_create_gd_thumbnails($this, $prefix, $filename) != true) {
+				trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
+			}
+		}
+	}
+
+	/**
+	 * Extract EXIF Data from image
+	 *
+	 * @warning image file must be saved first
+	 */
+	public function extractExifData() {
+		include_once dirname(dirname(__FILE__)) . "/lib/exif.php";
+		td_get_exif($this);
+	}
+	
+	/**
+	 * Has the photo been tagged with "in this photo" tags
+	 *
+	 * @return true/false
+	 */
+	public function isPhotoTagged() {
+		$num_tags = count_annotations($this->getGUID(), 'object', 'image', 'phototag');
+		if ($num_tags > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Get an array of photo tag information
+	 *
+	 * @return array of json representations of the tags and the tag link text
+	 */
+	public function getPhotoTags() {
+		global $CONFIG;
+
+		// get tags as annotations
+		$photo_tags = get_annotations($this->getGUID(), 'object', 'image', 'phototag');
+		if (!$photo_tags) {
+			// no tags or user doesn't have permission to tags, so return
+			return false;
+		}
+
+		$photo_tags_json = "[";
+		foreach ($photo_tags as $p) {
+			$photo_tag = unserialize($p->value);
+
+			// create link to page with other photos tagged with same tag
+			$phototag_text = $photo_tag->value;
+			$phototag_link = $CONFIG->wwwroot . 'search/?tag=' . $phototag_text . '&subtype=image&object=object';
+			if ($photo_tag->type === 'user') {
+				$user = get_entity($photo_tag->value);
+				if ($user) {
+					$phototag_text = $user->name;
+				} else {
+					$phototag_text = "unknown user";
+				}
+
+				$phototag_link = $CONFIG->wwwroot . "pg/photos/tagged/" . $photo_tag->value;
+			}
+
+			if (isset($photo_tag->x1)) {
+				// hack to handle format of Pedro Prez's tags - ugh
+				$photo_tag->coords = "\"x1\":\"{$photo_tag->x1}\",\"y1\":\"{$photo_tag->y1}\",\"width\":\"{$photo_tag->width}\",\"height\":\"{$photo_tag->height}\"";
+				$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
+			} else {
+				$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
+			}
+
+			// prepare variable arrays for tagging view
+			$photo_tag_links[$p->id] = array('text' => $phototag_text, 'url' => $phototag_link);
+		}
+
+		$photo_tags_json = rtrim($photo_tags_json,',');
+		$photo_tags_json .= ']';
+
+		$ret_data = array('json' => $photo_tags_json, 'links' => $photo_tag_links);
+		return $ret_data;
+	}
+
+	/**
+	 * Get the view information for this image
+	 *
+	 * @param $viewer_guid the guid of the viewer (0 if not logged in)
+	 * @return array with number of views, number of unique viewers, and number of views for this viewer
+	 */
+	public function getViews($viewer_guid) {
+		$views = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 99999);
+		if ($views) {
+			$total_views = count($views);
+
+			if ($this->owner_guid == $viewer_guid) {
+				// get unique number of viewers
+				foreach ($views as $view) {
+					$diff_viewers[$view->owner_guid] = 1;
+				}
+				$unique_viewers = count($diff_viewers);
+			}
+			else if ($viewer_guid) {
+				// get the number of times this user has viewed the photo
+				$my_views = 0;
+				foreach ($views as $view) {
+					if ($view->owner_guid == $viewer_guid) {
+						$my_views++;
+					}
+				}
+			}
+
+			$view_info = array("total" => $total_views, "unique" => $unique_viewers, "mine" => $my_views);
+		}
+		else {
+			$view_info = array("total" => 0, "unique" => 0, "mine" => 0);
+		}
+
+		return $view_info;
+	}
+
+	/**
+	 * Add a tidypics view annotation to this image
+	 *
+	 * @param $viewer_guid
+	 * @return none
+	 */
+	public function addView($viewer_guid) {
+		if ($viewer_guid != $this->owner_guid && tp_is_person()) {
+			create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC);
+		}
+	}
+
+	/**
+	 * Remove thumbnails - usually in preparation for deletion
+	 *
+	 * The thumbnails are not actually ElggObjects so we create
+	 * temporary objects to delete them.
+	 */
+	protected function removeThumbnails() {
+		$thumbnail = $this->thumbnail;
+		$smallthumb = $this->smallthumb;
+		$largethumb = $this->largethumb;
+
+		//delete standard thumbnail image
+		if ($thumbnail) {
+			$delfile = new ElggFile();
+			$delfile->owner_guid = $this->getOwner();
+			$delfile->setFilename($thumbnail);
+			$delfile->delete();
+		}
+		//delete small thumbnail image
+		if ($smallthumb) {
+			$delfile = new ElggFile();
+			$delfile->owner_guid = $this->getOwner();
+			$delfile->setFilename($smallthumb);
+			$delfile->delete();
+		}
+		//delete large thumbnail image
+		if ($largethumb) {
+			$delfile = new ElggFile();
+			$delfile->owner_guid = $this->getOwner();
+			$delfile->setFilename($largethumb);
+			$delfile->delete();
+		}
+	}
+}
diff --git a/lib/album.php b/lib/album.php
deleted file mode 100644
index e178acd5d..000000000
--- a/lib/album.php
+++ /dev/null
@@ -1,243 +0,0 @@
-attributes['subtype'] = "album";
-	}
-
-	public function __construct($guid = null) {
-		parent::__construct($guid);
-	}
-
-	/**
-	 * Delete album
-	 *
-	 * @return bool
-	 */
-	public function delete() {
-
-		$this->deleteImages();
-		$this->deleteAlbumDir();
-		
-		return parent::delete();
-	}
-
-	/**
-	 * Get an array of image objects
-	 *
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array
-	 */
-	public function getImages($limit, $offset=0) {
-		$imageList = $this->getImageList();
-		if ($offset > count($imageList)) {
-			return array();
-		}
-
-		$imageList = array_slice($imageList, $offset, $limit);
-		
-		$images = array();
-		foreach ($imageList as $guid) {
-			$images[] = get_entity($guid);
-		}
-		return $images;
-	}
-
-	/**
-	 * View a list of images
-	 *
-	 * @param int $limit
-	 * @param int $offset
-	 * @return string
-	 */
-	public function viewImages($limit, $offset=0) {
-		$images = $this->getImages($limit, $offset);
-		if (count($images) == 0) {
-			return '';
-		}
-
-		$count = $this->getSize();
-
-		return elgg_view_entity_list($images, $count, $offset, $limit, false, false, true);
-	}
-
-	/**
-	 * Get the GUID of the album cover
-	 * 
-	 * @return int
-	 */
-	public function getCoverImageGuid() {
-		if ($this->getSize() == 0) {
-			return 0;
-		}
-
-		$guid = $this->cover;
-		$imageList = $this->getImageList();
-		if (!in_array($guid, $imageList)) {
-			// select random photo to be cover
-			$index = array_rand($imageList, 1);
-			$guid = $imageList[$index];
-			$this->cover = $guid;
-		}
-		return $guid;
-	}
-
-	/**
-	 * Set the GUID for the album cover
-	 *
-	 * @param int $guid
-	 * @return bool
-	 */
-	public function setCoverImageGuid($guid) {
-		$imageList = $this->getImageList();
-		if (!in_array($guid, $imageList)) {
-			return false;
-		}
-		$this->cover = $guid;
-		return true;
-	}
-
-	/**
-	 * Get the number of photos in the album
-	 *
-	 * @return int
-	 */
-	public function getSize() {
-		return count($this->getImageList());
-	}
-
-	/**
-	 * Returns an order list of image guids
-	 * 
-	 * @return array
-	 */
-	public function getImageList() {
-		$listString = $this->orderedImages;
-		if (!$listString) {
-			return array();
-		}
-		$list = unserialize($listString);
-		return $list;
-	}
-
-	/**
-	 * Sets the album image order
-	 *
-	 * @param array $list An indexed array of image guids 
-	 */
-	public function setImageList($list) {
-		$listString = serialize($list);
-		$this->orderedImages = $listString;
-	}
-
-	/**
-	 * Add new images to the front of the image list
-	 *
-	 * @param array $list An indexed array of image guids
-	 */
-	public function prependImageList($list) {
-		$currentList = $this->getImageList();
-		$list = array_merge($list, $currentList);
-		$this->setImageList($list);
-	}
-
-	/**
-	 * Get the GUID of the image before the current one
-	 *
-	 * @param int $currentGuid
-	 * @return int
-	 */
-	public function getPreviousImageGuid($currentGuid) {
-		$imageList = $this->getImageList();
-		$key = array_search($currentGuid, $imageList);
-		if ($key === FALSE) {
-			return 0;
-		}
-		$key--;
-		if ($key < 0) {
-			return 0;
-		}
-		return $imageList[$key];
-	}
-
-	/**
-	 * Get the GUID of the image after the current one
-	 *
-	 * @param int $currentGuid
-	 * @return int
-	 */
-	public function getNextImageGuid($currentGuid) {
-		$imageList = $this->getImageList();
-		$key = array_search($currentGuid, $imageList);
-		if ($key === FALSE) {
-			return 0;
-		}
-		$key++;
-		if ($key >= count($imageList)) {
-			return 0;
-		}
-		return $imageList[$key];
-	}
-
-	/**
-	 * Remove an image from the album list
-	 *
-	 * @param int $imageGuid
-	 * @return bool
-	 */
-	public function removeImage($imageGuid)  {
-		$imageList = $this->getImageList();
-		$key = array_search($imageGuid, $imageList);
-		if ($key === FALSE) {
-			return FALSE;
-		}
-		
-		unset($imageList[$key]);
-		$this->setImageList($imageList);
-
-		return TRUE;
-	}
-
-	protected function deleteImages() {
-		// get all the images from this album as long as less than 999 images
-		$images = elgg_get_entities(array(
-			"type=" => "object",
-			"subtype" => "image",
-			"container_guid" => $this->guid,
-			"limit" => ELGG_ENTITIES_NO_VALUE,
-		));
-		if ($images) {
-			foreach ($images as $image) {
-				if ($image) {
-					$image->delete();
-				}
-			}
-		}
-	}
-
-	protected function deleteAlbumDir() {
-		$tmpfile = new ElggFile();
-		$tmpfile->setFilename('image/' . $this->guid . '/._tmp_del_tidypics_album_');
-		$tmpfile->subtype = 'image';
-		$tmpfile->owner_guid = $this->owner_guid;
-		$tmpfile->container_guid = $this->guid;
-		$tmpfile->open("write");
-		$tmpfile->write('');
-		$tmpfile->close();
-		$tmpfile->save();
-		$albumdir = eregi_replace('/._tmp_del_tidypics_album_', '', $tmpfile->getFilenameOnFilestore());
-		$tmpfile->delete();
-		if (is_dir($albumdir)) {
-			rmdir($albumdir);
-		}
-	}
-}
diff --git a/lib/image.php b/lib/image.php
deleted file mode 100644
index f6ecd8ad9..000000000
--- a/lib/image.php
+++ /dev/null
@@ -1,337 +0,0 @@
-attributes['subtype'] = "image";
-	}
-
-	public function __construct($guid = null) {
-		parent::__construct($guid);
-	}
-
-	/**
-	 * delete image
-	 *
-	 * @return bool
-	 */
-	public function delete() {
-
-		// check if batch should be deleted
-		$batch = elgg_get_entities_from_relationship(array(
-			'relationship' => 'belongs_to_batch',
-			'relationship_guid' => $this->guid,
-			'inverse_relationship' => false,
-		));
-		if ($batch) {
-			$batch = $batch[0];
-			$count = elgg_get_entities_from_relationship(array(
-				'relationship' => 'belongs_to_batch',
-				'relationship_guid' => $batch->guid,
-				'inverse_relationship' => true,
-				'count' => true,
-			));
-			if ($count == 1) {
-				// last image so delete batch
-				$batch->delete();
-			}
-		}
-
-		$album = get_entity($this->container_guid);
-		if ($album) {
-			$album->removeImage($this->guid);
-		}
-
-		$this->removeThumbnails();
-
-		// update quota
-		$owner = $this->getOwnerEntity();
-		$owner->image_repo_size = (int)$owner->image_repo_size - $this->size();
-
-		return parent::delete();
-	}
-
-	/**
-	 * Set the internal filenames
-	 * 
-	 * @warning container needs to be set first
-	 */
-	public function setOriginalFilename($originalName) {
-		$prefix = "image/" . $this->container_guid . "/";
-		$filestorename = elgg_strtolower(time() . $originalName);
-		$this->setFilename($prefix . $filestorename);
-		$this->originalfilename = $originalName;
-	}
-
-	/**
-	 * Save the uploaded image
-	 *
-	 * @warning filename needs to be set first
-	 * 
-	 * @param string $uploadedFilename name of the uploaded file
-	 * @param int $size
-	 */
-	public function saveImageFile($uploadedFilename, $size) {
-
-		// we need to make sure the directory for the album exists
-		// @note for group albums, the photos are distributed among the users
-		$dir = tp_get_img_dir() . $this->getContainer();
-		if (!file_exists($dir)) {
-			mkdir($dir, 0755, true);
-		}
-
-		$filename = $this->getFilenameOnFilestore();
-
-		$result = move_uploaded_file($uploadedFilename, $filename);
-		if (!$result) {
-			return false;
-		}
-
-		$owner = $this->getOwnerEntity();
-		$owner->image_repo_size = (int)$owner->image_repo_size + $size;
-
-		return true;
-	}
-
-	/**
-	 * Save the image thumbnails
-	 *
-	 * @warning container guid and filename must be set
-	 * 
-	 * @param string $imageLib
-	 */
-	public function saveThumbnails($imageLib) {
-		include_once dirname(__FILE__) . "/resize.php";
-		
-		$prefix = "image/" . $this->container_guid . "/";
-		$filename = $this->getFilename();
-		$filename = substr($filename, strrpos($filename, '/') + 1);
-		
-		if ($imageLib == 'ImageMagick') {
-			// ImageMagick command line
-			if (tp_create_im_cmdline_thumbnails($this, $prefix, $filename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING);
-			}
-		} else if ($imageLib == 'ImageMagickPHP') {
-			// imagick php extension
-			if (tp_create_imagick_thumbnails($this, $prefix, $filename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING);
-			}
-		} else {
-			if (tp_create_gd_thumbnails($this, $prefix, $filename) != true) {
-				trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING);
-			}
-		}
-	}
-
-	/**
-	 * Extract EXIF Data from image
-	 *
-	 * @warning image file must be saved first
-	 */
-	public function extractExifData() {
-		include_once dirname(__FILE__) . "/exif.php";
-		td_get_exif($this);
-	}
-	
-	/**
-	 * Has the photo been tagged with "in this photo" tags
-	 *
-	 * @return true/false
-	 */
-	public function isPhotoTagged() {
-		$num_tags = count_annotations($this->getGUID(), 'object', 'image', 'phototag');
-		if ($num_tags > 0) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Get an array of photo tag information
-	 *
-	 * @return array of json representations of the tags and the tag link text
-	 */
-	public function getPhotoTags() {
-		global $CONFIG;
-
-		// get tags as annotations
-		$photo_tags = get_annotations($this->getGUID(), 'object', 'image', 'phototag');
-		if (!$photo_tags) {
-			// no tags or user doesn't have permission to tags, so return
-			return false;
-		}
-
-		$photo_tags_json = "[";
-		foreach ($photo_tags as $p) {
-			$photo_tag = unserialize($p->value);
-
-			// create link to page with other photos tagged with same tag
-			$phototag_text = $photo_tag->value;
-			$phototag_link = $CONFIG->wwwroot . 'search/?tag=' . $phototag_text . '&subtype=image&object=object';
-			if ($photo_tag->type === 'user') {
-				$user = get_entity($photo_tag->value);
-				if ($user) {
-					$phototag_text = $user->name;
-				} else {
-					$phototag_text = "unknown user";
-				}
-
-				$phototag_link = $CONFIG->wwwroot . "pg/photos/tagged/" . $photo_tag->value;
-			}
-
-			if (isset($photo_tag->x1)) {
-				// hack to handle format of Pedro Prez's tags - ugh
-				$photo_tag->coords = "\"x1\":\"{$photo_tag->x1}\",\"y1\":\"{$photo_tag->y1}\",\"width\":\"{$photo_tag->width}\",\"height\":\"{$photo_tag->height}\"";
-				$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
-			} else {
-				$photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},';
-			}
-
-			// prepare variable arrays for tagging view
-			$photo_tag_links[$p->id] = array('text' => $phototag_text, 'url' => $phototag_link);
-		}
-
-		$photo_tags_json = rtrim($photo_tags_json,',');
-		$photo_tags_json .= ']';
-
-		$ret_data = array('json' => $photo_tags_json, 'links' => $photo_tag_links);
-		return $ret_data;
-	}
-
-	/**
-	 * Get the view information for this image
-	 *
-	 * @param $viewer_guid the guid of the viewer (0 if not logged in)
-	 * @return array with number of views, number of unique viewers, and number of views for this viewer
-	 */
-	public function getViews($viewer_guid) {
-		$views = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 99999);
-		if ($views) {
-			$total_views = count($views);
-
-			if ($this->owner_guid == $viewer_guid) {
-				// get unique number of viewers
-				foreach ($views as $view) {
-					$diff_viewers[$view->owner_guid] = 1;
-				}
-				$unique_viewers = count($diff_viewers);
-			}
-			else if ($viewer_guid) {
-				// get the number of times this user has viewed the photo
-				$my_views = 0;
-				foreach ($views as $view) {
-					if ($view->owner_guid == $viewer_guid) {
-						$my_views++;
-					}
-				}
-			}
-
-			$view_info = array("total" => $total_views, "unique" => $unique_viewers, "mine" => $my_views);
-		}
-		else {
-			$view_info = array("total" => 0, "unique" => 0, "mine" => 0);
-		}
-
-		return $view_info;
-	}
-
-	/**
-	 * Add a tidypics view annotation to this image
-	 *
-	 * @param $viewer_guid
-	 * @return none
-	 */
-	public function addView($viewer_guid) {
-		if ($viewer_guid != $this->owner_guid && tp_is_person()) {
-			create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC);
-		}
-	}
-
-	/**
-	 * Remove thumbnails - usually in preparation for deletion
-	 *
-	 * The thumbnails are not actually ElggObjects so we create
-	 * temporary objects to delete them.
-	 */
-	protected function removeThumbnails() {
-		$thumbnail = $this->thumbnail;
-		$smallthumb = $this->smallthumb;
-		$largethumb = $this->largethumb;
-
-		//delete standard thumbnail image
-		if ($thumbnail) {
-			$delfile = new ElggFile();
-			$delfile->owner_guid = $this->getOwner();
-			$delfile->setFilename($thumbnail);
-			$delfile->delete();
-		}
-		//delete small thumbnail image
-		if ($smallthumb) {
-			$delfile = new ElggFile();
-			$delfile->owner_guid = $this->getOwner();
-			$delfile->setFilename($smallthumb);
-			$delfile->delete();
-		}
-		//delete large thumbnail image
-		if ($largethumb) {
-			$delfile = new ElggFile();
-			$delfile->owner_guid = $this->getOwner();
-			$delfile->setFilename($largethumb);
-			$delfile->delete();
-		}
-	}
-}
-
-/**
- * get a list of people that can be tagged in an image
- *
- * @param $viewer entity
- * @return array of guid->name for tagging
- */
-function tp_get_tag_list($viewer) {
-	$friends = get_user_friends($viewer->getGUID(), '', 999, 0);
-	$friend_list = array();
-	if ($friends) {
-		foreach($friends as $friend) {
-			//error_log("friend $friend->name");
-			$friend_list[$friend->guid] = $friend->name;
-		}
-	}
-
-	// is this a group
-	$is_group = tp_is_group_page();
-	if ($is_group) {
-		$group_guid = page_owner();
-		$viewer_guid = $viewer->guid;
-		$members = get_group_members($group_guid, 999);
-		if (is_array($members)) {
-			foreach ($members as $member) {
-				if ($viewer_guid != $member->guid) {
-					$group_list[$member->guid] = $member->name;
-					//error_log("group $member->name");
-				}
-			}
-
-			// combine group and friends list
-			$intersect = array_intersect_key($friend_list, $group_list);
-			$unique_friends = array_diff_key($friend_list, $group_list);
-			$unique_members = array_diff_key($group_list, $friend_list);
-			//$friend_list = array_merge($friend_list, $group_list);
-			//$friend_list = array_unique($friend_list);
-			$friend_list = $intersect + $unique_friends + $unique_members;
-		}
-	}
-
-	asort($friend_list);
-
-	return $friend_list;
-}
diff --git a/lib/tidypics.php b/lib/tidypics.php
index 581503a51..8fcfc22c9 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -187,3 +187,48 @@ function tp_is_person() {
 
 	return false;
 }
+
+/**
+ * get a list of people that can be tagged in an image
+ *
+ * @param $viewer entity
+ * @return array of guid->name for tagging
+ */
+function tp_get_tag_list($viewer) {
+	$friends = get_user_friends($viewer->getGUID(), '', 999, 0);
+	$friend_list = array();
+	if ($friends) {
+		foreach($friends as $friend) {
+			//error_log("friend $friend->name");
+			$friend_list[$friend->guid] = $friend->name;
+		}
+	}
+
+	// is this a group
+	$is_group = tp_is_group_page();
+	if ($is_group) {
+		$group_guid = page_owner();
+		$viewer_guid = $viewer->guid;
+		$members = get_group_members($group_guid, 999);
+		if (is_array($members)) {
+			foreach ($members as $member) {
+				if ($viewer_guid != $member->guid) {
+					$group_list[$member->guid] = $member->name;
+					//error_log("group $member->name");
+				}
+			}
+
+			// combine group and friends list
+			$intersect = array_intersect_key($friend_list, $group_list);
+			$unique_friends = array_diff_key($friend_list, $group_list);
+			$unique_members = array_diff_key($group_list, $friend_list);
+			//$friend_list = array_merge($friend_list, $group_list);
+			//$friend_list = array_unique($friend_list);
+			$friend_list = $intersect + $unique_friends + $unique_members;
+		}
+	}
+
+	asort($friend_list);
+
+	return $friend_list;
+}
diff --git a/start.php b/start.php
index 3543dede1..167db651e 100644
--- a/start.php
+++ b/start.php
@@ -10,9 +10,9 @@ define('TP_OLD_ALBUM', 0);
 define('TP_NEW_ALBUM', 1);
 
 // include core libraries
-include dirname(__FILE__) . "/lib/tidypics.php";
-include dirname(__FILE__) . "/lib/image.php";
-include dirname(__FILE__) . "/lib/album.php";
+require dirname(__FILE__) . "/lib/tidypics.php";
+require dirname(__FILE__) . "/classes/TidypicsImage.php";
+require dirname(__FILE__) . "/classes/TidypicsAlbum.php";
 
 
 // Make sure tidypics_init is called on initialization
-- 
cgit v1.2.3


From eb9b13e1bfd861cba9b7a812d929b565d5775175 Mon Sep 17 00:00:00 2001
From: Cash Costello 
Date: Thu, 10 Nov 2011 07:33:15 -0500
Subject: removed more flickr code

---
 lib/flickr.php         |  6 -----
 pages/lists/flickr.php | 60 --------------------------------------------------
 2 files changed, 66 deletions(-)
 delete mode 100644 lib/flickr.php
 delete mode 100644 pages/lists/flickr.php

diff --git a/lib/flickr.php b/lib/flickr.php
deleted file mode 100644
index 7f91b0f01..000000000
--- a/lib/flickr.php
+++ /dev/null
@@ -1,6 +0,0 @@
-guid, "flickr_username" );
-if( empty( $flickr_username )) {
-	register_error( "No Flickr username set");
-	echo "
      No flickr username set: $temp_user->guid"; die;
-	forward( "/" );
-	die;
-}
-$flickr_user = $f->people_findByUsername( $flickr_username->value );
-
-// Get the friendly URL of the user's photos
-$photos_url = $f->urls_getUserPhotos( $flickr_user["id"] );
-
-if( !empty( $flickr_user )) {
-	$recent = $f->people_getPublicPhotos( $flickr_user['id'], NULL, NULL, 5 );
-} else {
-	echo "user not found"; die;
-}
-//echo "
      "; var_dump( $recent ); echo "
      ";
-
-//echo "
      "; var_dump( $user ); echo "
      ";
-$body = elgg_view_title( "Flickr photos for $flickr_user[username]" );
-
-$count = 0;
-foreach ($recent['photos']['photo'] as $photo) {
-	
-	$photo_info = $f->photos_getInfo( $photo["id"], $photo["secret"] );
-	$body .= "
      ";
-	$body .= "$photo_info[title]
      Views: $photo_info[views]
      ";
-	$body .= "";
-	$body .= "$photo[title]";
-	$body .= "";
-
-	$tag_count = 0;
-	$body .= "
      Tags:
      ";
-	foreach( $photo_info["tags"]["tag"] as $tag ) {
-		if( $tag_count ) $body .= ", ";
-		$body .= "$tag[_content]";
-		$tag_count++;
-	}
-	
-	$body .= "
      ";
-	$count++;
-}
-page_draw( "Flickr photos for $flickr_user[username]", elgg_view_layout("two_column_left_sidebar", '', $body));
-
-?>
\ No newline at end of file
-- 
cgit v1.2.3


From 4562cfbb1a630b14fd194271f99f1f8c098dc38d Mon Sep 17 00:00:00 2001
From: cash 
Date: Sat, 19 Nov 2011 12:10:46 -0500
Subject: basic pages for viewing all/mine/friends and viewing an album

---
 classes/TidypicsAlbum.php              |  18 +++
 classes/TidypicsImage.php              |  13 ++
 languages/en.php                       |   9 +-
 pages/friends.php                      |  41 ------
 pages/ownedalbums.php                  |  67 ---------
 pages/photos/album/view.php            |  46 ++++++
 pages/photos/all.php                   |  37 +++++
 pages/photos/friends.php               |  33 +++++
 pages/photos/owner.php                 |  45 ++++++
 pages/viewalbum.php                    |  75 ----------
 pages/world.php                        |  32 ----
 start.php                              | 261 +++++++++++++++++----------------
 views/default/object/album.php         | 154 ++-----------------
 views/default/object/album/full.php    |  60 ++++++++
 views/default/object/album/summary.php |  41 ++++++
 views/default/object/image.php         |  17 ++-
 views/default/object/image/full.php    |   2 +
 views/default/object/image/summary.php |  43 ++++++
 views/default/tidypics/css.php         |  12 ++
 19 files changed, 518 insertions(+), 488 deletions(-)
 delete mode 100644 pages/friends.php
 delete mode 100644 pages/ownedalbums.php
 create mode 100644 pages/photos/album/view.php
 create mode 100644 pages/photos/all.php
 create mode 100644 pages/photos/friends.php
 create mode 100644 pages/photos/owner.php
 delete mode 100644 pages/viewalbum.php
 delete mode 100644 pages/world.php
 create mode 100644 views/default/object/album/full.php
 create mode 100644 views/default/object/album/summary.php
 create mode 100644 views/default/object/image/full.php
 create mode 100644 views/default/object/image/summary.php

diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php
index e178acd5d..1fbdb8ad8 100644
--- a/classes/TidypicsAlbum.php
+++ b/classes/TidypicsAlbum.php
@@ -17,6 +17,15 @@ class TidypicsAlbum extends ElggObject {
 		parent::__construct($guid);
 	}
 
+	/**
+	 * Get the title of the photo album
+	 * 
+	 * @return string
+	 */
+	public function getTitle() {
+		return $this->title;
+	}
+
 	/**
 	 * Delete album
 	 *
@@ -70,6 +79,15 @@ class TidypicsAlbum extends ElggObject {
 		return elgg_view_entity_list($images, $count, $offset, $limit, false, false, true);
 	}
 
+	public function getCoverImageURL($size = 'small') {
+		if ($this->cover) {
+			$url = "pg/photos/thumbnail/$this->cover/$size/";
+		} else {
+			$url = "mod/tidypics/graphics/empty_album.png";
+		}
+		return elgg_normalize_url($url);
+	}
+
 	/**
 	 * Get the GUID of the album cover
 	 * 
diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php
index 531d54912..652cc9e9b 100644
--- a/classes/TidypicsImage.php
+++ b/classes/TidypicsImage.php
@@ -17,6 +17,19 @@ class TidypicsImage extends ElggFile {
 		parent::__construct($guid);
 	}
 
+	/**
+	 * Get the title of the image
+	 *
+	 * @return string
+	 */
+	public function getTitle() {
+		return $this->title;
+	}
+
+	public function getSrcUrl() {
+		return "pg/photos/thumbnail/$this->guid/small/";
+	}
+
 	/**
 	 * delete image
 	 *
diff --git a/languages/en.php b/languages/en.php
index 8bc66a5f6..d6d934c20 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -11,11 +11,15 @@ $english = array(
 			'photos' => "Photos",
 			'album' => "Photo Album",
 			'albums' => "Photo Albums",
+
+			'photos:add' => "Create album",
+			'images:upload' => "Upload photos",
+
 			'album:slideshow' => "View slideshow",
 			'album:yours' => "Your photo albums",
 			'album:yours:friends' => "Your friends' photo albums",
 			'album:user' => "%s's photo albums",
-			'album:friends' => "%s's friends' photo albums",
+			'album:friends' => "Friends' photo albums",
 			'album:all' => "All site photo albums",
 			'album:group' => "Group albums",
 			'item:object:image' => "Photos",
@@ -104,6 +108,9 @@ $english = array(
 			'tidypics:uploader:basic' => 'You can upload up to 10 photos at a time (%s MB maximum per photo)',
 			'tidypics:sort:instruct' => 'Sort the album photos by dragging and dropping the images. Then click the save button.',
 
+		// albums
+			'album:num' => '%s photos',
+
 		//views
 			'image:total' => "Images in album:",
 			'image:by' => "Image added by",
diff --git a/pages/friends.php b/pages/friends.php
deleted file mode 100644
index d5dfdba5c..000000000
--- a/pages/friends.php
+++ /dev/null
@@ -1,41 +0,0 @@
-guid == get_loggedin_userid()) {
-	$title = elgg_echo('album:yours:friends');
-} else {
-	$title = sprintf(elgg_echo('album:friends'), $user->name);
-}
-
-$area2 = elgg_view_title($title);
-
-$albums = get_user_friends_objects($user->guid, 'album', 12);
-
-// get html for viewing list of photo albums
-set_context('search');
-set_input('search_viewtype', 'gallery'); // need to force gallery view
-$content = tp_view_entity_list($albums, count($albums), 0, 12, false, false, true);
-
-$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
-
-$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
-page_draw($title, $body);
diff --git a/pages/ownedalbums.php b/pages/ownedalbums.php
deleted file mode 100644
index 9483512c6..000000000
--- a/pages/ownedalbums.php
+++ /dev/null
@@ -1,67 +0,0 @@
-username) || empty($owner->username)) {
-	forward('pg/photos/world');
-}
-
-
-// setup group menu for album index
-if ($owner instanceof ElggGroup) {
-	add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name),
-			$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
-	if (can_write_to_container(0, $owner->guid)) {
-		add_submenu_item(	elgg_echo('album:create'),
-				$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
-				'tidypics');
-	}
-}
-
-//set the title
-$title = sprintf(elgg_echo('album:user'), $owner->name);
-$area2 = elgg_view_title($title);
-
-// Get objects
-set_context('search');
-set_input('search_viewtype', 'gallery');
-if ($owner instanceof ElggGroup) {
-	$content .= elgg_list_entities(array(
-		"type" => "object",
-		"subtype" => "album",
-		"container_guid" => $owner->guid,
-		"limit" => 12,
-		"full_view" => false,
-));
-} else {
-	$content .= elgg_list_entities(array(
-		"type" => "object",
-		"subtype" => "album",
-		"container_guid" => $owner->guid,
-		"limit" => 12,
-		"full_view" => false,
-));
-}
-
-$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
-
-set_context('photos');
-$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
-// Finally draw the page
-page_draw($title, $body);
\ No newline at end of file
diff --git a/pages/photos/album/view.php b/pages/photos/album/view.php
new file mode 100644
index 000000000..adb5a1b51
--- /dev/null
+++ b/pages/photos/album/view.php
@@ -0,0 +1,46 @@
+getContainerGUID());
+$owner = elgg_get_page_owner_entity();
+
+$title = elgg_echo($album->getTitle());
+
+// set up breadcrumbs
+elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all');
+elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
+elgg_push_breadcrumb($album->getTitle());
+
+$content = elgg_view_entity($album, array('full_view' => true));
+
+if ($album->canWriteToContainer()) {
+	elgg_register_menu_item('title', array(
+			'name' => 'upload',
+			'href' => 'photos/upload/' . $album->getGUID(),
+			'text' => elgg_echo('images:upload'),
+			'link_class' => 'elgg-button elgg-button-action',
+	));
+}
+
+$body = elgg_view_layout('content', array(
+	'filter' => false,
+	'content' => $content,
+	'title' => $album->getTitle(),
+	'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'album')),
+));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/photos/all.php b/pages/photos/all.php
new file mode 100644
index 000000000..edda65ce0
--- /dev/null
+++ b/pages/photos/all.php
@@ -0,0 +1,37 @@
+ 'object',
+	'subtype' => 'album',
+	'limit' => $num_albums,
+	'full_view' => false,
+	'list_type' => 'gallery',
+	'list_type_toggle' => false,
+	'gallery_class' => 'tidypics-gallery',
+));
+elgg_pop_context();
+
+$title = elgg_echo('album:all');
+
+elgg_register_title_button('photos');
+
+$body = elgg_view_layout('content', array(
+	'filter_context' => 'all',
+	'content' => $content,
+	'title' => $title,
+	'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'all')),
+));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/photos/friends.php b/pages/photos/friends.php
new file mode 100644
index 000000000..b7b6178c5
--- /dev/null
+++ b/pages/photos/friends.php
@@ -0,0 +1,33 @@
+name, "photos/friends/$owner->username");
+elgg_push_breadcrumb(elgg_echo('friends'));
+
+$title = elgg_echo('album:friends');
+
+
+$num_albums = 16;
+
+elgg_push_context('tidypics:main');
+set_input('list_type', 'gallery');
+$content = list_user_friends_objects($owner->guid, 'album', $num_albums, false);
+elgg_pop_context();
+
+elgg_register_title_button();
+
+$body = elgg_view_layout('content', array(
+	'filter_context' => 'friends',
+	'content' => $content,
+	'title' => $title,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/photos/owner.php b/pages/photos/owner.php
new file mode 100644
index 000000000..f6582e326
--- /dev/null
+++ b/pages/photos/owner.php
@@ -0,0 +1,45 @@
+name));
+
+// set up breadcrumbs
+elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all');
+elgg_push_breadcrumb($owner->name);
+
+
+$num_albums = 16;
+
+elgg_push_context('tidypics:main');
+$content = elgg_list_entities(array(
+	'type' => 'object',
+	'subtype' => 'album',
+	'container_guid' => $owner->getGUID(),
+	'limit' => $num_albums,
+	'full_view' => false,
+	'list_type' => 'gallery',
+	'list_type_toggle' => false,
+	'gallery_class' => 'tidypics-gallery',
+));
+elgg_pop_context();
+
+elgg_register_title_button();
+
+$body = elgg_view_layout('content', array(
+	'filter_context' => 'mine',
+	'content' => $content,
+	'title' => $title,
+	'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'owner')),
+));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/viewalbum.php b/pages/viewalbum.php
deleted file mode 100644
index 870596769..000000000
--- a/pages/viewalbum.php
+++ /dev/null
@@ -1,75 +0,0 @@
-container_guid) {
-	set_page_owner($album->container_guid);
-} else {
-	set_page_owner($album->owner_guid);
-}
-
-$owner = page_owner_entity();
-
-// setup group menu
-if ($owner instanceof ElggGroup) {
-	add_submenu_item(	sprintf(elgg_echo('album:group'),$owner->name),
-			$CONFIG->wwwroot . "pg/photos/owned/" . $owner->username);
-}
-
-// allow other plugins to override the slideshow
-$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array('album' => $album), null);
-if ($slideshow_link) {
-	add_submenu_item(elgg_echo('album:slideshow'),
-			$slideshow_link,
-			'photos' );
-}
-
-if (can_write_to_container(0, $album->container_guid)) {
-	if ($owner instanceof ElggGroup) {
-		add_submenu_item(	elgg_echo('album:create'),
-				$CONFIG->wwwroot . 'pg/photos/new/' . $owner->username,
-				'photos');
-	}
-	add_submenu_item(	elgg_echo('album:addpix'),
-			$CONFIG->wwwroot . 'pg/photos/upload/' . $album_guid,
-			'photos');
-	add_submenu_item(	elgg_echo('album:sort'),
-			$CONFIG->wwwroot . 'pg/photos/sort/' . $album_guid,
-			'photos');
-	add_submenu_item(	elgg_echo('album:edit'),
-			$CONFIG->wwwroot . 'pg/photos/edit/' . $album_guid,
-			'photos');
-	$ts = time();
-	$token = generate_action_token($ts);
-	add_submenu_item(	elgg_echo('album:delete'),
-			$CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $album_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts,
-			'photos',
-			true);
-}
-
-// create body
-$area2 = elgg_view_entity($album, true);
-$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
-page_draw($album->title, $body);
diff --git a/pages/world.php b/pages/world.php
deleted file mode 100644
index 4599f8209..000000000
--- a/pages/world.php
+++ /dev/null
@@ -1,32 +0,0 @@
- 'object',
-	'subtype' => 'album',
-	'limit' => $num_albums,
-));
-set_context('photos');
-
-$area2 = elgg_view('tidypics/content_wrapper', array('title' => $title, 'content' => $content,));
-
-$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
-page_draw($title, $body);
diff --git a/start.php b/start.php
index 167db651e..ae52e7098 100644
--- a/start.php
+++ b/start.php
@@ -1,8 +1,9 @@
 wwwroot . "pg/photos/owned/" . $_SESSION['user']->username);
-	}
+	// Set up site menu
+	elgg_register_menu_item('site', array(
+		'name' => 'photos',
+		'href' => 'photos/all',
+		'text' => elgg_echo('photos'),
+	));
 
 	// Extend CSS
-	elgg_extend_view('css', 'tidypics/css');
+	elgg_extend_view('css/elgg', 'tidypics/css');
 
 	// Extend hover-over and profile menu
 	elgg_extend_view('profile/menu/links','tidypics/hover_menu');
@@ -42,11 +43,11 @@ function tidypics_init() {
 	elgg_extend_view('extensions/xmlns', 'extensions/tidypics/xmlns');
 	elgg_extend_view('extensions/channel', 'extensions/tidypics/channel');
 
-	// Register a page handler, so we can have nice URLs
-	register_page_handler('photos','tidypics_page_handler');
+	// Register a page handler so we can have nice URLs
+	elgg_register_page_handler('photos', 'tidypics_page_handler');
 
 	// register for menus
-	register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus');
+	//register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus');
 	register_elgg_event_handler('pagesetup', 'system', 'tidypics_adminmenu');
 
 	// Add a new tidypics widget
@@ -248,145 +249,149 @@ function tidypics_mostviewed_submenus() {
 /**
  * tidypics page handler
  *
- * @param array $page Array of page elements, forwarded by the page handling mechanism
+ * @param array $page Array of url segments
  */
 function tidypics_page_handler($page) {
 
 	global $CONFIG;
 
-	if (isset($page[0])) {
-		switch($page[0]) {
-			case "owned":  //view list of albums owned by container
-				if (isset($page[1])) {
-					set_input('username', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/ownedalbums.php");
-				break;
+	if (!isset($page[0])) {
+		return false;
+	}
 
-			case "view": //view an image individually
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");
-				break;
+	switch($page[0]) {
+		case "all": // all site albums
+		case "world":
+			include($CONFIG->pluginspath . "tidypics/pages/photos/all.php");
+			break;
 
-			case "album": //view an album individually
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/viewalbum.php");
-				break;
+		case "owned":  // albums owned by container entity
+		case "owner":
+			if (isset($page[1])) {
+				set_input('username', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/photos/owner.php");
+			break;
 
-			case "sort": //sort a photo album
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/sortalbum.php");
-				break;
+		case "friends": // albums of friends
+			if (isset($page[1])) {
+				set_input('username', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/photos/friends.php");
+			break;
 
-			case "new":  //create new album
-				if (isset($page[1])) {
-					set_input('username', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/newalbum.php");
-				break;
+		case "view": //view an image individually
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");
+			break;
 
-			case "upload": //upload images to album
-				if (isset($page[1])) {
-					set_input('album_guid', $page[1]);
-				}
-				if (isset($page[2])) {
-					set_input('uploader', 'basic');
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/upload.php");
-				break;
+		case "album": //view an album individually
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/photos/album/view.php");
+			break;
 
-			case "edit": //edit image or album
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/edit.php");
-				break;
+		case "sort": //sort a photo album
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/sortalbum.php");
+			break;
 
-			case "batch": //update titles and descriptions
-				if (isset($page[1])) {
-					set_input('batch', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/edit_multiple.php");
-				break;
+		case "new":  //create new album
+		case "add":
+			if (isset($page[1])) {
+				set_input('username', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/newalbum.php");
+			break;
 
-			case "friends": // albums of friends
-				if (isset($page[1])) {
-					set_input('username', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/friends.php");
-				break;
+		case "upload": //upload images to album
+			if (isset($page[1])) {
+				set_input('album_guid', $page[1]);
+			}
+			if (isset($page[2])) {
+				set_input('uploader', 'basic');
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/upload.php");
+			break;
 
-			case "world": // all site albums
-				include($CONFIG->pluginspath . "tidypics/pages/world.php");
-				break;
+		case "edit": //edit image or album
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/edit.php");
+			break;
 
-			case "download": // download an image
-				if (isset($page[1])) {
-					set_input('file_guid', $page[1]);
-				}
-				if (isset($page[2])) {
-					set_input('type', $page[2]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/download.php");
-				break;
+		case "batch": //update titles and descriptions
+			if (isset($page[1])) {
+				set_input('batch', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/edit_multiple.php");
+			break;
 
-			case "thumbnail": // tidypics thumbnail
-				if (isset($page[1])) {
-					set_input('file_guid', $page[1]);
-				}
-				if (isset($page[2])) {
-					set_input('size', $page[2]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/thumbnail.php");
-				break;
+		case "download": // download an image
+			if (isset($page[1])) {
+				set_input('file_guid', $page[1]);
+			}
+			if (isset($page[2])) {
+				set_input('type', $page[2]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/download.php");
+			break;
 
-			case "tagged": // all photos tagged with user
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/tagged.php");
-				break;
+		case "thumbnail": // tidypics thumbnail
+			if (isset($page[1])) {
+				set_input('file_guid', $page[1]);
+			}
+			if (isset($page[2])) {
+				set_input('size', $page[2]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/thumbnail.php");
+			break;
 
-			case "mostviewed": // images with the most views
-				if (isset($page[1])) {
-					set_input('username', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/lists/mostviewedimages.php");
-				break;
+		case "tagged": // all photos tagged with user
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/tagged.php");
+			break;
 
-			case "mostrecent": // images uploaded most recently
-				if (isset($page[1])) {
-					set_input('username', $page[1]);
-				}
-				include($CONFIG->pluginspath . "tidypics/pages/lists/mostrecentimages.php");
-				break;
+		case "mostviewed": // images with the most views
+			if (isset($page[1])) {
+				set_input('username', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/lists/mostviewedimages.php");
+			break;
+
+		case "mostrecent": // images uploaded most recently
+			if (isset($page[1])) {
+				set_input('username', $page[1]);
+			}
+			include($CONFIG->pluginspath . "tidypics/pages/lists/mostrecentimages.php");
+			break;
 
-			case "recentlyviewed": // images most recently viewed
-				include($CONFIG->pluginspath . "tidypics/pages/lists/recentlyviewed.php");
-				break;
+		case "recentlyviewed": // images most recently viewed
+			include($CONFIG->pluginspath . "tidypics/pages/lists/recentlyviewed.php");
+			break;
 
-			case "recentlycommented": // images with the most recent comments
-				include($CONFIG->pluginspath . "tidypics/pages/lists/recentlycommented.php");
-				break;
+		case "recentlycommented": // images with the most recent comments
+			include($CONFIG->pluginspath . "tidypics/pages/lists/recentlycommented.php");
+			break;
 
-			case "highestrated": // images with the highest average rating
-				include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
-				break;
+		case "highestrated": // images with the highest average rating
+			include($CONFIG->pluginspath . "tidypics/pages/lists/highestrated.php");
+			break;
 
-			case "admin":
-				include ($CONFIG->pluginspath . "tidypics/pages/admin.php");
-				break;
-		}
-	}
-	else {
-		// going to all site albums if something goes wrong with the page handler
-		include($CONFIG->pluginspath . "tidypics/pages/world.php");
+		case "admin":
+			include ($CONFIG->pluginspath . "tidypics/pages/admin.php");
+			break;
+
+		default:
+			return false;
 	}
 	
 	return true;
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 13b94aed5..51b25b7da 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -1,150 +1,18 @@
 getGUID();
-$owner = $album->getOwnerEntity();
-$tags = $album->tags;
-$title = $album->title;
-$desc = $album->description;
-$friendlytime = friendly_time($album->time_created);
-$mime = $album->mimetype;
-
-if (get_context() == "search") {
-
-	if (get_input('search_viewtype') == "gallery") {
-
-/******************************************************************************
- *
- *  Gallery view of an album object
+ * Album view
  * 
- *  This is called when looking at page of albums
- *
- *
- *****************************************************************************/
-
-		$album_cover_guid = $album->getCoverImageGuid();
-		if ($album_cover_guid) {
-			$album_cover = '' . $title . '';
-		} else {
-			$album_cover = 'new album';
-		}
-?>
-
      
-	
      
-		
-	
      
-	
      
-	name;?>
-		

      
-				getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
-				}
-?>
-	      
-
      
-' . $title . '
      ';
-		$info .= "
      username}\">{$owner->name} {$friendlytime}";
-		$numcomments = elgg_count_comments($album);
-		if ($numcomments) {
-			$info .= ", getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")";
-		}
-		$info .= "
      ";
+$album = elgg_extract('entity', $vars);
+$full_view = elgg_extract('full_view', $vars, false);
 
-		$album_cover_guid = $album->getCoverImageGuid();
-		if ($album_cover_guid) {
-			$icon = "getURL()}\">" . 'thumbnail';
-		} else {
-			$icon = "getURL()}\">" . 'new album';
-		}
-		echo elgg_view_listing($icon, $info);
-	}
+if ($full_view) {
+	echo elgg_view('object/album/full', $vars);
 } else {
-
-/******************************************************************************
- *
- *  Individual view of an album object
- * 
- *  This is called when getting a listing of the photos in an album
- *
- *
- *****************************************************************************/
-
-	$page = get_input("page");
-	list($album_placeholder, $album_id, $album_title) = split("/", $page);
-
-	$photo_ratings = get_plugin_setting('photo_ratings', 'tidypics');
-	if ($photo_ratings == "enabled") {
-		add_submenu_item(	elgg_echo("tidypics:highestrated"),
-				$CONFIG->wwwroot . "pg/photos/highestrated/group:" . $album_id,
-				'photos');
-	}
-	echo elgg_view_title($title);
-?>
-
      
-	
      
-			
-	
      
-' . autop($desc) . '
      ';
-
-	$offset = (int)get_input('offset', 0);
-	echo $album->viewImages(16, $offset);
-	//	echo '
      ' . elgg_echo('image:none') . '
      ';
-	//	$num_images = 0;
-	//}
-
-?>
-	
      
-	
      
-
-		
       $tags));?>
      
-
-	 name; ?>  
      
-	 getSize(); ?>
      
-
-		
      
-		:
-
-	
      
-
-';
-} // end of individual album view
-
+	echo elgg_view('object/album/summary', $vars);
+}
diff --git a/views/default/object/album/full.php b/views/default/object/album/full.php
new file mode 100644
index 000000000..7484a48f3
--- /dev/null
+++ b/views/default/object/album/full.php
@@ -0,0 +1,60 @@
+getOwnerEntity();
+
+$owner_icon = elgg_view_entity_icon($owner, 'tiny');
+
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $album,
+	'handler' => 'photos',
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
+
+$owner_link = elgg_view('output/url', array(
+	'href' => "photos/owner/$owner->username",
+	'text' => $owner->name,
+	'is_trusted' => true,
+));
+$author_text = elgg_echo('byline', array($owner_link));
+$date = elgg_view_friendly_time($album->time_created);
+$categories = elgg_view('output/categories', $vars);
+
+$subtitle = "$author_text $date $categories";
+
+$params = array(
+	'entity' => $album,
+	'title' => false,
+	'metadata' => $metadata,
+	'subtitle' => $subtitle,
+	'tags' => elgg_view('output/tags', array('tags' => $album->tags)),
+);
+$params = $params + $vars;
+$summary = elgg_view('object/elements/summary', $params);
+
+$body = elgg_list_entities(array(
+	'type' => 'object',
+	'subtype' => 'image',
+	'container_guid' => $album->getGUID(),
+	'limit' => 16,
+	'full_view' => false,
+	'list_type' => 'gallery',
+	'list_type_toggle' => false,
+	'gallery_class' => 'tidypics-gallery',
+));
+
+echo elgg_view('object/elements/full', array(
+	'entity' => $album,
+	'icon' => $owner_icon,
+	'summary' => $summary,
+	'body' => $body,
+));
diff --git a/views/default/object/album/summary.php b/views/default/object/album/summary.php
new file mode 100644
index 000000000..78eec3517
--- /dev/null
+++ b/views/default/object/album/summary.php
@@ -0,0 +1,41 @@
+ $album->getCoverImageURL(),
+	'alt' => $album->getTitle(),
+	'class' => 'elgg-photo',
+));
+
+$header = elgg_view('output/url', array(
+	'text' => $album->getTitle(),
+	'href' => $album->getURL(),
+));
+
+$body = elgg_view('output/url', array(
+	'text' => $album_cover,
+	'href' => $album->getURL(),
+	'encode_text' => false,
+	'is_trusted' => true,
+));
+
+$footer = elgg_view('output/url', array(
+	'text' => $album->getContainerEntity()->name,
+	'href' => $album->getContainerEntity()->getURL(),
+	'is_trusted' => true,
+));
+$footer .= '
      ' . elgg_echo('album:num', array($album->getSize())) . '
      ';
+
+$params = array(
+	'footer' => $footer,
+);
+echo elgg_view_module('tidypics-album', $header, $body, $params);
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 8c1f23ec2..12d58440d 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -1,9 +1,24 @@
  $image->getSrcURL(),
+	'alt' => $image->getTitle(),
+	'class' => 'elgg-photo',
+));
+
+$header = elgg_view('output/url', array(
+	'text' => $image->getTitle(),
+	'href' => $image->getURL(),
+));
+
+$body = elgg_view('output/url', array(
+	'text' => $img,
+	'href' => $image->getURL(),
+	'encode_text' => false,
+	'is_trusted' => true,
+));
+
+/*
+$footer = elgg_view('output/url', array(
+	'text' => $image->getContainerEntity()->name,
+	'href' => $image->getContainerEntity()->getURL(),
+	'is_trusted' => true,
+));
+$footer .= '
      ' . elgg_echo('album:num', array($album->getSize())) . '
      ';
+*/
+
+$params = array(
+	'footer' => $footer,
+);
+echo elgg_view_module('tidypics-image', $header, $body, $params);
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index 25a29fdc3..bf47d42b7 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -3,6 +3,18 @@
 	 * tidypics CSS extender
 	 */
 ?>
+
+.elgg-module-tidypics-album,
+.elgg-module-tidypics-image {
+	width: 161px;
+	text-align: center;
+	margin: 5px 10px;
+}
+
+
+
 /* ---- tidypics object views ---- */
 
 .tidypics_wrapper > table.entity_gallery {
-- 
cgit v1.2.3


From 98664daa72a390fe760b69116af8bfa9327826e3 Mon Sep 17 00:00:00 2001
From: cash 
Date: Sat, 19 Nov 2011 18:43:35 -0500
Subject: album creation and editing is working

---
 actions/addalbum.php                            |  57 --------
 actions/photos/album/save.php                   |  48 +++++++
 classes/TidypicsAlbum.php                       |  30 +++-
 languages/en.php                                |   2 +-
 lib/tidypics.php                                |  31 ++++
 pages/edit.php                                  |  54 -------
 pages/newalbum.php                              |  30 ----
 pages/photos/album/add.php                      |  34 +++++
 pages/photos/album/edit.php                     |  47 +++++++
 pages/photos/album/view.php                     |   3 +-
 pages/photos/image/upload.php                   |  62 ++++++++
 pages/upload.php                                |  62 --------
 start.php                                       |  56 ++++----
 views/default/forms/photos/admin/settings.php   | 179 ++++++++++++++++++++++++
 views/default/forms/photos/ajax_upload.php      | 141 +++++++++++++++++++
 views/default/forms/photos/album/save.php       |  48 +++++++
 views/default/forms/photos/basic_upload.php     | 104 ++++++++++++++
 views/default/forms/tidypics/admin/settings.php | 179 ------------------------
 views/default/forms/tidypics/ajax_upload.php    | 141 -------------------
 views/default/forms/tidypics/basic_upload.php   | 104 --------------
 views/default/tidypics/forms/edit.php           | 125 -----------------
 21 files changed, 753 insertions(+), 784 deletions(-)
 delete mode 100644 actions/addalbum.php
 create mode 100644 actions/photos/album/save.php
 delete mode 100644 pages/edit.php
 delete mode 100644 pages/newalbum.php
 create mode 100644 pages/photos/album/add.php
 create mode 100644 pages/photos/album/edit.php
 create mode 100644 pages/photos/image/upload.php
 delete mode 100644 pages/upload.php
 create mode 100644 views/default/forms/photos/admin/settings.php
 create mode 100644 views/default/forms/photos/ajax_upload.php
 create mode 100644 views/default/forms/photos/album/save.php
 create mode 100644 views/default/forms/photos/basic_upload.php
 delete mode 100644 views/default/forms/tidypics/admin/settings.php
 delete mode 100644 views/default/forms/tidypics/ajax_upload.php
 delete mode 100644 views/default/forms/tidypics/basic_upload.php
 delete mode 100644 views/default/tidypics/forms/edit.php

diff --git a/actions/addalbum.php b/actions/addalbum.php
deleted file mode 100644
index 8ddcca131..000000000
--- a/actions/addalbum.php
+++ /dev/null
@@ -1,57 +0,0 @@
-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']));
-}
-
-mkdir(tp_get_img_dir() . $album->guid, 0755, true);
-
-system_message(elgg_echo("album:created"));
-
-// 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);
-
-forward("pg/photos/upload/" . $album->guid);
diff --git a/actions/photos/album/save.php b/actions/photos/album/save.php
new file mode 100644
index 000000000..cc7181678
--- /dev/null
+++ b/actions/photos/album/save.php
@@ -0,0 +1,48 @@
+container_guid = $container_guid;
+$album->owner_guid = elgg_get_logged_in_user_guid();
+$album->access_id = $access_id;
+$album->title = $title;
+$album->description = $description;
+if ($tags) {
+	$album->tags = string_to_tag_array($tags);
+}
+
+if (!$album->save()) {
+	register_error(elgg_echo("album:error"));
+	forward(REFERER);
+}
+
+elgg_clear_sticky_form('tidypics');
+
+system_message(elgg_echo("album:created"));
+forward($album->getURL());
diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php
index 1fbdb8ad8..75a018410 100644
--- a/classes/TidypicsAlbum.php
+++ b/classes/TidypicsAlbum.php
@@ -18,12 +18,23 @@ class TidypicsAlbum extends ElggObject {
 	}
 
 	/**
-	 * Get the title of the photo album
-	 * 
-	 * @return string
+	 * Save an album
+	 *
+	 * @return bool
 	 */
-	public function getTitle() {
-		return $this->title;
+	public function save() {
+
+		if (!isset($this->new_album)) {
+			$this->new_album = true;
+		}
+
+		if (!parent::save()) {
+			return false;
+		}
+		
+		mkdir(tp_get_img_dir() . $this->guid, 0755, true);
+
+		return true;
 	}
 
 	/**
@@ -39,6 +50,15 @@ class TidypicsAlbum extends ElggObject {
 		return parent::delete();
 	}
 
+	/**
+	 * Get the title of the photo album
+	 *
+	 * @return string
+	 */
+	public function getTitle() {
+		return $this->title;
+	}
+
 	/**
 	 * Get an array of image objects
 	 *
diff --git a/languages/en.php b/languages/en.php
index d6d934c20..63d4632c6 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -206,7 +206,7 @@ The photo can be viewed here: %s",
 			'album:none' => "No albums have been created yet.",
 			'album:uploadfailed' => "Sorry; we could not save your album.",
 			'album:deletefailed' => "Your album could not be deleted.",
-			'album:blank' => "Please give this album a title and description.",
+			'album:blank' => "Please give this album a title.",
 			'tidypics:upgrade:failed' => "The upgrade of Tidypics failed", 
 );
 
diff --git a/lib/tidypics.php b/lib/tidypics.php
index 8fcfc22c9..7eedb246d 100644
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -59,6 +59,37 @@ function tp_get_img_dir() {
 	return $file->getFilenameOnFilestore() . 'image/';
 }
 
+function tidypics_prepare_form_vars($entity = null) {
+	// input names => defaults
+	$values = array(
+		'title' => '',
+		'description' => '',
+		'access_id' => ACCESS_DEFAULT,
+		'tags' => '',
+		'container_guid' => elgg_get_page_owner_guid(),
+		'guid' => null,
+		'entity' => $entity,
+	);
+
+	if ($entity) {
+		foreach (array_keys($values) as $field) {
+			if (isset($entity->$field)) {
+				$values[$field] = $entity->$field;
+			}
+		}
+	}
+
+	if (elgg_is_sticky_form('tidypics')) {
+		$sticky_values = elgg_get_sticky_values('tidypics');
+		foreach ($sticky_values as $key => $value) {
+			$values[$key] = $value;
+		}
+	}
+
+	elgg_clear_sticky_form('tidypics');
+
+	return $values;
+}
 
 
 /*********************************************************************
diff --git a/pages/edit.php b/pages/edit.php
deleted file mode 100644
index 06d3dd9c4..000000000
--- a/pages/edit.php
+++ /dev/null
@@ -1,54 +0,0 @@
-canEdit()) {
-	forward();
-}
-
-$subtype = $entity->getSubtype();
-
-if ($subtype == 'album') {
-	$title = elgg_echo('album:edit');
-
-	if ($container = $entity->container_guid) {
-		set_page_owner($container);
-	}
-
-} else if ($subtype == 'image') {
-	$title = elgg_echo('image:edit');
-
-	if ($container = get_entity($entity->container_guid)->container_guid) {
-		set_page_owner($container);
-	}
-
-} else {
-	forward();
-}
-
-$page_owner = page_owner_entity();
-if ($page_owner instanceof ElggGroup) {
-	add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name),
-			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-}
-
-
-$area2 .= elgg_view_title($title);
-$area2 .= elgg_view('tidypics/forms/edit', array('entity' => $entity, 'subtype' => $subtype));
-$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-
-page_draw($title, $body);
diff --git a/pages/newalbum.php b/pages/newalbum.php
deleted file mode 100644
index 535116237..000000000
--- a/pages/newalbum.php
+++ /dev/null
@@ -1,30 +0,0 @@
-guid);
-}
-
-if ($page_owner instanceof ElggGroup) {
-	add_submenu_item(sprintf(elgg_echo('album:group'), $page_owner->name),
-			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-}
-
-$area2 = elgg_view_title(elgg_echo('album:add'));
-$area2 .= elgg_view("tidypics/forms/edit");
-
-// Display page
-page_draw(elgg_echo('album:add'),elgg_view_layout("two_column_left_sidebar", '', $area2));
diff --git a/pages/photos/album/add.php b/pages/photos/album/add.php
new file mode 100644
index 000000000..d34d39177
--- /dev/null
+++ b/pages/photos/album/add.php
@@ -0,0 +1,34 @@
+name, "photos/owner/$owner->username");
+} else {
+	elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all");
+}
+elgg_push_breadcrumb($title);
+
+$vars = tidypics_prepare_form_vars();
+$content = elgg_view_form('photos/album/save', array('method' => 'post'), $vars);
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/photos/album/edit.php b/pages/photos/album/edit.php
new file mode 100644
index 000000000..6fff50b29
--- /dev/null
+++ b/pages/photos/album/edit.php
@@ -0,0 +1,47 @@
+canEdit()) {
+	// @todo cannot change it
+	forward('photos/all');
+}
+
+elgg_set_page_owner_guid($entity->getContainerGUID());
+$owner = elgg_get_page_owner_entity();
+
+gatekeeper(); 
+group_gatekeeper();
+
+$title = elgg_echo('album:edit');
+
+// set up breadcrumbs
+elgg_push_breadcrumb(elgg_echo('photos'), "photos/all");
+if (elgg_instanceof($owner, 'user')) {
+	elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
+} else {
+	elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all");
+}
+elgg_push_breadcrumb($title);
+
+$vars = tidypics_prepare_form_vars($entity);
+$content = elgg_view_form('photos/album/save', array('method' => 'post'), $vars);
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/photos/album/view.php b/pages/photos/album/view.php
index adb5a1b51..aafcf14bc 100644
--- a/pages/photos/album/view.php
+++ b/pages/photos/album/view.php
@@ -12,7 +12,8 @@ group_gatekeeper();
 $album_guid = (int) get_input('guid');
 $album = get_entity($album_guid);
 if (!$album) {
-	
+	// @todo album deleted or don't have access
+	forward('photos/all');
 }
 
 elgg_set_page_owner_guid($album->getContainerGUID());
diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php
new file mode 100644
index 000000000..6580c6f52
--- /dev/null
+++ b/pages/photos/image/upload.php
@@ -0,0 +1,62 @@
+canEdit()) {
+	// throw warning and forward to previous page
+	forward($_SERVER['HTTP_REFERER']);
+}
+
+// set page owner based on container (user or group)
+set_page_owner($album->container_guid);
+
+$page_owner = page_owner_entity();
+if ($page_owner instanceof ElggGroup) {
+	add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name),
+			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
+}
+
+set_context('photos');
+$title = elgg_echo('album:addpix') . ': ' . $album->title;
+$area2 .= elgg_view_title($title);
+
+if ($uploader == 'basic') {
+	$area2 .= elgg_view('input/form', array(
+		'action' => "{$CONFIG->wwwroot}action/tidypics/upload",
+		'body' => elgg_view('forms/tidypics/basic_upload', array('album' => $album)),
+		'internalid' => 'tidypicsUpload',
+		'enctype' => 'multipart/form-data',
+		'method' => 'post',
+	));
+
+} else {
+	$area2 .= elgg_view("forms/tidypics/ajax_upload", array('album' => $album));
+}
+
+$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+
+page_draw($title, $body);
diff --git a/pages/upload.php b/pages/upload.php
deleted file mode 100644
index 6580c6f52..000000000
--- a/pages/upload.php
+++ /dev/null
@@ -1,62 +0,0 @@
-canEdit()) {
-	// throw warning and forward to previous page
-	forward($_SERVER['HTTP_REFERER']);
-}
-
-// set page owner based on container (user or group)
-set_page_owner($album->container_guid);
-
-$page_owner = page_owner_entity();
-if ($page_owner instanceof ElggGroup) {
-	add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name),
-			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-}
-
-set_context('photos');
-$title = elgg_echo('album:addpix') . ': ' . $album->title;
-$area2 .= elgg_view_title($title);
-
-if ($uploader == 'basic') {
-	$area2 .= elgg_view('input/form', array(
-		'action' => "{$CONFIG->wwwroot}action/tidypics/upload",
-		'body' => elgg_view('forms/tidypics/basic_upload', array('album' => $album)),
-		'internalid' => 'tidypicsUpload',
-		'enctype' => 'multipart/form-data',
-		'method' => 'post',
-	));
-
-} else {
-	$area2 .= elgg_view("forms/tidypics/ajax_upload", array('album' => $album));
-}
-
-$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
-
-page_draw($title, $body);
diff --git a/start.php b/start.php
index ae52e7098..953789924 100644
--- a/start.php
+++ b/start.php
@@ -83,11 +83,11 @@ function tidypics_init() {
 	register_plugin_hook('forward', 'system', 'tidypics_ajax_session_handler');
 
 	// Register actions
-	$base_dir = $CONFIG->pluginspath . "tidypics/actions";
+	$base_dir = $CONFIG->pluginspath . "tidypics/actions/photos";
+	elgg_register_action("photos/album/save", "$base_dir/album/save.php");
 	register_action("tidypics/upload", false, "$base_dir/upload.php");
 	register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php");
 	register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php");
-	register_action("tidypics/addalbum", false, "$base_dir/addalbum.php");
 	register_action("tidypics/sortalbum", false, "$base_dir/sortalbum.php");
 	register_action("tidypics/edit", false, "$base_dir/edit.php");
 	register_action("tidypics/delete", false, "$base_dir/delete.php");
@@ -247,22 +247,21 @@ function tidypics_mostviewed_submenus() {
 }
 
 /**
- * tidypics page handler
+ * Tidypics page handler
  *
  * @param array $page Array of url segments
  */
 function tidypics_page_handler($page) {
 
-	global $CONFIG;
-
 	if (!isset($page[0])) {
 		return false;
 	}
 
+	$base = elgg_get_plugins_path() . 'tidypics/pages/photos';
 	switch($page[0]) {
 		case "all": // all site albums
 		case "world":
-			include($CONFIG->pluginspath . "tidypics/pages/photos/all.php");
+			require "$base/all.php";
 			break;
 
 		case "owned":  // albums owned by container entity
@@ -270,28 +269,43 @@ function tidypics_page_handler($page) {
 			if (isset($page[1])) {
 				set_input('username', $page[1]);
 			}
-			include($CONFIG->pluginspath . "tidypics/pages/photos/owner.php");
+			require "$base/owner.php";
 			break;
 
 		case "friends": // albums of friends
 			if (isset($page[1])) {
 				set_input('username', $page[1]);
 			}
-			include($CONFIG->pluginspath . "tidypics/pages/photos/friends.php");
+			require "$base/friends.php";
 			break;
 
-		case "view": //view an image individually
+		case "album": // view an album individually
 			if (isset($page[1])) {
 				set_input('guid', $page[1]);
 			}
-			include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");
+			require "$base/album/view.php";
 			break;
 
-		case "album": //view an album individually
+		case "new":  // create new album
+		case "add":
 			if (isset($page[1])) {
 				set_input('guid', $page[1]);
 			}
-			include($CONFIG->pluginspath . "tidypics/pages/photos/album/view.php");
+			require "$base/album/add.php";
+			break;
+
+		case "edit": //edit image or album
+			set_input('guid', $page[1]);
+			$entity = get_entity($page[1]);
+			switch ($entity->getSubtype()) {
+				case 'album':
+					require "$base/album/edit.php";
+					break;
+				default:
+					echo 'not album';
+					exit;
+					return false;
+			}
 			break;
 
 		case "sort": //sort a photo album
@@ -301,14 +315,13 @@ function tidypics_page_handler($page) {
 			include($CONFIG->pluginspath . "tidypics/pages/sortalbum.php");
 			break;
 
-		case "new":  //create new album
-		case "add":
+		case "view": //view an image individually
 			if (isset($page[1])) {
-				set_input('username', $page[1]);
+				set_input('guid', $page[1]);
 			}
-			include($CONFIG->pluginspath . "tidypics/pages/newalbum.php");
+			include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");
 			break;
-
+		
 		case "upload": //upload images to album
 			if (isset($page[1])) {
 				set_input('album_guid', $page[1]);
@@ -316,14 +329,7 @@ function tidypics_page_handler($page) {
 			if (isset($page[2])) {
 				set_input('uploader', 'basic');
 			}
-			include($CONFIG->pluginspath . "tidypics/pages/upload.php");
-			break;
-
-		case "edit": //edit image or album
-			if (isset($page[1])) {
-				set_input('guid', $page[1]);
-			}
-			include($CONFIG->pluginspath . "tidypics/pages/edit.php");
+			include($CONFIG->pluginspath . "tidypics/pages/photos/image/upload.php");
 			break;
 
 		case "batch": //update titles and descriptions
diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php
new file mode 100644
index 000000000..06b3f4cb9
--- /dev/null
+++ b/views/default/forms/photos/admin/settings.php
@@ -0,0 +1,179 @@
+' . elgg_echo('tidypics:settings:heading:main') . '';
+
+// Tagging
+$tagging = $plugin->tagging;
+if (!$tagging) {
+	$tagging = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
+
+// Download Link
+$download_link = $plugin->download_link;
+if (!$download_link) {
+	$download_link = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
+
+// Ratings
+$photo_ratings = $plugin->photo_ratings;
+if (!$photo_ratings) {
+	$photo_ratings = "disabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
+
+// Show EXIF
+$exif = $plugin->exif;
+if (!$exif) {
+	$exif = "disabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
+
+// Show View count
+$view_count = $plugin->view_count;
+if (!$view_count) {
+	$view_count = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
+
+// Use flash uploader
+$uploader = $plugin->uploader;
+if (!$uploader) {
+	$uploader = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:uploader') => 'enabled'), 'internalname' => 'uploader', 'value' => $uploader )) . "
      ";
+
+// Watermark Text
+$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
+$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
+
+// Max Image Size
+$maxfilesize = $plugin->maxfilesize;
+if (!$maxfilesize) {
+	$maxfilesize = (int)5; // 5 MB
+}
+$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
+$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
+
+// Quota Size
+$quota = $plugin->quota;
+if (!$quota) {
+	$quota = 0;
+}
+$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
+$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
+
+// Image Library
+if (extension_loaded('imagick')) {
+	$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
+}
+
+$disablefunc = explode(',', ini_get('disable_functions'));
+if (is_callable('exec') && !in_array('exec',$disablefunc)) {
+	$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
+}
+
+$img_lib_options['GD'] = 'GD';
+
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:img_lib') . '
      ';
+$image_lib = $plugin->image_lib;
+if (!$image_lib) {
+	$image_lib = 'GD';
+}
+$form_body .= '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
+$form_body .= elgg_view('input/pulldown', array(
+		'internalname' => 'params[image_lib]',
+		'options_values' => $img_lib_options,
+		'value' => $image_lib
+));
+$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
+
+if (is_callable('exec') && !in_array('exec', $disablefunc)) {
+	// Image Magick Path
+	$im_path = $plugin->im_path;
+	if(!$im_path) {
+		$im_path = "";
+	}
+	$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
+	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
+}
+
+
+// River Image options
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:river') . '
      ';
+$img_river_view = $plugin->img_river_view;
+if (!$img_river_view) {
+	$img_river_view = 'batch';
+}
+$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view') . ': ';
+$form_body .= elgg_view('input/pulldown', array(
+		'internalname' => 'params[img_river_view]',
+		'options_values' => array(
+				'all' => 'all',
+				'batch' => '1',
+				'none' => 'none',
+		),
+		'value' => $img_river_view
+));
+$form_body .= '
      ';
+
+// River Album options
+$album_river_view = $plugin->album_river_view;
+if (!$album_river_view) {
+	$album_river_view = 'set';
+}
+$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view') . ': ';
+$form_body .= elgg_view('input/pulldown', array(
+		'internalname' => 'params[album_river_view]',
+		'options_values' => array(
+				'cover' => 'cover',
+				'set' => 'set',
+		),
+		'value' => $album_river_view
+));
+$form_body .= '
      ';
+
+// Thumbnail sizes
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:sizes') . '
      ';
+$form_body .= "
      You must edit the css if you change the default sizes
      ";
+$image_sizes = $plugin->image_sizes;
+if(!$image_sizes) {
+	$image_sizes = array(); // set default values
+	$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
+	$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
+	$image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60;
+} else {
+	$image_sizes = unserialize($image_sizes);
+}
+$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
+$form_body .= 'width:    ';
+$form_body .= 'height: 
      ';
+
+$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
+$form_body .= 'width and height:    ';
+//$form_body .= 'height: 
      ';
+
+$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
+$form_body .= 'width and height:    ';
+//$form_body .= 'height: 
      ';
+
+
+// Group permission override
+$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:groups') . '
      ';
+$grp_perm_override = $plugin->grp_perm_override;
+if (!$grp_perm_override) {
+	$grp_perm_override = "enabled";
+}
+$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
+
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
+
+echo $form_body;
diff --git a/views/default/forms/photos/ajax_upload.php b/views/default/forms/photos/ajax_upload.php
new file mode 100644
index 000000000..a1d13e80b
--- /dev/null
+++ b/views/default/forms/photos/ajax_upload.php
@@ -0,0 +1,141 @@
+salt);
+
+$basic_uploader_url = current_page_url() . '/basic';
+$upload_endpoint_url = "{$vars['url']}action/tidypics/ajax_upload/";
+$upload_complete_url = "{$vars['url']}action/tidypics/ajax_upload_complete/";
+
+$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
+if (!$maxfilesize) {
+	$maxfilesize = 5;
+}
+
+$quota = get_plugin_setting('quota','tidypics');
+if ($quota) {
+	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
+	$image_repo_size = (int)$image_repo_size_md->value;
+	$image_repo_size = $image_repo_size / 1024 / 1024;
+	$quote_percentage = round(100 * ($image_repo_size / $quota));
+	// for small quotas, so one decimal place
+	if ($quota < 10) {
+		$image_repo_size = sprintf('%.1f', $image_repo_size);
+	} else {
+		$image_repo_size = round($image_repo_size);
+	}
+	if ($image_repo_size > $quota) {
+		$image_repo_size = $quota;
+	}
+}
+
+?>
+
+
      
+
+	
      
+
+	
+
      
+
+
diff --git a/views/default/forms/photos/album/save.php b/views/default/forms/photos/album/save.php
new file mode 100644
index 000000000..8a1202c07
--- /dev/null
+++ b/views/default/forms/photos/album/save.php
@@ -0,0 +1,48 @@
+
+
+
      
+	
+	 'title', 'value' => $title)); ?>
+
      
+
      
+	
+	 'description', 'value' => $description)); ?>
+
      
+
      
+	
+	 'tags', 'value' => $tags)); ?>
+
      
+
+
      
+	
+	 'access_id', 'value' => $access_id)); ?>
+
      
+
      
+ 'guid', 'value' => $guid));
+echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
+echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+?>
+
      
diff --git a/views/default/forms/photos/basic_upload.php b/views/default/forms/photos/basic_upload.php
new file mode 100644
index 000000000..55ab854a4
--- /dev/null
+++ b/views/default/forms/photos/basic_upload.php
@@ -0,0 +1,104 @@
+access_id;
+
+$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
+if (!$maxfilesize) {
+	$maxfilesize = 5;
+}
+
+$quota = get_plugin_setting('quota','tidypics');
+if ($quota) {
+	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
+	$image_repo_size = (int)$image_repo_size_md->value;
+	$image_repo_size = $image_repo_size / 1024 / 1024;
+	$quote_percentage = round(100 * ($image_repo_size / $quota));
+	// for small quotas, so one decimal place
+	if ($quota < 10) {
+		$image_repo_size = sprintf('%.1f', $image_repo_size);
+	} else {
+		$image_repo_size = round($image_repo_size);
+	}
+	if ($image_repo_size > $quota) {
+		$image_repo_size = $quota;
+	}
+}
+
+?>
+
      
+
      
+	
+	
      
+		
      
+		
      
+		
+		
      
+			
+	
      
+		
      
+		
      ...
      
+	
      
+	
        
+		' . elgg_view("input/file",array('internalname' => "upload_$x")) . '';
+		}
+		?>
+	
      
+
      
+
      
+	guid . '" />';
+	}
+	if ($access_id) {
+		echo '';
+	}
+	?>
+	" onclick="displayProgress();" />
+
      
+
+
      
+
\ No newline at end of file
diff --git a/views/default/forms/tidypics/admin/settings.php b/views/default/forms/tidypics/admin/settings.php
deleted file mode 100644
index 06b3f4cb9..000000000
--- a/views/default/forms/tidypics/admin/settings.php
+++ /dev/null
@@ -1,179 +0,0 @@
-' . elgg_echo('tidypics:settings:heading:main') . '';
-
-// Tagging
-$tagging = $plugin->tagging;
-if (!$tagging) {
-	$tagging = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "
      ";
-
-// Download Link
-$download_link = $plugin->download_link;
-if (!$download_link) {
-	$download_link = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "
      ";
-
-// Ratings
-$photo_ratings = $plugin->photo_ratings;
-if (!$photo_ratings) {
-	$photo_ratings = "disabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "
      ";
-
-// Show EXIF
-$exif = $plugin->exif;
-if (!$exif) {
-	$exif = "disabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "
      ";
-
-// Show View count
-$view_count = $plugin->view_count;
-if (!$view_count) {
-	$view_count = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "
      ";
-
-// Use flash uploader
-$uploader = $plugin->uploader;
-if (!$uploader) {
-	$uploader = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:uploader') => 'enabled'), 'internalname' => 'uploader', 'value' => $uploader )) . "
      ";
-
-// Watermark Text
-$form_body .= "
      " . elgg_echo('tidypics:settings:watermark') . "
      ";
-$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "
      ";
-
-// Max Image Size
-$maxfilesize = $plugin->maxfilesize;
-if (!$maxfilesize) {
-	$maxfilesize = (int)5; // 5 MB
-}
-$form_body .= "
      " . elgg_echo('tidypics:settings:maxfilesize') . "
      ";
-$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "
      ";
-
-// Quota Size
-$quota = $plugin->quota;
-if (!$quota) {
-	$quota = 0;
-}
-$form_body .= "
      " . elgg_echo('tidypics:settings:quota') . "
      ";
-$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "
      ";
-
-// Image Library
-if (extension_loaded('imagick')) {
-	$img_lib_options['ImageMagickPHP'] = 'imagick PHP extension';
-}
-
-$disablefunc = explode(',', ini_get('disable_functions'));
-if (is_callable('exec') && !in_array('exec',$disablefunc)) {
-	$img_lib_options['ImageMagick'] = 'ImageMagick Cmdline';
-}
-
-$img_lib_options['GD'] = 'GD';
-
-$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:img_lib') . '
      ';
-$image_lib = $plugin->image_lib;
-if (!$image_lib) {
-	$image_lib = 'GD';
-}
-$form_body .= '
      ' . elgg_echo('tidypics:settings:image_lib') . ': ';
-$form_body .= elgg_view('input/pulldown', array(
-		'internalname' => 'params[image_lib]',
-		'options_values' => $img_lib_options,
-		'value' => $image_lib
-));
-$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.
      ';
-
-if (is_callable('exec') && !in_array('exec', $disablefunc)) {
-	// Image Magick Path
-	$im_path = $plugin->im_path;
-	if(!$im_path) {
-		$im_path = "";
-	}
-	$form_body .= "
      " . elgg_echo('tidypics:settings:im_path') . "
      ";
-	$form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "
      ";
-}
-
-
-// River Image options
-$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:river') . '
      ';
-$img_river_view = $plugin->img_river_view;
-if (!$img_river_view) {
-	$img_river_view = 'batch';
-}
-$form_body .= '
      ' . elgg_echo('tidypics:settings:img_river_view') . ': ';
-$form_body .= elgg_view('input/pulldown', array(
-		'internalname' => 'params[img_river_view]',
-		'options_values' => array(
-				'all' => 'all',
-				'batch' => '1',
-				'none' => 'none',
-		),
-		'value' => $img_river_view
-));
-$form_body .= '
      ';
-
-// River Album options
-$album_river_view = $plugin->album_river_view;
-if (!$album_river_view) {
-	$album_river_view = 'set';
-}
-$form_body .= '
      ' . elgg_echo('tidypics:settings:album_river_view') . ': ';
-$form_body .= elgg_view('input/pulldown', array(
-		'internalname' => 'params[album_river_view]',
-		'options_values' => array(
-				'cover' => 'cover',
-				'set' => 'set',
-		),
-		'value' => $album_river_view
-));
-$form_body .= '
      ';
-
-// Thumbnail sizes
-$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:sizes') . '
      ';
-$form_body .= "
      You must edit the css if you change the default sizes
      ";
-$image_sizes = $plugin->image_sizes;
-if(!$image_sizes) {
-	$image_sizes = array(); // set default values
-	$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600;
-	$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153;
-	$image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60;
-} else {
-	$image_sizes = unserialize($image_sizes);
-}
-$form_body .= "
      " . elgg_echo('tidypics:settings:largesize') . "
      ";
-$form_body .= 'width:    ';
-$form_body .= 'height: 
      ';
-
-$form_body .= "
      " . elgg_echo('tidypics:settings:smallsize') . "
      ";
-$form_body .= 'width and height:    ';
-//$form_body .= 'height: 
      ';
-
-$form_body .= "
      " . elgg_echo('tidypics:settings:thumbsize') . "
      ";
-$form_body .= 'width and height:    ';
-//$form_body .= 'height: 
      ';
-
-
-// Group permission override
-$form_body .= '
      ' . elgg_echo('tidypics:settings:heading:groups') . '
      ';
-$grp_perm_override = $plugin->grp_perm_override;
-if (!$grp_perm_override) {
-	$grp_perm_override = "enabled";
-}
-$form_body .= '
      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "
      ";
-
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save")));
-
-echo $form_body;
diff --git a/views/default/forms/tidypics/ajax_upload.php b/views/default/forms/tidypics/ajax_upload.php
deleted file mode 100644
index a1d13e80b..000000000
--- a/views/default/forms/tidypics/ajax_upload.php
+++ /dev/null
@@ -1,141 +0,0 @@
-salt);
-
-$basic_uploader_url = current_page_url() . '/basic';
-$upload_endpoint_url = "{$vars['url']}action/tidypics/ajax_upload/";
-$upload_complete_url = "{$vars['url']}action/tidypics/ajax_upload_complete/";
-
-$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
-if (!$maxfilesize) {
-	$maxfilesize = 5;
-}
-
-$quota = get_plugin_setting('quota','tidypics');
-if ($quota) {
-	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
-	$image_repo_size = (int)$image_repo_size_md->value;
-	$image_repo_size = $image_repo_size / 1024 / 1024;
-	$quote_percentage = round(100 * ($image_repo_size / $quota));
-	// for small quotas, so one decimal place
-	if ($quota < 10) {
-		$image_repo_size = sprintf('%.1f', $image_repo_size);
-	} else {
-		$image_repo_size = round($image_repo_size);
-	}
-	if ($image_repo_size > $quota) {
-		$image_repo_size = $quota;
-	}
-}
-
-?>
-
-
      
-
-	
      
-
-	
-
      
-
-
diff --git a/views/default/forms/tidypics/basic_upload.php b/views/default/forms/tidypics/basic_upload.php
deleted file mode 100644
index 55ab854a4..000000000
--- a/views/default/forms/tidypics/basic_upload.php
+++ /dev/null
@@ -1,104 +0,0 @@
-access_id;
-
-$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
-if (!$maxfilesize) {
-	$maxfilesize = 5;
-}
-
-$quota = get_plugin_setting('quota','tidypics');
-if ($quota) {
-	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
-	$image_repo_size = (int)$image_repo_size_md->value;
-	$image_repo_size = $image_repo_size / 1024 / 1024;
-	$quote_percentage = round(100 * ($image_repo_size / $quota));
-	// for small quotas, so one decimal place
-	if ($quota < 10) {
-		$image_repo_size = sprintf('%.1f', $image_repo_size);
-	} else {
-		$image_repo_size = round($image_repo_size);
-	}
-	if ($image_repo_size > $quota) {
-		$image_repo_size = $quota;
-	}
-}
-
-?>
-
      
-
      
-	
-	
      
-		
      
-		
      
-		
-		
      
-			
-	
      
-		
      
-		
      ...
      
-	
      
-	
        
-		' . elgg_view("input/file",array('internalname' => "upload_$x")) . '';
-		}
-		?>
-	
      
-
      
-
      
-	guid . '" />';
-	}
-	if ($access_id) {
-		echo '';
-	}
-	?>
-	" onclick="displayProgress();" />
-
      
-
-
      
-
\ No newline at end of file
diff --git a/views/default/tidypics/forms/edit.php b/views/default/tidypics/forms/edit.php
deleted file mode 100644
index 8e2bd9bcc..000000000
--- a/views/default/tidypics/forms/edit.php
+++ /dev/null
@@ -1,125 +0,0 @@
-title;
-	$body = $vars['entity']->description;
-	$tags = $vars['entity']->tags;
-	$access_id = $vars['entity']->access_id;
-	$subtype = $vars['subtype'];
-
-	// if nothing is sent, create new, but only new albums are sent here
-	// new images are sent to upload.php
-} else {
-	$action = "tidypics/addalbum";
-	$tags = "";
-	$title = "";
-	$body = "";
-	$access_id = ACCESS_DEFAULT;
-	$subtype = 'album';
-
-	$title = $_SESSION['tidypicstitle'];
-	$body = $_SESSION['tidypicsbody'];
-	$tags = $_SESSION['tidypicstags'];
-
-	unset($_SESSION['tidypicstitle']);
-	unset($_SESSION['tidypicsbody']);
-	unset($_SESSION['tidypicstags']);
-}
-
-// group or individual 
-$container_guid = page_owner();
-
-?>
-
      
-	
      
-		
      
-			
-			 "tidypicstitle", "value" => $title,));  ?>
-		
      
-		
-		
      
-			
-				 "tidypicsbody","value" => $body,)); ?>
-		
      
-			
-		
      
-			
-				 "tidypicsbody","value" => $body,"class" => 'tidypics_caption_input')); ?>
-		
      
-			
-		
      
-			
-			 "tidypicstags","value" => $tags,));  ?>
-		
      
-
-		container_guid;
-
-			// should this image be the cover for the album - only ask for non-cover photos
-			// determine if it is already the cover
-			$img_guid = $vars['entity']->guid;
-			$album = get_entity($container_guid);
-			$cover_guid = $album->getCoverImageGuid();
-
-			if ($cover_guid != $img_guid) {
-
-				?>
-		
      
-					 "cover",
-					'options' => array(elgg_echo("album:cover")),
-					));
-					?>
-		
      
-				
-		
      
-					
-		
      
-
-				
-		
      
-			
-				 'access_id','value' => $access_id)); ?>
-		
      
-
-			
-		
-			
-		
-		
-		
      
-	
      
-
      
\ No newline at end of file
-- 
cgit v1.2.3


From c51b483f24936c8d04a54a6999412937ec21c49a Mon Sep 17 00:00:00 2001
From: cash 
Date: Sat, 19 Nov 2011 23:13:26 -0500
Subject: uploading photos through the basic interface works now

---
 actions/delete.php                              |  58 -------
 actions/edit_multi.php                          |  65 --------
 actions/photos/batch/edit.php                   |  42 +++++
 actions/photos/delete.php                       |  48 ++++++
 actions/photos/image/upload.php                 | 126 +++++++++++++++
 actions/upload.php                              | 202 ------------------------
 classes/TidypicsAlbum.php                       |   2 +
 classes/TidypicsImage.php                       | 124 ++++++++++++---
 pages/edit_multiple.php                         |  52 ------
 pages/photos/batch/edit.php                     |  44 ++++++
 pages/photos/image/thumbnail.php                |  34 ++++
 pages/photos/image/upload.php                   |  61 ++++---
 pages/thumbnail.php                             |  78 ---------
 start.php                                       |  67 ++++----
 views/default/forms/photos/basic_upload.php     | 103 +++++-------
 views/default/forms/photos/batch/edit.php       |  32 ++++
 views/default/forms/photos/batch/edit/image.php |  39 +++++
 views/default/object/album/full.php             |   5 +-
 views/default/tidypics/forms/edit_multi.php     |  59 -------
 19 files changed, 570 insertions(+), 671 deletions(-)
 delete mode 100644 actions/delete.php
 delete mode 100644 actions/edit_multi.php
 create mode 100644 actions/photos/batch/edit.php
 create mode 100644 actions/photos/delete.php
 create mode 100644 actions/photos/image/upload.php
 delete mode 100644 actions/upload.php
 delete mode 100644 pages/edit_multiple.php
 create mode 100644 pages/photos/batch/edit.php
 create mode 100644 pages/photos/image/thumbnail.php
 delete mode 100644 pages/thumbnail.php
 create mode 100644 views/default/forms/photos/batch/edit.php
 create mode 100644 views/default/forms/photos/batch/edit/image.php
 delete mode 100644 views/default/tidypics/forms/edit_multi.php

diff --git a/actions/delete.php b/actions/delete.php
deleted file mode 100644
index dfe910666..000000000
--- a/actions/delete.php
+++ /dev/null
@@ -1,58 +0,0 @@
-canEdit()) {
-	// user doesn't have permissions
-	register_error(elgg_echo("tidypics:deletefailed"));
-	forward($forward_url);
-}
-
-$subtype = $entity->getSubtype();
-$container = get_entity($entity->container_guid);
-
-if ($subtype != 'image' && $subtype != 'album') {
-	// how did we even get here?
-	register_error(elgg_echo("tidypics:deletefailed"));
-	forward($forward_url);
-}
-
-if ($subtype == 'image') {
-	//forward back to album after deleting pictures
-	$forward_url = $container->getURL();
-
-	// plugins can register to be told when a Tidypics image has been deleted
-	trigger_elgg_event('delete', 'tp_image', $entity);
-} else {
-	// forward to this person's albums
-	$forward_url = 'pg/photos/owned/' . $container->username;
-
-	// plugins can register to be told when a Tidypics album has been deleted
-	trigger_elgg_event('delete', 'tp_album', $entity);
-}
-
-
-if ($entity->delete()) {
-	system_message(elgg_echo("tidypics:deleted"));
-} else {
-	register_error(elgg_echo("tidypics:deletefailed"));
-}
-
-forward($forward_url);
diff --git a/actions/edit_multi.php b/actions/edit_multi.php
deleted file mode 100644
index 1d0e537b0..000000000
--- a/actions/edit_multi.php
+++ /dev/null
@@ -1,65 +0,0 @@
- $im) {
-	$image = get_entity($im);
-
-	if ($image->canEdit()) {
-
-		// Convert string of tags into a preformatted array
-		$tagarray = string_to_tag_array($tags_array[$key]);
-
-		//set title appropriately
-		if ($title_array[$key]) {
-			$image->title = $title_array[$key];
-		} else {
-			$image->title = substr($image->originalfilename, 0, strrpos($image->originalfilename, '.'));
-		}
-
-		//set description appropriately
-		$image->description = $caption_array[$key];
-
-		// Before we can set metadata, we need to save the image
-		if (!$image->save()) {
-			array_push($not_updated, $image->guid);
-		}
-
-		// Now let's add tags. We can pass an array directly to the object property! Easy.
-		$image->clearMetadata('tags');
-		if (is_array($tagarray)) {
-			$image->tags = $tagarray;
-		}
-
-		//if cover meta is sent from image save as metadata
-		if ($cover == $im) {
-			$album_entity->setCoverImageGuid($im);
-		}
-	}
-}
-
-// Success message
-if (count($not_updated) > 0) {
-	register_error(elgg_echo("images:notedited"));
-} else {
-	system_message(elgg_echo("images:edited"));
-}
-
-// Forward to the main album page
-forward($album_entity->getURL());
diff --git a/actions/photos/batch/edit.php b/actions/photos/batch/edit.php
new file mode 100644
index 000000000..6d376a9db
--- /dev/null
+++ b/actions/photos/batch/edit.php
@@ -0,0 +1,42 @@
+ $guid) {
+	$image = get_entity($guid);
+
+	if ($image->canEdit()) {
+
+		// set title appropriately
+		if ($titles[$key]) {
+			$image->title = $titles[$key];
+		} else {
+			$image->title = substr($image->originalfilename, 0, strrpos($image->originalfilename, '.'));
+		}
+
+		// set description appropriately
+		$image->description = $captions[$key];
+		$image->tags = string_to_tag_array($tags[$key]);
+
+		if (!$image->save()) {
+			array_push($not_updated, $image->getGUID());
+		}
+	}
+}
+
+if (count($not_updated) > 0) {
+	register_error(elgg_echo("images:notedited"));
+} else {
+	system_message(elgg_echo("images:edited"));
+}
+forward($image->getContainerEntity()->getURL());
diff --git a/actions/photos/delete.php b/actions/photos/delete.php
new file mode 100644
index 000000000..f8d194e55
--- /dev/null
+++ b/actions/photos/delete.php
@@ -0,0 +1,48 @@
+canEdit()) {
+	// user doesn't have permissions
+	register_error(elgg_echo("tidypics:deletefailed"));
+	forward(REFERER);
+}
+
+$container = $entity->getContainerEntity();
+
+$subtype = $entity->getSubtype();
+switch ($subtype) {
+	case 'album':
+		if (elgg_instanceof($container, 'user')) {
+			$forward_url = "photos/owner/$container->username";
+		} else {
+			$forward_url = "photos/group/$container->guid/all";
+		}
+		break;
+	case 'image':
+		$forward_url = $container->getURL();
+		break;
+	default:
+		forward(REFERER);
+		break;
+}
+
+if ($entity->delete()) {
+	system_message(elgg_echo("tidypics:deleted"));
+} else {
+	register_error(elgg_echo("tidypics:deletefailed"));
+}
+
+forward($forward_url);
diff --git a/actions/photos/image/upload.php b/actions/photos/image/upload.php
new file mode 100644
index 000000000..3a1970367
--- /dev/null
+++ b/actions/photos/image/upload.php
@@ -0,0 +1,126 @@
+ $value) {
+	$data = array();
+	foreach ($_FILES['images'] as $key => $values) {
+		$data[$key] = $values[$index];
+	}
+
+	if (empty($data['name'])) {
+		continue;
+	}
+
+	$image = new TidypicsImage();
+	$image->container_guid = $album->getGUID();
+	$image->setMimeType($mime);
+	$image->access_id = $album->access_id;
+
+	try {
+		$result = $image->save($data);
+	} catch (Exception $e) {
+		array_push($not_uploaded, $data['name']);
+		array_push($error_msgs, $e->getMessage());
+	}
+
+	if ($result) {
+		array_push($uploaded_images, $image->getGUID());
+
+		if ($img_river_view == "all") {
+			add_to_river('river/object/image/create', 'create', $image->getObjectOwnerGUID(), $image->getGUID());
+		}
+	}
+}
+
+if (count($uploaded_images)) {
+	// Create a new batch object to contain these photos
+	$batch = new ElggObject();
+	$batch->subtype = "tidypics_batch";
+	$batch->access_id = $album->access_id;
+	$batch->container_guid = $album->getGUID();
+	if ($batch->save()) {
+		foreach ($uploaded_images as $uploaded_guid) {
+			add_entity_relationship($uploaded_guid, "belongs_to_batch", $batch->getGUID());
+		}
+	}
+
+	$album->prependImageList($uploaded_images);
+
+	if ($img_river_view == "batch" && $album->new_album == false) {
+		add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
+	}
+
+	if ($album->new_album) {
+		$album->new_album = false;
+		add_to_river('river/object/album/create', 'create', $album->getOwnerGUID(), $album->getGUID());
+
+		// we throw the notification manually here so users are not told about the new album until there
+		// is at least a few photos in it
+		object_notifications('create', 'object', $album);
+	}
+}
+
+if (count($not_uploaded) > 0) {
+	if (count($uploaded_images) > 0) {
+		$error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images))  . '
      ';
+	} else {
+		$error = elgg_echo("tidypics:completeuploadfailure") . '
      ';
+	}
+
+	$num_failures = count($not_uploaded);
+	for ($i = 0; $i < $num_failures; $i++) {
+		$error .= "{$not_uploaded[$i]}: {$error_msgs[$i]} 
      ";
+	}
+	register_error($error);
+
+	if (count($uploaded_images) == 0) {
+		//upload failed, so forward to previous page
+		forward(REFERER);
+	} else {
+		// some images did upload so we fall through
+	}
+} else {
+	system_message(elgg_echo('tidypics:upl_success'));
+}
+
+forward("photos/edit/$batch->guid");
diff --git a/actions/upload.php b/actions/upload.php
deleted file mode 100644
index 3bbd97e60..000000000
--- a/actions/upload.php
+++ /dev/null
@@ -1,202 +0,0 @@
-new_album == TP_NEW_ALBUM) {
-	$new_album = true;
-} else {
-	$new_album = false;
-}
-
-
-// post limit exceeded
-if (count($_FILES) == 0) {
-	trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
-	register_error(elgg_echo('tidypics:exceedpostlimit'));
-	forward($_SERVER['HTTP_REFERER']);
-}
-
-// test to make sure at least 1 image was selected by user
-$num_images = 0;
-foreach($_FILES as $key => $sent_file) {
-	if (!empty($sent_file['name'])) {
-		$num_images++;
-	}
-}
-if ($num_images == 0) {
-	// have user try again
-	register_error(elgg_echo('tidypics:noimages'));
-	forward($_SERVER['HTTP_REFERER']);
-}
-
-$uploaded_images = array();
-$not_uploaded = array();
-$error_msgs = array();
-
-foreach($_FILES as $key => $sent_file) {
-
-	// skip empty entries
-	if (empty($sent_file['name'])) {
-		continue;
-	}
-
-	$name = $sent_file['name'];
-	$mime = $sent_file['type'];
-
-	if ($sent_file['error']) {
-		array_push($not_uploaded, $sent_file['name']);
-		if ($sent_file['error'] == 1) {
-			trigger_error('Tidypics warning: image exceeded server php upload limit', E_USER_WARNING);
-			array_push($error_msgs, elgg_echo('tidypics:image_mem'));
-		} else {
-			array_push($error_msgs, elgg_echo('tidypics:unk_error'));
-		}
-		continue;
-	}
-
-	// must be an image
-	if (!tp_upload_check_format($mime)) {
-		array_push($not_uploaded, $sent_file['name']);
-		array_push($error_msgs, elgg_echo('tidypics:not_image'));
-		continue;
-	}
-
-	// check quota
-	if (!tp_upload_check_quota($sent_file['size'], get_loggedin_userid())) {
-		array_push($not_uploaded, $sent_file['name']);
-		array_push($error_msgs, elgg_echo('tidypics:exceed_quota'));
-		continue;
-	}
-
-	// make sure file does not exceed memory limit
-	if (!tp_upload_check_max_size($sent_file['size'])) {
-		array_push($not_uploaded, $sent_file['name']);
-		array_push($error_msgs, elgg_echo('tidypics:image_mem'));
-		continue;
-	}
-
-	// make sure the in memory image size does not exceed memory available
-	$imginfo = getimagesize($sent_file['tmp_name']);
-	if (!tp_upload_memory_check($image_lib, $imginfo[0] * $imginfo[1])) {
-		array_push($not_uploaded, $sent_file['name']);
-		array_push($error_msgs, elgg_echo('tidypics:image_pixels'));
-		trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
-		continue;
-	}
-
-	//this will save to user's folder in /image/ and organize by photo album
-	$file = new TidypicsImage();
-	$file->container_guid = $album_guid;
-	$file->setMimeType($mime);
-	$file->simpletype = "image";
-	$file->access_id = $access_id;
-	//$file->title = substr($name, 0, strrpos($name, '.'));
-
-	$result = $file->save();
-
-	if (!$result) {
-		array_push($not_uploaded, $sent_file['name']);
-		array_push($error_msgs, elgg_echo('tidypics:save_error'));
-		continue;
-	}
-
-	$file->setOriginalFilename($name);
-	$file->saveImageFile($sent_file['tmp_name'], $sent_file['size']);
-	$file->extractExifData();
-	$file->saveThumbnails($image_lib);
-
-	array_push($uploaded_images, $file->guid);
-
-	// plugins can register to be told when a new image has been uploaded
-	trigger_elgg_event('upload', 'tp_image', $file);
-
-	// successful upload so check if this is a new album and throw river event/notification if so
-	if ($album->new_album == TP_NEW_ALBUM) {
-		$album->new_album = TP_OLD_ALBUM;
-
-		// we throw the notification manually here so users are not told about the new album until there
-		// is at least a few photos in it
-		object_notifications('create', 'object', $album);
-
-		add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
-	}
-
-	if ($img_river_view == "all") {
-		add_to_river('river/object/image/create', 'create', $file->getObjectOwnerGUID(), $file->getGUID());
-	}
-	unset($file);  // may not be needed but there seems to be a memory leak
-
-} //end of for loop
-
-if (count($not_uploaded) > 0) {
-	if (count($uploaded_images) > 0) {
-		$error = sprintf(elgg_echo("tidypics:partialuploadfailure"), count($not_uploaded), count($not_uploaded) + count($uploaded_images))  . '
      ';
-	} else {
-		$error = elgg_echo("tidypics:completeuploadfailure") . '
      ';
-	}
-
-	$num_failures = count($not_uploaded);
-	for ($i = 0; $i < $num_failures; $i++) {
-		$error .= "{$not_uploaded[$i]}: {$error_msgs[$i]} 
      ";
-	}
-	register_error($error);
-
-	if (count($uploaded_images) == 0) {
-		//upload failed, so forward to previous page
-		forward($_SERVER['HTTP_REFERER']);
-	} else {
-		// some images did upload so we fall through
-	}
-} else {
-	system_message(elgg_echo('tidypics:upl_success'));
-}
-
-if (count($uploaded_images)) {
-	// Create a new batch object to contain these photos
-	$batch = new ElggObject();
-	$batch->subtype = "tidypics_batch";
-	$batch->access_id = $access_id;
-	$batch->container_guid = $album_guid;
-
-	if ($batch->save()) {
-		foreach ($uploaded_images as $uploaded_guid) {
-			add_entity_relationship($uploaded_guid, "belongs_to_batch", $batch->getGUID());
-		}
-		if ($img_river_view == "batch" && $new_album == false) {
-			add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
-		}
-	}
-}
-
-
-if (count($uploaded_images) > 0) {
-	$album->prependImageList($uploaded_images);
-}
-
-// plugins can register to be told when a Tidypics album has had images added
-trigger_elgg_event('upload', 'tp_album', $album);
-
-
-//forward to multi-image edit page
-forward($CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images)); 
diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php
index 75a018410..18fa556e3 100644
--- a/classes/TidypicsAlbum.php
+++ b/classes/TidypicsAlbum.php
@@ -3,6 +3,8 @@
  * Tidypics Album class
  *
  * @package TidypicsAlbum
+ * @author Cash Costello
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
  */
 
 
diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php
index 652cc9e9b..c604d869e 100644
--- a/classes/TidypicsImage.php
+++ b/classes/TidypicsImage.php
@@ -3,6 +3,8 @@
  * Tidypics Image class
  *
  * @package TidypicsImage
+ * @author Cash Costello
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
  */
 
 
@@ -17,6 +19,29 @@ class TidypicsImage extends ElggFile {
 		parent::__construct($guid);
 	}
 
+	/**
+	 *
+	 * @warning container_guid must be set first
+	 *
+	 * @param array $data
+	 * @return bool
+	 */
+	public function save($data = null) {
+
+		if (!parent::save()) {
+			return false;
+		}
+
+		if ($data) {
+			// new image
+			$this->simpletype = "image";
+			$this->saveImageFile($data);
+			$this->saveThumbnails();
+		}
+
+		return true;
+	}
+
 	/**
 	 * Get the title of the image
 	 *
@@ -26,8 +51,13 @@ class TidypicsImage extends ElggFile {
 		return $this->title;
 	}
 
-	public function getSrcUrl() {
-		return "pg/photos/thumbnail/$this->guid/small/";
+	/**
+	 * Get the src URL for the image
+	 * 
+	 * @return string
+	 */
+	public function getSrcUrl($size = 'small') {
+		return "photos/thumbnail/$this->guid/$size/";
 	}
 
 	/**
@@ -73,10 +103,8 @@ class TidypicsImage extends ElggFile {
 
 	/**
 	 * Set the internal filenames
-	 * 
-	 * @warning container needs to be set first
 	 */
-	public function setOriginalFilename($originalName) {
+	protected function setOriginalFilename($originalName) {
 		$prefix = "image/" . $this->container_guid . "/";
 		$filestorename = elgg_strtolower(time() . $originalName);
 		$this->setFilename($prefix . $filestorename);
@@ -85,24 +113,23 @@ class TidypicsImage extends ElggFile {
 
 	/**
 	 * Save the uploaded image
-	 *
-	 * @warning filename needs to be set first
 	 * 
-	 * @param string $uploadedFilename name of the uploaded file
-	 * @param int $size
+	 * @param array $data
 	 */
-	public function saveImageFile($uploadedFilename, $size) {
+	protected function saveImageFile($data) {
+		$this->checkUploadErrors($data);
 
 		// we need to make sure the directory for the album exists
 		// @note for group albums, the photos are distributed among the users
-		$dir = tp_get_img_dir() . $this->getContainer();
+		$dir = tp_get_img_dir() . $this->getContainerGUID();
 		if (!file_exists($dir)) {
 			mkdir($dir, 0755, true);
 		}
 
+		// move the uploaded file into album directory
+		$this->setOriginalFilename($data['name']);
 		$filename = $this->getFilenameOnFilestore();
-
-		$result = move_uploaded_file($uploadedFilename, $filename);
+		$result = move_uploaded_file($data['tmp_name'], $filename);
 		if (!$result) {
 			return false;
 		}
@@ -113,15 +140,42 @@ class TidypicsImage extends ElggFile {
 		return true;
 	}
 
+	protected function checkUploadErrors($data) {
+		// check for upload errors
+		if ($data['error']) {
+			if ($data['error'] == 1) {
+				trigger_error('Tidypics warning: image exceeded server php upload limit', E_USER_WARNING);
+				throw new Exception(elgg_echo('tidypics:image_mem'));
+			} else {
+				throw new Exception(elgg_echo('tidypics:unk_error'));
+			}
+		}
+
+		// must be an image
+		if (!tp_upload_check_format($data['type'])) {
+			throw new Exception(elgg_echo('tidypics:not_image'));
+		}
+
+		// make sure file does not exceed memory limit
+		if (!tp_upload_check_max_size($data['size'])) {
+			throw new Exception(elgg_echo('tidypics:image_mem'));
+		}
+
+		// make sure the in memory image size does not exceed memory available
+		$imginfo = getimagesize($data['tmp_name']);
+		if (!tp_upload_memory_check($image_lib, $imginfo[0] * $imginfo[1])) {
+			trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);
+			throw new Exception(elgg_echo('tidypics:image_pixels'));
+		}
+	}
+
 	/**
 	 * Save the image thumbnails
-	 *
-	 * @warning container guid and filename must be set
-	 * 
-	 * @param string $imageLib
 	 */
-	public function saveThumbnails($imageLib) {
-		include_once dirname(dirname(__FILE__)) . "/lib/resize.php";
+	protected function saveThumbnails() {
+		elgg_load_library('tidypics:resize');
+
+		$imageLib = elgg_get_plugin_setting('image_lib', 'tidypics');
 		
 		$prefix = "image/" . $this->container_guid . "/";
 		$filename = $this->getFilename();
@@ -144,6 +198,38 @@ class TidypicsImage extends ElggFile {
 		}
 	}
 
+	/**
+	 * Get the image data of a thumbnail
+	 *
+	 * @param string $size
+	 * @return string
+	 */
+	public function getThumbnail($size) {
+		switch ($size) {
+			case 'thumb':
+				$thumb = $this->thumbnail;
+				break;
+			case 'small':
+				$thumb = $this->smallthumb;
+				break;
+			case 'large':
+				$thumb = $this->largethumb;
+				break;
+			default:
+				return '';
+				break;
+		}
+
+		if (!$thumb) {
+			return '';
+		}
+
+		$file = new ElggFile();
+		$file->owner_guid = $this->getObjectOwnerGUID();
+		$file->setFilename($thumb);
+		return $file->grabFile();
+	}
+
 	/**
 	 * Extract EXIF Data from image
 	 *
diff --git a/pages/edit_multiple.php b/pages/edit_multiple.php
deleted file mode 100644
index 7c7b989cf..000000000
--- a/pages/edit_multiple.php
+++ /dev/null
@@ -1,52 +0,0 @@
- 'batch',
-		'metadata_value' => $batch,
-		'type' => 'object',
-		'subtype' => 'image',
-		'owner_guid' => get_loggedin_userid(),
-		'limit' => ELGG_ENTITIES_NO_VALUE,
-	));
-} else {
-	// parse out photo guids
-	$file_string = get_input('files');
-	$file_array_sent = explode('-', $file_string);
-
-	$images = array();
-	foreach ($file_array_sent as $file_guid) {
-		if ($entity = get_entity($file_guid)) {
-			if ($entity->canEdit()) {
-				array_push($images, $entity);
-			}
-		}
-	}
-}
-
-if (!$images) {
-	forward($_SERVER['HTTP_REFERER']);
-}
-
-
-$title = elgg_echo('tidypics:editprops');
-
-$content .= elgg_view_title($title);
-$content .= elgg_view("tidypics/forms/edit_multi", array('images' => $images));
-
-$body = elgg_view_layout('two_column_left_sidebar', '', $content);
-page_draw($title, $body);
diff --git a/pages/photos/batch/edit.php b/pages/photos/batch/edit.php
new file mode 100644
index 000000000..b96ddf408
--- /dev/null
+++ b/pages/photos/batch/edit.php
@@ -0,0 +1,44 @@
+canEdit()) {
+	// @todo cannot change it
+	forward('photos/all');
+}
+
+$album = $batch->getContainerEntity();
+
+elgg_set_page_owner_guid($batch->getContainerEntity()->getContainerGUID());
+$owner = elgg_get_page_owner_entity();
+
+$title = elgg_echo('tidypics:editprops');
+
+elgg_push_breadcrumb(elgg_echo('photos'), "photos/all");
+elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
+elgg_push_breadcrumb($album->title, $album->getURL());
+elgg_push_breadcrumb($title);
+
+$content = elgg_view_form('photos/batch/edit', array(), array('batch' => $batch));
+
+$body = elgg_view_layout('content', array(
+	'filter' => false,
+	'content' => $content,
+	'title' => elgg_echo('tidypics:editprops'),
+	'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'album')),
+));
+
+echo elgg_view_page($title, $body);
diff --git a/pages/photos/image/thumbnail.php b/pages/photos/image/thumbnail.php
new file mode 100644
index 000000000..ae07f2706
--- /dev/null
+++ b/pages/photos/image/thumbnail.php
@@ -0,0 +1,34 @@
+getThumbnail($size);
+if (!$contents) {
+	forward("mod/tidypics/graphics/image_error_$size");
+}
+
+// expires every 14 days
+$expires = 14 * 60*60*24;
+
+// overwrite header caused by php session code so images can be cached
+$mime = $image->getMimeType();
+header("Content-Type: $mime");
+header("Content-Length: " . strlen($contents));
+header("Cache-Control: public", true);
+header("Pragma: public", true);
+header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
+
+// Return the thumbnail and exit
+echo $contents;
+exit;
diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php
index 6580c6f52..526972a35 100644
--- a/pages/photos/image/upload.php
+++ b/pages/photos/image/upload.php
@@ -1,62 +1,59 @@
 canEdit()) {
+	// @todo
 	// throw warning and forward to previous page
-	forward($_SERVER['HTTP_REFERER']);
+	forward(REFERER);
+}
+
+if (!$album->canEdit()) {
+	// @todo have to be able to edit album to upload photos
 }
 
 // set page owner based on container (user or group)
-set_page_owner($album->container_guid);
+elgg_set_page_owner_guid($album->getContainerGUID());
+$owner = elgg_get_page_owner_entity();
 
-$page_owner = page_owner_entity();
-if ($page_owner instanceof ElggGroup) {
-	add_submenu_item(	sprintf(elgg_echo('album:group'),$page_owner->name),
-			$CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username);
-}
+$title = elgg_echo('album:addpix');
 
-set_context('photos');
-$title = elgg_echo('album:addpix') . ': ' . $album->title;
-$area2 .= elgg_view_title($title);
+// set up breadcrumbs
+elgg_push_breadcrumb(elgg_echo('photos'), "photos/all");
+elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
+elgg_push_breadcrumb($album->getTitle(), $album->getURL());
+elgg_push_breadcrumb(elgg_echo('album:addpix'));
 
-if ($uploader == 'basic') {
-	$area2 .= elgg_view('input/form', array(
-		'action' => "{$CONFIG->wwwroot}action/tidypics/upload",
-		'body' => elgg_view('forms/tidypics/basic_upload', array('album' => $album)),
-		'internalid' => 'tidypicsUpload',
-		'enctype' => 'multipart/form-data',
-		'method' => 'post',
-	));
 
+if ($uploader == 'basic') {
+	$content = elgg_view('forms/photos/basic_upload', array('entity' => $album));
 } else {
-	$area2 .= elgg_view("forms/tidypics/ajax_upload", array('album' => $album));
+	$content = elgg_view('forms/photos/ajax_upload', array('entity' => $album));
 }
 
-$body = elgg_view_layout('two_column_left_sidebar', '', $area2);
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+));
 
-page_draw($title, $body);
+echo elgg_view_page($title, $body);
diff --git a/pages/thumbnail.php b/pages/thumbnail.php
deleted file mode 100644
index 9daa2f9c0..000000000
--- a/pages/thumbnail.php
+++ /dev/null
@@ -1,78 +0,0 @@
-getSubtype() != "image") {
-	forward('mod/tidypics/graphics/' . $error_image);
-}
-
-// Get filename
-if ($size == "thumb") {
-	$thumbfile = $file->thumbnail;
-} else if ($size == "small") {
-	$thumbfile = $file->smallthumb;
-} else {
-	$thumbfile = $file->largethumb;
-}
-
-if (!$thumbfile) {
-	forward('mod/tidypics/graphics/' . $error_image);
-}
-
-// create Elgg File object
-$readfile = new ElggFile();
-$readfile->owner_guid = $file->owner_guid;
-$readfile->setFilename($thumbfile);
-$contents = $readfile->grabFile();
-
-// send error image if file could not be read
-if (!$contents) {
-	forward('mod/tidypics/graphics/' . $error_image);
-}
-
-// expires every 14 days
-$expires = 14 * 60*60*24;
-
-// overwrite header caused by php session code so images can be cached
-$mime = $file->getMimeType();
-header("Content-Type: $mime");
-header("Content-Length: " . strlen($contents));
-header("Cache-Control: public", true);
-header("Pragma: public", true);
-header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true);
-
-// Return the thumbnail and exit
-echo $contents;
-exit;
diff --git a/start.php b/start.php
index 953789924..fff4ebf8d 100644
--- a/start.php
+++ b/start.php
@@ -6,16 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
  */
 
-// set some simple defines
-define('TP_OLD_ALBUM', 0);
-define('TP_NEW_ALBUM', 1);
-
-// include core libraries
-require dirname(__FILE__) . "/lib/tidypics.php";
-
-
-// Make sure tidypics_init is called on initialization
-register_elgg_event_handler('init', 'system', 'tidypics_init');
+elgg_register_event_handler('init', 'system', 'tidypics_init');
 
 /**
  * Tidypics plugin initialization
@@ -23,6 +14,9 @@ register_elgg_event_handler('init', 'system', 'tidypics_init');
 function tidypics_init() {
 	global $CONFIG;
 
+	// include core libraries
+	require dirname(__FILE__) . "/lib/tidypics.php";
+	
 	// Set up site menu
 	elgg_register_menu_item('site', array(
 		'name' => 'photos',
@@ -85,18 +79,21 @@ function tidypics_init() {
 	// Register actions
 	$base_dir = $CONFIG->pluginspath . "tidypics/actions/photos";
 	elgg_register_action("photos/album/save", "$base_dir/album/save.php");
-	register_action("tidypics/upload", false, "$base_dir/upload.php");
+	elgg_register_action("photos/delete", "$base_dir/delete.php");
+	elgg_register_action("photos/image/upload", "$base_dir/image/upload.php");
+	elgg_register_action("photos/batch/edit", "$base_dir/batch/edit.php");
 	register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php");
 	register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php");
 	register_action("tidypics/sortalbum", false, "$base_dir/sortalbum.php");
 	register_action("tidypics/edit", false, "$base_dir/edit.php");
-	register_action("tidypics/delete", false, "$base_dir/delete.php");
-	register_action("tidypics/edit_multi", false, "$base_dir/edit_multi.php");
 	register_action("tidypics/addtag", false, "$base_dir/addtag.php");
 	register_action("tidypics/deletetag", false, "$base_dir/deletetag.php");
 
 	register_action("tidypics/admin/settings", false, "$base_dir/admin/settings.php", true);
 	register_action("tidypics/admin/upgrade", false, "$base_dir/admin/upgrade.php", true);
+
+	elgg_register_library('tidypics:upload', $CONFIG->pluginspath . 'tidypics/lib/upload.php');
+	elgg_register_library('tidypics:resize', $CONFIG->pluginspath . 'tidypics/lib/resize.php');
 }
 
 /**
@@ -301,9 +298,10 @@ function tidypics_page_handler($page) {
 				case 'album':
 					require "$base/album/edit.php";
 					break;
+				case 'tidypics_batch':
+					require "$base/batch/edit.php";
+					break;
 				default:
-					echo 'not album';
-					exit;
 					return false;
 			}
 			break;
@@ -315,21 +313,22 @@ function tidypics_page_handler($page) {
 			include($CONFIG->pluginspath . "tidypics/pages/sortalbum.php");
 			break;
 
-		case "view": //view an image individually
-			if (isset($page[1])) {
-				set_input('guid', $page[1]);
-			}
-			include($CONFIG->pluginspath . "tidypics/pages/viewimage.php");
+		case "image": //view an image
+		case "view":
+			set_input('guid', $page[1]);
+			require "$base/image/view.php";
 			break;
-		
-		case "upload": //upload images to album
-			if (isset($page[1])) {
-				set_input('album_guid', $page[1]);
-			}
-			if (isset($page[2])) {
-				set_input('uploader', 'basic');
-			}
-			include($CONFIG->pluginspath . "tidypics/pages/photos/image/upload.php");
+
+		case "thumbnail": // tidypics thumbnail
+			set_input('guid', $page[1]);
+			set_input('size', elgg_extract(2, $page, 'small'));
+			require "$base/image/thumbnail.php";
+			break;
+
+		case "upload": // upload images to album
+			set_input('guid', $page[1]);
+			set_input('uploader', elgg_extract(2, $page, 'basic'));
+			require "$base/image/upload.php";
 			break;
 
 		case "batch": //update titles and descriptions
@@ -349,16 +348,6 @@ function tidypics_page_handler($page) {
 			include($CONFIG->pluginspath . "tidypics/pages/download.php");
 			break;
 
-		case "thumbnail": // tidypics thumbnail
-			if (isset($page[1])) {
-				set_input('file_guid', $page[1]);
-			}
-			if (isset($page[2])) {
-				set_input('size', $page[2]);
-			}
-			include($CONFIG->pluginspath . "tidypics/pages/thumbnail.php");
-			break;
-
 		case "tagged": // all photos tagged with user
 			if (isset($page[1])) {
 				set_input('guid', $page[1]);
diff --git a/views/default/forms/photos/basic_upload.php b/views/default/forms/photos/basic_upload.php
index 55ab854a4..e4535814b 100644
--- a/views/default/forms/photos/basic_upload.php
+++ b/views/default/forms/photos/basic_upload.php
@@ -1,24 +1,22 @@
 access_id;
 
-$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
-if (!$maxfilesize) {
-	$maxfilesize = 5;
-}
-
-$quota = get_plugin_setting('quota','tidypics');
+$maxfilesize = (float) elgg_get_plugin_setting('maxfilesize', 'tidypics');
+$quota = elgg_get_plugin_setting('quota', 'tidypics');
+/*
 if ($quota) {
 	$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
 	$image_repo_size = (int)$image_repo_size_md->value;
@@ -34,16 +32,6 @@ if ($quota) {
 		$image_repo_size = $quota;
 	}
 }
-
-?>
-
      
-
      
-	
-	
      
-		
      
-		
      
 		
@@ -51,54 +39,37 @@ if ($quota) {
 			
-	
      
-		
      
-		
      ...
      
-	
      
-	
        
-		' . elgg_view("input/file",array('internalname' => "upload_$x")) . '';
-		}
-		?>
-	
      
-
      
-
      
-	guid . '" />';
-	}
-	if ($access_id) {
-		echo '';
-	}
-	?>
-	" onclick="displayProgress();" />
-
      
-
-
      
-
\ No newline at end of file
+echo elgg_view('input/form', array(
+	'body' => $form_body,
+	'action' => 'action/photos/image/upload',
+	'enctype' => 'multipart/form-data',
+));
diff --git a/views/default/forms/photos/batch/edit.php b/views/default/forms/photos/batch/edit.php
new file mode 100644
index 000000000..fa017ac96
--- /dev/null
+++ b/views/default/forms/photos/batch/edit.php
@@ -0,0 +1,32 @@
+getContainerEntity();
+
+$images = elgg_get_entities_from_relationship(array(
+	'type' => 'object',
+	'subtype' => 'image',
+	'relationship' => 'belongs_to_batch',
+	'relationship_guid' => $batch->getGUID(),
+	'inverse_relationship' => true,
+));
+
+echo '
        ';
+foreach ($images as $image) {
+	echo '
      • ';
+	echo elgg_view('forms/photos/batch/edit/image', array('entity' => $image));
+	echo '
        • ';
+}
+echo '
      ';
+
+echo '
      ';
+echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+echo '
      ';
diff --git a/views/default/forms/photos/batch/edit/image.php b/views/default/forms/photos/batch/edit/image.php
new file mode 100644
index 000000000..bf982ed84
--- /dev/null
+++ b/views/default/forms/photos/batch/edit/image.php
@@ -0,0 +1,39 @@
+';
+
+echo '
      ';
+echo elgg_view('output/img', array(
+	'src' => $image->getSrcURL(),
+	'alt' => $image->getTitle(),
+	'class' => 'elgg-photo',
+));
+echo '
      ';
+
+echo '
      ';
+echo '
      ';
+echo elgg_view('input/text', array('name' => 'title[]', 'value' => $title,));
+echo '
      ';
+
+echo '
      ';
+echo elgg_view('input/longtext', array('name' => 'caption[]'));
+echo '
      ';
+
+echo '
      ';
+echo elgg_view('input/tags', array('name' => 'tags[]'));
+echo '
      ';
+
+echo elgg_view('input/hidden', array('name' => 'guid[]', 'value' => $image->getGUID()));
+echo '
      ';
+
+echo '
      '; diff --git a/views/default/object/album/full.php b/views/default/object/album/full.php index 7484a48f3..4d2d8c88b 100644 --- a/views/default/object/album/full.php +++ b/views/default/object/album/full.php @@ -41,7 +41,10 @@ $params = array( $params = $params + $vars; $summary = elgg_view('object/elements/summary', $params); -$body = elgg_list_entities(array( +$body = elgg_view('output/longtext', array( + 'value' => $album->description, +)); +$body .= elgg_list_entities(array( 'type' => 'object', 'subtype' => 'image', 'container_guid' => $album->getGUID(), diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php deleted file mode 100644 index aba6fd324..000000000 --- a/views/default/tidypics/forms/edit_multi.php +++ /dev/null @@ -1,59 +0,0 @@ -container_guid); - -?> -
      -
      -getCoverImageGuid()) { - $no_cover = true; - } - - foreach ($images as $key => $image) { - $guid = $image->guid; - $body = $image->description; - $title = $image->title; - $tags = $image->tags; - - // first one is default cover if there isn't one already - if ($no_cover) { - $val = $guid; - $no_cover = false; - } - - echo '
      '; - echo '' . $title . ''; - echo '
      '; - echo '

      '; - echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n"; - echo '

      '; - echo '

      "; - echo elgg_view("input/longtext",array("internalname" => "caption[$key]", "value" => $body, "class" => 'tidypics_caption_input',)) . "\n"; - echo "

      "; - echo '

      \n"; - echo elgg_view("input/tags", array( "internalname" => "tags[$key]","value" => $tags)) . "\n"; - echo '

      '; - echo '' . "\n"; - echo elgg_view('input/securitytoken'); - - echo elgg_view("input/radio", array("internalname" => "cover", - "value" => $val, - 'options' => array( elgg_echo('album:cover') => $guid, - ), - )); - echo '
      '; - echo '
      '; - } - -?> - -

      -
      -
      \ No newline at end of file -- cgit v1.2.3 From 9b814dd2124a8c71dec3a8d510d288f040b03b9e Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 20 Nov 2011 18:41:34 -0500 Subject: working on settings --- actions/admin/settings.php | 83 --------------------------- actions/photos/admin/settings.php | 77 +++++++++++++++++++++++++ activate.php | 32 +++++++++++ classes/TidypicsAlbum.php | 41 ++++++++++--- deactivate.php | 10 ++++ languages/en.php | 3 +- pages/photos/image/view.php | 52 +++++++++++++++++ pages/photos/owner.php | 15 ++++- pages/viewimage.php | 62 -------------------- start.php | 59 +++++++++++++------ views/default/admin/settings/tidypics.php | 11 ++++ views/default/forms/photos/admin/settings.php | 80 +++++++++++++++++++++++--- views/default/object/album/full.php | 10 +++- views/default/object/image/full.php | 66 +++++++++++++++++++++ 14 files changed, 415 insertions(+), 186 deletions(-) delete mode 100644 actions/admin/settings.php create mode 100644 actions/photos/admin/settings.php create mode 100644 activate.php create mode 100644 deactivate.php create mode 100644 pages/photos/image/view.php delete mode 100644 pages/viewimage.php create mode 100644 views/default/admin/settings/tidypics.php diff --git a/actions/admin/settings.php b/actions/admin/settings.php deleted file mode 100644 index d3801f655..000000000 --- a/actions/admin/settings.php +++ /dev/null @@ -1,83 +0,0 @@ - $v) { - if (!set_plugin_setting($k, $v, 'tidypics')) { - register_error(sprintf(elgg_echo('plugins:settings:save:fail'), 'tidypics')); - forward($_SERVER['HTTP_REFERER']); - } -} - -// check boxes -if (is_array(get_input('download_link'))) { // this can be done due to way Elgg uses checkboxes - set_plugin_setting('download_link', 'enabled', 'tidypics'); -} else { - set_plugin_setting('download_link', 'disabled', 'tidypics'); -} - -if (is_array(get_input('tagging'))) { - set_plugin_setting('tagging', 'enabled', 'tidypics'); -} else { - set_plugin_setting('tagging', 'disabled', 'tidypics'); -} - -if (is_array(get_input('photo_ratings'))) { - set_plugin_setting('photo_ratings', 'enabled', 'tidypics'); -} else { - set_plugin_setting('photo_ratings', 'disabled', 'tidypics'); -} - -if (is_array(get_input('exif'))) { - set_plugin_setting('exif', 'enabled', 'tidypics'); -} else { - set_plugin_setting('exif', 'disabled', 'tidypics'); -} - -if (is_array(get_input('view_count'))) { - set_plugin_setting('view_count', 'enabled', 'tidypics'); -} else { - set_plugin_setting('view_count', 'disabled', 'tidypics'); -} - -if (is_array(get_input('uploader'))) { - set_plugin_setting('uploader', 'enabled', 'tidypics'); -} else { - set_plugin_setting('uploader', 'disabled', 'tidypics'); -} - -if (is_array(get_input('grp_perm_override'))) { - set_plugin_setting('grp_perm_override', 'enabled', 'tidypics'); -} else { - set_plugin_setting('grp_perm_override', 'disabled', 'tidypics'); -} - - -// image sizes -$image_sizes = array(); -$image_sizes['large_image_width'] = get_input('large_thumb_width'); -$image_sizes['large_image_height'] = get_input('large_thumb_height'); -$image_sizes['small_image_width'] = get_input('small_thumb_width'); -//$image_sizes['small_image_height'] = get_input('small_thumb_height'); -$image_sizes['small_image_height'] = get_input('small_thumb_width'); -$image_sizes['thumb_image_width'] = get_input('thumb_width'); -//$image_sizes['thumb_image_height'] = get_input('thumb_height'); -$image_sizes['thumb_image_height'] = get_input('thumb_width'); -set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics'); - - - -system_message(elgg_echo('tidypics:settings:save:ok')); - -forward($_SERVER['HTTP_REFERER']); diff --git a/actions/photos/admin/settings.php b/actions/photos/admin/settings.php new file mode 100644 index 000000000..a401d9bf3 --- /dev/null +++ b/actions/photos/admin/settings.php @@ -0,0 +1,77 @@ + $v) { + if (!$plugin->setSetting($k, $v)) { + register_error(elgg_echo('plugins:settings:save:fail', array('tidypics'))); + forward(REFERER); + } +} + +system_message(elgg_echo('tidypics:settings:save:ok')); +forward(REFERER); + +// check boxes +if (is_array(get_input('download_link'))) { // this can be done due to way Elgg uses checkboxes + set_plugin_setting('download_link', 'enabled', 'tidypics'); +} else { + set_plugin_setting('download_link', 'disabled', 'tidypics'); +} + +if (is_array(get_input('tagging'))) { + set_plugin_setting('tagging', 'enabled', 'tidypics'); +} else { + set_plugin_setting('tagging', 'disabled', 'tidypics'); +} + +if (is_array(get_input('photo_ratings'))) { + set_plugin_setting('photo_ratings', 'enabled', 'tidypics'); +} else { + set_plugin_setting('photo_ratings', 'disabled', 'tidypics'); +} + +if (is_array(get_input('exif'))) { + set_plugin_setting('exif', 'enabled', 'tidypics'); +} else { + set_plugin_setting('exif', 'disabled', 'tidypics'); +} + +if (is_array(get_input('view_count'))) { + set_plugin_setting('view_count', 'enabled', 'tidypics'); +} else { + set_plugin_setting('view_count', 'disabled', 'tidypics'); +} + +if (is_array(get_input('uploader'))) { + set_plugin_setting('uploader', 'enabled', 'tidypics'); +} else { + set_plugin_setting('uploader', 'disabled', 'tidypics'); +} + +if (is_array(get_input('grp_perm_override'))) { + set_plugin_setting('grp_perm_override', 'enabled', 'tidypics'); +} else { + set_plugin_setting('grp_perm_override', 'disabled', 'tidypics'); +} + + +// image sizes +$image_sizes = array(); +$image_sizes['large_image_width'] = get_input('large_thumb_width'); +$image_sizes['large_image_height'] = get_input('large_thumb_height'); +$image_sizes['small_image_width'] = get_input('small_thumb_width'); +//$image_sizes['small_image_height'] = get_input('small_thumb_height'); +$image_sizes['small_image_height'] = get_input('small_thumb_width'); +$image_sizes['thumb_image_width'] = get_input('thumb_width'); +//$image_sizes['thumb_image_height'] = get_input('thumb_height'); +$image_sizes['thumb_image_height'] = get_input('thumb_width'); +set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics'); + diff --git a/activate.php b/activate.php new file mode 100644 index 000000000..ca74c6119 --- /dev/null +++ b/activate.php @@ -0,0 +1,32 @@ + true, +); + +foreach ($defaults as $name => $value) { + if ($plugin->getSetting($name) === null) { + $plugin->setSetting($name, $value); + } +} diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php index 18fa556e3..f1fd20669 100644 --- a/classes/TidypicsAlbum.php +++ b/classes/TidypicsAlbum.php @@ -9,12 +9,20 @@ class TidypicsAlbum extends ElggObject { - protected function initialise_attributes() { - parent::initialise_attributes(); + + /** + * Sets the internal attributes + */ + protected function initializeAttributes() { + parent::initializeAttributes(); $this->attributes['subtype'] = "album"; } + /** + * Constructor + * @param mixed $guid + */ public function __construct($guid = null) { parent::__construct($guid); } @@ -36,6 +44,8 @@ class TidypicsAlbum extends ElggObject { mkdir(tp_get_img_dir() . $this->guid, 0755, true); + elgg_trigger_event('create', 'album', $this); + return true; } @@ -68,7 +78,7 @@ class TidypicsAlbum extends ElggObject { * @param int $offset * @return array */ - public function getImages($limit, $offset=0) { + public function getImages($limit, $offset = 0) { $imageList = $this->getImageList(); if ($offset > count($imageList)) { return array(); @@ -90,7 +100,7 @@ class TidypicsAlbum extends ElggObject { * @param int $offset * @return string */ - public function viewImages($limit, $offset=0) { + public function viewImages($limit, $offset = 0) { $images = $this->getImages($limit, $offset); if (count($images) == 0) { return ''; @@ -101,9 +111,16 @@ class TidypicsAlbum extends ElggObject { return elgg_view_entity_list($images, $count, $offset, $limit, false, false, true); } + /** + * Get the URL for the album cover image + * + * @param string $size + * @return string + */ public function getCoverImageURL($size = 'small') { - if ($this->cover) { - $url = "pg/photos/thumbnail/$this->cover/$size/"; + $coverGuid = $this->getCoverImageGuid(); + if ($coverGuid) { + $url = "pg/photos/thumbnail/$coverGuid/$size/"; } else { $url = "mod/tidypics/graphics/empty_album.png"; } @@ -237,16 +254,19 @@ class TidypicsAlbum extends ElggObject { public function removeImage($imageGuid) { $imageList = $this->getImageList(); $key = array_search($imageGuid, $imageList); - if ($key === FALSE) { - return FALSE; + if ($key === false) { + return false; } unset($imageList[$key]); $this->setImageList($imageList); - return TRUE; + return true; } + /** + * Delete all the images in this album + */ protected function deleteImages() { // get all the images from this album as long as less than 999 images $images = elgg_get_entities(array( @@ -264,6 +284,9 @@ class TidypicsAlbum extends ElggObject { } } + /** + * Delete the album directory on disk + */ protected function deleteAlbumDir() { $tmpfile = new ElggFile(); $tmpfile->setFilename('image/' . $this->guid . '/._tmp_del_tidypics_album_'); diff --git a/deactivate.php b/deactivate.php new file mode 100644 index 000000000..55191a9e4 --- /dev/null +++ b/deactivate.php @@ -0,0 +1,10 @@ + "Photos", 'album' => "Photo Album", 'albums' => "Photo Albums", + 'admin:settings:tidypics' => 'Tidypics', 'photos:add' => "Create album", 'images:upload' => "Upload photos", @@ -21,7 +22,7 @@ $english = array( 'album:user' => "%s's photo albums", 'album:friends' => "Friends' photo albums", 'album:all' => "All site photo albums", - 'album:group' => "Group albums", + 'photos:group' => "Group photos", 'item:object:image' => "Photos", 'item:object:album' => "Albums", 'tidypics:uploading:images' => "Please wait. Uploading images.", diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php new file mode 100644 index 000000000..d9231eb08 --- /dev/null +++ b/pages/photos/image/view.php @@ -0,0 +1,52 @@ +getContainerEntity(); +if ($album) { + elgg_set_page_owner_guid($album->getContainerGUID()); +} +$owner = elgg_get_page_owner_entity(); + +// set up breadcrumbs +elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all'); +if (elgg_instanceof($page_owner, 'group')) { + elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); +} else { + elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); +} +elgg_push_breadcrumb($album->title, $album->getURL()); +elgg_push_breadcrumb($photo->title); + +// add download button to title menu +elgg_register_menu_item('title', array( + 'name' => 'download', + 'href' => 'photos/download', + 'text' => elgg_echo('image:download'), + 'link_class' => 'elgg-button elgg-button-action', +)); + +$content = elgg_view_entity($photo, array('full_view' => true)); + +$body = elgg_view_layout('content', array( + 'filter' => false, + 'content' => $content, + 'title' => $photo->title, + 'sidebar' => elgg_view('tidypics/sidebar', array( + 'page' => 'view', + 'image' => $photo, + )), +)); + +echo elgg_view_page($photo->title, $body); diff --git a/pages/photos/owner.php b/pages/photos/owner.php index f6582e326..214cd2e37 100644 --- a/pages/photos/owner.php +++ b/pages/photos/owner.php @@ -35,11 +35,22 @@ elgg_pop_context(); elgg_register_title_button(); -$body = elgg_view_layout('content', array( +$params = array( 'filter_context' => 'mine', 'content' => $content, 'title' => $title, 'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'owner')), -)); +); + +// don't show filter if out of filter context +if ($owner instanceof ElggGroup) { + $params['filter'] = false; +} + +if ($owner->getGUID() != elgg_get_logged_in_user_guid()) { + $params['filter_context'] = ''; +} + +$body = elgg_view_layout('content', $params); echo elgg_view_page($title, $body); diff --git a/pages/viewimage.php b/pages/viewimage.php deleted file mode 100644 index 890f7e8c4..000000000 --- a/pages/viewimage.php +++ /dev/null @@ -1,62 +0,0 @@ -owner_guid); -$album = get_entity($photo->container_guid); -if ($album) { - $owner_guid = $album->container_guid; - if ($owner_guid) { - set_page_owner($owner_guid); - } -} - - -$page_owner = page_owner_entity(); -if ($page_owner instanceof ElggGroup) { - add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); -} - -if (can_write_to_container(0, $album->container_guid)) { - add_submenu_item( elgg_echo('image:edit'), - $CONFIG->wwwroot . 'pg/photos/edit/' . $photo_guid, - 'photos'); - $ts = time(); - $token = generate_action_token($ts); - add_submenu_item( elgg_echo('image:delete'), - $CONFIG->wwwroot . 'action/tidypics/delete?guid=' . $photo_guid . '&__elgg_token=' . $token . '&__elgg_ts=' . $ts, - 'photos', - true); -} - - -$title = $photo->title; -$area2 = elgg_view_title($title); -$area2 .= elgg_view_entity($photo, true); - -$body = elgg_view_layout('two_column_left_sidebar', '', $area2); - -page_draw($title, $body); diff --git a/start.php b/start.php index fff4ebf8d..cd3a5158d 100644 --- a/start.php +++ b/start.php @@ -12,9 +12,8 @@ elgg_register_event_handler('init', 'system', 'tidypics_init'); * Tidypics plugin initialization */ function tidypics_init() { - global $CONFIG; - // include core libraries + // Include core libraries require dirname(__FILE__) . "/lib/tidypics.php"; // Set up site menu @@ -27,6 +26,13 @@ function tidypics_init() { // Extend CSS elgg_extend_view('css/elgg', 'tidypics/css'); + // Add photos link to owner block/hover menus + elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); + + // Add admin menu item + elgg_register_admin_menu_item('configure', 'tidypics', 'settings'); + +/* // Extend hover-over and profile menu elgg_extend_view('profile/menu/links','tidypics/hover_menu'); @@ -75,9 +81,9 @@ function tidypics_init() { // ajax handler for uploads when use_only_cookies is set register_plugin_hook('forward', 'system', 'tidypics_ajax_session_handler'); - +*/ // Register actions - $base_dir = $CONFIG->pluginspath . "tidypics/actions/photos"; + $base_dir = elgg_get_plugins_path() . 'tidypics/actions/photos'; elgg_register_action("photos/album/save", "$base_dir/album/save.php"); elgg_register_action("photos/delete", "$base_dir/delete.php"); elgg_register_action("photos/image/upload", "$base_dir/image/upload.php"); @@ -89,11 +95,13 @@ function tidypics_init() { register_action("tidypics/addtag", false, "$base_dir/addtag.php"); register_action("tidypics/deletetag", false, "$base_dir/deletetag.php"); - register_action("tidypics/admin/settings", false, "$base_dir/admin/settings.php", true); + elgg_register_action("photos/admin/settings", "$base_dir/admin/settings.php", 'admin'); register_action("tidypics/admin/upgrade", false, "$base_dir/admin/upgrade.php", true); - elgg_register_library('tidypics:upload', $CONFIG->pluginspath . 'tidypics/lib/upload.php'); - elgg_register_library('tidypics:resize', $CONFIG->pluginspath . 'tidypics/lib/resize.php'); + // Register libraries + $base_dir = elgg_get_plugins_path() . 'tidypics/lib'; + elgg_register_library('tidypics:upload', "$base/upload.php"); + elgg_register_library('tidypics:resize', "$base/resize.php"); } /** @@ -263,31 +271,25 @@ function tidypics_page_handler($page) { case "owned": // albums owned by container entity case "owner": - if (isset($page[1])) { - set_input('username', $page[1]); - } require "$base/owner.php"; break; case "friends": // albums of friends - if (isset($page[1])) { - set_input('username', $page[1]); - } require "$base/friends.php"; break; + case "group": // albums of a group + require "$base/owner.php"; + break; + case "album": // view an album individually - if (isset($page[1])) { - set_input('guid', $page[1]); - } + set_input('guid', $page[1]); require "$base/album/view.php"; break; case "new": // create new album case "add": - if (isset($page[1])) { - set_input('guid', $page[1]); - } + set_input('guid', $page[1]); require "$base/album/add.php"; break; @@ -392,6 +394,25 @@ function tidypics_page_handler($page) { return true; } +/** + * Add a menu item to an ownerblock + */ +function tidypics_owner_block_menu($hook, $type, $return, $params) { + if (elgg_instanceof($params['entity'], 'user')) { + $url = "photos/owner/{$params['entity']->username}"; + $item = new ElggMenuItem('photos', elgg_echo('photos'), $url); + $return[] = $item; + } else { + if ($params['entity']->blog_enable != "no") { + $url = "photos/group/{$params['entity']->guid}/all"; + $item = new ElggMenuItem('photos', elgg_echo('photos:group'), $url); + $return[] = $item; + } + } + + return $return; +} + /** * Override permissions for group albums and images * diff --git a/views/default/admin/settings/tidypics.php b/views/default/admin/settings/tidypics.php new file mode 100644 index 000000000..aaaebd371 --- /dev/null +++ b/views/default/admin/settings/tidypics.php @@ -0,0 +1,11 @@ + elgg_echo('tidypics:admin:instructions'))); + +echo elgg_view_form('photos/admin/settings'); diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php index 06b3f4cb9..ea1e12de8 100644 --- a/views/default/forms/photos/admin/settings.php +++ b/views/default/forms/photos/admin/settings.php @@ -3,18 +3,84 @@ * Tidypics admin settings form body */ -$plugin = find_plugin_settings('tidypics'); +$plugin = elgg_get_plugin_from_id('tidypics'); + +echo '
      '; +$checked = $plugin->tagging ? 'checked' : false; +echo elgg_view('input/checkbox', array( + 'name' => 'params[tagging]', + 'value' => true, + 'checked' => (bool)$plugin->tagging, +)); +echo ' ' . elgg_echo('tidypics:settings:tagging'); +echo '
      '; + +// Thumbnail sizes +echo '
      '; +echo '

      ' . elgg_echo('tidypics:settings:heading:sizes') . '

      '; +echo "
      You must edit the css if you change the default sizes
      "; +$image_sizes = unserialize($plugin->image_sizes); + +/* +if(!$image_sizes) { + $image_sizes = array(); // set default values + $image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600; + $image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153; + $image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60; +} else { + $image_sizes = unserialize($image_sizes); +} + * + */ + +$sizes = array('large', 'small', 'tiny'); +foreach ($sizes as $size) { + echo elgg_echo("tidypics:settings:{$size}size"); + echo ' width: '; + echo elgg_view('input/text', array( + 'name' => "{$size}_thumb_width", + 'value' => $image_sizes["{$size}_image_width"], + 'style' => 'width: 150px;' + )); + echo ' height: '; + echo elgg_view('input/text', array( + 'name' => "{$size}_thumb_height", + 'value' => $image_sizes["{$size}_image_height"], + 'style' => 'width: 150px;' + )); +} + +$form_body .= 'width:    '; +$form_body .= 'height:

      '; + +$form_body .= "

      " . elgg_echo('tidypics:settings:smallsize') . "
      "; +$form_body .= 'width and height:    '; +//$form_body .= 'height:

      '; + +$form_body .= "

      " . elgg_echo('tidypics:settings:thumbsize') . "
      "; +$form_body .= 'width and height:    '; +//$form_body .= 'height:

      '; +echo '
      '; + +echo elgg_view('input/submit', array('value' => elgg_echo("save"))); + +return true; // Main settings -$form_body = '

      ' . elgg_echo('tidypics:settings:heading:main') . '

      '; +echo '

      ' . elgg_echo('tidypics:settings:heading:main') . '

      '; // Tagging -$tagging = $plugin->tagging; -if (!$tagging) { - $tagging = "enabled"; -} -$form_body .= '

      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:tagging') => 'enabled'), 'internalname' => 'tagging', 'value' => $tagging )) . "

      "; +$tagging = $plugin->tagging ? $plugin->tagging : 'enabled'; +echo '
      '; +echo elgg_view("input/checkboxes", array( + 'name' => 'tagging', + 'value' => $tagging, + 'options' => array( + elgg_echo('tidypics:settings:tagging') => 'enabled' + ), +)); +echo "
      "; // Download Link $download_link = $plugin->download_link; diff --git a/views/default/object/album/full.php b/views/default/object/album/full.php index 4d2d8c88b..e350d2327 100644 --- a/views/default/object/album/full.php +++ b/views/default/object/album/full.php @@ -41,9 +41,13 @@ $params = array( $params = $params + $vars; $summary = elgg_view('object/elements/summary', $params); -$body = elgg_view('output/longtext', array( - 'value' => $album->description, -)); +$body = ''; +if ($album->description) { + $body = elgg_view('output/longtext', array( + 'value' => $album->description, + 'class' => 'mbm', + )); +} $body .= elgg_list_entities(array( 'type' => 'object', 'subtype' => 'image', diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index a4abe2daf..d08c03f9c 100644 --- a/views/default/object/image/full.php +++ b/views/default/object/image/full.php @@ -1,2 +1,68 @@ $image->getSrcURL('large'), + 'alt' => $image->getTitle(), + 'class' => 'elgg-photo', +)); + +$content = elgg_view('output/url', array( + 'text' => $img, + 'href' => $image->getURL(), +)); + +$owner_link = elgg_view('output/url', array( + 'href' => "photos/owner/" . $photo->getOwnerEntity()->username, + 'text' => $photo->getOwnerEntity()->name, +)); +$author_text = elgg_echo('byline', array($owner_link)); + +$owner_icon = elgg_view_entity_icon($photo->getOwnerEntity(), 'tiny'); + +$metadata = elgg_view_menu('entity', array( + 'entity' => $vars['entity'], + 'handler' => 'photos', + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz', +)); + +$subtitle = "$author_text $date $categories $comments_link"; + +$params = array( + 'entity' => $photo, + 'title' => false, + 'metadata' => $metadata, + 'subtitle' => $subtitle, + 'tags' => $tags, +); +$list_body = elgg_view('object/elements/summary', $params); + +$params = array('class' => 'mbl'); +$summary = elgg_view_image_block($owner_icon, $list_body, $params); + +echo $summary; + +if ($photo->description) { + echo elgg_view('output/longtext', array( + 'value' => $photo->description, + 'class' => 'mbl', + )); +} + +echo '
      '; +echo elgg_view('tidypics/tagging/help'); +echo elgg_view('tidypics/tagging/select', array('photo' => $photo)); +echo $content; +echo '
      '; + + echo elgg_view_comments($photo); \ No newline at end of file -- cgit v1.2.3 From 4bfbb194ec1f9fc2647d1cb4e946fb95492076d6 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 23 Nov 2011 15:25:48 -0500 Subject: settings are good enough for a preview release now --- actions/photos/admin/settings.php | 66 +----- activate.php | 20 ++ languages/en.php | 13 +- lib/tidypics.php | 17 ++ start.php | 1 + views/default/forms/photos/admin/settings.php | 290 ++++++++------------------ views/default/tidypics/css.php | 4 + 7 files changed, 152 insertions(+), 259 deletions(-) diff --git a/actions/photos/admin/settings.php b/actions/photos/admin/settings.php index a401d9bf3..1a4a4bdda 100644 --- a/actions/photos/admin/settings.php +++ b/actions/photos/admin/settings.php @@ -16,62 +16,16 @@ foreach ($params as $k => $v) { } } -system_message(elgg_echo('tidypics:settings:save:ok')); -forward(REFERER); - -// check boxes -if (is_array(get_input('download_link'))) { // this can be done due to way Elgg uses checkboxes - set_plugin_setting('download_link', 'enabled', 'tidypics'); -} else { - set_plugin_setting('download_link', 'disabled', 'tidypics'); -} - -if (is_array(get_input('tagging'))) { - set_plugin_setting('tagging', 'enabled', 'tidypics'); -} else { - set_plugin_setting('tagging', 'disabled', 'tidypics'); -} - -if (is_array(get_input('photo_ratings'))) { - set_plugin_setting('photo_ratings', 'enabled', 'tidypics'); -} else { - set_plugin_setting('photo_ratings', 'disabled', 'tidypics'); -} - -if (is_array(get_input('exif'))) { - set_plugin_setting('exif', 'enabled', 'tidypics'); -} else { - set_plugin_setting('exif', 'disabled', 'tidypics'); -} - -if (is_array(get_input('view_count'))) { - set_plugin_setting('view_count', 'enabled', 'tidypics'); -} else { - set_plugin_setting('view_count', 'disabled', 'tidypics'); -} - -if (is_array(get_input('uploader'))) { - set_plugin_setting('uploader', 'enabled', 'tidypics'); -} else { - set_plugin_setting('uploader', 'disabled', 'tidypics'); -} - -if (is_array(get_input('grp_perm_override'))) { - set_plugin_setting('grp_perm_override', 'enabled', 'tidypics'); -} else { - set_plugin_setting('grp_perm_override', 'disabled', 'tidypics'); -} - - // image sizes $image_sizes = array(); -$image_sizes['large_image_width'] = get_input('large_thumb_width'); -$image_sizes['large_image_height'] = get_input('large_thumb_height'); -$image_sizes['small_image_width'] = get_input('small_thumb_width'); -//$image_sizes['small_image_height'] = get_input('small_thumb_height'); -$image_sizes['small_image_height'] = get_input('small_thumb_width'); -$image_sizes['thumb_image_width'] = get_input('thumb_width'); -//$image_sizes['thumb_image_height'] = get_input('thumb_height'); -$image_sizes['thumb_image_height'] = get_input('thumb_width'); -set_plugin_setting('image_sizes', serialize($image_sizes), 'tidypics'); +$image_sizes['large_image_width'] = get_input('large_image_width'); +$image_sizes['large_image_height'] = get_input('large_image_height'); +$image_sizes['small_image_width'] = get_input('small_image_width'); +$image_sizes['small_image_height'] = get_input('small_image_height'); +$image_sizes['tiny_image_width'] = get_input('tiny_image_width'); +$image_sizes['tiny_image_height'] = get_input('tiny_image_height'); +$plugin->setSetting('image_sizes', serialize($image_sizes)); + +system_message(elgg_echo('tidypics:settings:save:ok')); +forward(REFERER); diff --git a/activate.php b/activate.php index ca74c6119..25d34338c 100644 --- a/activate.php +++ b/activate.php @@ -21,8 +21,28 @@ if (get_subtype_id('object', 'image')) { // set default settings $plugin = elgg_get_plugin_from_id('tidypics'); +$image_sizes = array(); +$image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600; +$image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153; +$image_sizes['tiny_image_width'] = $image_sizes['tiny_image_height'] = 60; +$image_sizes = serialize($image_sizes); + $defaults = array( 'tagging' => true, + 'view_count' => true, + 'uploader' => true, + 'exif' => true, + 'download_link' => true, + + 'maxfilesize' => 5, + 'image_lib' => 'GD', + + 'img_river_view' => 'batch', + 'album_river_view' => 'set', + + 'image_sizes' => $image_sizes, + + 'grp_perm_override' => true, ); foreach ($defaults as $name => $value) { diff --git a/languages/en.php b/languages/en.php index e93ee3197..58055039c 100644 --- a/languages/en.php +++ b/languages/en.php @@ -64,25 +64,30 @@ $english = array( 'tidypics:settings:download_link' => "Show download link", 'tidypics:settings:tagging' => "Enable photo tagging", 'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)", - 'tidypics:settings:exif' => "Show EXIF data", - 'tidypics:settings:view_count' => "View counter", + 'tidypics:settings:exif' => "Display EXIF data", + 'tidypics:settings:view_count' => "Display view count", 'tidypics:settings:uploader' => "Use Flash uploader", 'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums", 'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):", 'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota", 'tidypics:settings:watermark' => "Enter text to appear in the watermark", - 'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands (with trailing slash)", + 'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands", 'tidypics:settings:img_river_view' => "How many entries in activity river for each batch of uploaded images", 'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album", 'tidypics:settings:largesize' => "Primary image size", 'tidypics:settings:smallsize' => "Album view image size", - 'tidypics:settings:thumbsize' => "Thumbnail image size", + 'tidypics:settings:tinysize' => "Thumbnail image size", + 'tidypics:settings:sizes:instructs' => 'You may need to change the CSS if you change the default sizes', 'tidypics:settings:im_id' => "Image ID", 'tidypics:settings:heading:img_lib' => "Image Library Settings", 'tidypics:settings:heading:main' => "Major Settings", 'tidypics:settings:heading:river' => "Activity Integration Options", 'tidypics:settings:heading:sizes' => "Thumbnail Size", 'tidypics:settings:heading:groups' => "Group Settings", + 'tidypics:option:all' => 'All', + 'tidypics:option:none' => 'None', + 'tidypics:option:cover' => 'Cover', + 'tidypics:option:set' => 'Set', //actions 'album:create' => "Create new album", diff --git a/lib/tidypics.php b/lib/tidypics.php index 7eedb246d..0a4586c29 100644 --- a/lib/tidypics.php +++ b/lib/tidypics.php @@ -91,6 +91,23 @@ function tidypics_prepare_form_vars($entity = null) { return $values; } +function tidypics_get_image_libraries() { + $options = array(); + if (extension_loaded('gd')) { + $options['GD'] = 'GD'; + } + + if (extension_loaded('imagick')) { + $options['ImageMagickPHP'] = 'imagick PHP extension'; + } + + $disablefunc = explode(',', ini_get('disable_functions')); + if (is_callable('exec') && !in_array('exec', $disablefunc)) { + $options['ImageMagick'] = 'ImageMagick executable'; + } + + return $options; +} /********************************************************************* * the functions below replace broken core functions or add functions diff --git a/start.php b/start.php index cd3a5158d..056c1739a 100644 --- a/start.php +++ b/start.php @@ -25,6 +25,7 @@ function tidypics_init() { // Extend CSS elgg_extend_view('css/elgg', 'tidypics/css'); + elgg_extend_view('css/admin', 'tidypics/css'); // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php index ea1e12de8..5c71e24f6 100644 --- a/views/default/forms/photos/admin/settings.php +++ b/views/default/forms/photos/admin/settings.php @@ -1,134 +1,132 @@ '; + $checked = $plugin->$checkbox ? 'checked' : false; + echo elgg_view('input/checkbox', array( + 'name' => "params[$checkbox]", + 'value' => true, + 'checked' => (bool)$plugin->$checkbox, + )); + echo ' ' . elgg_echo("tidypics:settings:$checkbox"); + echo '
      '; +} + +// max image size echo '
      '; -$checked = $plugin->tagging ? 'checked' : false; -echo elgg_view('input/checkbox', array( - 'name' => 'params[tagging]', - 'value' => true, - 'checked' => (bool)$plugin->tagging, +echo elgg_echo('tidypics:settings:maxfilesize'); +echo elgg_view('input/text', array( + 'name' => 'params[maxfilesize]', + 'value' => $plugin->maxfilesize, )); -echo ' ' . elgg_echo('tidypics:settings:tagging'); echo '
      '; -// Thumbnail sizes +// image library +echo '

      ' . elgg_echo('tidypics:settings:heading:img_lib') . '

      '; +echo'
      '; +echo elgg_echo('tidypics:settings:image_lib') . ': '; +echo elgg_view('input/dropdown', array( + 'name' => 'params[image_lib]', + 'options_values' => tidypics_get_image_libraries(), + 'value' => $plugin->image_lib, +)); +echo '
      '; echo '
      '; -echo '

      ' . elgg_echo('tidypics:settings:heading:sizes') . '

      '; -echo "
      You must edit the css if you change the default sizes
      "; -$image_sizes = unserialize($plugin->image_sizes); +echo elgg_echo('tidypics:settings:im_path') . ' '; +echo elgg_view("input/text", array('name' => 'params[im_path]', 'value' => $$plugin->im_path)); +echo '
      '; -/* -if(!$image_sizes) { - $image_sizes = array(); // set default values - $image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600; - $image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153; - $image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60; -} else { - $image_sizes = unserialize($image_sizes); -} - * - */ +// river integration +echo '

      ' . elgg_echo('tidypics:settings:heading:river') . '

      '; +echo '
      '; +echo elgg_echo('tidypics:settings:img_river_view') . ': '; +echo elgg_view('input/dropdown', array( + 'name' => 'params[img_river_view]', + 'options_values' => array( + 'all' => elgg_echo('tidypics:option:all'), + 'batch' => '1', + 'none' => elgg_echo('tidypics:option:none'), + ), + 'value' => $plugin->img_river_view, +)); +echo '
      '; +echo '
      '; +echo elgg_echo('tidypics:settings:album_river_view') . ': '; +echo elgg_view('input/dropdown', array( + 'name' => 'params[album_river_view]', + 'options_values' => array( + 'cover' => elgg_echo('tidypics:option:cover'), + 'set' => elgg_echo('tidypics:option:set'), + ), + 'value' => $plugin->album_river_view, +)); +echo '
      '; + + +// thumbnail sizes +echo '
      '; +echo '

      ' . elgg_echo('tidypics:settings:heading:sizes') . '

      '; +echo '
      ' . elgg_echo('tidypics:settings:sizes:instructs') . '
      '; +$image_sizes = unserialize($plugin->image_sizes); +echo ''; $sizes = array('large', 'small', 'tiny'); foreach ($sizes as $size) { + echo ''; + echo ''; + echo ''; } - -$form_body .= 'width:    '; -$form_body .= 'height:

      '; - -$form_body .= "

      " . elgg_echo('tidypics:settings:smallsize') . "
      "; -$form_body .= 'width and height:    '; -//$form_body .= 'height:

      '; - -$form_body .= "

      " . elgg_echo('tidypics:settings:thumbsize') . "
      "; -$form_body .= 'width and height:    '; -//$form_body .= 'height:

      '; +echo '
      '; echo elgg_echo("tidypics:settings:{$size}size"); - echo ' width: '; + echo ''; + echo 'width: '; echo elgg_view('input/text', array( - 'name' => "{$size}_thumb_width", + 'name' => "{$size}_image_width", 'value' => $image_sizes["{$size}_image_width"], - 'style' => 'width: 150px;' + 'class' => 'tidypics-input-thin', )); - echo ' height: '; + echo ''; + echo 'height: '; echo elgg_view('input/text', array( - 'name' => "{$size}_thumb_height", + 'name' => "{$size}_image_height", 'value' => $image_sizes["{$size}_image_height"], - 'style' => 'width: 150px;' + 'class' => 'tidypics-input-thin', )); + echo '
      '; echo '
      '; -echo elgg_view('input/submit', array('value' => elgg_echo("save"))); -return true; - - -// Main settings -echo '

      ' . elgg_echo('tidypics:settings:heading:main') . '

      '; - -// Tagging -$tagging = $plugin->tagging ? $plugin->tagging : 'enabled'; +// Group albums +echo '

      ' . elgg_echo('tidypics:settings:heading:groups') . '

      '; echo '
      '; -echo elgg_view("input/checkboxes", array( - 'name' => 'tagging', - 'value' => $tagging, - 'options' => array( - elgg_echo('tidypics:settings:tagging') => 'enabled' - ), +$checked = $plugin->grp_perm_override ? 'checked' : false; +echo elgg_view('input/checkbox', array( + 'name' => "params[grp_perm_override]", + 'value' => true, + 'checked' => (bool)$plugin->grp_perm_override, )); -echo "
      "; +echo ' ' . elgg_echo("tidypics:settings:grp_perm_override"); +echo '
      '; -// Download Link -$download_link = $plugin->download_link; -if (!$download_link) { - $download_link = "enabled"; -} -$form_body .= '

      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:download_link') => 'enabled'), 'internalname' => 'download_link', 'value' => $download_link )) . "

      "; -// Ratings -$photo_ratings = $plugin->photo_ratings; -if (!$photo_ratings) { - $photo_ratings = "disabled"; -} -$form_body .= '

      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:photo_ratings') => 'enabled'), 'internalname' => 'photo_ratings', 'value' => $photo_ratings )) . "

      "; - -// Show EXIF -$exif = $plugin->exif; -if (!$exif) { - $exif = "disabled"; -} -$form_body .= '

      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:exif') => 'enabled'), 'internalname' => 'exif', 'value' => $exif )) . "

      "; +echo elgg_view('input/submit', array('value' => elgg_echo("save"))); -// Show View count -$view_count = $plugin->view_count; -if (!$view_count) { - $view_count = "enabled"; -} -$form_body .= '

      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "

      "; +return true; -// Use flash uploader -$uploader = $plugin->uploader; -if (!$uploader) { - $uploader = "enabled"; -} -$form_body .= '

      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:uploader') => 'enabled'), 'internalname' => 'uploader', 'value' => $uploader )) . "

      "; // Watermark Text $form_body .= "

      " . elgg_echo('tidypics:settings:watermark') . "
      "; $form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "

      "; -// Max Image Size -$maxfilesize = $plugin->maxfilesize; -if (!$maxfilesize) { - $maxfilesize = (int)5; // 5 MB -} -$form_body .= "

      " . elgg_echo('tidypics:settings:maxfilesize') . "
      "; -$form_body .= elgg_view("input/text",array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)) . "

      "; - // Quota Size $quota = $plugin->quota; if (!$quota) { @@ -137,109 +135,3 @@ if (!$quota) { $form_body .= "

      " . elgg_echo('tidypics:settings:quota') . "
      "; $form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "

      "; -// Image Library -if (extension_loaded('imagick')) { - $img_lib_options['ImageMagickPHP'] = 'imagick PHP extension'; -} - -$disablefunc = explode(',', ini_get('disable_functions')); -if (is_callable('exec') && !in_array('exec',$disablefunc)) { - $img_lib_options['ImageMagick'] = 'ImageMagick Cmdline'; -} - -$img_lib_options['GD'] = 'GD'; - -$form_body .= '

      ' . elgg_echo('tidypics:settings:heading:img_lib') . '

      '; -$image_lib = $plugin->image_lib; -if (!$image_lib) { - $image_lib = 'GD'; -} -$form_body .= '

      ' . elgg_echo('tidypics:settings:image_lib') . ': '; -$form_body .= elgg_view('input/pulldown', array( - 'internalname' => 'params[image_lib]', - 'options_values' => $img_lib_options, - 'value' => $image_lib -)); -$form_body .= '
      Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.

      '; - -if (is_callable('exec') && !in_array('exec', $disablefunc)) { - // Image Magick Path - $im_path = $plugin->im_path; - if(!$im_path) { - $im_path = ""; - } - $form_body .= "

      " . elgg_echo('tidypics:settings:im_path') . "
      "; - $form_body .= elgg_view("input/text",array('internalname' => 'params[im_path]', 'value' => $im_path)) . "

      "; -} - - -// River Image options -$form_body .= '

      ' . elgg_echo('tidypics:settings:heading:river') . '

      '; -$img_river_view = $plugin->img_river_view; -if (!$img_river_view) { - $img_river_view = 'batch'; -} -$form_body .= '

      ' . elgg_echo('tidypics:settings:img_river_view') . ': '; -$form_body .= elgg_view('input/pulldown', array( - 'internalname' => 'params[img_river_view]', - 'options_values' => array( - 'all' => 'all', - 'batch' => '1', - 'none' => 'none', - ), - 'value' => $img_river_view -)); -$form_body .= '

      '; - -// River Album options -$album_river_view = $plugin->album_river_view; -if (!$album_river_view) { - $album_river_view = 'set'; -} -$form_body .= '

      ' . elgg_echo('tidypics:settings:album_river_view') . ': '; -$form_body .= elgg_view('input/pulldown', array( - 'internalname' => 'params[album_river_view]', - 'options_values' => array( - 'cover' => 'cover', - 'set' => 'set', - ), - 'value' => $album_river_view -)); -$form_body .= '

      '; - -// Thumbnail sizes -$form_body .= '

      ' . elgg_echo('tidypics:settings:heading:sizes') . '

      '; -$form_body .= "
      You must edit the css if you change the default sizes
      "; -$image_sizes = $plugin->image_sizes; -if(!$image_sizes) { - $image_sizes = array(); // set default values - $image_sizes['large_image_width'] = $image_sizes['large_image_height'] = 600; - $image_sizes['small_image_width'] = $image_sizes['small_image_height'] = 153; - $image_sizes['thumb_image_width'] = $image_sizes['thumb_image_height'] = 60; -} else { - $image_sizes = unserialize($image_sizes); -} -$form_body .= "

      " . elgg_echo('tidypics:settings:largesize') . "
      "; -$form_body .= 'width:    '; -$form_body .= 'height:

      '; - -$form_body .= "

      " . elgg_echo('tidypics:settings:smallsize') . "
      "; -$form_body .= 'width and height:    '; -//$form_body .= 'height:

      '; - -$form_body .= "

      " . elgg_echo('tidypics:settings:thumbsize') . "
      "; -$form_body .= 'width and height:    '; -//$form_body .= 'height:

      '; - - -// Group permission override -$form_body .= '

      ' . elgg_echo('tidypics:settings:heading:groups') . '

      '; -$grp_perm_override = $plugin->grp_perm_override; -if (!$grp_perm_override) { - $grp_perm_override = "enabled"; -} -$form_body .= '

      ' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:grp_perm_override') => 'enabled'), 'internalname' => 'grp_perm_override', 'value' => $grp_perm_override )) . "

      "; - -$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))); - -echo $form_body; diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index bf47d42b7..e35b8e73f 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -11,6 +11,10 @@ margin: 5px 10px; } +.tidypics-input-thin { + width: 120px; +} + -- cgit v1.2.3 From 0aa823656bf92ae472cb6780afb24f5a0390b880 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 23 Nov 2011 16:50:04 -0500 Subject: added editing of images --- actions/photos/image/save.php | 40 +++++++++++++++++ classes/TidypicsAlbum.php | 11 +++++ classes/TidypicsImage.php | 17 +++++-- languages/en.php | 1 + lib/resize.php | 16 +++---- lib/upload.php | 4 +- pages/photos/album/edit.php | 1 + pages/photos/all.php | 5 ++- pages/photos/friends.php | 5 ++- pages/photos/image/edit.php | 54 ++++++++++++++++++++++ pages/photos/owner.php | 6 +-- start.php | 74 ++++++++++++++++++++++--------- views/default/forms/photos/image/save.php | 48 ++++++++++++++++++++ 13 files changed, 242 insertions(+), 40 deletions(-) create mode 100644 actions/photos/image/save.php create mode 100644 pages/photos/image/edit.php create mode 100644 views/default/forms/photos/image/save.php diff --git a/actions/photos/image/save.php b/actions/photos/image/save.php new file mode 100644 index 000000000..535ae8bbb --- /dev/null +++ b/actions/photos/image/save.php @@ -0,0 +1,40 @@ +access_id = $access_id; +$image->title = $title; +$image->description = $description; +if ($tags) { + $image->tags = string_to_tag_array($tags); +} + +if (!$image->save()) { + register_error(elgg_echo("image:error")); + forward(REFERER); +} + +elgg_clear_sticky_form('tidypics'); + +system_message(elgg_echo("image:saved")); +forward($image->getURL()); diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php index f1fd20669..f85b66d72 100644 --- a/classes/TidypicsAlbum.php +++ b/classes/TidypicsAlbum.php @@ -71,6 +71,17 @@ class TidypicsAlbum extends ElggObject { return $this->title; } + /** + * Get the URL for this album + * + * @return string + */ + public function getURL() { + $title = elgg_get_friendly_title($this->getTitle()); + $url = "photos/album/$this->guid/$title"; + return elgg_normalize_url($url); + } + /** * Get an array of image objects * diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index c604d869e..926bc386b 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -9,8 +9,8 @@ class TidypicsImage extends ElggFile { - protected function initialise_attributes() { - parent::initialise_attributes(); + protected function initializeAttributes() { + parent::initializeAttributes(); $this->attributes['subtype'] = "image"; } @@ -51,6 +51,17 @@ class TidypicsImage extends ElggFile { return $this->title; } + /** + * Get the URL for the web page of this image + * + * @return string + */ + public function getURL() { + $title = elgg_get_friendly_title($this->getTitle()); + $url = "photos/image/$this->guid/$title"; + return elgg_normalize_url($url); + } + /** * Get the src URL for the image * @@ -312,7 +323,7 @@ class TidypicsImage extends ElggFile { * @param $viewer_guid the guid of the viewer (0 if not logged in) * @return array with number of views, number of unique viewers, and number of views for this viewer */ - public function getViews($viewer_guid) { + public function getViewCount($viewer_guid) { $views = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 99999); if ($views) { $total_views = count($views); diff --git a/languages/en.php b/languages/en.php index 58055039c..96b63c170 100644 --- a/languages/en.php +++ b/languages/en.php @@ -53,6 +53,7 @@ $english = array( 'tidypics:nophotosingroup' => 'This groups does not have any photos yet', 'tidypics:upgrade' => 'Upgrade', 'tidypics:sort' => 'Sorting the %s album', + 'tidypics:none' => 'No photo albums', //settings 'tidypics:settings' => 'Settings', diff --git a/lib/resize.php b/lib/resize.php index 857d0ba1c..78b5290e6 100644 --- a/lib/resize.php +++ b/lib/resize.php @@ -19,11 +19,11 @@ include dirname(__FILE__) . "/watermark.php"; function tp_create_gd_thumbnails($file, $prefix, $filestorename) { global $CONFIG; - $image_sizes = get_plugin_setting('image_sizes', 'tidypics'); + $image_sizes = elgg_get_plugin_setting('image_sizes', 'tidypics'); if (!$image_sizes) { // move this out of library register_error(elgg_echo('tidypics:nosettings')); - forward($_SERVER['HTTP_REFERER']); + forward(REFERER); return FALSE; } $image_sizes = unserialize($image_sizes); @@ -38,8 +38,8 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) { $rtn_code = tp_gd_resize( $file->getFilenameOnFilestore(), $thumbname, FALSE, - $image_sizes['thumb_image_width'], - $image_sizes['thumb_image_height'], + $image_sizes['tiny_image_width'], + $image_sizes['tiny_image_height'], TRUE); if (!$rtn_code) { return FALSE; @@ -209,8 +209,8 @@ function tp_create_imagick_thumbnails($file, $prefix, $filestorename) { $thumbname = $thumb->getFilenameOnFilestore(); $rtn_code = tp_imagick_resize( $file->getFilenameOnFilestore(), $thumbname, - $image_sizes['thumb_image_width'], - $image_sizes['thumb_image_height'], + $image_sizes['tiny_image_width'], + $image_sizes['tiny_image_height'], TRUE); if (!$rtn_code) { return FALSE; @@ -335,8 +335,8 @@ function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) { $thumbname = $thumb->getFilenameOnFilestore(); $rtn_code = tp_im_cmdline_resize( $file->getFilenameOnFilestore(), $thumbname, - $image_sizes['thumb_image_width'], - $image_sizes['thumb_image_height'], + $image_sizes['tiny_image_width'], + $image_sizes['tiny_image_height'], TRUE); if (!$rtn_code) { return FALSE; diff --git a/lib/upload.php b/lib/upload.php index 30540dced..0b034517c 100644 --- a/lib/upload.php +++ b/lib/upload.php @@ -82,7 +82,7 @@ function tp_upload_memory_check($image_lib, $num_pixels) { * @return bool false = too large */ function tp_upload_check_max_size($image_size) { - $max_file_size = (float) get_plugin_setting('maxfilesize','tidypics'); + $max_file_size = (float) elgg_get_plugin_setting('maxfilesize', 'tidypics'); if (!$max_file_size) { // default to 5 MB if not set $max_file_size = 5; @@ -103,7 +103,7 @@ function tp_upload_check_quota($image_size, $owner_guid) { static $quota; if (!isset($quota)) { - $quota = get_plugin_setting('quota','tidypics'); + $quota = elgg_get_plugin_setting('quota', 'tidypics'); $quota = 1024 * 1024 * $quota; } diff --git a/pages/photos/album/edit.php b/pages/photos/album/edit.php index 6fff50b29..7efb05ce1 100644 --- a/pages/photos/album/edit.php +++ b/pages/photos/album/edit.php @@ -33,6 +33,7 @@ if (elgg_instanceof($owner, 'user')) { } else { elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); } +elgg_push_breadcrumb($entity->getTitle(), $entity->getURL()); elgg_push_breadcrumb($title); $vars = tidypics_prepare_form_vars($entity); diff --git a/pages/photos/all.php b/pages/photos/all.php index edda65ce0..aef7f11c6 100644 --- a/pages/photos/all.php +++ b/pages/photos/all.php @@ -10,7 +10,6 @@ elgg_push_breadcrumb(elgg_echo('photos')); $num_albums = 16; -elgg_push_context('tidypics:main'); $offset = (int)get_input('offset', 0); $content = elgg_list_entities(array( 'type' => 'object', @@ -21,7 +20,9 @@ $content = elgg_list_entities(array( 'list_type_toggle' => false, 'gallery_class' => 'tidypics-gallery', )); -elgg_pop_context(); +if (!$content) { + $content = elgg_echo('tidypics:none'); +} $title = elgg_echo('album:all'); diff --git a/pages/photos/friends.php b/pages/photos/friends.php index b7b6178c5..e6ac49cc6 100644 --- a/pages/photos/friends.php +++ b/pages/photos/friends.php @@ -17,10 +17,11 @@ $title = elgg_echo('album:friends'); $num_albums = 16; -elgg_push_context('tidypics:main'); set_input('list_type', 'gallery'); $content = list_user_friends_objects($owner->guid, 'album', $num_albums, false); -elgg_pop_context(); +if (!$content) { + $content = elgg_echo('tidypics:none'); +} elgg_register_title_button(); diff --git a/pages/photos/image/edit.php b/pages/photos/image/edit.php new file mode 100644 index 000000000..76c1381c9 --- /dev/null +++ b/pages/photos/image/edit.php @@ -0,0 +1,54 @@ +canEdit()) { + // @todo cannot change it + forward($entity->getContainerEntity()->getURL()); +} + +$album = $entity->getContainerEntity(); +if (!$album) { + +} + +elgg_set_page_owner_guid($album->getContainerGUID()); +$owner = elgg_get_page_owner_entity(); + +gatekeeper(); +group_gatekeeper(); + +$title = elgg_echo('image:edit'); + +// set up breadcrumbs +elgg_push_breadcrumb(elgg_echo('photos'), "photos/all"); +if (elgg_instanceof($owner, 'user')) { + elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); +} else { + elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); +} +elgg_push_breadcrumb($album->getTitle(), $album->getURL()); +elgg_push_breadcrumb($entity->getTitle(), $entity->getURL()); +elgg_push_breadcrumb($title); + +$vars = tidypics_prepare_form_vars($entity); +$content = elgg_view_form('photos/image/save', array('method' => 'post'), $vars); + +$body = elgg_view_layout('content', array( + 'content' => $content, + 'title' => $title, + 'filter' => '', +)); + +echo elgg_view_page($title, $body); diff --git a/pages/photos/owner.php b/pages/photos/owner.php index 214cd2e37..506cb569b 100644 --- a/pages/photos/owner.php +++ b/pages/photos/owner.php @@ -10,7 +10,6 @@ group_gatekeeper(); $owner = elgg_get_page_owner_entity(); -//set the title $title = elgg_echo('album:user', array($owner->name)); // set up breadcrumbs @@ -20,7 +19,6 @@ elgg_push_breadcrumb($owner->name); $num_albums = 16; -elgg_push_context('tidypics:main'); $content = elgg_list_entities(array( 'type' => 'object', 'subtype' => 'album', @@ -31,7 +29,9 @@ $content = elgg_list_entities(array( 'list_type_toggle' => false, 'gallery_class' => 'tidypics-gallery', )); -elgg_pop_context(); +if (!$content) { + $content = elgg_echo('tidypics:none'); +} elgg_register_title_button(); diff --git a/start.php b/start.php index 056c1739a..1c548b90b 100644 --- a/start.php +++ b/start.php @@ -23,6 +23,9 @@ function tidypics_init() { 'text' => elgg_echo('photos'), )); + // Register a page handler so we can have nice URLs + elgg_register_page_handler('photos', 'tidypics_page_handler'); + // Extend CSS elgg_extend_view('css/elgg', 'tidypics/css'); elgg_extend_view('css/admin', 'tidypics/css'); @@ -33,6 +36,13 @@ function tidypics_init() { // Add admin menu item elgg_register_admin_menu_item('configure', 'tidypics', 'settings'); + // Register for search + elgg_register_entity_type('object', 'image'); + elgg_register_entity_type('object', 'album'); + + // Register for the entity menu + elgg_register_plugin_hook_handler('register', 'menu:entity', 'tidypics_entity_menu_setup'); + /* // Extend hover-over and profile menu elgg_extend_view('profile/menu/links','tidypics/hover_menu'); @@ -44,8 +54,6 @@ function tidypics_init() { elgg_extend_view('extensions/xmlns', 'extensions/tidypics/xmlns'); elgg_extend_view('extensions/channel', 'extensions/tidypics/channel'); - // Register a page handler so we can have nice URLs - elgg_register_page_handler('photos', 'tidypics_page_handler'); // register for menus //register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus'); @@ -59,14 +67,6 @@ function tidypics_init() { register_entity_url_handler('tidypics_image_url', 'object', 'image'); register_entity_url_handler('tidypics_album_url', 'object', 'album'); - // add the class files for image and album - add_subtype("object", "image", "TidypicsImage"); - add_subtype("object", "album", "TidypicsAlbum"); - - // Register entity type - register_entity_type('object','image'); - register_entity_type('object','album'); - add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true); if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled") { @@ -88,21 +88,22 @@ function tidypics_init() { elgg_register_action("photos/album/save", "$base_dir/album/save.php"); elgg_register_action("photos/delete", "$base_dir/delete.php"); elgg_register_action("photos/image/upload", "$base_dir/image/upload.php"); + elgg_register_action("photos/image/save", "$base_dir/image/save.php"); elgg_register_action("photos/batch/edit", "$base_dir/batch/edit.php"); - register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php"); - register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php"); - register_action("tidypics/sortalbum", false, "$base_dir/sortalbum.php"); - register_action("tidypics/edit", false, "$base_dir/edit.php"); - register_action("tidypics/addtag", false, "$base_dir/addtag.php"); - register_action("tidypics/deletetag", false, "$base_dir/deletetag.php"); + //register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php"); + //register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php"); + //register_action("tidypics/sortalbum", false, "$base_dir/sortalbum.php"); + //register_action("tidypics/edit", false, "$base_dir/edit.php"); + //register_action("tidypics/addtag", false, "$base_dir/addtag.php"); + //register_action("tidypics/deletetag", false, "$base_dir/deletetag.php"); elgg_register_action("photos/admin/settings", "$base_dir/admin/settings.php", 'admin'); - register_action("tidypics/admin/upgrade", false, "$base_dir/admin/upgrade.php", true); + //register_action("tidypics/admin/upgrade", false, "$base_dir/admin/upgrade.php", true); // Register libraries $base_dir = elgg_get_plugins_path() . 'tidypics/lib'; - elgg_register_library('tidypics:upload', "$base/upload.php"); - elgg_register_library('tidypics:resize', "$base/resize.php"); + elgg_register_library('tidypics:upload', "$base_dir/upload.php"); + elgg_register_library('tidypics:resize', "$base_dir/resize.php"); } /** @@ -264,7 +265,7 @@ function tidypics_page_handler($page) { } $base = elgg_get_plugins_path() . 'tidypics/pages/photos'; - switch($page[0]) { + switch ($page[0]) { case "all": // all site albums case "world": require "$base/all.php"; @@ -301,6 +302,9 @@ function tidypics_page_handler($page) { case 'album': require "$base/album/edit.php"; break; + case 'image': + require "$base/image/edit.php"; + break; case 'tidypics_batch': require "$base/batch/edit.php"; break; @@ -414,6 +418,36 @@ function tidypics_owner_block_menu($hook, $type, $return, $params) { return $return; } +/** + * Add particular blog links/info to entity menu + */ +function tidypics_entity_menu_setup($hook, $type, $return, $params) { + if (elgg_in_context('widgets')) { + return $return; + } + + $entity = $params['entity']; + $handler = elgg_extract('handler', $params, false); + if ($handler != 'photos') { + return $return; + } + + if (elgg_instanceof($entity, 'object', 'image')) { + if (elgg_get_plugin_setting('view_count', 'tidypics')) { + $status_text = '27 views'; + $options = array( + 'name' => 'published_status', + 'text' => "$status_text", + 'href' => false, + 'priority' => 90, + ); + $return[] = ElggMenuItem::factory($options); + } + } + + return $return; +} + /** * Override permissions for group albums and images * diff --git a/views/default/forms/photos/image/save.php b/views/default/forms/photos/image/save.php new file mode 100644 index 000000000..47a08640a --- /dev/null +++ b/views/default/forms/photos/image/save.php @@ -0,0 +1,48 @@ + + +
      + + 'title', 'value' => $title)); ?> +
      +
      + + 'description', 'value' => $description)); ?> +
      +
      + + 'tags', 'value' => $tags)); ?> +
      + +
      + + 'access_id', 'value' => $access_id)); ?> +
      +
      + 'guid', 'value' => $guid)); +echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid)); +echo elgg_view('input/submit', array('value' => elgg_echo('save'))); +?> +
      -- cgit v1.2.3 From 47bd8586910b1df3f29e2425572372e382b26f6a Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 23 Nov 2011 18:46:41 -0500 Subject: added support for group albums --- pages/photos/album/view.php | 6 +++- start.php | 45 +++-------------------------- views/default/object/album.php | 6 +++- views/default/object/album/gallery.php | 41 +++++++++++++++++++++++++++ views/default/object/album/list.php | 52 ++++++++++++++++++++++++++++++++++ views/default/object/album/summary.php | 41 --------------------------- views/default/photos/group_module.php | 45 +++++++++++++++++++++++++++++ 7 files changed, 152 insertions(+), 84 deletions(-) create mode 100644 views/default/object/album/gallery.php create mode 100644 views/default/object/album/list.php delete mode 100644 views/default/object/album/summary.php create mode 100644 views/default/photos/group_module.php diff --git a/pages/photos/album/view.php b/pages/photos/album/view.php index aafcf14bc..39816b299 100644 --- a/pages/photos/album/view.php +++ b/pages/photos/album/view.php @@ -23,7 +23,11 @@ $title = elgg_echo($album->getTitle()); // set up breadcrumbs elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all'); -elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); +if (elgg_instanceof($owner, 'group')) { + elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); +} else { + elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); +} elgg_push_breadcrumb($album->getTitle()); $content = elgg_view_entity($album, array('full_view' => true)); diff --git a/start.php b/start.php index 1c548b90b..b57ffb73e 100644 --- a/start.php +++ b/start.php @@ -43,10 +43,11 @@ function tidypics_init() { // Register for the entity menu elgg_register_plugin_hook_handler('register', 'menu:entity', 'tidypics_entity_menu_setup'); -/* - // Extend hover-over and profile menu - elgg_extend_view('profile/menu/links','tidypics/hover_menu'); + // Add group option + add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true); + elgg_extend_view('groups/tool_latest', 'photos/group_module'); +/* //group view ** psuedo widget view for group pages** elgg_extend_view('groups/right_column','tidypics/groupprofile_albums'); @@ -57,16 +58,11 @@ function tidypics_init() { // register for menus //register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus'); - register_elgg_event_handler('pagesetup', 'system', 'tidypics_adminmenu'); // Add a new tidypics widget add_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile'); add_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile'); - // Register a URL handler for files - register_entity_url_handler('tidypics_image_url', 'object', 'image'); - register_entity_url_handler('tidypics_album_url', 'object', 'album'); - add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true); if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled") { @@ -224,17 +220,6 @@ function tidypics_submenus() { } -/** - * Sets up tidypics admin menu. Triggered on pagesetup. - */ -function tidypics_adminmenu() { - global $CONFIG; - - if (get_context() == 'admin' && isadminloggedin()) { - add_submenu_item(elgg_echo('tidypics:administration'), $CONFIG->url . "pg/photos/admin/"); - } -} - /** * Sets up submenus for tidypics most viewed pages */ @@ -500,28 +485,6 @@ function tidypics_notify_message($hook, $type, $result, $params) { return null; } -/** - * Populates the ->getUrl() method for file objects - * Registered in the init function - * - * @param ElggEntity $entity album/image entity - * @return string File URL - */ -function tidypics_image_url($entity) { - global $CONFIG; - $title = $entity->title; - $title = friendly_title($title); - return $CONFIG->url . "pg/photos/view/" . $entity->getGUID() . "/" . $title; -} - -function tidypics_album_url($entity) { - global $CONFIG; - $title = $entity->title; - $title = friendly_title($title); - return $CONFIG->url . "pg/photos/album/" . $entity->getGUID() . "/" . $title; -} - - /** * Catch the plugin hook and add the default album slideshow * diff --git a/views/default/object/album.php b/views/default/object/album.php index 51b25b7da..bfcfd96d2 100644 --- a/views/default/object/album.php +++ b/views/default/object/album.php @@ -14,5 +14,9 @@ $full_view = elgg_extract('full_view', $vars, false); if ($full_view) { echo elgg_view('object/album/full', $vars); } else { - echo elgg_view('object/album/summary', $vars); + if (elgg_in_context('widgets')) { + echo elgg_view('object/album/list', $vars); + } else { + echo elgg_view('object/album/gallery', $vars); + } } diff --git a/views/default/object/album/gallery.php b/views/default/object/album/gallery.php new file mode 100644 index 000000000..78eec3517 --- /dev/null +++ b/views/default/object/album/gallery.php @@ -0,0 +1,41 @@ + $album->getCoverImageURL(), + 'alt' => $album->getTitle(), + 'class' => 'elgg-photo', +)); + +$header = elgg_view('output/url', array( + 'text' => $album->getTitle(), + 'href' => $album->getURL(), +)); + +$body = elgg_view('output/url', array( + 'text' => $album_cover, + 'href' => $album->getURL(), + 'encode_text' => false, + 'is_trusted' => true, +)); + +$footer = elgg_view('output/url', array( + 'text' => $album->getContainerEntity()->name, + 'href' => $album->getContainerEntity()->getURL(), + 'is_trusted' => true, +)); +$footer .= '
      ' . elgg_echo('album:num', array($album->getSize())) . '
      '; + +$params = array( + 'footer' => $footer, +); +echo elgg_view_module('tidypics-album', $header, $body, $params); diff --git a/views/default/object/album/list.php b/views/default/object/album/list.php new file mode 100644 index 000000000..ccbd01cd1 --- /dev/null +++ b/views/default/object/album/list.php @@ -0,0 +1,52 @@ +getOwnerEntity(); + +$owner_link = elgg_view('output/url', array( + 'href' => "photos/owner/$owner->username", + 'text' => $owner->name, + 'is_trusted' => true, +)); +$author_text = elgg_echo('byline', array($owner_link)); +$date = elgg_view_friendly_time($album->time_created); +$categories = elgg_view('output/categories', $vars); + +$subtitle = "$author_text $date $categories"; + +$title = elgg_view('output/url', array( + 'text' => $album->getTitle(), + 'href' => $album->getURL(), +)); + +$params = array( + 'entity' => $album, + 'title' => $title, + 'metadata' => null, + 'subtitle' => $subtitle, + 'tags' => elgg_view('output/tags', array('tags' => $album->tags)), +); +$params = $params + $vars; +$summary = elgg_view('object/elements/summary', $params); + +$cover = elgg_view('output/img', array( + 'src' => $album->getCoverImageURL('thumb'), + 'alt' => $album->getTitle(), + 'class' => 'elgg-photo', +)); +$icon = elgg_view('output/url', array( + 'text' => $cover, + 'href' => $album->getURL(), + 'encode_text' => false, + 'is_trusted' => true, +)); + +echo $header = elgg_view_image_block($icon, $summary); diff --git a/views/default/object/album/summary.php b/views/default/object/album/summary.php deleted file mode 100644 index 78eec3517..000000000 --- a/views/default/object/album/summary.php +++ /dev/null @@ -1,41 +0,0 @@ - $album->getCoverImageURL(), - 'alt' => $album->getTitle(), - 'class' => 'elgg-photo', -)); - -$header = elgg_view('output/url', array( - 'text' => $album->getTitle(), - 'href' => $album->getURL(), -)); - -$body = elgg_view('output/url', array( - 'text' => $album_cover, - 'href' => $album->getURL(), - 'encode_text' => false, - 'is_trusted' => true, -)); - -$footer = elgg_view('output/url', array( - 'text' => $album->getContainerEntity()->name, - 'href' => $album->getContainerEntity()->getURL(), - 'is_trusted' => true, -)); -$footer .= '
      ' . elgg_echo('album:num', array($album->getSize())) . '
      '; - -$params = array( - 'footer' => $footer, -); -echo elgg_view_module('tidypics-album', $header, $body, $params); diff --git a/views/default/photos/group_module.php b/views/default/photos/group_module.php new file mode 100644 index 000000000..aa0e7b3ff --- /dev/null +++ b/views/default/photos/group_module.php @@ -0,0 +1,45 @@ +photos_enable == "no") { + return true; +} + +$all_link = elgg_view('output/url', array( + 'href' => "photos/group/$group->guid/all", + 'text' => elgg_echo('link:view:all'), + 'is_trusted' => true, +)); + +elgg_push_context('widgets'); +$options = array( + 'type' => 'object', + 'subtype' => 'album', + 'container_guid' => elgg_get_page_owner_guid(), + 'limit' => 6, + 'full_view' => false, + 'pagination' => false, +); +$content = elgg_list_entities($options); +elgg_pop_context(); + +if (!$content) { + $content = '

      ' . elgg_echo('tidypics:none') . '

      '; +} + +$new_link = elgg_view('output/url', array( + 'href' => "photos/add/$group->guid", + 'text' => elgg_echo('photos:add'), + 'is_trusted' => true, +)); + +echo elgg_view('groups/profile/module', array( + 'title' => elgg_echo('photos:group'), + 'content' => $content, + 'all_link' => $all_link, + 'add_link' => $new_link, +)); -- cgit v1.2.3 From 22afb49f30fc9bcd6be84f734e89a9b644f2fb0f Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 26 Nov 2011 14:08:38 -0500 Subject: updated widgets for 1.8 --- start.php | 12 ++++---- views/default/object/album/gallery.php | 2 +- views/default/tidypics/css.php | 7 +++++ views/default/widgets/album_view/content.php | 14 +++++++++ views/default/widgets/album_view/edit.php | 39 ++++++++++++------------- views/default/widgets/album_view/view.php | 14 --------- views/default/widgets/latest_photos/content.php | 15 ++++++++++ views/default/widgets/latest_photos/edit.php | 29 ++++++++++-------- views/default/widgets/latest_photos/view.php | 16 ---------- 9 files changed, 77 insertions(+), 71 deletions(-) create mode 100644 views/default/widgets/album_view/content.php delete mode 100644 views/default/widgets/album_view/view.php create mode 100644 views/default/widgets/latest_photos/content.php delete mode 100644 views/default/widgets/latest_photos/view.php diff --git a/start.php b/start.php index b57ffb73e..f58e26e8c 100644 --- a/start.php +++ b/start.php @@ -43,13 +43,15 @@ function tidypics_init() { // Register for the entity menu elgg_register_plugin_hook_handler('register', 'menu:entity', 'tidypics_entity_menu_setup'); - // Add group option + // Register group option add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true); elgg_extend_view('groups/tool_latest', 'photos/group_module'); + // Register widgets + elgg_register_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile'); + elgg_register_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile'); + /* - //group view ** psuedo widget view for group pages** - elgg_extend_view('groups/right_column','tidypics/groupprofile_albums'); // rss extensions elgg_extend_view('extensions/xmlns', 'extensions/tidypics/xmlns'); @@ -59,11 +61,7 @@ function tidypics_init() { // register for menus //register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus'); - // Add a new tidypics widget - add_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile'); - add_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile'); - add_group_tool_option('photos', elgg_echo('tidypics:enablephotos'), true); if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled") { register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override'); diff --git a/views/default/object/album/gallery.php b/views/default/object/album/gallery.php index 78eec3517..ee22f0436 100644 --- a/views/default/object/album/gallery.php +++ b/views/default/object/album/gallery.php @@ -1,6 +1,6 @@ li { + width: 100%; +} + .tidypics-input-thin { width: 120px; diff --git a/views/default/widgets/album_view/content.php b/views/default/widgets/album_view/content.php new file mode 100644 index 000000000..d6476f075 --- /dev/null +++ b/views/default/widgets/album_view/content.php @@ -0,0 +1,14 @@ + 'object', + 'subtype' => 'album', + 'container_guid' => elgg_get_page_owner_guid(), + 'limit' => $vars['entity']->num_display, + 'full_view' => false, + 'pagination' => false, +); +echo elgg_list_entities($options); diff --git a/views/default/widgets/album_view/edit.php b/views/default/widgets/album_view/edit.php index 9068ffe17..fde8b87b0 100644 --- a/views/default/widgets/album_view/edit.php +++ b/views/default/widgets/album_view/edit.php @@ -1,25 +1,22 @@ -

      -num_display == '') { +// set default value +if (!isset($vars['entity']->num_display)) { $vars['entity']->num_display = 5; } + +$params = array( + 'name' => 'params[num_display]', + 'value' => $vars['entity']->num_display, + 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20), +); +$dropdown = elgg_view('input/dropdown', $params); + ?> - -

      \ No newline at end of file +
      + : + +
      diff --git a/views/default/widgets/album_view/view.php b/views/default/widgets/album_view/view.php deleted file mode 100644 index 1b980aa8b..000000000 --- a/views/default/widgets/album_view/view.php +++ /dev/null @@ -1,14 +0,0 @@ -
      -num_display; -//if no number has been set, default to 5 -if (!$number) { - $number = 5; -} - -echo elgg_view('tidypics/albums', array('num_albums' => $number)); - -?> -
      \ No newline at end of file diff --git a/views/default/widgets/latest_photos/content.php b/views/default/widgets/latest_photos/content.php new file mode 100644 index 000000000..ecd72aec4 --- /dev/null +++ b/views/default/widgets/latest_photos/content.php @@ -0,0 +1,15 @@ + 'object', + 'subtype' => 'image', + 'limit' => $vars['entity']->num_display, + 'owner_guid' => elgg_get_page_owner_guid(), + 'full_view' => false, + 'list_type' => 'gallery', + 'list_type_toggle' => false, + 'gallery_class' => 'tidypics-gallery-widget', +)); diff --git a/views/default/widgets/latest_photos/edit.php b/views/default/widgets/latest_photos/edit.php index 06693648d..ac870c9f8 100644 --- a/views/default/widgets/latest_photos/edit.php +++ b/views/default/widgets/latest_photos/edit.php @@ -1,17 +1,22 @@ -

      -num_display == '') { +// set default value +if (!isset($vars['entity']->num_display)) { $vars['entity']->num_display = 6; } +$params = array( + 'name' => 'params[num_display]', + 'value' => $vars['entity']->num_display, + 'options' => array(3, 6, 9, 12), +); +$dropdown = elgg_view('input/dropdown', $params); + ?> - -

      \ No newline at end of file +
      + : + +
      diff --git a/views/default/widgets/latest_photos/view.php b/views/default/widgets/latest_photos/view.php deleted file mode 100644 index 108d070c9..000000000 --- a/views/default/widgets/latest_photos/view.php +++ /dev/null @@ -1,16 +0,0 @@ -
      -num_display; -//if no number has been set, default to 6 -if (!$number) { - $number = 6; -} - -echo '
      '; -echo tp_get_latest_photos($number, page_owner(), 'widget'); -echo '
      '; - -?> -
      \ No newline at end of file -- cgit v1.2.3 From ca5a35607dfb277cecba120ce27eece7c59f270a Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 26 Nov 2011 16:35:25 -0500 Subject: fixed RSS feeds for Elgg 1.8 --- classes/TidypicsImage.php | 2 +- start.php | 6 +-- views/rss/extensions/photos/xmlns.php | 9 +++++ views/rss/extensions/tidypics/channel.php | 1 - views/rss/extensions/tidypics/xmlns.php | 1 - views/rss/object/album.php | 64 +++++-------------------------- views/rss/object/album/full.php | 16 ++++++++ views/rss/object/album/summary.php | 33 ++++++++++++++++ views/rss/object/file.php | 23 ----------- views/rss/object/image.php | 57 +++++++++++++++++++-------- views/rss/tidypics/content_wrapper.php | 2 - views/rss/tidypics/gallery.php | 16 -------- 12 files changed, 112 insertions(+), 118 deletions(-) create mode 100644 views/rss/extensions/photos/xmlns.php delete mode 100644 views/rss/extensions/tidypics/channel.php delete mode 100644 views/rss/extensions/tidypics/xmlns.php create mode 100644 views/rss/object/album/full.php create mode 100644 views/rss/object/album/summary.php delete mode 100644 views/rss/object/file.php delete mode 100644 views/rss/tidypics/content_wrapper.php delete mode 100644 views/rss/tidypics/gallery.php diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index 926bc386b..a37e0dc38 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -68,7 +68,7 @@ class TidypicsImage extends ElggFile { * @return string */ public function getSrcUrl($size = 'small') { - return "photos/thumbnail/$this->guid/$size/"; + return elgg_normalize_url("photos/thumbnail/$this->guid/$size/"); } /** diff --git a/start.php b/start.php index f58e26e8c..817578607 100644 --- a/start.php +++ b/start.php @@ -51,11 +51,11 @@ function tidypics_init() { elgg_register_widget_type('album_view', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:album_descr"), 'profile'); elgg_register_widget_type('latest_photos', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), 'profile'); + // RSS extensions for embedded media + elgg_extend_view('extensions/xmlns', 'extensions/photos/xmlns'); + /* - // rss extensions - elgg_extend_view('extensions/xmlns', 'extensions/tidypics/xmlns'); - elgg_extend_view('extensions/channel', 'extensions/tidypics/channel'); // register for menus diff --git a/views/rss/extensions/photos/xmlns.php b/views/rss/extensions/photos/xmlns.php new file mode 100644 index 000000000..67cf45133 --- /dev/null +++ b/views/rss/extensions/photos/xmlns.php @@ -0,0 +1,9 @@ + xmlns:media="http://search.yahoo.com/mrss/" \ No newline at end of file diff --git a/views/rss/extensions/tidypics/channel.php b/views/rss/extensions/tidypics/channel.php deleted file mode 100644 index 8b620d15d..000000000 --- a/views/rss/extensions/tidypics/channel.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/views/rss/extensions/tidypics/xmlns.php b/views/rss/extensions/tidypics/xmlns.php deleted file mode 100644 index cb9646dcb..000000000 --- a/views/rss/extensions/tidypics/xmlns.php +++ /dev/null @@ -1 +0,0 @@ - xmlns:media="http://search.yahoo.com/mrss/" \ No newline at end of file diff --git a/views/rss/object/album.php b/views/rss/object/album.php index 8df98cf7a..0c4606245 100644 --- a/views/rss/object/album.php +++ b/views/rss/object/album.php @@ -1,59 +1,15 @@ - - getURL(); ?> - time_created) ?> - getURL(); ?> - <![CDATA[<?php echo $vars['entity']->title; ?>]]> - description)); ?>]]> - -getCoverImageGuid(); - if ($album_cover_guid) { - // Set title - $vars['title'] = $album->title; - if (empty($vars['title'])) { - $title = $vars['config']->sitename; - } else if (empty($vars['config']->sitename)) { - $title = $vars['title']; - } else { - $title = $vars['config']->sitename . ": " . $vars['title']; - } - $album_cover_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $album_cover_guid . '&size=thumb'; -?> - - <![CDATA[<?php echo $title; ?>]]> - getURL() . '?view=rss'; ?> - - "object", - "subtype" => "image", - "container_guid" => $album->guid, - "limit" => $limit, - )); - - - foreach ($images as $image) { - echo elgg_view_entity($image); - } +$full_view = elgg_extract('full_view', $vars, false); +if ($full_view) { + echo elgg_view('object/album/full', $vars); +} else { + echo elgg_view('object/album/summary', $vars); } diff --git a/views/rss/object/album/full.php b/views/rss/object/album/full.php new file mode 100644 index 000000000..8261e5ce0 --- /dev/null +++ b/views/rss/object/album/full.php @@ -0,0 +1,16 @@ + 'object', + 'subtype' => 'image', + 'container_guid' => $vars['entity']->getGUID(), + 'limit' => $limit, + 'full_view' => false, +)); diff --git a/views/rss/object/album/summary.php b/views/rss/object/album/summary.php new file mode 100644 index 000000000..b6dc8f003 --- /dev/null +++ b/views/rss/object/album/summary.php @@ -0,0 +1,33 @@ +getURL(), ENT_NOQUOTES, 'UTF-8'); +$pubdate = date('r', $vars['entity']->getTimeCreated()); + +$title = $vars['entity']->getTitle(); +$description = autop($vars['entity']->description); + +$creator = elgg_view('page/components/creator', $vars); +$georss = elgg_view('page/components/georss', $vars); +$extension = elgg_view('extensions/item', $vars); + +$item = <<<__HTML + + $permalink + $pubdate + $permalink + <![CDATA[$title]]> + + $creator$georss$extension + + +__HTML; + +echo $item; diff --git a/views/rss/object/file.php b/views/rss/object/file.php deleted file mode 100644 index 1ede661ad..000000000 --- a/views/rss/object/file.php +++ /dev/null @@ -1,23 +0,0 @@ -title; -if (empty($title)) { - $title = substr($vars['entity']->description,0,32); - if (strlen($vars['entity']->description) > 32) { - $title .= " ..."; - } -} -?> - - - getURL(); ?> - time_created) ?> - getURL(); ?> - <![CDATA[<?php echo $title; ?>]]> - description)); ?>]]> - - diff --git a/views/rss/object/image.php b/views/rss/object/image.php index b93592081..a59021bd1 100644 --- a/views/rss/object/image.php +++ b/views/rss/object/image.php @@ -1,19 +1,42 @@ title; -$descr = $vars['entity']->description; -$download = $vars['url'] . 'pg/photos/download/' . $vars['entity']->guid . '/inline/'; -$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid='; -?> - - - <?php echo $title; ?> - guid . '&size=large'; ?> - - time_created); ?> - getURL(); ?> - - - - - \ No newline at end of file +$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8'); +$pubdate = date('r', $vars['entity']->getTimeCreated()); + +$title = $vars['entity']->getTitle(); +$description = autop($vars['entity']->description); + +$creator = elgg_view('page/components/creator', $vars); +$georss = elgg_view('page/components/georss', $vars); +$extension = elgg_view('extensions/item', $vars); + +$thumbnail_url = $vars['entity']->getSrcUrl('thumb'); +$download_url = $vars['entity']->getSrcUrl('large'); + +$mime_type = $vars['entity']->getMimeType(); + +$item = <<<__HTML + + $permalink + $pubdate + $permalink + <![CDATA[$title]]> + + $creator$georss$extension + + + + + + +__HTML; + +echo $item; diff --git a/views/rss/tidypics/content_wrapper.php b/views/rss/tidypics/content_wrapper.php deleted file mode 100644 index 0b16f2357..000000000 --- a/views/rss/tidypics/content_wrapper.php +++ /dev/null @@ -1,2 +0,0 @@ - 0) { - foreach($entities as $entity) { - echo elgg_view_entity($entity); - } -} -- cgit v1.2.3 From efdd4b6544e14355f6ae0e6151c6f828271d3913 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Mon, 28 Nov 2011 07:50:23 -0500 Subject: working on album sorting --- pages/photos/album/sort.php | 46 ++++++++++++++++++++++++++ pages/photos/image/view.php | 2 +- pages/sortalbum.php | 38 ---------------------- start.php | 16 +++++---- views/default/forms/photos/album/sort.php | 28 ++++++++++++++++ views/default/js/photos/tidypics.php | 26 +++++++++++++++ views/default/tidypics/css.php | 6 ++++ views/default/tidypics/sort.php | 54 ------------------------------- views/rss/object/album.php | 4 ++- views/rss/object/album/full.php | 3 ++ 10 files changed, 123 insertions(+), 100 deletions(-) create mode 100644 pages/photos/album/sort.php delete mode 100644 pages/sortalbum.php create mode 100644 views/default/forms/photos/album/sort.php create mode 100644 views/default/js/photos/tidypics.php delete mode 100644 views/default/tidypics/sort.php diff --git a/pages/photos/album/sort.php b/pages/photos/album/sort.php new file mode 100644 index 000000000..874da4777 --- /dev/null +++ b/pages/photos/album/sort.php @@ -0,0 +1,46 @@ +getContainerEntity(); +elgg_set_page_owner_guid($owner->getGUID()); + +$title = elgg_echo('tidypics:sort', array($album->getTitle())); + +// set up breadcrumbs +elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all'); +if (elgg_instanceof($owner, 'group')) { + elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); +} else { + elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); +} +elgg_push_breadcrumb($album->title, $album->getURL()); +elgg_push_breadcrumb($title); + + +$content = elgg_view_form('photos/album/sort', array(), array('album' => $album)); + +$body = elgg_view_layout('content', array( + 'filter' => false, + 'content' => $content, + 'title' => $title, + 'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'album')), +)); + +echo elgg_view_page($title, $body); diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index d9231eb08..f172b7cd6 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -21,7 +21,7 @@ $owner = elgg_get_page_owner_entity(); // set up breadcrumbs elgg_push_breadcrumb(elgg_echo('photos'), 'photos/all'); -if (elgg_instanceof($page_owner, 'group')) { +if (elgg_instanceof($owner, 'group')) { elgg_push_breadcrumb($owner->name, "photos/group/$owner->guid/all"); } else { elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); diff --git a/pages/sortalbum.php b/pages/sortalbum.php deleted file mode 100644 index 0bbd8159e..000000000 --- a/pages/sortalbum.php +++ /dev/null @@ -1,38 +0,0 @@ -container_guid) { - set_page_owner($album->container_guid); -} else { - set_page_owner($album->owner_guid); -} - -$owner = page_owner_entity(); - -$title = sprintf(elgg_echo('tidypics:sort'), $album->title); - -$content = elgg_view_title($title); -$content .= elgg_view('tidypics/sort', array('album' => $album)); - -$body = elgg_view_layout('two_column_left_sidebar', '', $content); - -page_draw($title, $body); diff --git a/start.php b/start.php index 817578607..b24f3cb61 100644 --- a/start.php +++ b/start.php @@ -30,6 +30,11 @@ function tidypics_init() { elgg_extend_view('css/elgg', 'tidypics/css'); elgg_extend_view('css/admin', 'tidypics/css'); + // Register the JavaScript lib + $js = elgg_get_simplecache_url('js', 'photos/tidypics'); + elgg_register_simplecache_view('js/photos/tidypics'); + elgg_register_js('tidypics', $js, 'footer'); + // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); @@ -87,7 +92,6 @@ function tidypics_init() { //register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php"); //register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php"); //register_action("tidypics/sortalbum", false, "$base_dir/sortalbum.php"); - //register_action("tidypics/edit", false, "$base_dir/edit.php"); //register_action("tidypics/addtag", false, "$base_dir/addtag.php"); //register_action("tidypics/deletetag", false, "$base_dir/deletetag.php"); @@ -247,6 +251,8 @@ function tidypics_page_handler($page) { return false; } + elgg_load_js('tidypics'); + $base = elgg_get_plugins_path() . 'tidypics/pages/photos'; switch ($page[0]) { case "all": // all site albums @@ -296,11 +302,9 @@ function tidypics_page_handler($page) { } break; - case "sort": //sort a photo album - if (isset($page[1])) { - set_input('guid', $page[1]); - } - include($CONFIG->pluginspath . "tidypics/pages/sortalbum.php"); + case "sort": // sort a photo album + set_input('guid', $page[1]); + require "$base/album/sort.php"; break; case "image": //view an image diff --git a/views/default/forms/photos/album/sort.php b/views/default/forms/photos/album/sort.php new file mode 100644 index 000000000..524112e0c --- /dev/null +++ b/views/default/forms/photos/album/sort.php @@ -0,0 +1,28 @@ +getImageList(); + +echo '
      '; +echo elgg_echo('tidypics:sort:instruct'); +echo '
      '; + +echo '
      '; +echo elgg_view('input/hidden', array('name' => 'guids')); +echo elgg_view('input/hidden', array('name' => 'album_guid', 'value' => $album->guid)); +echo elgg_view('input/submit', array('value' => elgg_echo('save'))); +echo '
      '; + +echo '
      '; +echo ''; diff --git a/views/default/js/photos/tidypics.php b/views/default/js/photos/tidypics.php new file mode 100644 index 000000000..509d2116a --- /dev/null +++ b/views/default/js/photos/tidypics.php @@ -0,0 +1,26 @@ + + +elgg.provide('elgg.tidypics'); + +elgg.tidypics.init = function() { + $("#tidypics-sort").sortable({ + opacity: 0.7, + revert: true, + scroll: true + }); + + $('.elgg-form-photos-album-sort').submit(function() { + var tidypics_guids = []; + $("#tidypics-sort li").each(function(index) { + tidypics_guids.push($(this).attr('id')); + }); + $('input[name="guids"]').val(tidypics_guids.toString()); + }); +}; + +elgg.register_hook_handler('init', 'system', elgg.tidypics.init); diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 542123bd0..82594db0e 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -22,6 +22,12 @@ width: 120px; } +#tidypics-sort li { +width:153px; +height:153px; +} + + diff --git a/views/default/tidypics/sort.php b/views/default/tidypics/sort.php deleted file mode 100644 index 66dd8a999..000000000 --- a/views/default/tidypics/sort.php +++ /dev/null @@ -1,54 +0,0 @@ -getImageList(); - -// create submission form -$body = elgg_view('input/hidden', array('internalname' => 'guids')); -$body .= elgg_view('input/hidden', array('internalname' => 'album_guid', 'value' => $album->guid)); -$body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); -?> -
      -
      - -
      - 'tidypics_sort_form', - 'action' => "{$vars['url']}action/tidypics/sortalbum", - 'body' => $body, - ); - echo elgg_view('input/form', $params); - ?> - -
        - "; - } - ?> -
      -
      -
      - - \ No newline at end of file diff --git a/views/rss/object/album.php b/views/rss/object/album.php index 0c4606245..f880b56d6 100644 --- a/views/rss/object/album.php +++ b/views/rss/object/album.php @@ -3,9 +3,11 @@ * Album RSS view * * @uses $vars['entity'] TidypicsAlbum + * + * @author Cash Costello + * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 */ - $full_view = elgg_extract('full_view', $vars, false); if ($full_view) { diff --git a/views/rss/object/album/full.php b/views/rss/object/album/full.php index 8261e5ce0..b1f5a567b 100644 --- a/views/rss/object/album/full.php +++ b/views/rss/object/album/full.php @@ -3,6 +3,9 @@ * List photos in an album for RSS * * @uses $vars['entity'] TidypicsAlbum + * + * @author Cash Costello + * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 */ $limit = (int)get_input('limit', 20); -- cgit v1.2.3 From 9b838be94d37d560b1a05f76cd5ecca5d41119fc Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 1 Dec 2011 22:00:06 -0500 Subject: river views for image and albums - not for batches yet --- classes/TidypicsAlbum.php | 4 +++ languages/en.php | 5 +-- views/default/river/object/album/create.php | 56 ++++++++++++----------------- views/default/river/object/image/create.php | 48 +++++++++++++++---------- 4 files changed, 58 insertions(+), 55 deletions(-) diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php index f85b66d72..028811e55 100644 --- a/classes/TidypicsAlbum.php +++ b/classes/TidypicsAlbum.php @@ -122,6 +122,10 @@ class TidypicsAlbum extends ElggObject { return elgg_view_entity_list($images, $count, $offset, $limit, false, false, true); } + public function getCoverImage() { + return get_entity($this->getCoverImageGuid()); + } + /** * Get the URL for the album cover image * diff --git a/languages/en.php b/languages/en.php index 96b63c170..40be85fd6 100644 --- a/languages/en.php +++ b/languages/en.php @@ -160,13 +160,14 @@ The photo can be viewed here: %s", 'album:more' => "View all albums", // river - 'image:river:created' => "%s added the photo %s to album %s", + 'river:create:object:image' => "%s uploaded the photo %s", + 'image:river:created' => "%s added the photo %s to the album %s", 'image:river:created:multiple' => "%s added %u photos to album %s", 'image:river:item' => "a photo", 'image:river:annotate' => "a comment on the photo", 'image:river:tagged' => "%s tagged %s in the photo %s", 'image:river:tagged:unknown' => "%s tagged %s in a photo", - 'album:river:created' => "%s created a new photo album", + 'river:create:object:album' => "%s created a new photo album %s", 'album:river:group' => "in the group", 'album:river:item' => "an album", 'album:river:annotate' => "a comment on the photo album", diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php index 4d797d842..a60891ff8 100644 --- a/views/default/river/object/album/create.php +++ b/views/default/river/object/album/create.php @@ -1,47 +1,35 @@ subject_guid); -$album = get_entity($vars['item']->object_guid); - -$group_album = ($album->owner_guid != $album->container_guid); -if ($group_album) { - $group = get_entity($album->container_guid); - $group_name = $group->name; - $group_link = $group->getURL(); -} - -$url = "getURL()}\">{$performed_by->name}"; -$string = sprintf(elgg_echo("album:river:created"), $url) . " "; -$string .= "getURL() . "\">" . $album->title . ""; -if ($group_album) { - $string .= ' ' . elgg_echo('album:river:group') . ' ' . "{$group_name}"; -} - -$album_river_view = get_plugin_setting('album_river_view', 'tidypics'); +$album = $vars['item']->getObjectEntity(); +$album_river_view = elgg_get_plugin_setting('album_river_view', 'tidypics'); if ($album_river_view == "cover") { - $album_cover_guid = $album->getCoverImageGuid(); - if ($album_cover_guid) { - $string .= "
      wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album_cover_guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/>' . "
      "; + $image = $album->getCoverImage(); + if ($image) { + $attachments = elgg_view('output/img', array( + 'src' => $image->getSrcUrl('thumb'), + )); } } else { - - $string .= "
      "; - - $images = elgg_get_entities(array( - "type" => "object", - "subtype" => "image", - "container_guid" => $album->guid, - "limit" => 7, - )); + $images = $album->getImages(7); if (count($images)) { + $attachments = ''; } - - $string .= "
      "; } -echo $string; +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'attachments' => $attachments, +)); diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php index 9de043e91..091956125 100644 --- a/views/default/river/object/image/create.php +++ b/views/default/river/object/image/create.php @@ -1,24 +1,34 @@ subject_guid); -$image = get_entity($vars['item']->object_guid); -if ($image->title) { - $title = $image->title; -} else { - $title = elgg_echo("untitled"); -} +$subject = $vars['item']->getSubjectEntity(); +$subject_link = elgg_view('output/url', array( + 'href' => $subject->getURL(), + 'text' => $subject->name, + 'class' => 'elgg-river-subject', + 'is_trusted' => true, +)); -$url = "getURL()}\">{$performed_by->name}"; -$album = get_entity($image->container_guid); +$image = $vars['item']->getObjectEntity(); +$attachments = elgg_view('output/img', array( + 'src' => $image->getSrcUrl('thumb'), +)); +$image_link = elgg_view('output/url', array( + 'href' => $image->getURL(), + 'text' => $image->getTitle(), + 'is_trusted' => true, +)); -$album_link = "" . $album->title . ""; -$image_link = "getURL() . "\">" . $title . ""; +$album_link = elgg_view('output/url', array( + 'href' => $image->getContainerEntity()->getURL(), + 'text' => $image->getContainerEntity()->getTitle(), + 'is_trusted' => true, +)); -$string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_link); - -$string .= "
      "; - -$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; -$string .= "
      "; - -echo $string; +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'attachments' => $attachments, + 'summary' => elgg_echo('image:river:created', array($subject_link, $image_link, $album_link)), +)); -- cgit v1.2.3 From 5e7ea5369519949ea6dc7954a61f4d4eba29b0d0 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 3 Dec 2011 15:19:12 -0500 Subject: removed some old code --- mostvieweddashboard.php | 43 -------- start.php | 272 ++++++++++++++++++++++++------------------------ thumbnail.php | 80 -------------- 3 files changed, 136 insertions(+), 259 deletions(-) delete mode 100644 mostvieweddashboard.php delete mode 100644 thumbnail.php diff --git a/mostvieweddashboard.php b/mostvieweddashboard.php deleted file mode 100644 index e98e784da..000000000 --- a/mostvieweddashboard.php +++ /dev/null @@ -1,43 +0,0 @@ -dbprefix; -$max = 24; - -//this works but is wildly inefficient -//$annotations = get_annotations(0, "object", "image", "tp_view", "", "", 5000); - -$sql = "SELECT ent.guid, count( * ) AS views - FROM " . $prefix . "entities ent - INNER JOIN " . $prefix . "entity_subtypes sub ON ent.subtype = sub.id - AND sub.subtype = 'image' - INNER JOIN " . $prefix . "annotations ann1 ON ann1.entity_guid = ent.guid - INNER JOIN " . $prefix . "metastrings ms ON ms.id = ann1.name_id - AND ms.string = 'tp_view' - GROUP BY ent.guid - ORDER BY views DESC - LIMIT $max"; - -$result = get_data($sql); - -$entities = array(); -foreach($result as $entity) { - $entities[] = get_entity($entity->guid); -} - -tidypics_mostviewed_submenus(); - -$title = elgg_echo("tidypics:mostvieweddashboard"); -$area2 = elgg_view_title($title); -$area2 .= elgg_view_entity_list($entities, $max, 0, $max); -$body = elgg_view_layout('two_column_left_sidebar', '', $area2); -page_draw($title, $body); diff --git a/start.php b/start.php index b24f3cb61..ce0af7312 100644 --- a/start.php +++ b/start.php @@ -104,142 +104,6 @@ function tidypics_init() { elgg_register_library('tidypics:resize', "$base_dir/resize.php"); } -/** - * Sets up sidebar menus for tidypics. Triggered on pagesetup. - */ -function tidypics_submenus() { - - global $CONFIG; - - $page_owner = page_owner_entity(); - - if ($page_owner instanceof ElggGroup) { - if (get_context() == "groups") { - if ($page_owner->photos_enable != "no") { - add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); - } - } - } - // context is only set to photos on individual pages, not on group pages - else if (get_context() == "photos") { - - $view_count = get_plugin_setting('view_count', 'tidypics'); - - // owner gets "your albumn", "your friends albums", "your most recent", "your most viewed" - if (get_loggedin_userid() && get_loggedin_userid() == $page_owner->guid) { - - add_submenu_item( elgg_echo('album:create'), - $CONFIG->wwwroot . "pg/photos/new/{$page_owner->username}/", - 'tidypics-a' ); - - add_submenu_item( elgg_echo("album:yours"), - $CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", - 'tidypics-a' ); - - add_submenu_item( elgg_echo('album:yours:friends'), - $CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", - 'tidypics-a'); - - add_submenu_item( elgg_echo('tidypics:yourmostrecent'), - $CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/", - 'tidypics-a'); - - if ($view_count != 'disabled') { - add_submenu_item( elgg_echo('tidypics:yourmostviewed'), - $CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/", - 'tidypics-a'); - } - - } else if (isloggedin()) { - - $user = get_loggedin_user(); - - // logged in not owner gets "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent" - // and then "your albums", "your most recent", "your most viewed" - add_submenu_item( elgg_echo("album:yours"), - $CONFIG->wwwroot . "pg/photos/owned/{$user->username}/", - 'tidypics-b' ); - - add_submenu_item( elgg_echo('tidypics:yourmostrecent'), - $CONFIG->wwwroot . "pg/photos/mostrecent/{$user->username}/", - 'tidypics-b'); - - if ($view_count != 'disabled') { - add_submenu_item( elgg_echo('tidypics:yourmostviewed'), - $CONFIG->wwwroot . "pg/photos/mostviewed/{$user->username}/", - 'tidypics-b'); - } - - if ($page_owner->name) { // check to make sure the owner set their display name - add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", - 'tidypics-a' ); - add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", - 'tidypics-a'); - - if ($view_count != 'disabled') { - add_submenu_item( sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/", - 'tidypics-a'); - } - - add_submenu_item( sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/", - 'tidypics-a'); - } - } else if ($page_owner->guid) { - // non logged in user gets "page owners albums", "page owner's friends albums" - add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", - 'tidypics-a' ); - add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", - 'tidypics-a'); - } - - // everyone gets world albums, most recent, most viewed, most recently viewed, recently commented - add_submenu_item( elgg_echo('album:all'), - $CONFIG->wwwroot . "pg/photos/world/", - 'tidypics-z'); - add_submenu_item( elgg_echo('tidypics:mostrecent'), - $CONFIG->wwwroot . 'pg/photos/mostrecent/', - 'tidypics-z'); - - if ($view_count != 'disabled') { - add_submenu_item( elgg_echo('tidypics:mostviewed'), - $CONFIG->wwwroot . 'pg/photos/mostviewed/', - 'tidypics-z'); - add_submenu_item( elgg_echo('tidypics:recentlyviewed'), - $CONFIG->wwwroot . 'pg/photos/recentlyviewed/', - 'tidypics-z'); - } - add_submenu_item( elgg_echo('tidypics:recentlycommented'), - $CONFIG->wwwroot . 'pg/photos/recentlycommented/', - 'tidypics-z'); - } - -} - -/** - * Sets up submenus for tidypics most viewed pages - */ -function tidypics_mostviewed_submenus() { - - global $CONFIG; - - add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostvieweddashboard.php"); - add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthisyear.php"); - add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthismonth.php"); - add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimageslastmonth.php"); - add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagestoday.php"); - add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimages.php"); - add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagesthismonth.php"); - add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagestoday.php"); - add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented/'); -} - /** * Tidypics page handler * @@ -583,3 +447,139 @@ function tidypics_ajax_session_handler($hook, $entity_type, $returnvalue, $param exit; } + +/** + * Sets up sidebar menus for tidypics. Triggered on pagesetup. + */ +function tidypics_submenus() { + + global $CONFIG; + + $page_owner = page_owner_entity(); + + if ($page_owner instanceof ElggGroup) { + if (get_context() == "groups") { + if ($page_owner->photos_enable != "no") { + add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); + } + } + } + // context is only set to photos on individual pages, not on group pages + else if (get_context() == "photos") { + + $view_count = get_plugin_setting('view_count', 'tidypics'); + + // owner gets "your albumn", "your friends albums", "your most recent", "your most viewed" + if (get_loggedin_userid() && get_loggedin_userid() == $page_owner->guid) { + + add_submenu_item( elgg_echo('album:create'), + $CONFIG->wwwroot . "pg/photos/new/{$page_owner->username}/", + 'tidypics-a' ); + + add_submenu_item( elgg_echo("album:yours"), + $CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", + 'tidypics-a' ); + + add_submenu_item( elgg_echo('album:yours:friends'), + $CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", + 'tidypics-a'); + + add_submenu_item( elgg_echo('tidypics:yourmostrecent'), + $CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/", + 'tidypics-a'); + + if ($view_count != 'disabled') { + add_submenu_item( elgg_echo('tidypics:yourmostviewed'), + $CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/", + 'tidypics-a'); + } + + } else if (isloggedin()) { + + $user = get_loggedin_user(); + + // logged in not owner gets "page owners albums", "page owner's friends albums", "page owner's most viewed", "page owner's most recent" + // and then "your albums", "your most recent", "your most viewed" + add_submenu_item( elgg_echo("album:yours"), + $CONFIG->wwwroot . "pg/photos/owned/{$user->username}/", + 'tidypics-b' ); + + add_submenu_item( elgg_echo('tidypics:yourmostrecent'), + $CONFIG->wwwroot . "pg/photos/mostrecent/{$user->username}/", + 'tidypics-b'); + + if ($view_count != 'disabled') { + add_submenu_item( elgg_echo('tidypics:yourmostviewed'), + $CONFIG->wwwroot . "pg/photos/mostviewed/{$user->username}/", + 'tidypics-b'); + } + + if ($page_owner->name) { // check to make sure the owner set their display name + add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", + 'tidypics-a' ); + add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", + 'tidypics-a'); + + if ($view_count != 'disabled') { + add_submenu_item( sprintf(elgg_echo('tidypics:friendmostviewed'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/mostviewed/{$page_owner->username}/", + 'tidypics-a'); + } + + add_submenu_item( sprintf(elgg_echo('tidypics:friendmostrecent'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/mostrecent/{$page_owner->username}/", + 'tidypics-a'); + } + } else if ($page_owner->guid) { + // non logged in user gets "page owners albums", "page owner's friends albums" + add_submenu_item( sprintf(elgg_echo("album:user"), $page_owner->name), + $CONFIG->wwwroot . "pg/photos/owned/{$page_owner->username}/", + 'tidypics-a' ); + add_submenu_item( sprintf(elgg_echo('album:friends'),$page_owner->name), + $CONFIG->wwwroot . "pg/photos/friends/{$page_owner->username}/", + 'tidypics-a'); + } + + // everyone gets world albums, most recent, most viewed, most recently viewed, recently commented + add_submenu_item( elgg_echo('album:all'), + $CONFIG->wwwroot . "pg/photos/world/", + 'tidypics-z'); + add_submenu_item( elgg_echo('tidypics:mostrecent'), + $CONFIG->wwwroot . 'pg/photos/mostrecent/', + 'tidypics-z'); + + if ($view_count != 'disabled') { + add_submenu_item( elgg_echo('tidypics:mostviewed'), + $CONFIG->wwwroot . 'pg/photos/mostviewed/', + 'tidypics-z'); + add_submenu_item( elgg_echo('tidypics:recentlyviewed'), + $CONFIG->wwwroot . 'pg/photos/recentlyviewed/', + 'tidypics-z'); + } + add_submenu_item( elgg_echo('tidypics:recentlycommented'), + $CONFIG->wwwroot . 'pg/photos/recentlycommented/', + 'tidypics-z'); + } + +} + +/** + * Sets up submenus for tidypics most viewed pages + */ +function tidypics_mostviewed_submenus() { + + global $CONFIG; + + add_submenu_item(elgg_echo('tidypics:mostvieweddashboard'), $CONFIG->url . "mod/tidypics/mostvieweddashboard.php"); + add_submenu_item(elgg_echo('tidypics:mostviewedthisyear'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthisyear.php"); + add_submenu_item(elgg_echo('tidypics:mostviewedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagesthismonth.php"); + add_submenu_item(elgg_echo('tidypics:mostviewedlastmonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimageslastmonth.php"); + add_submenu_item(elgg_echo('tidypics:mostviewedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostviewedimagestoday.php"); + add_submenu_item(elgg_echo('tidypics:mostcommented'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimages.php"); + add_submenu_item(elgg_echo('tidypics:mostcommentedthismonth'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagesthismonth.php"); + add_submenu_item(elgg_echo('tidypics:mostcommentedtoday'), $CONFIG->url . "mod/tidypics/pages/lists/mostcommentedimagestoday.php"); + add_submenu_item(elgg_echo('tidypics:recentlycommented'), $CONFIG->wwwroot . 'pg/photos/recentlycommented/'); +} diff --git a/thumbnail.php b/thumbnail.php deleted file mode 100644 index f9f9d1e5f..000000000 --- a/thumbnail.php +++ /dev/null @@ -1,80 +0,0 @@ -getSubtype() != "image") { - forward('mod/tidypics/graphics/' . $error_image); -} - -// Get filename -if ($size == "thumb") { - $thumbfile = $file->thumbnail; -} else if ($size == "small") { - $thumbfile = $file->smallthumb; -} else { - $thumbfile = $file->largethumb; -} - -if (!$thumbfile) { - forward('mod/tidypics/graphics/' . $error_image); -} - -// create Elgg File object -$readfile = new ElggFile(); -$readfile->owner_guid = $file->owner_guid; -$readfile->setFilename($thumbfile); -$contents = $readfile->grabFile(); - -// send error image if file could not be read -if (!$contents) { - forward('mod/tidypics/graphics/' . $error_image); -} - -// expires every 14 days -$expires = 14 * 60*60*24; - -// overwrite header caused by php session code so images can be cached -$mime = $file->getMimeType(); -header("Content-Type: $mime"); -header("Content-Length: " . strlen($contents)); -header("Cache-Control: public", true); -header("Pragma: public", true); -header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true); - -// Return the thumbnail and exit -echo $contents; -exit; -- cgit v1.2.3 From 092197523f135b1aec3de8ff50df0dcf724c8094 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 3 Dec 2011 15:42:40 -0500 Subject: river finished up for image, batch, album --- languages/en.php | 3 +- views/default/river/object/album/create.php | 5 +- views/default/river/object/image/create.php | 1 + .../default/river/object/tidypics_batch/create.php | 79 +++++++++++----------- views/default/tidypics/css.php | 12 +++- 5 files changed, 55 insertions(+), 45 deletions(-) diff --git a/languages/en.php b/languages/en.php index 40be85fd6..c701f98f4 100644 --- a/languages/en.php +++ b/languages/en.php @@ -161,8 +161,9 @@ The photo can be viewed here: %s", // river 'river:create:object:image' => "%s uploaded the photo %s", + 'river:create:object:tidypics_batch' => "%s uploaded some photos", 'image:river:created' => "%s added the photo %s to the album %s", - 'image:river:created:multiple' => "%s added %u photos to album %s", + 'image:river:created:multiple' => "%s added %u photos to the album %s", 'image:river:item' => "a photo", 'image:river:annotate' => "a comment on the photo", 'image:river:tagged' => "%s tagged %s in the photo %s", diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php index a60891ff8..3f9c42d7a 100644 --- a/views/default/river/object/album/create.php +++ b/views/default/river/object/album/create.php @@ -17,11 +17,12 @@ if ($album_river_view == "cover") { $images = $album->getImages(7); if (count($images)) { - $attachments = '
        '; + $attachments = '
          '; foreach($images as $image) { - $attachments .= '
        • '; + $attachments .= '
        • '; $attachments .= elgg_view('output/img', array( 'src' => $image->getSrcUrl('thumb'), + 'class' => 'elgg-photo', )); $attachments .= '
          • '; } diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php index 091956125..44efa0c59 100644 --- a/views/default/river/object/image/create.php +++ b/views/default/river/object/image/create.php @@ -14,6 +14,7 @@ $subject_link = elgg_view('output/url', array( $image = $vars['item']->getObjectEntity(); $attachments = elgg_view('output/img', array( 'src' => $image->getSrcUrl('thumb'), + 'class' => 'elgg-photo', )); $image_link = elgg_view('output/url', array( 'href' => $image->getURL(), diff --git a/views/default/river/object/tidypics_batch/create.php b/views/default/river/object/tidypics_batch/create.php index e7a4d1409..1dfce6925 100644 --- a/views/default/river/object/tidypics_batch/create.php +++ b/views/default/river/object/tidypics_batch/create.php @@ -1,51 +1,50 @@ subject_guid); -$batch = get_entity($vars['item']->object_guid); -$album = get_entity($batch->container_guid); - -if (!$batch || !$album) { - return true; -} +$batch = $vars['item']->getObjectEntity(); // Get images related to this batch $images = elgg_get_entities_from_relationship(array( - 'relationship' => 'belongs_to_batch', - 'relationship_guid' => $batch->getGUID(), - 'inverse_relationship' => true, - 'types' => array('object'), - 'subtypes' => array('image'), - 'offset' => 0, - )); - -// nothing to show -if (!$images) { - return true; -} - -$user_link = "getURL()}\">{$performed_by->name}"; -$album_link = "" . $album->title . ""; -if (count($images) > 1) { - $image_text = elgg_echo("image:river:created:multiple"); - $string = sprintf($image_text, $user_link, count($images), $album_link); -} else { - $image_text = elgg_echo("image:river:created"); - $title = $images[0]->title; - if (!$title) { - $title = elgg_echo("untitled"); - } - $image_link = "getURL() . "\">" . $title . ""; - $string = sprintf($image_text, $user_link, $image_link, $album_link); -} - -$string .= "
          "; + 'relationship' => 'belongs_to_batch', + 'relationship_guid' => $batch->getGUID(), + 'inverse_relationship' => true, + 'type' => 'object', + 'subtype' => 'image', + 'offset' => 0, +)); + +$album = $batch->getContainerEntity(); +$album_link = elgg_view('output/url', array( + 'href' => $album->getURL(), + 'text' => $album->getTitle(), + 'is_trusted' => true, +)); + +$subject = $vars['item']->getSubjectEntity(); +$subject_link = elgg_view('output/url', array( + 'href' => $subject->getURL(), + 'text' => $subject->name, + 'class' => 'elgg-river-subject', + 'is_trusted' => true, +)); if (count($images)) { + $attachments = ''; } -$string .= "
          "; - -echo $string; +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'attachments' => $attachments, + 'summary' => elgg_echo('image:river:created:multiple', array($subject_link, count($images), $album_link)), +)); diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index 82594db0e..b95e24193 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -23,8 +23,16 @@ } #tidypics-sort li { -width:153px; -height:153px; + width:153px; + height:153px; +} + +.tidypics-river-list > li { + display: inline-block; +} + +.tidypics-photo-item + .tidypics-photo-item { + margin-left: 7px; } -- cgit v1.2.3 From 5d26276359a4448f0aebc66c3a87b332338e7027 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 3 Dec 2011 16:46:50 -0500 Subject: better image display code - using elgg_view_entity_icon() now --- classes/TidypicsAlbum.php | 16 ------ classes/TidypicsImage.php | 5 +- views/default/forms/photos/batch/edit/image.php | 6 +-- views/default/icon/object/album.php | 40 ++++++++++++++ views/default/icon/object/image.php | 62 ++++++++++++++++++++++ views/default/object/album/gallery.php | 15 ++---- views/default/object/album/list.php | 12 +---- views/default/object/image/full.php | 16 ++---- views/default/object/image/summary.php | 6 +-- views/default/river/object/album/create.php | 12 ++--- views/default/river/object/image/create.php | 9 ++-- .../default/river/object/tidypics_batch/create.php | 8 +-- views/default/tidypics/css.php | 17 +++++- views/default/widgets/album_view/content.php | 3 ++ views/default/widgets/album_view/edit.php | 3 ++ views/default/widgets/latest_photos/content.php | 3 ++ views/default/widgets/latest_photos/edit.php | 3 ++ views/rss/object/image.php | 4 +- 18 files changed, 161 insertions(+), 79 deletions(-) create mode 100644 views/default/icon/object/album.php create mode 100644 views/default/icon/object/image.php diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php index 028811e55..e5a8e2c0c 100644 --- a/classes/TidypicsAlbum.php +++ b/classes/TidypicsAlbum.php @@ -126,22 +126,6 @@ class TidypicsAlbum extends ElggObject { return get_entity($this->getCoverImageGuid()); } - /** - * Get the URL for the album cover image - * - * @param string $size - * @return string - */ - public function getCoverImageURL($size = 'small') { - $coverGuid = $this->getCoverImageGuid(); - if ($coverGuid) { - $url = "pg/photos/thumbnail/$coverGuid/$size/"; - } else { - $url = "mod/tidypics/graphics/empty_album.png"; - } - return elgg_normalize_url($url); - } - /** * Get the GUID of the album cover * diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index a37e0dc38..1f6812760 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -67,7 +67,10 @@ class TidypicsImage extends ElggFile { * * @return string */ - public function getSrcUrl($size = 'small') { + public function getIconURL($size = 'small') { + if ($size == 'tiny') { + $size = 'thumb'; + } return elgg_normalize_url("photos/thumbnail/$this->guid/$size/"); } diff --git a/views/default/forms/photos/batch/edit/image.php b/views/default/forms/photos/batch/edit/image.php index bf982ed84..eed804e90 100644 --- a/views/default/forms/photos/batch/edit/image.php +++ b/views/default/forms/photos/batch/edit/image.php @@ -13,11 +13,7 @@ $image = $vars['entity']; echo '
          '; echo '
          '; -echo elgg_view('output/img', array( - 'src' => $image->getSrcURL(), - 'alt' => $image->getTitle(), - 'class' => 'elgg-photo', -)); +echo elgg_view_entity_icon($image, 'small', array('href' => false)); echo '
          '; echo '
          '; diff --git a/views/default/icon/object/album.php b/views/default/icon/object/album.php new file mode 100644 index 000000000..656b2e0df --- /dev/null +++ b/views/default/icon/object/album.php @@ -0,0 +1,40 @@ +getCoverImageGuid(); +if ($cover_guid) { + $vars['title'] = $album->getTitle(); + echo elgg_view_entity_icon(get_entity($cover_guid), $vars['size'], $vars); +} else { + $url = "mod/tidypics/graphics/empty_album.png"; + $url = elgg_normalize_url($url); + $img = elgg_view('output/img', array( + 'src' => $url, + 'class' => 'elgg-photo', + 'title' => $album->getTitle(), + 'alt' => $album->getTitle(), + )); + + $params = array( + 'href' => $url, + 'text' => $img, + 'is_trusted' => true, + ); + if (isset($vars['link_class'])) { + $params['class'] = $vars['link_class']; + } + echo elgg_view('output/url', $params); +} diff --git a/views/default/icon/object/image.php b/views/default/icon/object/image.php new file mode 100644 index 000000000..3dbced8ab --- /dev/null +++ b/views/default/icon/object/image.php @@ -0,0 +1,62 @@ +getTitle(); +} else { + $title = $vars['title']; +} + +$url = $entity->getURL(); +if (isset($vars['href'])) { + $url = $vars['href']; +} + +$class = ''; +if (isset($vars['img_class'])) { + $class = $vars['img_class']; +} +$class = "elgg-photo $class"; + +$img_src = $entity->getIconURL($vars['size']); +$img_src = elgg_format_url($img_src); +$img = elgg_view('output/img', array( + 'src' => $img_src, + 'class' => $class, + 'title' => $title, + 'alt' => $title, +)); + +if ($url) { + $params = array( + 'href' => $url, + 'text' => $img, + 'is_trusted' => true, + ); + if (isset($vars['link_class'])) { + $params['class'] = $vars['link_class']; + } + echo elgg_view('output/url', $params); +} else { + echo $img; +} diff --git a/views/default/object/album/gallery.php b/views/default/object/album/gallery.php index ee22f0436..53194b53c 100644 --- a/views/default/object/album/gallery.php +++ b/views/default/object/album/gallery.php @@ -10,22 +10,13 @@ $album = elgg_extract('entity', $vars); -$album_cover = elgg_view('output/img', array( - 'src' => $album->getCoverImageURL(), - 'alt' => $album->getTitle(), - 'class' => 'elgg-photo', -)); +$album_cover = elgg_view_entity_icon($album, 'small'); $header = elgg_view('output/url', array( 'text' => $album->getTitle(), 'href' => $album->getURL(), -)); - -$body = elgg_view('output/url', array( - 'text' => $album_cover, - 'href' => $album->getURL(), - 'encode_text' => false, 'is_trusted' => true, + 'class' => 'tidypics-heading', )); $footer = elgg_view('output/url', array( @@ -38,4 +29,4 @@ $footer .= '
          ' . elgg_echo('album:num', array($album->g $params = array( 'footer' => $footer, ); -echo elgg_view_module('tidypics-album', $header, $body, $params); +echo elgg_view_module('tidypics-album', $header, $album_cover, $params); diff --git a/views/default/object/album/list.php b/views/default/object/album/list.php index ccbd01cd1..e576c92f1 100644 --- a/views/default/object/album/list.php +++ b/views/default/object/album/list.php @@ -37,16 +37,6 @@ $params = array( $params = $params + $vars; $summary = elgg_view('object/elements/summary', $params); -$cover = elgg_view('output/img', array( - 'src' => $album->getCoverImageURL('thumb'), - 'alt' => $album->getTitle(), - 'class' => 'elgg-photo', -)); -$icon = elgg_view('output/url', array( - 'text' => $cover, - 'href' => $album->getURL(), - 'encode_text' => false, - 'is_trusted' => true, -)); +$icon = elgg_view_entity_icon($album, 'tiny'); echo $header = elgg_view_image_block($icon, $summary); diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index d08c03f9c..f866e432d 100644 --- a/views/default/object/image/full.php +++ b/views/default/object/image/full.php @@ -10,15 +10,9 @@ $image = $photo = $vars['entity']; -$img = elgg_view('output/img', array( - 'src' => $image->getSrcURL('large'), - 'alt' => $image->getTitle(), - 'class' => 'elgg-photo', -)); - -$content = elgg_view('output/url', array( - 'text' => $img, - 'href' => $image->getURL(), +$img = elgg_view_entity_icon($image, 'large', array( + 'href' => false, + 'img_class' => 'tidypics-photo', )); $owner_link = elgg_view('output/url', array( @@ -62,7 +56,7 @@ if ($photo->description) { echo '
          '; echo elgg_view('tidypics/tagging/help'); echo elgg_view('tidypics/tagging/select', array('photo' => $photo)); -echo $content; +echo $img; echo '
          '; - echo elgg_view_comments($photo); \ No newline at end of file +echo elgg_view_comments($photo); diff --git a/views/default/object/image/summary.php b/views/default/object/image/summary.php index 71c1be6b9..16c197098 100644 --- a/views/default/object/image/summary.php +++ b/views/default/object/image/summary.php @@ -10,11 +10,7 @@ $image = elgg_extract('entity', $vars); -$img = elgg_view('output/img', array( - 'src' => $image->getSrcURL(), - 'alt' => $image->getTitle(), - 'class' => 'elgg-photo', -)); +$img = elgg_view_entity_icon($image, 'small'); $header = elgg_view('output/url', array( 'text' => $image->getTitle(), diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php index 3f9c42d7a..c8c79f406 100644 --- a/views/default/river/object/album/create.php +++ b/views/default/river/object/album/create.php @@ -1,6 +1,9 @@ getObjectEntity(); @@ -9,9 +12,7 @@ $album_river_view = elgg_get_plugin_setting('album_river_view', 'tidypics'); if ($album_river_view == "cover") { $image = $album->getCoverImage(); if ($image) { - $attachments = elgg_view('output/img', array( - 'src' => $image->getSrcUrl('thumb'), - )); + $attachments = elgg_view_entity_icon($image, 'tiny'); } } else { $images = $album->getImages(7); @@ -20,10 +21,7 @@ if ($album_river_view == "cover") { $attachments = '
            '; foreach($images as $image) { $attachments .= '
          • '; - $attachments .= elgg_view('output/img', array( - 'src' => $image->getSrcUrl('thumb'), - 'class' => 'elgg-photo', - )); + $attachments .= elgg_view_entity_icon($image, 'tiny'); $attachments .= '
            • '; } $attachments .= '
          '; diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php index 44efa0c59..08cfdc550 100644 --- a/views/default/river/object/image/create.php +++ b/views/default/river/object/image/create.php @@ -1,6 +1,9 @@ getSubjectEntity(); @@ -12,10 +15,8 @@ $subject_link = elgg_view('output/url', array( )); $image = $vars['item']->getObjectEntity(); -$attachments = elgg_view('output/img', array( - 'src' => $image->getSrcUrl('thumb'), - 'class' => 'elgg-photo', -)); +$attachments = elgg_view_entity_icon($image, 'tiny'); + $image_link = elgg_view('output/url', array( 'href' => $image->getURL(), 'text' => $image->getTitle(), diff --git a/views/default/river/object/tidypics_batch/create.php b/views/default/river/object/tidypics_batch/create.php index 1dfce6925..44c40c110 100644 --- a/views/default/river/object/tidypics_batch/create.php +++ b/views/default/river/object/tidypics_batch/create.php @@ -1,6 +1,9 @@ getObjectEntity(); @@ -34,10 +37,7 @@ if (count($images)) { $attachments = '
            '; foreach($images as $image) { $attachments .= '
          • '; - $attachments .= elgg_view('output/img', array( - 'src' => $image->getSrcUrl('thumb'), - 'class' => 'elgg-photo', - )); + $attachments .= elgg_view_entity_icon($image, 'tiny'); $attachments .= '
            • '; } $attachments .= '
          '; diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php index b95e24193..0c0f33c2c 100644 --- a/views/default/tidypics/css.php +++ b/views/default/tidypics/css.php @@ -8,15 +8,27 @@ .elgg-module-tidypics-image { width: 161px; text-align: center; - margin: 5px 10px; + margin: 5px 0; } .elgg-module-tidypics-image { margin: 5px auto; } + .tidypics-gallery-widget > li { width: 100%; } +.tidypics-photo { + margin: 0 auto; +} + +.tidypics-heading { + color: #0054A7; +} +.tidypics-heading:hover { + color: #0054A7; + text-decoration: none; +} .tidypics-input-thin { width: 120px; @@ -35,6 +47,9 @@ margin-left: 7px; } +.tidypics-gallery > li { + padding: 0 10px; +} getSrcUrl('thumb'); -$download_url = $vars['entity']->getSrcUrl('large'); +$thumbnail_url = $vars['entity']->getIconURL('tiny'); +$download_url = $vars['entity']->getIconURL('large'); $mime_type = $vars['entity']->getMimeType(); -- cgit v1.2.3 From f057f68c6f946244b3afe0340ae11efdde0d8136 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 3 Dec 2011 16:55:53 -0500 Subject: some more clean-up --- start.php | 4 +- views/default/object/image/summary.php | 2 + views/default/photos/css.php | 469 +++++++++++++++++++++++++ views/default/tidypics/albums.php | 59 ---- views/default/tidypics/breadcrumbs.php | 23 -- views/default/tidypics/content_wrapper.php | 10 - views/default/tidypics/css.php | 469 ------------------------- views/default/tidypics/groupprofile_albums.php | 17 - views/default/tidypics/hover_menu.php | 12 - 9 files changed, 473 insertions(+), 592 deletions(-) create mode 100644 views/default/photos/css.php delete mode 100644 views/default/tidypics/albums.php delete mode 100644 views/default/tidypics/breadcrumbs.php delete mode 100644 views/default/tidypics/content_wrapper.php delete mode 100644 views/default/tidypics/css.php delete mode 100644 views/default/tidypics/groupprofile_albums.php delete mode 100644 views/default/tidypics/hover_menu.php diff --git a/start.php b/start.php index ce0af7312..f094bd2f4 100644 --- a/start.php +++ b/start.php @@ -27,8 +27,8 @@ function tidypics_init() { elgg_register_page_handler('photos', 'tidypics_page_handler'); // Extend CSS - elgg_extend_view('css/elgg', 'tidypics/css'); - elgg_extend_view('css/admin', 'tidypics/css'); + elgg_extend_view('css/elgg', 'photos/css'); + elgg_extend_view('css/admin', 'photos/css'); // Register the JavaScript lib $js = elgg_get_simplecache_url('js', 'photos/tidypics'); diff --git a/views/default/object/image/summary.php b/views/default/object/image/summary.php index 16c197098..ed8ceff38 100644 --- a/views/default/object/image/summary.php +++ b/views/default/object/image/summary.php @@ -15,6 +15,8 @@ $img = elgg_view_entity_icon($image, 'small'); $header = elgg_view('output/url', array( 'text' => $image->getTitle(), 'href' => $image->getURL(), + 'is_trusted' => true, + 'class' => 'tidypics-heading', )); $body = elgg_view('output/url', array( diff --git a/views/default/photos/css.php b/views/default/photos/css.php new file mode 100644 index 000000000..0c0f33c2c --- /dev/null +++ b/views/default/photos/css.php @@ -0,0 +1,469 @@ + + +.elgg-module-tidypics-album, +.elgg-module-tidypics-image { + width: 161px; + text-align: center; + margin: 5px 0; +} +.elgg-module-tidypics-image { + margin: 5px auto; +} + +.tidypics-gallery-widget > li { + width: 100%; +} + +.tidypics-photo { + margin: 0 auto; +} + +.tidypics-heading { + color: #0054A7; +} +.tidypics-heading:hover { + color: #0054A7; + text-decoration: none; +} + +.tidypics-input-thin { + width: 120px; +} + +#tidypics-sort li { + width:153px; + height:153px; +} + +.tidypics-river-list > li { + display: inline-block; +} + +.tidypics-photo-item + .tidypics-photo-item { + margin-left: 7px; +} + +.tidypics-gallery > li { + padding: 0 10px; +} + + + +/* ---- tidypics object views ---- */ + +.tidypics_wrapper > table.entity_gallery { + border-spacing: 0; +} + +.tidypics_wrapper .entity_gallery td { + padding: 0; +} + +.tidypics_wrapper .entity_gallery_item, +.tidypics_wrapper .entity_gallery_item:hover { + background-color: transparent; + color: inherit; +} + +#tidypics_breadcrumbs { +margin:5px 0 15px 0; +font-size:80%; +} + +#tidypics_desc { +padding:0 20px; +font-style:italic; +} + +#tidypics_image_nav { +text-align:center; +} + +#tidypics_image_wrapper { +margin:10px 0 10px 0; +text-align:center; +} + +#tidypics_image { +border:1px solid #dedede; +padding:5px; +} + +#tidypics_image_nav ul li { +display:inline; +margin-right:15px; +} + +#tidypics_controls { +text-align:center; +margin-bottom:10px; +} + +#tidypics_controls a { +margin:10px; +} + +#tidypics_controls ul { +list-style:none; +margin:0px; +padding:8px; +} + +#tidypics_controls ul li { +padding:2px 10px 2px 22px; +margin:2px 0px; +display:inline; +} + +.tidypics_info { +padding:20px; +} + +#tidypics_exif { +padding-left:20px; +font-size:80%; +} + +.tidypics_album_images { +float:left; +width:153px; +height:153px; +margin:3px; +padding:4px; +border:1px solid #dedede; +text-align:center; +} + +.tidypics_album_cover { +padding:2px; +border:1px solid #dedede; +margin:5px 0; +} + +.tidypics_album_widget_single_item { +margin-bottom:8px; +} + +.tidypics_album_gallery_item { +float:left; +margin-bottom:20px; +padding: 4px; +text-align:center; +width: 160px; +} + +.tidypics_line_break { +width: 100%; +clear: both; +} + +.tidypics_gallery_title { +font-weight:bold; +} + +.tidypics_popup { +border:1px solid #3B5999; +width:200px; +position:absolute; +z-index:10000; +display:none; +background:#ffffff; +padding:10px; +font-size:12px; +text-align:left; +} + +/* ------ tidypics widget view ------ */ + +#tidypics_album_widget_container { +text-align:center; +} + +.tidypics_album_widget_timestamp { +color:#333333; +} + +.tidypics_widget_latest { +margin: 0 auto; +width: 208px; +} + +/* --------- image upload/edit forms ------------ */ + +#tidpics_image_upload_list li { +margin:3px 0; +} + +.tidypics_edit_image_container { +padding:5px; +margin:5px 0; +overflow:auto; +} + +.tidypics_edit_images { +float:right; +width:160px; +height:160px; +margin:4px; +padding:5px; +border:1px solid #dedede; +text-align:center; +} + +.tidypics_image_info { +float:left; +width:60%; +} + +.tidypics_image_info label { +font-size:1em; +} + +.tidypics_caption_input { + width:98%; + height:100px; +} + +/* ---- tidypics group css ----- */ + +#tidypics_group_profile { +-webkit-border-radius: 8px; +-moz-border-radius: 8px; +background:white none repeat scroll 0 0; +margin:0 0 20px; +padding:0 0 5px; +} + + +/* --------- tidypics river items ------------ */ + +.river_object_image_create { + background: url(mod/tidypics/graphics/icons/river_icon_image.gif) no-repeat left -1px; +} +.river_object_album_create { + background: url(mod/tidypics/graphics/icons/river_icon_album.gif) no-repeat left -1px; +} +.river_object_image_comment { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} +.river_object_album_comment { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} +.river_user_tag { + background: url(mod/tidypics/graphics/icons/river_icon_tag.gif) no-repeat left -1px; +} + +/* ----------- tagging ---------------- */ +#tidypics_tag_instructions { +background:#BBDAF7; +border:1px solid #4690D6; +padding:10px; +height:25px; +min-width:360px; +display:none; +overflow:hidden; +position:absolute; +z-index:10000; +-webkit-border-radius: 8px; +-moz-border-radius: 8px; +} + +#tidypics_tag_instruct_text { +padding-top: 3px; +float: left; +} + +#tidypics_tag_instruct_button_div { +float: left; +margin-left: 15px; +} + +#tidypics_tag_instruct_button { +margin:0; +} + +#tidypics_tag_menu { +width:240px; +max-height:400px; +overflow:hidden; +-webkit-border-radius: 8px; +-moz-border-radius: 8px; +} + +.tidypics_popup_header { +width:100%; +margin-bottom:10px; +} + + +#tidypics_tagmenu_left { +width:175px; +float:left; +} + +#tidypics_tagmenu_right { +float:left; +} + +#tidypics_tagmenu_left .input-filter { +width:150px; +} + +#tidypics_tagmenu_right .submit_button { +margin-top:2px; +} + +#tidypics_delete_tag_menu { +-webkit-border-radius: 8px; +-moz-border-radius: 8px; +overflow:hidden; +} + +.tidypics_tag { +display:none; +background:url(mod/tidypics/graphics/spacer.gif); +border:2px solid #ffffff; +overflow:hidden; +position:absolute; +z-index:0; +} + +.tidypics_tag_text { +display:none; +overflow:hidden; +position:absolute; +z-index:0; +text-align:center; +background:#BBDAF7; +border:1px solid #3B5999; +-webkit-border-radius:3px; +-moz-border-radius:3px; +padding:1px; +} + +#tidypics_phototags_list { +padding:0 20px 0 20px; +} + +#tidypics_phototags_list ul { +list-style:none; +margin:0px; +padding:8px; +} + +#tidypics_phototags_list ul li { +padding-right:10px; +margin:2px 0px; +display:inline; +} + +#tidypics_image_upload_list { +list-style: none; +} + +/*----- uploadify ------*/ + +#tidypics_uploader_steps { +list-style:none; +} + +#tidypics_uploader_steps li { +margin-bottom: 20px; +} + +#tidypics_uploader_steps li a { +font-weight:bold; +} + +.tidypics_choose_button_hover { +color:#0054a7; +text-decoration:underline; +} + +.tidypics_disable { +color:#cccccc; +} + +.tidypics_disable:hover { +color:#cccccc; +text-decoration:none; +} + + +.uploadifyQueueItem { +background-color:#F5F5F5; +border:2px solid #E5E5E5; +font-size:11px; +margin-top:5px; +padding:10px; +width:350px; +} + +.uploadifyProgress { +background-color:#FFFFFF; +border-color:#808080 #C5C5C5 #C5C5C5 #808080; +border-style:solid; +border-width:1px; +margin-top:10px; +width:100%; +} + +.uploadifyProgressBar { +background-color: #0054a7; +width: 1px; +height: 3px; +} + +#tidypics_uploader { +position:relative; +width:400px; +min-height:20px; +} + +#tidypics_choose_button { +position:absolute; +top:0; +left:0; +z-index:0; +display:block; +float:left; +} + +#tidypics_flash_uploader { +position:relative; +z-index:100; +} + +.uploadifyQueueItem .cancel { +float: right; +} + +.uploadifyError { +border: 2px solid #FBCBBC; +background-color: #FDE5DD; +} + +#tidypics_album_sort { +padding:0; +margin:0; +} + +#tidypics_album_sort li { +float:left; +margin:3px; +width:161px; +height:161px; +list-style:none; +} + +#tidypics_album_sort img { +border:1px solid #dedede; +padding:4px; +} + diff --git a/views/default/tidypics/albums.php b/views/default/tidypics/albums.php deleted file mode 100644 index 61daadba7..000000000 --- a/views/default/tidypics/albums.php +++ /dev/null @@ -1,59 +0,0 @@ - "object", - "subtype" => "album", - "container_guid" => page_owner(), - "limit" => $number, -)); - -echo '
          '; - -if ($owner_albums) { - foreach ($owner_albums as $album) { - - $album_cover_guid = $album->getCoverImageGuid(); - if ($album_cover_guid) { - $album_cover = '' . $album->title . ''; - } else { - $album_cover = '' . $album->title . ''; - } -?> -
          -
          title;?>
          -
          time_created);?>
          - getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")
          "; - } -?> - -
          - username) || empty($owner->username)) { - echo '

          ' . elgg_echo('album:all') . '

          '; - } else { - echo '

          ' . elgg_echo('album:more') . '

          '; - } - -} - -if (can_write_to_container(0, $owner->guid)) { - echo '

          username . '>' . elgg_echo("album:create") . '

          '; -} - - -//close album_widget_container div -echo "
          "; diff --git a/views/default/tidypics/breadcrumbs.php b/views/default/tidypics/breadcrumbs.php deleted file mode 100644 index e9f491b38..000000000 --- a/views/default/tidypics/breadcrumbs.php +++ /dev/null @@ -1,23 +0,0 @@ -wwwroot . "pg/photos/owned/" . $page_owner->username; -if (get_loggedin_userid() == $page_owner->guid) { - $first_level_text = elgg_echo('album:yours'); -} else { - $first_level_text = sprintf(elgg_echo('album:user'), $page_owner->name); -} -?> - -title; - $second_level_link = $vars['album']->getURL(); - ?> ->> - -
          -
          - -
          -
          \ No newline at end of file diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php deleted file mode 100644 index 0c0f33c2c..000000000 --- a/views/default/tidypics/css.php +++ /dev/null @@ -1,469 +0,0 @@ - - -.elgg-module-tidypics-album, -.elgg-module-tidypics-image { - width: 161px; - text-align: center; - margin: 5px 0; -} -.elgg-module-tidypics-image { - margin: 5px auto; -} - -.tidypics-gallery-widget > li { - width: 100%; -} - -.tidypics-photo { - margin: 0 auto; -} - -.tidypics-heading { - color: #0054A7; -} -.tidypics-heading:hover { - color: #0054A7; - text-decoration: none; -} - -.tidypics-input-thin { - width: 120px; -} - -#tidypics-sort li { - width:153px; - height:153px; -} - -.tidypics-river-list > li { - display: inline-block; -} - -.tidypics-photo-item + .tidypics-photo-item { - margin-left: 7px; -} - -.tidypics-gallery > li { - padding: 0 10px; -} - - - -/* ---- tidypics object views ---- */ - -.tidypics_wrapper > table.entity_gallery { - border-spacing: 0; -} - -.tidypics_wrapper .entity_gallery td { - padding: 0; -} - -.tidypics_wrapper .entity_gallery_item, -.tidypics_wrapper .entity_gallery_item:hover { - background-color: transparent; - color: inherit; -} - -#tidypics_breadcrumbs { -margin:5px 0 15px 0; -font-size:80%; -} - -#tidypics_desc { -padding:0 20px; -font-style:italic; -} - -#tidypics_image_nav { -text-align:center; -} - -#tidypics_image_wrapper { -margin:10px 0 10px 0; -text-align:center; -} - -#tidypics_image { -border:1px solid #dedede; -padding:5px; -} - -#tidypics_image_nav ul li { -display:inline; -margin-right:15px; -} - -#tidypics_controls { -text-align:center; -margin-bottom:10px; -} - -#tidypics_controls a { -margin:10px; -} - -#tidypics_controls ul { -list-style:none; -margin:0px; -padding:8px; -} - -#tidypics_controls ul li { -padding:2px 10px 2px 22px; -margin:2px 0px; -display:inline; -} - -.tidypics_info { -padding:20px; -} - -#tidypics_exif { -padding-left:20px; -font-size:80%; -} - -.tidypics_album_images { -float:left; -width:153px; -height:153px; -margin:3px; -padding:4px; -border:1px solid #dedede; -text-align:center; -} - -.tidypics_album_cover { -padding:2px; -border:1px solid #dedede; -margin:5px 0; -} - -.tidypics_album_widget_single_item { -margin-bottom:8px; -} - -.tidypics_album_gallery_item { -float:left; -margin-bottom:20px; -padding: 4px; -text-align:center; -width: 160px; -} - -.tidypics_line_break { -width: 100%; -clear: both; -} - -.tidypics_gallery_title { -font-weight:bold; -} - -.tidypics_popup { -border:1px solid #3B5999; -width:200px; -position:absolute; -z-index:10000; -display:none; -background:#ffffff; -padding:10px; -font-size:12px; -text-align:left; -} - -/* ------ tidypics widget view ------ */ - -#tidypics_album_widget_container { -text-align:center; -} - -.tidypics_album_widget_timestamp { -color:#333333; -} - -.tidypics_widget_latest { -margin: 0 auto; -width: 208px; -} - -/* --------- image upload/edit forms ------------ */ - -#tidpics_image_upload_list li { -margin:3px 0; -} - -.tidypics_edit_image_container { -padding:5px; -margin:5px 0; -overflow:auto; -} - -.tidypics_edit_images { -float:right; -width:160px; -height:160px; -margin:4px; -padding:5px; -border:1px solid #dedede; -text-align:center; -} - -.tidypics_image_info { -float:left; -width:60%; -} - -.tidypics_image_info label { -font-size:1em; -} - -.tidypics_caption_input { - width:98%; - height:100px; -} - -/* ---- tidypics group css ----- */ - -#tidypics_group_profile { --webkit-border-radius: 8px; --moz-border-radius: 8px; -background:white none repeat scroll 0 0; -margin:0 0 20px; -padding:0 0 5px; -} - - -/* --------- tidypics river items ------------ */ - -.river_object_image_create { - background: url(mod/tidypics/graphics/icons/river_icon_image.gif) no-repeat left -1px; -} -.river_object_album_create { - background: url(mod/tidypics/graphics/icons/river_icon_album.gif) no-repeat left -1px; -} -.river_object_image_comment { - background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; -} -.river_object_album_comment { - background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; -} -.river_user_tag { - background: url(mod/tidypics/graphics/icons/river_icon_tag.gif) no-repeat left -1px; -} - -/* ----------- tagging ---------------- */ -#tidypics_tag_instructions { -background:#BBDAF7; -border:1px solid #4690D6; -padding:10px; -height:25px; -min-width:360px; -display:none; -overflow:hidden; -position:absolute; -z-index:10000; --webkit-border-radius: 8px; --moz-border-radius: 8px; -} - -#tidypics_tag_instruct_text { -padding-top: 3px; -float: left; -} - -#tidypics_tag_instruct_button_div { -float: left; -margin-left: 15px; -} - -#tidypics_tag_instruct_button { -margin:0; -} - -#tidypics_tag_menu { -width:240px; -max-height:400px; -overflow:hidden; --webkit-border-radius: 8px; --moz-border-radius: 8px; -} - -.tidypics_popup_header { -width:100%; -margin-bottom:10px; -} - - -#tidypics_tagmenu_left { -width:175px; -float:left; -} - -#tidypics_tagmenu_right { -float:left; -} - -#tidypics_tagmenu_left .input-filter { -width:150px; -} - -#tidypics_tagmenu_right .submit_button { -margin-top:2px; -} - -#tidypics_delete_tag_menu { --webkit-border-radius: 8px; --moz-border-radius: 8px; -overflow:hidden; -} - -.tidypics_tag { -display:none; -background:url(mod/tidypics/graphics/spacer.gif); -border:2px solid #ffffff; -overflow:hidden; -position:absolute; -z-index:0; -} - -.tidypics_tag_text { -display:none; -overflow:hidden; -position:absolute; -z-index:0; -text-align:center; -background:#BBDAF7; -border:1px solid #3B5999; --webkit-border-radius:3px; --moz-border-radius:3px; -padding:1px; -} - -#tidypics_phototags_list { -padding:0 20px 0 20px; -} - -#tidypics_phototags_list ul { -list-style:none; -margin:0px; -padding:8px; -} - -#tidypics_phototags_list ul li { -padding-right:10px; -margin:2px 0px; -display:inline; -} - -#tidypics_image_upload_list { -list-style: none; -} - -/*----- uploadify ------*/ - -#tidypics_uploader_steps { -list-style:none; -} - -#tidypics_uploader_steps li { -margin-bottom: 20px; -} - -#tidypics_uploader_steps li a { -font-weight:bold; -} - -.tidypics_choose_button_hover { -color:#0054a7; -text-decoration:underline; -} - -.tidypics_disable { -color:#cccccc; -} - -.tidypics_disable:hover { -color:#cccccc; -text-decoration:none; -} - - -.uploadifyQueueItem { -background-color:#F5F5F5; -border:2px solid #E5E5E5; -font-size:11px; -margin-top:5px; -padding:10px; -width:350px; -} - -.uploadifyProgress { -background-color:#FFFFFF; -border-color:#808080 #C5C5C5 #C5C5C5 #808080; -border-style:solid; -border-width:1px; -margin-top:10px; -width:100%; -} - -.uploadifyProgressBar { -background-color: #0054a7; -width: 1px; -height: 3px; -} - -#tidypics_uploader { -position:relative; -width:400px; -min-height:20px; -} - -#tidypics_choose_button { -position:absolute; -top:0; -left:0; -z-index:0; -display:block; -float:left; -} - -#tidypics_flash_uploader { -position:relative; -z-index:100; -} - -.uploadifyQueueItem .cancel { -float: right; -} - -.uploadifyError { -border: 2px solid #FBCBBC; -background-color: #FDE5DD; -} - -#tidypics_album_sort { -padding:0; -margin:0; -} - -#tidypics_album_sort li { -float:left; -margin:3px; -width:161px; -height:161px; -list-style:none; -} - -#tidypics_album_sort img { -border:1px solid #dedede; -padding:4px; -} - diff --git a/views/default/tidypics/groupprofile_albums.php b/views/default/tidypics/groupprofile_albums.php deleted file mode 100644 index 85b32425e..000000000 --- a/views/default/tidypics/groupprofile_albums.php +++ /dev/null @@ -1,17 +0,0 @@ -photos_enable != 'no') { - echo '
          '; -?> -

          guid; ?>">Group albums

          -' . elgg_echo('album:group') . ''; - echo elgg_view('tidypics/albums', array('num_albums' => 5)); - echo '
          '; -} diff --git a/views/default/tidypics/hover_menu.php b/views/default/tidypics/hover_menu.php deleted file mode 100644 index 240891f51..000000000 --- a/views/default/tidypics/hover_menu.php +++ /dev/null @@ -1,12 +0,0 @@ - - -

          - -

          \ No newline at end of file -- cgit v1.2.3 From 183e2841c50b9bdd7683680580f2b13eacbfbeca Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 3 Dec 2011 17:26:27 -0500 Subject: basic view counting --- classes/TidypicsImage.php | 168 +++++++++++++++++++++++-------------------- pages/photos/image/view.php | 5 ++ start.php | 3 +- views/default/photos/css.php | 1 + 4 files changed, 99 insertions(+), 78 deletions(-) diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index 1f6812760..aec48b474 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -20,6 +20,7 @@ class TidypicsImage extends ElggFile { } /** + * Save the image * * @warning container_guid must be set first * @@ -42,6 +43,47 @@ class TidypicsImage extends ElggFile { return true; } + /** + * Delete image + * + * @return bool + */ + public function delete() { + + // check if batch should be deleted + $batch = elgg_get_entities_from_relationship(array( + 'relationship' => 'belongs_to_batch', + 'relationship_guid' => $this->guid, + 'inverse_relationship' => false, + )); + if ($batch) { + $batch = $batch[0]; + $count = elgg_get_entities_from_relationship(array( + 'relationship' => 'belongs_to_batch', + 'relationship_guid' => $batch->guid, + 'inverse_relationship' => true, + 'count' => true, + )); + if ($count == 1) { + // last image so delete batch + $batch->delete(); + } + } + + $album = get_entity($this->container_guid); + if ($album) { + $album->removeImage($this->guid); + } + + $this->removeThumbnails(); + + // update quota + $owner = $this->getOwnerEntity(); + $owner->image_repo_size = (int)$owner->image_repo_size - $this->size(); + + return parent::delete(); + } + /** * Get the title of the image * @@ -75,46 +117,67 @@ class TidypicsImage extends ElggFile { } /** - * delete image + * Get the view information for this image * - * @return bool + * @param $viewer_guid The guid of the viewer + * @return array with number of views, number of unique viewers, and number of views for this viewer */ - public function delete() { + public function getViewInfo($viewer_guid = 0) { + if ($viewer_guid == 0) { + $viewer_guid = elgg_get_logged_in_user_guid(); + } - // check if batch should be deleted - $batch = elgg_get_entities_from_relationship(array( - 'relationship' => 'belongs_to_batch', - 'relationship_guid' => $this->guid, - 'inverse_relationship' => false, + $views = elgg_get_annotations(array( + 'guid' => $this->getGUID(), + 'annotation_name' => 'tp_view', + 'limit' => 0, )); - if ($batch) { - $batch = $batch[0]; - $count = elgg_get_entities_from_relationship(array( - 'relationship' => 'belongs_to_batch', - 'relationship_guid' => $batch->guid, - 'inverse_relationship' => true, - 'count' => true, - )); - if ($count == 1) { - // last image so delete batch - $batch->delete(); + if ($views) { + $total_views = count($views); + + if ($this->getOwnerGUID() == $viewer_guid) { + // get unique number of viewers + $diff_viewers = array(); + foreach ($views as $view) { + $diff_viewers[$view->owner_guid] = 1; + } + $unique_viewers = count($diff_viewers); + } else if ($viewer_guid) { + // get the number of times this user has viewed the photo + $my_views = 0; + foreach ($views as $view) { + if ($view->owner_guid == $viewer_guid) { + $my_views++; + } + } } - } - $album = get_entity($this->container_guid); - if ($album) { - $album->removeImage($this->guid); + $view_info = array("total" => $total_views, "unique" => $unique_viewers, "mine" => $my_views); + } + else { + $view_info = array("total" => 0, "unique" => 0, "mine" => 0); } - $this->removeThumbnails(); + return $view_info; + } - // update quota - $owner = $this->getOwnerEntity(); - $owner->image_repo_size = (int)$owner->image_repo_size - $this->size(); + /** + * Add a view to this image + * + * @param $viewer_guid + * @return void + */ + public function addView($viewer_guid = 0) { + if ($viewer_guid == 0) { + $viewer_guid = elgg_get_logged_in_user_guid(); + } - return parent::delete(); + if ($viewer_guid != $this->owner_guid && tp_is_person()) { + create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC); + } } + /** * Set the internal filenames */ @@ -320,55 +383,6 @@ class TidypicsImage extends ElggFile { return $ret_data; } - /** - * Get the view information for this image - * - * @param $viewer_guid the guid of the viewer (0 if not logged in) - * @return array with number of views, number of unique viewers, and number of views for this viewer - */ - public function getViewCount($viewer_guid) { - $views = get_annotations($this->getGUID(), "object", "image", "tp_view", "", 0, 99999); - if ($views) { - $total_views = count($views); - - if ($this->owner_guid == $viewer_guid) { - // get unique number of viewers - foreach ($views as $view) { - $diff_viewers[$view->owner_guid] = 1; - } - $unique_viewers = count($diff_viewers); - } - else if ($viewer_guid) { - // get the number of times this user has viewed the photo - $my_views = 0; - foreach ($views as $view) { - if ($view->owner_guid == $viewer_guid) { - $my_views++; - } - } - } - - $view_info = array("total" => $total_views, "unique" => $unique_viewers, "mine" => $my_views); - } - else { - $view_info = array("total" => 0, "unique" => 0, "mine" => 0); - } - - return $view_info; - } - - /** - * Add a tidypics view annotation to this image - * - * @param $viewer_guid - * @return none - */ - public function addView($viewer_guid) { - if ($viewer_guid != $this->owner_guid && tp_is_person()) { - create_annotation($this->getGUID(), "tp_view", "1", "integer", $viewer_guid, ACCESS_PUBLIC); - } - } - /** * Remove thumbnails - usually in preparation for deletion * diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index f172b7cd6..22ccfb34d 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -11,6 +11,11 @@ group_gatekeeper(); // get the photo entity $photo_guid = (int) get_input('guid'); $photo = get_entity($photo_guid); +if (!$photo) { + +} + +$photo->addView(); // set page owner based on owner of photo album $album = $photo->getContainerEntity(); diff --git a/start.php b/start.php index f094bd2f4..4942f949a 100644 --- a/start.php +++ b/start.php @@ -285,7 +285,8 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) { if (elgg_instanceof($entity, 'object', 'image')) { if (elgg_get_plugin_setting('view_count', 'tidypics')) { - $status_text = '27 views'; + $view_info = $entity->getViewInfo(); + $status_text = (int)$view_info['total'] . ' views'; $options = array( 'name' => 'published_status', 'text' => "$status_text", diff --git a/views/default/photos/css.php b/views/default/photos/css.php index 0c0f33c2c..119d98c09 100644 --- a/views/default/photos/css.php +++ b/views/default/photos/css.php @@ -20,6 +20,7 @@ .tidypics-photo { margin: 0 auto; + display: block; } .tidypics-heading { -- cgit v1.2.3 From 67ce751dec9442ccef35bdbe596f9832b3b11c22 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 3 Dec 2011 17:46:33 -0500 Subject: updated the manifest for 1.8 --- manifest.xml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/manifest.xml b/manifest.xml index 5dabe4dfd..53181fc29 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,10 +1,16 @@ - - - - - - - - - + + Tidypics Photo Gallery + Cash Costello + 1.8.0 + A photo gallery with albums, tagging, and a slideshow. + content + multimedia + https://github.com/cash/Tidypics + Cash Costello 2011 + GNU General Public License Version 2 + + elgg_release + 1.8 + + \ No newline at end of file -- cgit v1.2.3 From be3479085d475428a213868e13e8504e924e32ba Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 11 Dec 2011 20:59:29 -0500 Subject: added navigation when viewing full image --- classes/TidypicsAlbum.php | 36 +++++++++++++++++-------------- languages/en.php | 1 + manifest.xml | 2 +- views/default/object/image/full.php | 13 +++++------ views/default/object/image/navigation.php | 34 +++++++++++++++++++++++++++++ views/default/photos/css.php | 14 ++++++++++++ 6 files changed, 77 insertions(+), 23 deletions(-) create mode 100644 views/default/object/image/navigation.php diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php index e5a8e2c0c..e04344a6b 100644 --- a/classes/TidypicsAlbum.php +++ b/classes/TidypicsAlbum.php @@ -207,41 +207,45 @@ class TidypicsAlbum extends ElggObject { } /** - * Get the GUID of the image before the current one + * Get the previous image in the album * - * @param int $currentGuid - * @return int + * @param int $guid GUID of the current image + * @return TidypicsImage */ - public function getPreviousImageGuid($currentGuid) { + public function getPreviousImage($guid) { $imageList = $this->getImageList(); - $key = array_search($currentGuid, $imageList); + $key = array_search($guid, $imageList); if ($key === FALSE) { - return 0; + return null; } $key--; if ($key < 0) { - return 0; + return get_entity(end($imageList)); } - return $imageList[$key]; + return get_entity($imageList[$key]); } /** - * Get the GUID of the image after the current one + * Get the next image in the album * - * @param int $currentGuid - * @return int + * @param int $guid GUID of the current image + * @return TidypicsImage */ - public function getNextImageGuid($currentGuid) { + public function getNextImage($guid) { $imageList = $this->getImageList(); - $key = array_search($currentGuid, $imageList); + $key = array_search($guid, $imageList); if ($key === FALSE) { - return 0; + return null; } $key++; if ($key >= count($imageList)) { - return 0; + return get_entity($imageList[0]); } - return $imageList[$key]; + return get_entity($imageList[$key]); + } + + public function getIndex($guid) { + return array_search($guid, $this->getImageList()) + 1; } /** diff --git a/languages/en.php b/languages/en.php index c701f98f4..e7d7bb988 100644 --- a/languages/en.php +++ b/languages/en.php @@ -126,6 +126,7 @@ $english = array( 'image:none' => "No images have been added yet.", 'image:back' => "Previous", 'image:next' => "Next", + 'image:index' => "%u of %u", // tagging 'tidypics:taginstruct' => 'Select area that you want to tag', diff --git a/manifest.xml b/manifest.xml index 53181fc29..b955ef6bb 100644 --- a/manifest.xml +++ b/manifest.xml @@ -2,7 +2,7 @@ Tidypics Photo Gallery Cash Costello - 1.8.0 + 1.8.0-preview1 A photo gallery with albums, tagging, and a slideshow. content multimedia diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index f866e432d..48ed40876 100644 --- a/views/default/object/image/full.php +++ b/views/default/object/image/full.php @@ -46,6 +46,13 @@ $summary = elgg_view_image_block($owner_icon, $list_body, $params); echo $summary; +echo '
          '; +echo elgg_view('object/image/navigation', $vars); +//echo elgg_view('tidypics/tagging/help'); +//echo elgg_view('tidypics/tagging/select', array('photo' => $photo)); +echo $img; +echo '
          '; + if ($photo->description) { echo elgg_view('output/longtext', array( 'value' => $photo->description, @@ -53,10 +60,4 @@ if ($photo->description) { )); } -echo '
          '; -echo elgg_view('tidypics/tagging/help'); -echo elgg_view('tidypics/tagging/select', array('photo' => $photo)); -echo $img; -echo '
          '; - echo elgg_view_comments($photo); diff --git a/views/default/object/image/navigation.php b/views/default/object/image/navigation.php new file mode 100644 index 000000000..155b76364 --- /dev/null +++ b/views/default/object/image/navigation.php @@ -0,0 +1,34 @@ +getContainerEntity(); +$previous_photo = $album->getPreviousImage($photo->getGUID()); +$next_photo = $album->getNextImage($photo->getGUID()); +$size = $album->getSize(); +$index = $album->getIndex($photo->getGUID()); + +echo '
            '; +echo '
          • '; +echo elgg_view('output/url', array( + 'text' => elgg_view_icon('arrow-left'), + 'href' => $previous_photo->getURL(), +)); +echo '
            • '; + +echo '
          • '; +echo '' . elgg_echo('image:index', array($index, $size)) . ''; +echo '
            • '; + +echo '
          • '; +echo elgg_view('output/url', array( + 'text' => elgg_view_icon('arrow-right'), + 'href' => $next_photo->getURL(), +)); +echo '
            • '; +echo '
          '; diff --git a/views/default/photos/css.php b/views/default/photos/css.php index 119d98c09..18f225131 100644 --- a/views/default/photos/css.php +++ b/views/default/photos/css.php @@ -52,6 +52,20 @@ padding: 0 10px; } +.tidypics-album-nav { + margin: 3px 0; + text-align: center; + color: #aaa; +} + +.tidypics-album-nav > li { + padding: 0 3px; +} + +.tidypics-album-nav > li { + vertical-align: top; +} + -- cgit v1.2.3 From 175bcd1e19e8094a0096dbe678e5f7748b664a89 Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 11 Dec 2011 21:13:20 -0500 Subject: added lightbox to single images --- classes/TidypicsImage.php | 4 ++++ pages/photos/image/thumbnail.php | 6 +++++- views/default/js/photos/tidypics.php | 3 +++ views/default/object/image/full.php | 5 ++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index aec48b474..49585fd0c 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -307,6 +307,10 @@ class TidypicsImage extends ElggFile { return $file->grabFile(); } + public function getImage() { + return $this->grabFile(); + } + /** * Extract EXIF Data from image * diff --git a/pages/photos/image/thumbnail.php b/pages/photos/image/thumbnail.php index ae07f2706..ed39c6169 100644 --- a/pages/photos/image/thumbnail.php +++ b/pages/photos/image/thumbnail.php @@ -13,7 +13,11 @@ if (!$image) { // @todo } -$contents = $image->getThumbnail($size); +if ($size == 'master') { + $contents = $image->getImage(); +} else { + $contents = $image->getThumbnail($size); +} if (!$contents) { forward("mod/tidypics/graphics/image_error_$size"); } diff --git a/views/default/js/photos/tidypics.php b/views/default/js/photos/tidypics.php index 509d2116a..896192eea 100644 --- a/views/default/js/photos/tidypics.php +++ b/views/default/js/photos/tidypics.php @@ -8,6 +8,9 @@ elgg.provide('elgg.tidypics'); elgg.tidypics.init = function() { + + $(".tidypics-lightbox").fancybox({'type': 'image'}); + $("#tidypics-sort").sortable({ opacity: 0.7, revert: true, diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index 48ed40876..e3a2c7003 100644 --- a/views/default/object/image/full.php +++ b/views/default/object/image/full.php @@ -11,9 +11,12 @@ $image = $photo = $vars['entity']; $img = elgg_view_entity_icon($image, 'large', array( - 'href' => false, + 'href' => $image->getIconURL('master'), 'img_class' => 'tidypics-photo', + 'link_class' => 'tidypics-lightbox', )); +elgg_load_js('lightbox'); +elgg_load_css('lightbox'); $owner_link = elgg_view('output/url', array( 'href' => "photos/owner/" . $photo->getOwnerEntity()->username, -- cgit v1.2.3 From 30e4d9f0a2e45e640de3e57bd5f432022141317c Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 11 Dec 2011 21:32:19 -0500 Subject: add the old slideshow back in --- languages/en.php | 2 +- start.php | 15 +++++++++++++++ views/default/js/photos/tidypics.php | 4 +++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/languages/en.php b/languages/en.php index e7d7bb988..ec65d0622 100644 --- a/languages/en.php +++ b/languages/en.php @@ -16,7 +16,7 @@ $english = array( 'photos:add' => "Create album", 'images:upload' => "Upload photos", - 'album:slideshow' => "View slideshow", + 'album:slideshow' => "Slideshow", 'album:yours' => "Your photo albums", 'album:yours:friends' => "Your friends' photo albums", 'album:user' => "%s's photo albums", diff --git a/start.php b/start.php index 4942f949a..948d42fb5 100644 --- a/start.php +++ b/start.php @@ -34,6 +34,7 @@ function tidypics_init() { $js = elgg_get_simplecache_url('js', 'photos/tidypics'); elgg_register_simplecache_view('js/photos/tidypics'); elgg_register_js('tidypics', $js, 'footer'); + elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer'); // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); @@ -139,6 +140,7 @@ function tidypics_page_handler($page) { case "album": // view an album individually set_input('guid', $page[1]); + elgg_load_js('tidypics:slideshow'); require "$base/album/view.php"; break; @@ -297,6 +299,19 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) { } } + if (elgg_instanceof($entity, 'object', 'album')) { + $url = $entity->getURL() . '?limit=50&view=rss'; + $url = elgg_format_url($url); + $slideshow_link = "javascript:PicLensLite.start({maxScale:0, feedUrl:'$url'})"; + $options = array( + 'name' => 'slideshow', + 'text' => elgg_echo('album:slideshow'), + 'href' => $slideshow_link, + 'priority' => 90, + ); + $return[] = ElggMenuItem::factory($options); + } + return $return; } diff --git a/views/default/js/photos/tidypics.php b/views/default/js/photos/tidypics.php index 896192eea..c97a1eadb 100644 --- a/views/default/js/photos/tidypics.php +++ b/views/default/js/photos/tidypics.php @@ -9,7 +9,9 @@ elgg.provide('elgg.tidypics'); elgg.tidypics.init = function() { - $(".tidypics-lightbox").fancybox({'type': 'image'}); + if ($(".tidypics-lightbox").length) { + $(".tidypics-lightbox").fancybox({'type': 'image'}); + } $("#tidypics-sort").sortable({ opacity: 0.7, -- cgit v1.2.3 From 86535f77d6b32a2c8a403609ded299a76c73bba0 Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 2 Jan 2012 09:48:22 -0500 Subject: added support for downloading images --- pages/download.php | 50 ----------------------------------------- pages/photos/image/download.php | 41 +++++++++++++++++++++++++++++++++ pages/photos/image/view.php | 16 +++++++------ start.php | 10 +++------ 4 files changed, 53 insertions(+), 64 deletions(-) delete mode 100644 pages/download.php create mode 100644 pages/photos/image/download.php diff --git a/pages/download.php b/pages/download.php deleted file mode 100644 index 23c3e39f4..000000000 --- a/pages/download.php +++ /dev/null @@ -1,50 +0,0 @@ -originalfilename; - $mime = $file->mimetype; - - header("Content-Type: $mime"); - if ($type == "inline") { - header("Content-Disposition: inline; filename=\"$filename\""); - } else { - header("Content-Disposition: attachment; filename=\"$filename\""); - } - - $readfile = new ElggFile($file_guid); - $readfile->owner_guid = $file->owner_guid; - - $contents = $readfile->grabFile(); - - if (empty($contents)) { - echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" ); - } else { - - // expires every 60 days - $expires = 60 * 60*60*24; - - header("Content-Length: " . strlen($contents)); - header("Cache-Control: public", true); - header("Pragma: public", true); - header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true); - - - echo $contents; - } - - exit; -} else { - register_error(elgg_echo("image:downloadfailed")); -} \ No newline at end of file diff --git a/pages/photos/image/download.php b/pages/photos/image/download.php new file mode 100644 index 000000000..ef47b7638 --- /dev/null +++ b/pages/photos/image/download.php @@ -0,0 +1,41 @@ +originalfilename; + $mime = $image->mimetype; + + header("Content-Type: $mime"); + header("Content-Disposition: $disposition; filename=\"$filename\""); + + $contents = $image->grabFile(); + + if (empty($contents)) { + echo file_get_contents(dirname(dirname(__FILE__)) . "/graphics/image_error_large.png" ); + } else { + + // expires every 60 days + $expires = 60 * 60*60*24; + + header("Content-Length: " . strlen($contents)); + header("Cache-Control: public", true); + header("Pragma: public", true); + header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true); + + echo $contents; + } + + exit; +} else { + register_error(elgg_echo("image:downloadfailed")); +} diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index 22ccfb34d..f9157a900 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -34,13 +34,15 @@ if (elgg_instanceof($owner, 'group')) { elgg_push_breadcrumb($album->title, $album->getURL()); elgg_push_breadcrumb($photo->title); -// add download button to title menu -elgg_register_menu_item('title', array( - 'name' => 'download', - 'href' => 'photos/download', - 'text' => elgg_echo('image:download'), - 'link_class' => 'elgg-button elgg-button-action', -)); +if (elgg_get_plugin_setting('download_link', 'tidypics')) { + // add download button to title menu + elgg_register_menu_item('title', array( + 'name' => 'download', + 'href' => "photos/download/$photo_guid", + 'text' => elgg_echo('image:download'), + 'link_class' => 'elgg-button elgg-button-action', + )); +} $content = elgg_view_entity($photo, array('full_view' => true)); diff --git a/start.php b/start.php index 948d42fb5..5638037cc 100644 --- a/start.php +++ b/start.php @@ -199,13 +199,9 @@ function tidypics_page_handler($page) { break; case "download": // download an image - if (isset($page[1])) { - set_input('file_guid', $page[1]); - } - if (isset($page[2])) { - set_input('type', $page[2]); - } - include($CONFIG->pluginspath . "tidypics/pages/download.php"); + set_input('guid', $page[1]); + set_input('disposition', elgg_extract(2, $page, 'attachment')); + include "$base/image/download.php"; break; case "tagged": // all photos tagged with user -- cgit v1.2.3 From 20ab73de5248b3418bbbad27850e3d3e093c473c Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 2 Jan 2012 12:45:16 -0500 Subject: added photo tagging - but not displaying or deleting tags yet --- actions/addtag.php | 105 ------------------------------- actions/photos/image/tag.php | 99 +++++++++++++++++++++++++++++ languages/en.php | 4 +- pages/photos/image/view.php | 5 ++ start.php | 23 +++++-- views/default/forms/photos/image/tag.php | 33 ++++++++++ views/default/js/photos/tagging.php | 73 +++++++++++++++++++++ views/default/object/image/full.php | 4 +- views/default/photos/css.php | 56 ++++++++++++++++- views/default/photos/tagging/help.php | 19 ++++++ views/default/photos/tagging/select.php | 16 +++++ 11 files changed, 321 insertions(+), 116 deletions(-) delete mode 100644 actions/addtag.php create mode 100644 actions/photos/image/tag.php create mode 100644 views/default/forms/photos/image/tag.php create mode 100644 views/default/js/photos/tagging.php create mode 100644 views/default/photos/tagging/help.php create mode 100644 views/default/photos/tagging/select.php diff --git a/actions/addtag.php b/actions/addtag.php deleted file mode 100644 index 97418f495..000000000 --- a/actions/addtag.php +++ /dev/null @@ -1,105 +0,0 @@ -tags)) { - if ($image->tags != $word) { - $new_word_tag = true; - $tagarray = $image->tags . ',' . $word; - $tagarray = string_to_tag_array($tagarray); - } - } else { - if (!in_array($word, $image->tags)) { - $new_word_tag = true; - $tagarray = $image->tags; - $tagarray[] = $word; - } - } -} - -// add new tag now so it is available in search -if ($new_word_tag) { - $image->clearMetadata('tags'); - $image->tags = $tagarray; -} - -// create string for javascript tag object -$tag->coords = $coordinates_str; -$tag->type = $relationships_type; -$tag->value = $value; - -$access_id = $image->getAccessID(); -$owner_id = get_loggedin_userid(); -$tagger = get_loggedin_user(); - -//Save annotation -$annotation_id = $image->annotate('phototag', serialize($tag), $access_id, $owner_id); -if ($annotation_id) { - // if tag is a user id, add relationship for searching (find all images with user x) - if ($relationships_type === 'user') { - if (!check_entity_relationship($user_id, 'phototag', $image_guid)) { - add_entity_relationship($user_id, 'phototag', $image_guid); - - // also add this to the river - subject is image, object is the tagged user - add_to_river('river/object/image/tag', 'tag', $tagger->guid, $user_id, $access_id, 0, $annotation_id); - - // notify user of tagging as long as not self - if ($owner_id != $user_id) { - notify_user( - $user_id, - $owner_id, - elgg_echo('tidypics:tag:subject'), - sprintf( - elgg_echo('tidypics:tag:body'), - $image->title, - $tagger->name, - $image->getURL() - ) - ); - } - } - } - - system_message(elgg_echo("tidypics:phototagging:success")); -} - - -forward($_SERVER['HTTP_REFERER']); diff --git a/actions/photos/image/tag.php b/actions/photos/image/tag.php new file mode 100644 index 000000000..0c7ce06ae --- /dev/null +++ b/actions/photos/image/tag.php @@ -0,0 +1,99 @@ +tags)) { + if ($image->tags != $word) { + $new_word_tag = true; + $tagarray = $image->tags . ',' . $word; + $tagarray = string_to_tag_array($tagarray); + } + } else { + if (!in_array($word, $image->tags)) { + $new_word_tag = true; + $tagarray = $image->tags; + $tagarray[] = $word; + } + } +} + +// add new tag now so it is available in search +if ($new_word_tag) { + $image->clearMetadata('tags'); + $image->tags = $tagarray; +} +*/ + +$tag = new stdClass(); +$tag->coords = $coordinates_str; +$tag->type = 'user'; +$tag->value = get_user_by_username($username)->getGUID(); +$access_id = $image->getAccessID(); + +$annotation_id = $image->annotate('phototag', serialize($tag), $access_id); +if ($annotation_id) { + // if tag is a user id, add relationship for searching (find all images with user x) + if ($tag->type === 'user') { + if (!check_entity_relationship($tag->value, 'phototag', $image_guid)) { + add_entity_relationship($tag->value, 'phototag', $image_guid); +/* + // also add this to the river - subject is image, object is the tagged user + add_to_river('river/object/image/tag', 'tag', $tagger->guid, $user_id, $access_id, 0, $annotation_id); + + // notify user of tagging as long as not self + if ($owner_id != $user_id) { + notify_user( + $user_id, + $owner_id, + elgg_echo('tidypics:tag:subject'), + sprintf( + elgg_echo('tidypics:tag:body'), + $image->title, + $tagger->name, + $image->getURL() + ) + ); + } + * + */ + } + } + + system_message(elgg_echo("tidypics:phototagging:success")); +} + +forward(REFERER); diff --git a/languages/en.php b/languages/en.php index ec65d0622..2276e4b12 100644 --- a/languages/en.php +++ b/languages/en.php @@ -45,7 +45,7 @@ $english = array( 'tidypics:friendmostviewed' => "%s's most viewed images", 'tidypics:friendmostrecent' => "%s's most recent images", 'tidypics:highestrated' => "Highest rated images", - 'tidypics:views' => "Views: %s", + 'tidypics:views' => "%s views", 'tidypics:viewsbyowner' => "by %s users (not including you)", 'tidypics:viewsbyothers' => "(%s by you)", 'tidypics:administration' => 'Tidypics Administration', @@ -129,7 +129,7 @@ $english = array( 'image:index' => "%u of %u", // tagging - 'tidypics:taginstruct' => 'Select area that you want to tag', + 'tidypics:taginstruct' => 'Select the area that you want to tag or %s', 'tidypics:deltag_title' => 'Select tags to delete', 'tidypics:finish_tagging' => 'Stop tagging', 'tidypics:tagthisphoto' => 'Tag this photo', diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index f9157a900..6db9ff529 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -17,6 +17,11 @@ if (!$photo) { $photo->addView(); +if (elgg_get_plugin_setting('tagging', 'tidypics')) { + elgg_load_js('tidypics:tagging'); + elgg_load_js('jquery.imgareaselect'); +} + // set page owner based on owner of photo album $album = $photo->getContainerEntity(); if ($album) { diff --git a/start.php b/start.php index 5638037cc..a81c1d854 100644 --- a/start.php +++ b/start.php @@ -34,6 +34,9 @@ function tidypics_init() { $js = elgg_get_simplecache_url('js', 'photos/tidypics'); elgg_register_simplecache_view('js/photos/tidypics'); elgg_register_js('tidypics', $js, 'footer'); + $js = elgg_get_simplecache_url('js', 'photos/tagging'); + elgg_register_simplecache_view('js/photos/tagging'); + elgg_register_js('tidypics:tagging', $js, 'footer'); elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer'); // Add photos link to owner block/hover menus @@ -93,7 +96,7 @@ function tidypics_init() { //register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php"); //register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php"); //register_action("tidypics/sortalbum", false, "$base_dir/sortalbum.php"); - //register_action("tidypics/addtag", false, "$base_dir/addtag.php"); + elgg_register_action("photos/image/tag", "$base_dir/image/tag.php"); //register_action("tidypics/deletetag", false, "$base_dir/deletetag.php"); elgg_register_action("photos/admin/settings", "$base_dir/admin/settings.php", 'admin'); @@ -284,15 +287,27 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) { if (elgg_instanceof($entity, 'object', 'image')) { if (elgg_get_plugin_setting('view_count', 'tidypics')) { $view_info = $entity->getViewInfo(); - $status_text = (int)$view_info['total'] . ' views'; + $text = elgg_echo('tidypics:views', array((int)$view_info['total'])); $options = array( - 'name' => 'published_status', - 'text' => "$status_text", + 'name' => 'views', + 'text' => "$text", 'href' => false, 'priority' => 90, ); $return[] = ElggMenuItem::factory($options); } + + if (elgg_get_plugin_setting('tagging', 'tidypics')) { + $options = array( + 'name' => 'tagging', + 'text' => elgg_echo('tidypics:actiontag'), + 'href' => '#', + 'title' => elgg_echo('tidypics:tagthisphoto'), + 'rel' => 'photo-tagging', + 'priority' => 80, + ); + $return[] = ElggMenuItem::factory($options); + } } if (elgg_instanceof($entity, 'object', 'album')) { diff --git a/views/default/forms/photos/image/tag.php b/views/default/forms/photos/image/tag.php new file mode 100644 index 000000000..31869be9e --- /dev/null +++ b/views/default/forms/photos/image/tag.php @@ -0,0 +1,33 @@ +'; + +echo elgg_view('input/autocomplete', array( + 'name' => 'username', + 'match_on' => 'friends', +)); + +echo elgg_view('input/hidden', array( + 'name' => 'guid', + 'value' => $vars['entity']->getGUID(), +)); + +echo elgg_view('input/hidden', array( + 'name' => 'coordinates', +)); + +echo '
          '; + +echo '
          '; +echo elgg_view('input/submit', array( + 'value' => elgg_echo('tidypics:actiontag'), +)); +echo '
          '; diff --git a/views/default/js/photos/tagging.php b/views/default/js/photos/tagging.php new file mode 100644 index 000000000..f831200e7 --- /dev/null +++ b/views/default/js/photos/tagging.php @@ -0,0 +1,73 @@ + + +elgg.provide('elgg.tidypics.tagging'); + +elgg.tidypics.tagging.init = function() { + $('[rel=photo-tagging]').click(elgg.tidypics.tagging.start); + + $('#tidypics-tagging-quit').click(elgg.tidypics.tagging.stop); +} + +/** + * Start a tagging session + */ +elgg.tidypics.tagging.start = function(event) { + + $('.tidypics-photo').imgAreaSelect({ + disable : false, + hide : false, + classPrefix : 'tidypics-tagging', + onSelectEnd : elgg.tidypics.tagging.startSelect, + onSelectStart: function() { + $('#tidypics-tagging-select').hide(); + } + }); + + $('.tidypics-photo').css({"cursor" : "crosshair"}); + + $('#tidypics-tagging-help').toggle(); + + event.preventDefault(); +} + +/** + * Stop tagging + * + * A tagging session could be completed or the user could have quit. + */ +elgg.tidypics.tagging.stop = function(event) { + $('#tidypics-tagging-help').toggle(); + $('#tidypics-tagging-select').hide(); + + $('.tidypics-photo').imgAreaSelect({hide: true, disable: true}); + $('.tidypics-photo').css({"cursor" : "pointer"}); + + event.preventDefault(); +} + +/** + * Start the selection stage of tagging + */ +elgg.tidypics.tagging.startSelect = function(img, selection) { + + var coords = '"x1":"' + selection.x1 + '",'; + coords += '"y1":"' + selection.y1 + '",'; + coords += '"width":"' + selection.width + '",'; + coords += '"height":"' + selection.height + '"'; + $("input[name=coordinates]").val(coords); + + $('#tidypics-tagging-select').show().css({ + 'top' : selection.y2 + 10, + 'left' : selection.x2 + }); +} + +elgg.register_hook_handler('init', 'system', elgg.tidypics.tagging.init); diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index e3a2c7003..33ba49739 100644 --- a/views/default/object/image/full.php +++ b/views/default/object/image/full.php @@ -51,8 +51,8 @@ echo $summary; echo '
          '; echo elgg_view('object/image/navigation', $vars); -//echo elgg_view('tidypics/tagging/help'); -//echo elgg_view('tidypics/tagging/select', array('photo' => $photo)); +echo elgg_view('photos/tagging/help', $vars); +echo elgg_view('photos/tagging/select', $vars); echo $img; echo '
          '; diff --git a/views/default/photos/css.php b/views/default/photos/css.php index 18f225131..31e3d9b53 100644 --- a/views/default/photos/css.php +++ b/views/default/photos/css.php @@ -1,9 +1,15 @@ +/* *************************************** + TIDYPICS +*************************************** */ .elgg-module-tidypics-album, .elgg-module-tidypics-image { width: 161px; @@ -23,6 +29,10 @@ display: block; } +.tidypics-wrapper-photo { + position: relative; +} + .tidypics-heading { color: #0054A7; } @@ -66,6 +76,46 @@ vertical-align: top; } +/* *************************************** + Tagging +*************************************** */ +.tidypics-tagging-border1 { + border: solid 2px white; +} + +.tidypics-tagging-border1, .tidypics-tagging-border2, +.tidypics-tagging-border3, .tidypics-tagging-border4 { + filter: alpha(opacity=50); + opacity: 0.5; +} + +.tidypics-tagging-handle { + background-color: #fff; + border: solid 1px #000; + filter: alpha(opacity=50); + opacity: 0.5; +} + +.tidypics-tagging-outer { + background-color: #000; + filter: alpha(opacity=50); + opacity: 0.5; +} + +.tidypics-tagging-help { + position: absolute; + left: 50%; + top: -25px; + width: 250px; + margin-left: -125px; + text-align: center; +} + +.tidypics-tagging-select { + position: absolute; + max-width: 300px; +} + diff --git a/views/default/photos/tagging/help.php b/views/default/photos/tagging/help.php new file mode 100644 index 000000000..a7f437e51 --- /dev/null +++ b/views/default/photos/tagging/help.php @@ -0,0 +1,19 @@ + elgg_echo('quit'), + 'href' => '#', + 'id' => 'tidypics-tagging-quit', +)); + +$instructions = elgg_echo('tidypics:taginstruct', array($button)); +?> + diff --git a/views/default/photos/tagging/select.php b/views/default/photos/tagging/select.php new file mode 100644 index 000000000..8894af63a --- /dev/null +++ b/views/default/photos/tagging/select.php @@ -0,0 +1,16 @@ + 'tidypics-tagging-select pam hidden', + 'id' => 'tidypics-tagging-select', +)); -- cgit v1.2.3 From fbdaf2a33386e6746be4de50a0b4aceb06ff5e68 Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 2 Jan 2012 14:34:58 -0500 Subject: displaying the tag on the photo but not a label for the tag --- classes/TidypicsImage.php | 14 ++++--- views/default/js/photos/tagging.php | 74 +++++++++++++++++++++++++++++++++-- views/default/object/image/full.php | 1 + views/default/photos/css.php | 6 +++ views/default/photos/tagging/tag.php | 24 ++++++++++++ views/default/photos/tagging/tags.php | 11 ++++++ 6 files changed, 120 insertions(+), 10 deletions(-) create mode 100644 views/default/photos/tagging/tag.php create mode 100644 views/default/photos/tagging/tags.php diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index 49585fd0c..7eca2f7c3 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -341,15 +341,16 @@ class TidypicsImage extends ElggFile { * @return array of json representations of the tags and the tag link text */ public function getPhotoTags() { - global $CONFIG; - // get tags as annotations - $photo_tags = get_annotations($this->getGUID(), 'object', 'image', 'phototag'); - if (!$photo_tags) { - // no tags or user doesn't have permission to tags, so return - return false; + $tags = array(); + $annotations = get_annotations($this->getGUID(), 'object', 'image', 'phototag'); + foreach ($annotations as $annotation) { + $tags[] = unserialize($annotation->value); } + return $tags; + + /* $photo_tags_json = "["; foreach ($photo_tags as $p) { $photo_tag = unserialize($p->value); @@ -385,6 +386,7 @@ class TidypicsImage extends ElggFile { $ret_data = array('json' => $photo_tags_json, 'links' => $photo_tag_links); return $ret_data; + */ } /** diff --git a/views/default/js/photos/tagging.php b/views/default/js/photos/tagging.php index f831200e7..b00200e74 100644 --- a/views/default/js/photos/tagging.php +++ b/views/default/js/photos/tagging.php @@ -11,16 +11,27 @@ elgg.provide('elgg.tidypics.tagging'); elgg.tidypics.tagging.init = function() { + elgg.tidypics.tagging.active = false; $('[rel=photo-tagging]').click(elgg.tidypics.tagging.start); $('#tidypics-tagging-quit').click(elgg.tidypics.tagging.stop); -} + + $('.tidypics-tag').each(elgg.tidypics.tagging.position); + + elgg.tidypics.tagging.tag_hover = false; + elgg.tidypics.tagging.toggleTagHover(); +}; /** * Start a tagging session */ elgg.tidypics.tagging.start = function(event) { + if (elgg.tidypics.tagging.active) { + elgg.tidypics.tagging.stop(event); + return; + } + $('.tidypics-photo').imgAreaSelect({ disable : false, hide : false, @@ -31,12 +42,16 @@ elgg.tidypics.tagging.start = function(event) { } }); + elgg.tidypics.tagging.toggleTagHover(); + $('.tidypics-photo').css({"cursor" : "crosshair"}); $('#tidypics-tagging-help').toggle(); + elgg.tidypics.tagging.active = true; + event.preventDefault(); -} +}; /** * Stop tagging @@ -50,8 +65,11 @@ elgg.tidypics.tagging.stop = function(event) { $('.tidypics-photo').imgAreaSelect({hide: true, disable: true}); $('.tidypics-photo').css({"cursor" : "pointer"}); + elgg.tidypics.tagging.active = false; + elgg.tidypics.tagging.toggleTagHover(); + event.preventDefault(); -} +}; /** * Start the selection stage of tagging @@ -68,6 +86,54 @@ elgg.tidypics.tagging.startSelect = function(img, selection) { 'top' : selection.y2 + 10, 'left' : selection.x2 }); -} +}; + +/** + * Position the tags over the image + */ +elgg.tidypics.tagging.position = function() { + var tag_left = parseInt($(this).data('x1')); + var tag_top = parseInt($(this).data('y1')); + var tag_width = parseInt($(this).data('width')); + var tag_height = parseInt($(this).data('height')); + + // add image offset + var image_pos = $('.tidypics-photo').position(); + tag_left += image_pos.left; + tag_top += image_pos.top; + + $(this).css({ + left: tag_left + 'px', + top: tag_top + 'px', + width: tag_width + 'px', + height: tag_height + 'px' + }); +}; + +/** + * Toggle whether tags are shown on hover over the image + */ +elgg.tidypics.tagging.toggleTagHover = function() { + if (elgg.tidypics.tagging.tag_hover == false) { + $('.tidypics-photo').hover( + function() { + $('.tidypics-tag').show(); + }, + function() { + $('.tidypics-tag').hide(); + } + ); + } else { + $('.tidypics-photo').hover( + function() { + $('.tidypics-tag').hide(); + }, + function() { + $('.tidypics-tag').hide(); + } + ); + } + elgg.tidypics.tagging.tag_hover = !elgg.tidypics.tagging.tag_hover; +}; elgg.register_hook_handler('init', 'system', elgg.tidypics.tagging.init); diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index 33ba49739..e12e96806 100644 --- a/views/default/object/image/full.php +++ b/views/default/object/image/full.php @@ -54,6 +54,7 @@ echo elgg_view('object/image/navigation', $vars); echo elgg_view('photos/tagging/help', $vars); echo elgg_view('photos/tagging/select', $vars); echo $img; +echo elgg_view('photos/tagging/tags', $vars); echo '
          '; if ($photo->description) { diff --git a/views/default/photos/css.php b/views/default/photos/css.php index 31e3d9b53..23926adbc 100644 --- a/views/default/photos/css.php +++ b/views/default/photos/css.php @@ -116,6 +116,12 @@ max-width: 300px; } +.tidypics-tag { + display: none; + position: absolute; + border: 2px solid white; +} + diff --git a/views/default/photos/tagging/tag.php b/views/default/photos/tagging/tag.php new file mode 100644 index 000000000..4d3affeb6 --- /dev/null +++ b/views/default/photos/tagging/tag.php @@ -0,0 +1,24 @@ +coords . '}'); + +$attributes = elgg_format_attributes(array( + 'class' => 'tidypics-tag', + 'data-x1' => $coords->x1, + 'data-y1' => $coords->y1, + 'data-width' => $coords->width, + 'data-height' => $coords->height, +)); + +//var_dump($vars['tag']); +//$text = "This is a something"; + +echo << +
          +HTML; diff --git a/views/default/photos/tagging/tags.php b/views/default/photos/tagging/tags.php new file mode 100644 index 000000000..7a4aa3a59 --- /dev/null +++ b/views/default/photos/tagging/tags.php @@ -0,0 +1,11 @@ +getPhotoTags(); +foreach ($tags as $tag) { + echo elgg_view('photos/tagging/tag', array('tag' => $tag)); +} -- cgit v1.2.3 From ad4f0fc6c003e0b3365f542795c1c6b3ee06749d Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 2 Jan 2012 15:40:23 -0500 Subject: displaying the labels on tags now --- views/default/js/photos/tagging.php | 17 +++++++++++------ views/default/object/image/full.php | 2 +- views/default/photos/css.php | 24 ++++++++++++++++++++---- views/default/photos/tagging/tag.php | 18 +++++++++++++++--- views/default/photos/tagging/tags.php | 3 +++ 5 files changed, 50 insertions(+), 14 deletions(-) diff --git a/views/default/js/photos/tagging.php b/views/default/js/photos/tagging.php index b00200e74..47bab9de5 100644 --- a/views/default/js/photos/tagging.php +++ b/views/default/js/photos/tagging.php @@ -102,9 +102,14 @@ elgg.tidypics.tagging.position = function() { tag_left += image_pos.left; tag_top += image_pos.top; - $(this).css({ + $(this).parent().css({ left: tag_left + 'px', - top: tag_top + 'px', + top: tag_top + 'px' /* + width: tag_width + 'px', + height: tag_height + 'px' */ + }); + + $(this).css({ width: tag_width + 'px', height: tag_height + 'px' }); @@ -117,19 +122,19 @@ elgg.tidypics.tagging.toggleTagHover = function() { if (elgg.tidypics.tagging.tag_hover == false) { $('.tidypics-photo').hover( function() { - $('.tidypics-tag').show(); + $('.tidypics-tag-wrapper').show(); }, function() { - $('.tidypics-tag').hide(); + $('.tidypics-tag-wrapper').hide(); } ); } else { $('.tidypics-photo').hover( function() { - $('.tidypics-tag').hide(); + $('.tidypics-tag-wrapper').hide(); }, function() { - $('.tidypics-tag').hide(); + $('.tidypics-tag-wrapper').hide(); } ); } diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index e12e96806..175519c16 100644 --- a/views/default/object/image/full.php +++ b/views/default/object/image/full.php @@ -49,7 +49,7 @@ $summary = elgg_view_image_block($owner_icon, $list_body, $params); echo $summary; -echo '
          '; +echo '
          '; echo elgg_view('object/image/navigation', $vars); echo elgg_view('photos/tagging/help', $vars); echo elgg_view('photos/tagging/select', $vars); diff --git a/views/default/photos/css.php b/views/default/photos/css.php index 23926adbc..3e18d1908 100644 --- a/views/default/photos/css.php +++ b/views/default/photos/css.php @@ -23,13 +23,20 @@ .tidypics-gallery-widget > li { width: 100%; } - +/* +.tidypics-lightbox { + margin: 0 auto; + display: block; + width: auto; +} +*/ +/* .tidypics-photo { margin: 0 auto; display: block; } - -.tidypics-wrapper-photo { +*/ +.tidypics-photo-wrapper { position: relative; } @@ -116,10 +123,19 @@ max-width: 300px; } -.tidypics-tag { +.tidypics-tag-wrapper { display: none; position: absolute; +} + +.tidypics-tag { border: 2px solid white; + clear: both; +} + +.tidypics-tag-label { + float: left; + margin-top: 5px; } coords . '}'); @@ -15,10 +18,19 @@ $attributes = elgg_format_attributes(array( 'data-height' => $coords->height, )); -//var_dump($vars['tag']); -//$text = "This is a something"; +if ($vars['tag']->type == 'user') { + $user = get_entity($vars['tag']->value); + $label = elgg_view('output/url', array( + 'text' => $user->name, + 'href' => $user->getURL(), + )); +} else { + $label = $vars['tag']->value; +} echo << +
          +
          +
          $label
          HTML; diff --git a/views/default/photos/tagging/tags.php b/views/default/photos/tagging/tags.php index 7a4aa3a59..29c9d0efb 100644 --- a/views/default/photos/tagging/tags.php +++ b/views/default/photos/tagging/tags.php @@ -3,6 +3,9 @@ * View the tags for this image * * @uses $vars['entity'] + * + * @author Cash Costello + * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 */ $tags = $vars['entity']->getPhotoTags(); -- cgit v1.2.3 From 9e54d3a4c5274b235a29de9a00e967695024d8e1 Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 2 Jan 2012 15:55:09 -0500 Subject: added support for plain word tags --- actions/photos/image/tag.php | 16 +++++++++++++--- views/default/photos/css.php | 14 +------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/actions/photos/image/tag.php b/actions/photos/image/tag.php index 0c7ce06ae..20f476944 100644 --- a/actions/photos/image/tag.php +++ b/actions/photos/image/tag.php @@ -26,7 +26,17 @@ if (empty($username)) { forward(REFERER); } -/* +$user = get_user_by_username($username); +if (!$user) { + // plain tag + $relationships_type = 'word'; + $value = $username; +} else { + $relationships_type = 'user'; + $value = $user->guid; +} + +/* // not adding as plain tag yet $new_word_tag = false; if ($user_id != 0) { $relationships_type = 'user'; @@ -60,8 +70,8 @@ if ($new_word_tag) { $tag = new stdClass(); $tag->coords = $coordinates_str; -$tag->type = 'user'; -$tag->value = get_user_by_username($username)->getGUID(); +$tag->type = $relationships_type; +$tag->value = $value; $access_id = $image->getAccessID(); $annotation_id = $image->annotate('phototag', serialize($tag), $access_id); diff --git a/views/default/photos/css.php b/views/default/photos/css.php index 3e18d1908..4429ca0c7 100644 --- a/views/default/photos/css.php +++ b/views/default/photos/css.php @@ -23,19 +23,6 @@ .tidypics-gallery-widget > li { width: 100%; } -/* -.tidypics-lightbox { - margin: 0 auto; - display: block; - width: auto; -} -*/ -/* -.tidypics-photo { - margin: 0 auto; - display: block; -} -*/ .tidypics-photo-wrapper { position: relative; } @@ -136,6 +123,7 @@ .tidypics-tag-label { float: left; margin-top: 5px; + color: #666; } Date: Mon, 2 Jan 2012 16:37:45 -0500 Subject: put in a workaround for tags being above the image for managing the hover events --- views/default/js/photos/tagging.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/views/default/js/photos/tagging.php b/views/default/js/photos/tagging.php index 47bab9de5..a3c7efc1c 100644 --- a/views/default/js/photos/tagging.php +++ b/views/default/js/photos/tagging.php @@ -124,8 +124,20 @@ elgg.tidypics.tagging.toggleTagHover = function() { function() { $('.tidypics-tag-wrapper').show(); }, - function() { - $('.tidypics-tag-wrapper').hide(); + function(event) { + // this check handles the tags appearing over the image + var mouseX = event.pageX; + var mouseY = event.pageY; + var offset = $('.tidypics-photo').offset(); + var width = $('.tidypics-photo').outerWidth() - 1; + var height = $('.tidypics-photo').outerHeight() - 1; + + mouseX -= offset.left; + mouseY -= offset.top; + + if (mouseX < 0 || mouseX > width || mouseY < 0 || mouseY > height) { + $('.tidypics-tag-wrapper').hide(); + } } ); } else { -- cgit v1.2.3 From f5e8d5e9be7873132fbfddf74ef8ff68f01fccae Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 2 Jan 2012 17:01:18 -0500 Subject: updated the upgrade system --- actions/admin/upgrade.php | 48 ----------------------------- actions/photos/admin/upgrade.php | 50 +++++++++++++++++++++++++++++++ lib/tidypics.php | 32 ++++++++++++++++++++ start.php | 2 +- views/default/admin/settings/tidypics.php | 12 ++++++++ 5 files changed, 95 insertions(+), 49 deletions(-) delete mode 100644 actions/admin/upgrade.php create mode 100644 actions/photos/admin/upgrade.php diff --git a/actions/admin/upgrade.php b/actions/admin/upgrade.php deleted file mode 100644 index 334e9588e..000000000 --- a/actions/admin/upgrade.php +++ /dev/null @@ -1,48 +0,0 @@ -pluginspath}tidypics/version.php"; - -$local_version = get_plugin_setting('version', 'tidypics'); - -if ($version <= $local_version) { - register_error('No upgrade required'); - forward($_SERVER['HTTP_REFERER']); -} - -set_time_limit(0); - -$base_dir = $CONFIG->pluginspath . 'tidypics/upgrades'; - -// taken from engine/lib/version.php -if ($handle = opendir($base_dir)) { - $upgrades = array(); - - while ($updatefile = readdir($handle)) { - // Look for upgrades and add to upgrades list - if (!is_dir("$base_dir/$updatefile")) { - if (preg_match('/^([0-9]{10})\.(php)$/', $updatefile, $matches)) { - $plugin_version = (int) $matches[1]; - if ($plugin_version > $local_version) { - $upgrades[] = "$base_dir/$updatefile"; - } - } - } - } - - // Sort and execute - asort($upgrades); - - if (sizeof($upgrades) > 0) { - foreach ($upgrades as $upgrade) { - include($upgrade); - } - } -} - -set_plugin_setting('version', $version, 'tidypics'); - -system_message("Tidypics has been upgraded"); - -forward($_SERVER['HTTP_REFERER']); diff --git a/actions/photos/admin/upgrade.php b/actions/photos/admin/upgrade.php new file mode 100644 index 000000000..c9ae1da48 --- /dev/null +++ b/actions/photos/admin/upgrade.php @@ -0,0 +1,50 @@ + $local_version) { + $upgrades[] = "$base_dir/$updatefile"; + } + } + } + } + + // Sort and execute + asort($upgrades); + + if (sizeof($upgrades) > 0) { + foreach ($upgrades as $upgrade) { + include($upgrade); + } + } +} + +elgg_set_plugin_setting('version', $version, 'tidypics'); + +system_message("Tidypics has been upgraded"); +forward(REFERER); diff --git a/lib/tidypics.php b/lib/tidypics.php index 0a4586c29..4e56ae829 100644 --- a/lib/tidypics.php +++ b/lib/tidypics.php @@ -109,6 +109,38 @@ function tidypics_get_image_libraries() { return $options; } +/** + * Are there upgrade scripts to be run? + * + * @return bool + */ +function tidypics_is_upgrade_available() { + // sets $version based on code + require_once elgg_get_plugins_path() . "tidypics/version.php"; + + $local_version = elgg_get_plugin_setting('version', 'tidypics'); + if ($local_version === false) { + // no version set so either new install or really old one + if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) { + $local_version = 0; + } else { + // set initial version for new install + elgg_set_plugin_setting('version', $version, 'tidypics'); + $local_version = $version; + } + } elseif ($local_version === '1.62') { + // special work around to handle old upgrade system + $local_version = 2010010101; + elgg_set_plugin_setting('version', $local_version, 'tidypics'); + } + + if ($local_version == $version) { + return false; + } else { + return true; + } +} + /********************************************************************* * the functions below replace broken core functions or add functions * that could/should exist in the core diff --git a/start.php b/start.php index a81c1d854..630068874 100644 --- a/start.php +++ b/start.php @@ -100,7 +100,7 @@ function tidypics_init() { //register_action("tidypics/deletetag", false, "$base_dir/deletetag.php"); elgg_register_action("photos/admin/settings", "$base_dir/admin/settings.php", 'admin'); - //register_action("tidypics/admin/upgrade", false, "$base_dir/admin/upgrade.php", true); + elgg_register_action("photos/admin/upgrade", "$base_dir/admin/upgrade.php", 'admin'); // Register libraries $base_dir = elgg_get_plugins_path() . 'tidypics/lib'; diff --git a/views/default/admin/settings/tidypics.php b/views/default/admin/settings/tidypics.php index aaaebd371..2e7d79942 100644 --- a/views/default/admin/settings/tidypics.php +++ b/views/default/admin/settings/tidypics.php @@ -6,6 +6,18 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 */ +if (tidypics_is_upgrade_available()) { + echo '
          '; + echo '

          '; + echo elgg_view('output/url', array( + 'text' => elgg_echo('tidypics:upgrade'), + 'href' => 'action/photos/admin/upgrade', + 'is_action' => true, + )); + echo '

          '; + echo '
          '; +} + echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions'))); echo elgg_view_form('photos/admin/settings'); -- cgit v1.2.3 From 55bbbaef6a06d4177dcaa32cee94095db0ae4042 Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 2 Jan 2012 17:06:49 -0500 Subject: removed unnecessary external packages --- vendors/jquery.imgareaselect-0.7.js | 614 ------------------------ vendors/jquery.quicksearch.js | 347 -------------- vendors/lytebox/images/blank.gif | Bin 43 -> 0 bytes vendors/lytebox/images/close_blue.png | Bin 1788 -> 0 bytes vendors/lytebox/images/close_gold.png | Bin 1652 -> 0 bytes vendors/lytebox/images/close_green.png | Bin 1525 -> 0 bytes vendors/lytebox/images/close_grey.png | Bin 1715 -> 0 bytes vendors/lytebox/images/close_red.png | Bin 1525 -> 0 bytes vendors/lytebox/images/loading.gif | Bin 2767 -> 0 bytes vendors/lytebox/images/next_blue.gif | Bin 733 -> 0 bytes vendors/lytebox/images/next_gold.gif | Bin 732 -> 0 bytes vendors/lytebox/images/next_green.gif | Bin 732 -> 0 bytes vendors/lytebox/images/next_grey.gif | Bin 731 -> 0 bytes vendors/lytebox/images/next_red.gif | Bin 732 -> 0 bytes vendors/lytebox/images/pause_blue.png | Bin 1357 -> 0 bytes vendors/lytebox/images/pause_gold.png | Bin 1207 -> 0 bytes vendors/lytebox/images/pause_green.png | Bin 1149 -> 0 bytes vendors/lytebox/images/pause_grey.png | Bin 1282 -> 0 bytes vendors/lytebox/images/pause_red.png | Bin 1133 -> 0 bytes vendors/lytebox/images/play_blue.png | Bin 1231 -> 0 bytes vendors/lytebox/images/play_gold.png | Bin 1141 -> 0 bytes vendors/lytebox/images/play_green.png | Bin 1097 -> 0 bytes vendors/lytebox/images/play_grey.png | Bin 1178 -> 0 bytes vendors/lytebox/images/play_red.png | Bin 1079 -> 0 bytes vendors/lytebox/images/prev_blue.gif | Bin 748 -> 0 bytes vendors/lytebox/images/prev_gold.gif | Bin 748 -> 0 bytes vendors/lytebox/images/prev_green.gif | Bin 748 -> 0 bytes vendors/lytebox/images/prev_grey.gif | Bin 748 -> 0 bytes vendors/lytebox/images/prev_red.gif | Bin 748 -> 0 bytes vendors/lytebox/lytebox.css | 93 ---- vendors/lytebox/lytebox.js | 843 --------------------------------- 31 files changed, 1897 deletions(-) delete mode 100644 vendors/jquery.imgareaselect-0.7.js delete mode 100644 vendors/jquery.quicksearch.js delete mode 100644 vendors/lytebox/images/blank.gif delete mode 100644 vendors/lytebox/images/close_blue.png delete mode 100644 vendors/lytebox/images/close_gold.png delete mode 100644 vendors/lytebox/images/close_green.png delete mode 100644 vendors/lytebox/images/close_grey.png delete mode 100644 vendors/lytebox/images/close_red.png delete mode 100644 vendors/lytebox/images/loading.gif delete mode 100644 vendors/lytebox/images/next_blue.gif delete mode 100644 vendors/lytebox/images/next_gold.gif delete mode 100644 vendors/lytebox/images/next_green.gif delete mode 100644 vendors/lytebox/images/next_grey.gif delete mode 100644 vendors/lytebox/images/next_red.gif delete mode 100644 vendors/lytebox/images/pause_blue.png delete mode 100644 vendors/lytebox/images/pause_gold.png delete mode 100644 vendors/lytebox/images/pause_green.png delete mode 100644 vendors/lytebox/images/pause_grey.png delete mode 100644 vendors/lytebox/images/pause_red.png delete mode 100644 vendors/lytebox/images/play_blue.png delete mode 100644 vendors/lytebox/images/play_gold.png delete mode 100644 vendors/lytebox/images/play_green.png delete mode 100644 vendors/lytebox/images/play_grey.png delete mode 100644 vendors/lytebox/images/play_red.png delete mode 100644 vendors/lytebox/images/prev_blue.gif delete mode 100644 vendors/lytebox/images/prev_gold.gif delete mode 100644 vendors/lytebox/images/prev_green.gif delete mode 100644 vendors/lytebox/images/prev_grey.gif delete mode 100644 vendors/lytebox/images/prev_red.gif delete mode 100644 vendors/lytebox/lytebox.css delete mode 100644 vendors/lytebox/lytebox.js diff --git a/vendors/jquery.imgareaselect-0.7.js b/vendors/jquery.imgareaselect-0.7.js deleted file mode 100644 index 3adac1d6a..000000000 --- a/vendors/jquery.imgareaselect-0.7.js +++ /dev/null @@ -1,614 +0,0 @@ -/* - * imgAreaSelect jQuery plugin - * version 0.7 - * - * Copyright (c) 2008-2009 Michal Wojciechowski (odyniec.net) - * - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * http://odyniec.net/projects/imgareaselect/ - * - */ - -jQuery.imgAreaSelect = { onKeyPress: null }; - -jQuery.imgAreaSelect.init = function (img, options) { - var $img = jQuery(img), $area = jQuery('
          '), - $border1 = jQuery('
          '), $border2 = jQuery('
          '), - $areaOver = jQuery('
          '), $areaOver2, - $outLeft = jQuery('
          '), $outTop = jQuery('
          '), - $outRight = jQuery('
          '), $outBottom = jQuery('
          '), - $handles, handleWidth, handles = [ ], - left, top, imgOfs, imgWidth, imgHeight, parent, parOfs, parScroll, - zIndex = 0, position = 'absolute', $p, startX, startY, moveX, moveY, - resizeMargin = 10, resize = [ ], V = 0, H = 1, - keyDown, d, aspectRatio, x1, x2, y1, y2, x, y, adjusted, - selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 }; - - var $a = $area.add($border1).add($border2).add($areaOver); - var $o = $outLeft.add($outTop).add($outRight).add($outBottom); - - function viewX(x) - { - return x + imgOfs.left + parScroll.left - parOfs.left; - } - - function viewY(y) - { - return y + imgOfs.top + parScroll.top - parOfs.top; - } - - function selX(x) - { - return x - imgOfs.left - parScroll.left + parOfs.left; - } - - function selY(y) - { - return y - imgOfs.top - parScroll.top + parOfs.top; - } - - function evX(event) - { - return event.pageX + parScroll.left - parOfs.left; - } - - function evY(event) - { - return event.pageY + parScroll.top - parOfs.top; - } - - function getZIndex() - { - $p = $img; - - while ($p.length && !$p.is('body')) { - if (!isNaN($p.css('z-index')) && $p.css('z-index') > zIndex) - zIndex = $p.css('z-index'); - if ($p.css('position') == 'fixed') - position = 'fixed'; - - $p = $p.parent(); - } - } - - function adjust() - { - imgOfs = $img.offset(); - imgOfs.left = parseInt(imgOfs.left) + parseInt($img.css("border-left-width")) + parseInt($img.css("padding-left")); - imgOfs.top = parseInt(imgOfs.top) + parseInt($img.css("border-top-width")) + parseInt($img.css("padding-top")); - imgWidth = $img.width(); - imgHeight = $img.height(); - - if (jQuery(parent).is('body')) - parOfs = parScroll = { left: 0, top: 0 }; - else { - parOfs = jQuery(parent).offset(); - parScroll = { left: parent.scrollLeft, top: parent.scrollTop }; - } - - left = viewX(0); - top = viewY(0); - } - - function update(resetKeyPress) - { - $a.css({ - left: viewX(selection.x1) + 'px', - top: viewY(selection.y1) + 'px', - width: Math.max(selection.width - options.borderWidth * 2, 0) + 'px', - height: Math.max(selection.height - options.borderWidth * 2, 0) + 'px' - }); - $areaOver.css({ width: selection.width + 'px', height: selection.height + 'px' }); - $outLeft.css({ left: left + 'px', top: top + 'px', - width: selection.x1 + 'px', height: imgHeight + 'px' }); - $outTop.css({ left: left + selection.x1 + 'px', top: top + 'px', - width: selection.width + 'px', height: selection.y1 + 'px' }); - $outRight.css({ left: left + selection.x2 + 'px', top: top + 'px', - width: imgWidth - selection.x2 + 'px', height: imgHeight + 'px' }); - $outBottom.css({ left: left + selection.x1 + 'px', top: top + selection.y2 + 'px', - width: selection.width + 'px', height: imgHeight - selection.y2 + 'px' }); - - if ($handles) { - handles[0].css({ left: viewX(selection.x1) + 'px', - top: viewY(selection.y1) + 'px' }); - handles[1].css({ left: viewX(selection.x2 - handleWidth) + 'px', - top: viewY(selection.y1) + 'px' }); - handles[2].css({ left: viewX(selection.x1) + 'px', - top: viewY(selection.y2 - handleWidth) + 'px' }); - handles[3].css({ left: viewX(selection.x2 - handleWidth) + 'px', - top: viewY(selection.y2 - handleWidth) + 'px' }); - - if (handles.length == 8) { - handles[4].css({ left: viewX(selection.x1 + (selection.width - - handleWidth) / 2) + 'px', top: viewY(selection.y1) + 'px' }); - handles[5].css({ left: viewX(selection.x1) + 'px', top: - viewY(selection.y1 + (selection.height - handleWidth) / 2) + 'px' }); - handles[6].css({ left: viewX(selection.x1 + (selection.width - handleWidth) - / 2) + 'px', top: viewY(selection.y2 - handleWidth) + 'px' }); - handles[7].css({ left: viewX(selection.x2 - handleWidth) + 'px', top: - viewY(selection.y1 + (selection.height - handleWidth) / 2) + 'px' }); - } - - for (var i = 0; i < handles.length; i++) { - if (selX(parseInt(handles[i].css('left'))) < 0) - handles[i].css('left', viewX(0) + 'px'); - if (selX(parseInt(handles[i].css('left'))) > imgWidth - handleWidth) - handles[i].css('left', viewX(imgWidth - handleWidth) + 'px'); - if (selY(parseInt(handles[i].css('top'))) < 0) - handles[i].css('top', viewY(0) + 'px'); - if (selY(parseInt(handles[i].css('top'))) > imgHeight - handleWidth) - handles[i].css('top', viewY(imgHeight - handleWidth) + 'px'); - } - } - - if (resetKeyPress !== false) { - if (jQuery.imgAreaSelect.keyPress != docKeyPress) - jQuery(document).unbind(jQuery.imgAreaSelect.keyPress, - jQuery.imgAreaSelect.onKeyPress); - - if (options.keys) - jQuery(document).bind(jQuery.imgAreaSelect.keyPress, - jQuery.imgAreaSelect.onKeyPress = docKeyPress); - } - } - - function areaMouseMove(event) - { - if (!adjusted) { - adjust(); - adjusted = true; - - $a.one('mouseout', function () { adjusted = false; }); - } - - x = selX(evX(event)) - selection.x1; - y = selY(evY(event)) - selection.y1; - - resize = [ ]; - - if (options.resizable) { - if (y <= resizeMargin) - resize[V] = 'n'; - else if (y >= selection.height - resizeMargin) - resize[V] = 's'; - if (x <= resizeMargin) - resize[H] = 'w'; - else if (x >= selection.width - resizeMargin) - resize[H] = 'e'; - } - - $areaOver.css('cursor', resize.length ? resize.join('') + '-resize' : - options.movable ? 'move' : ''); - if ($areaOver2) - $areaOver2.toggle(); - } - - function areaMouseDown(event) - { - if (event.which != 1) return false; - - adjust(); - - if (options.resizable && resize.length > 0) { - jQuery('body').css('cursor', resize.join('') + '-resize'); - - x1 = viewX(selection[resize[H] == 'w' ? 'x2' : 'x1']); - y1 = viewY(selection[resize[V] == 'n' ? 'y2' : 'y1']); - - jQuery(document).mousemove(selectingMouseMove); - $areaOver.unbind('mousemove', areaMouseMove); - - jQuery(document).one('mouseup', function () { - resize = [ ]; - - jQuery('body').css('cursor', ''); - - if (options.autoHide || selection.width == 0 || selection.height == 0) - $a.add($o).add($handles).hide(); - - options.onSelectEnd(img, selection); - - jQuery(document).unbind('mousemove', selectingMouseMove); - $areaOver.mousemove(areaMouseMove); - }); - } - else if (options.movable) { - moveX = selection.x1 + left; - moveY = selection.y1 + top; - startX = evX(event); - startY = evY(event); - - $areaOver.unbind('mousemove', areaMouseMove); - - jQuery(document).mousemove(movingMouseMove) - .one('mouseup', function () { - options.onSelectEnd(img, selection); - - jQuery(document).unbind('mousemove', movingMouseMove); - $areaOver.mousemove(areaMouseMove); - }); - } - else - $img.mousedown(event); - - return false; - } - - function aspectRatioXY() - { - x2 = Math.max(left, Math.min(left + imgWidth, - x1 + Math.abs(y2 - y1) * aspectRatio * (x2 >= x1 ? 1 : -1))); - y2 = Math.round(Math.max(top, Math.min(top + imgHeight, - y1 + Math.abs(x2 - x1) / aspectRatio * (y2 >= y1 ? 1 : -1)))); - x2 = Math.round(x2); - } - - function aspectRatioYX() - { - y2 = Math.max(top, Math.min(top + imgHeight, - y1 + Math.abs(x2 - x1) / aspectRatio * (y2 >= y1 ? 1 : -1))); - x2 = Math.round(Math.max(left, Math.min(left + imgWidth, - x1 + Math.abs(y2 - y1) * aspectRatio * (x2 >= x1 ? 1 : -1)))); - y2 = Math.round(y2); - } - - function doResize(newX2, newY2) - { - x2 = newX2; - y2 = newY2; - - if (options.minWidth && Math.abs(x2 - x1) < options.minWidth) { - x2 = x1 - options.minWidth * (x2 < x1 ? 1 : -1); - - if (x2 < left) - x1 = left + options.minWidth; - else if (x2 > left + imgWidth) - x1 = left + imgWidth - options.minWidth; - } - - if (options.minHeight && Math.abs(y2 - y1) < options.minHeight) { - y2 = y1 - options.minHeight * (y2 < y1 ? 1 : -1); - - if (y2 < top) - y1 = top + options.minHeight; - else if (y2 > top + imgHeight) - y1 = top + imgHeight - options.minHeight; - } - - x2 = Math.max(left, Math.min(x2, left + imgWidth)); - y2 = Math.max(top, Math.min(y2, top + imgHeight)); - - if (aspectRatio) - if (Math.abs(x2 - x1) / aspectRatio > Math.abs(y2 - y1)) - aspectRatioYX(); - else - aspectRatioXY(); - - if (options.maxWidth && Math.abs(x2 - x1) > options.maxWidth) { - x2 = x1 - options.maxWidth * (x2 < x1 ? 1 : -1); - if (aspectRatio) aspectRatioYX(); - } - - if (options.maxHeight && Math.abs(y2 - y1) > options.maxHeight) { - y2 = y1 - options.maxHeight * (y2 < y1 ? 1 : -1); - if (aspectRatio) aspectRatioXY(); - } - - selection = { x1: selX(Math.min(x1, x2)), x2: selX(Math.max(x1, x2)), - y1: selY(Math.min(y1, y2)), y2: selY(Math.max(y1, y2)), - width: Math.abs(x2 - x1), height: Math.abs(y2 - y1) }; - - update(); - - options.onSelectChange(img, selection); - } - - function selectingMouseMove(event) - { - x2 = !resize.length || resize[H] || aspectRatio ? evX(event) : viewX(selection.x2); - y2 = !resize.length || resize[V] || aspectRatio ? evY(event) : viewY(selection.y2); - - doResize(x2, y2); - - return false; - } - - function doMove(newX1, newY1) - { - x2 = (x1 = newX1) + selection.width; - y2 = (y1 = newY1) + selection.height; - - selection.x1 = selX(x1); - selection.y1 = selY(y1); - selection.x2 = selX(x2); - selection.y2 = selY(y2); - - update(); - - options.onSelectChange(img, selection); - } - - function movingMouseMove(event) - { - var newX1 = Math.max(left, Math.min(moveX + evX(event) - startX, - left + imgWidth - selection.width)); - var newY1 = Math.max(top, Math.min(moveY + evY(event) - startY, - top + imgHeight - selection.height)); - - doMove(newX1, newY1); - - event.preventDefault(); - return false; - } - - function startSelection(event) - { - adjust(); - - selection = { x1: selX(x1), y1: selY(y1) }; - doResize(x1, y1); - - resize = [ ]; - - $a.add($o).add($handles).show(); - - jQuery(document).unbind('mouseup', cancelSelection) - .mousemove(selectingMouseMove); - $areaOver.unbind('mousemove', areaMouseMove); - - options.onSelectStart(img, selection); - - jQuery(document).one('mouseup', function () { - if (options.autoHide || (selection.width * selection.height == 0)) - $a.add($o).add($handles).hide(); - - options.onSelectEnd(img, selection); - - jQuery(document).unbind('mousemove', selectingMouseMove); - $areaOver.mousemove(areaMouseMove); - }); - } - - function cancelSelection() - { - jQuery(document).unbind('mousemove', startSelection); - $a.add($o).add($handles).hide(); - - selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 }; - - options.onSelectChange(img, selection); - options.onSelectEnd(img, selection); - } - - function imgMouseDown(event) - { - if (event.which != 1) return false; - - startX = x1 = evX(event); - startY = y1 = evY(event); - - jQuery(document).one('mousemove', startSelection) - .one('mouseup', cancelSelection); - - return false; - } - - function windowResize() - { - adjust(); - update(false); - x1 = viewX(selection.x1); - y1 = viewY(selection.y1); - x2 = viewX(selection.x2); - y2 = viewY(selection.y2); - } - - var docKeyPress = function(event) { - var k = options.keys, d = 10, t, - key = event.keyCode || event.which; - - if (!isNaN(k.arrows)) d = k.arrows; - if (!isNaN(k.shift) && event.shiftKey) d = k.shift; - if (!isNaN(k.ctrl) && event.ctrlKey) d = k.ctrl; - if (!isNaN(k.alt) && (event.altKey || event.originalEvent.altKey)) d = k.alt; - - if (k.arrows == 'resize' || (k.shift == 'resize' && event.shiftKey) || - (k.ctrl == 'resize' && event.ctrlKey) || - (k.alt == 'resize' && (event.altKey || event.originalEvent.altKey))) - { - switch (key) { - case 37: - d = -d; - case 39: - t = Math.max(x1, x2); - x1 = Math.min(x1, x2); - x2 = Math.max(t + d, x1); - if (aspectRatio) aspectRatioYX(); - break; - case 38: - d = -d; - case 40: - t = Math.max(y1, y2); - y1 = Math.min(y1, y2); - y2 = Math.max(t + d, y1); - if (aspectRatio) aspectRatioXY(); - break; - default: - return; - } - - doResize(x2, y2); - } - else { - x1 = Math.min(x1, x2); - y1 = Math.min(y1, y2); - - switch (key) { - case 37: - doMove(Math.max(x1 - d, left), y1); - break; - case 38: - doMove(x1, Math.max(y1 - d, top)); - break; - case 39: - doMove(x1 + Math.min(d, imgWidth - selX(x2)), y1); - break; - case 40: - doMove(x1, y1 + Math.min(d, imgHeight - selY(y2))); - break; - default: - return; - } - } - - return false; - }; - - this.setOptions = function(newOptions) - { - options = jQuery.extend(options, newOptions); - - if (newOptions.x1 != null) { - selection = { x1: newOptions.x1, y1: newOptions.y1, - x2: newOptions.x2, y2: newOptions.y2 }; - newOptions.show = true; - } - - if (newOptions.keys) - options.keys = jQuery.extend({ shift: 1, ctrl: 'resize' }, - newOptions.keys === true ? { } : newOptions.keys); - - parent = jQuery(options.parent).get(0); - - adjust(); - - getZIndex(); - - x1 = viewX(selection.x1); - y1 = viewY(selection.y1); - x2 = viewX(selection.x2); - y2 = viewY(selection.y2); - selection.width = x2 - x1; - selection.height = y2 - y1; - - if ($handles) { - $handles.remove(); - $handles = null; - handles = [ ]; - } - - if (options.handles) { - for (var i = 0; i < (options.handles == 'corners' ? 4 : 8); i++) - $handles = $handles ? $handles.add(handles[i] = jQuery('
          ')) : - handles[i] = jQuery('
          '); - - handleWidth = 4 + options.borderWidth; - - $handles.css({ position: position, borderWidth: options.borderWidth, - borderStyle: 'solid', borderColor: options.borderColor1, - backgroundColor: options.borderColor2, display: $area.css('display'), - width: handleWidth + 'px', height: handleWidth + 'px', - fontSize: '0px', zIndex: zIndex > 0 ? zIndex + 1 : '1' }); - $handles.addClass(options.classPrefix + '-handle'); - - handleWidth += options.borderWidth * 2; - } - - $o.addClass(options.classPrefix + '-outer'); - $area.addClass(options.classPrefix + '-selection'); - $border1.addClass(options.classPrefix + '-border1'); - $border2.addClass(options.classPrefix + '-border2'); - - $a.css({ borderWidth: options.borderWidth + 'px' }); - $area.css({ backgroundColor: options.selectionColor, opacity: options.selectionOpacity }); - $border1.css({ borderStyle: 'solid', borderColor: options.borderColor1 }); - $border2.css({ borderStyle: 'dashed', borderColor: options.borderColor2 }); - $o.css({ opacity: options.outerOpacity, backgroundColor: options.outerColor }); - - jQuery(options.parent).append($o.add($a).add($handles)); - - update(); - - if (newOptions.hide) - $a.add($o).add($handles).hide(); - else if (newOptions.show) - $a.add($o).add($handles).show(); - - aspectRatio = options.aspectRatio && (d = options.aspectRatio.split(/:/)) ? - d[0] / d[1] : null; - - if (aspectRatio) - if (options.minWidth) - options.minHeight = parseInt(options.minWidth / aspectRatio); - else if (options.minHeight) - options.minWidth = parseInt(options.minHeight * aspectRatio); - - if (options.disable || options.enable === false) { - $areaOver.unbind('mousemove', areaMouseMove).unbind('mousedown', areaMouseDown); - $img.add($o).unbind('mousedown', imgMouseDown); - jQuery(window).unbind('resize', windowResize); - } - else if (options.enable || options.disable === false) { - if (options.resizable || options.movable) - $areaOver.mousemove(areaMouseMove).mousedown(areaMouseDown); - - if (!options.persistent) - $img.add($o).mousedown(imgMouseDown); - jQuery(window).resize(windowResize); - } - - options.enable = options.disable = undefined; - }; - - if (jQuery.browser.msie) - $img.attr('unselectable', 'on'); - - jQuery.imgAreaSelect.keyPress = jQuery.browser.msie || - jQuery.browser.safari ? 'keydown' : 'keypress'; - - if (jQuery.browser.opera) - $areaOver.append($areaOver2 = jQuery('
          ')); - - getZIndex(); - - $a.add($o).css({ display: 'none', position: position, - overflow: 'hidden', zIndex: zIndex > 0 ? zIndex : '0' }); - $areaOver.css({ zIndex: zIndex > 0 ? zIndex + 2 : '2' }); - $area.css({ borderStyle: 'solid' }); - - this.setOptions(options = jQuery.extend({ - borderColor1: '#000', - borderColor2: '#fff', - borderWidth: 1, - classPrefix: 'imgareaselect', - movable: true, - resizable: true, - selectionColor: '#fff', - selectionOpacity: 0.2, - outerColor: '#000', - outerOpacity: 0.2, - parent: 'body', - onSelectStart: function () {}, - onSelectChange: function () {}, - onSelectEnd: function () {} - }, options)); -}; - -jQuery.fn.imgAreaSelect = function (options) { - options = options || {}; - - this.each(function () { - if (jQuery(this).data('imgAreaSelect')) - jQuery(this).data('imgAreaSelect').setOptions(options); - else { - if (options.enable === undefined && options.disable === undefined) - options.enable = true; - - jQuery(this).data('imgAreaSelect', new jQuery.imgAreaSelect.init(this, options)); - } - }); - - return this; -}; diff --git a/vendors/jquery.quicksearch.js b/vendors/jquery.quicksearch.js deleted file mode 100644 index 700872bce..000000000 --- a/vendors/jquery.quicksearch.js +++ /dev/null @@ -1,347 +0,0 @@ -jQuery(function ($) { - $.fn.quicksearch = function (opt) { - - function is_empty(i) - { - return (i === null || i === undefined || i === false) ? true: false; - } - - function strip_html(input) - { - var regexp = new RegExp(/\<[^\<]+\>/g); - var output = input.replace(regexp, ""); - output = $.trim(output.toLowerCase().replace(/\n/, '').replace(/\s{2,}/, ' ')); - return output; - } - - function get_key() - { - var input = strip_html($('input[rel="' + options.randomElement + '"]').val()); - - if (input.indexOf(' ') === -1) - { - return input; - } - else - { - return input.split(" "); - } - } - - function test_key(k, value, type) - { - if (type === "string") - { - return test_key_string(k, value); - } - else - { - return test_key_arr(k, value); - } - } - - function test_key_string(k, value) - { - return (value.indexOf(k) > -1); - } - - function test_key_arr(k, value) - { - for (var i = 0; i < k.length; i++) { - var test = value.indexOf(k[i]); - if (test === -1) { - return false; - } - } - return true; - } - - function select_element(el) - { - if (options.hideElement === "grandparent") - { - return $(el).parent().parent(); - } - else if (options.hideElement === "parent") - { - return $(el).parent(); - } - else - { - return $(el); - } - } - - function stripe(el) - { - if (doStripe) - { - var i = 0; - select_element(el).filter(':visible').each(function () { - - for (var j = 0; j < stripeRowLength; j++) - { - if (i === j) - { - $(this).addClass(options.stripeRowClass[i]); - - } - else - { - $(this).removeClass(options.stripeRowClass[j]); - } - } - i = (i + 1) % stripeRowLength; - }); - } - } - - function fix_widths(el) - { - $(el).find('td').each(function () { - $(this).attr('width', parseInt($(this).css('width'))); - }); - } - - function loader(o) { - if (options.loaderId) - { - var l = $('input[rel="' + options.randomElement + '"]').parent().find('.loader'); - if (o === 'hide') - { - l.hide(); - } - else - { - l.show(); - } - } - } - - function place_form() { - var formPosition = options.position; - var formAttached = options.attached; - - if (formPosition === 'before') { - $(formAttached).before(make_form()); - } else if (formPosition === 'prepend') { - $(formAttached).prepend(make_form()); - } else if (formPosition === 'append') { - $(formAttached).append(make_form()); - } else { - $(formAttached).after(make_form()); - } - } - - function make_form_label() - { -/* - if (!is_empty(options.labelText)) { - return ' '; - } -*/ - return ''; - } - - function make_form_input() - { - var val = (!is_empty(options.inputText)) ? options.inputText : "" - return ' '; - } - - function make_form_loader() - { - if (!is_empty(options.loaderImg)) { - return 'Loading'; - } else { - return '' + options.loaderText + ''; - } - } - - function make_form() - { - var f = (!options.isFieldset) ? 'form' : 'fieldset'; - /*return '<' + f + ' action="#" ' + 'id="'+ options.formId + '" ' + 'class="quicksearch">' + - make_form_label() + make_form_input() + make_form_loader() + - '';*/ - return make_form_label() + make_form_input() + make_form_loader() - } - - function focus_on_load() - { - $('input[rel="' + options.randomElement + '"]').get(0).focus(); - } - - function toggle_text() { - $('input[rel="' + options.randomElement + '"]').focus(function () { - if ($(this).val() === options.inputText) { - $(this).val(''); - } - }); - $('input[rel="' + options.randomElement + '"]').blur(function () { - if ($(this).val() === "") { - $(this).val(options.inputText); - } - }); - } - - function get_cache(el) - { - return $(el).map(function(){ - return strip_html(this.innerHTML); - }); - } - - function init() - { - place_form(); - if (options.fixWidths) fix_widths(el); - if (options.focusOnLoad) focus_on_load(); - if (options.inputText != "" && options.inputText != null) toggle_text(); - - cache = get_cache(el); - - stripe(el); - loader('hide'); - } - - function qs() - { - clearTimeout(timeout); - timeout = setTimeout(function () { - - loader('show'); - - setTimeout(function () { - options.onBefore(); - - var k = get_key(); - var k_type = (typeof k); - var i = 0; - - k = options.filter(k); - - if (k != "") - { - if (typeof score[k] === "undefined") - { - score[k] = new Array(); - cache.each(function (i) { - if (test_key(k, cache[i], k_type)) - { - score[k][i] = true; - } - }); - } - - if (score[k].length === 0) - { - select_element(el).hide(); - } - else - { - /*console.log(score[k].length); - if(score[k].length==1) - { - //$(el).parents('ul').find('li:visible:eq(0) a').addClass('selected'); - } - else - { - //$(el).parents('ul').find('li:visible:eq(0) a').removeClass('selected') - }*/ - - $(el).each(function (i) { - if (score[k][i]) - { - select_element(this).show(); - } - else - { - select_element(this).hide(); - } - } - ); - - if($(el).parents('ul').find('li:visible').length==1) - $(el).parents('ul').find('li:visible:eq(0) a').addClass('selected'); - else - $(el).parents('ul').find('li:visible:eq(0) a').removeClass('selected'); - - } - } - else - { - select_element(el).show(); - } - - stripe(el); - }, options.delay/2); - - setTimeout( function () { - loader('hide'); - }, options.delay/2); - - options.onAfter(); - - }, options.delay/2); - } - - var options = $.extend({ - position: 'prepend', - attached: 'body', - formId: 'quicksearch', - labelText: 'Quick Search', - labelClass: 'qs_label', - inputText: null, - inputClass: 'qs_input', - loaderId: 'loader', - loaderClass: 'loader', - loaderImg: null, - loaderText: 'Loading...', - stripeRowClass: null, - hideElement: null, - delay: 500, - focusOnLoad: false, - onBefore: function () { }, - onAfter: function () { }, - filter: function (i) { - return i; - }, - randomElement: 'qs' + Math.floor(Math.random() * 1000000), - isFieldset: false, - fixWidths: false - }, opt); - - var timeout; - var score = {}; - var stripeRowLength = (!is_empty(options.stripeRowClass)) ? options.stripeRowClass.length : 0; - var doStripe = (stripeRowLength > 0) ? true : false; - var el = this; - var cache; - var selector = $(this).selector; - - $.fn.extend({ - reset_cache: function () { - el = $(selector); - cache = get_cache(el); - } - }); - - init(); - - $('input[rel="' + options.randomElement + '"]').keydown(function (e) { - var keycode = e.keyCode; - if (!(keycode === 9 || keycode === 13 || keycode === 16 || keycode === 17 || keycode === 18 || keycode === 38 || keycode === 40 || keycode === 224)) - { - qs(); - } - }); - - //$('#quicksearch').submit( function () { addTag()}); - - return this; - }; -}); \ No newline at end of file diff --git a/vendors/lytebox/images/blank.gif b/vendors/lytebox/images/blank.gif deleted file mode 100644 index 1d11fa9ad..000000000 Binary files a/vendors/lytebox/images/blank.gif and /dev/null differ diff --git a/vendors/lytebox/images/close_blue.png b/vendors/lytebox/images/close_blue.png deleted file mode 100644 index 297368c82..000000000 Binary files a/vendors/lytebox/images/close_blue.png and /dev/null differ diff --git a/vendors/lytebox/images/close_gold.png b/vendors/lytebox/images/close_gold.png deleted file mode 100644 index d1b847694..000000000 Binary files a/vendors/lytebox/images/close_gold.png and /dev/null differ diff --git a/vendors/lytebox/images/close_green.png b/vendors/lytebox/images/close_green.png deleted file mode 100644 index 83909e2d7..000000000 Binary files a/vendors/lytebox/images/close_green.png and /dev/null differ diff --git a/vendors/lytebox/images/close_grey.png b/vendors/lytebox/images/close_grey.png deleted file mode 100644 index bc83ac55e..000000000 Binary files a/vendors/lytebox/images/close_grey.png and /dev/null differ diff --git a/vendors/lytebox/images/close_red.png b/vendors/lytebox/images/close_red.png deleted file mode 100644 index 3d835bb30..000000000 Binary files a/vendors/lytebox/images/close_red.png and /dev/null differ diff --git a/vendors/lytebox/images/loading.gif b/vendors/lytebox/images/loading.gif deleted file mode 100644 index f864d5fd3..000000000 Binary files a/vendors/lytebox/images/loading.gif and /dev/null differ diff --git a/vendors/lytebox/images/next_blue.gif b/vendors/lytebox/images/next_blue.gif deleted file mode 100644 index 4666e44d3..000000000 Binary files a/vendors/lytebox/images/next_blue.gif and /dev/null differ diff --git a/vendors/lytebox/images/next_gold.gif b/vendors/lytebox/images/next_gold.gif deleted file mode 100644 index c5ba21f5c..000000000 Binary files a/vendors/lytebox/images/next_gold.gif and /dev/null differ diff --git a/vendors/lytebox/images/next_green.gif b/vendors/lytebox/images/next_green.gif deleted file mode 100644 index 85a1433b8..000000000 Binary files a/vendors/lytebox/images/next_green.gif and /dev/null differ diff --git a/vendors/lytebox/images/next_grey.gif b/vendors/lytebox/images/next_grey.gif deleted file mode 100644 index f1773cd19..000000000 Binary files a/vendors/lytebox/images/next_grey.gif and /dev/null differ diff --git a/vendors/lytebox/images/next_red.gif b/vendors/lytebox/images/next_red.gif deleted file mode 100644 index 4ddff3dae..000000000 Binary files a/vendors/lytebox/images/next_red.gif and /dev/null differ diff --git a/vendors/lytebox/images/pause_blue.png b/vendors/lytebox/images/pause_blue.png deleted file mode 100644 index 3d4e34f68..000000000 Binary files a/vendors/lytebox/images/pause_blue.png and /dev/null differ diff --git a/vendors/lytebox/images/pause_gold.png b/vendors/lytebox/images/pause_gold.png deleted file mode 100644 index ee529699c..000000000 Binary files a/vendors/lytebox/images/pause_gold.png and /dev/null differ diff --git a/vendors/lytebox/images/pause_green.png b/vendors/lytebox/images/pause_green.png deleted file mode 100644 index c52f28c1c..000000000 Binary files a/vendors/lytebox/images/pause_green.png and /dev/null differ diff --git a/vendors/lytebox/images/pause_grey.png b/vendors/lytebox/images/pause_grey.png deleted file mode 100644 index 1c2e9e0b2..000000000 Binary files a/vendors/lytebox/images/pause_grey.png and /dev/null differ diff --git a/vendors/lytebox/images/pause_red.png b/vendors/lytebox/images/pause_red.png deleted file mode 100644 index 5ee4dcf5c..000000000 Binary files a/vendors/lytebox/images/pause_red.png and /dev/null differ diff --git a/vendors/lytebox/images/play_blue.png b/vendors/lytebox/images/play_blue.png deleted file mode 100644 index c8cd259c4..000000000 Binary files a/vendors/lytebox/images/play_blue.png and /dev/null differ diff --git a/vendors/lytebox/images/play_gold.png b/vendors/lytebox/images/play_gold.png deleted file mode 100644 index 766d6513c..000000000 Binary files a/vendors/lytebox/images/play_gold.png and /dev/null differ diff --git a/vendors/lytebox/images/play_green.png b/vendors/lytebox/images/play_green.png deleted file mode 100644 index 6e832a438..000000000 Binary files a/vendors/lytebox/images/play_green.png and /dev/null differ diff --git a/vendors/lytebox/images/play_grey.png b/vendors/lytebox/images/play_grey.png deleted file mode 100644 index 8e18760be..000000000 Binary files a/vendors/lytebox/images/play_grey.png and /dev/null differ diff --git a/vendors/lytebox/images/play_red.png b/vendors/lytebox/images/play_red.png deleted file mode 100644 index 887d64496..000000000 Binary files a/vendors/lytebox/images/play_red.png and /dev/null differ diff --git a/vendors/lytebox/images/prev_blue.gif b/vendors/lytebox/images/prev_blue.gif deleted file mode 100644 index beba13ef5..000000000 Binary files a/vendors/lytebox/images/prev_blue.gif and /dev/null differ diff --git a/vendors/lytebox/images/prev_gold.gif b/vendors/lytebox/images/prev_gold.gif deleted file mode 100644 index b48193258..000000000 Binary files a/vendors/lytebox/images/prev_gold.gif and /dev/null differ diff --git a/vendors/lytebox/images/prev_green.gif b/vendors/lytebox/images/prev_green.gif deleted file mode 100644 index 2d4e14e52..000000000 Binary files a/vendors/lytebox/images/prev_green.gif and /dev/null differ diff --git a/vendors/lytebox/images/prev_grey.gif b/vendors/lytebox/images/prev_grey.gif deleted file mode 100644 index a7f2260a5..000000000 Binary files a/vendors/lytebox/images/prev_grey.gif and /dev/null differ diff --git a/vendors/lytebox/images/prev_red.gif b/vendors/lytebox/images/prev_red.gif deleted file mode 100644 index f702e6333..000000000 Binary files a/vendors/lytebox/images/prev_red.gif and /dev/null differ diff --git a/vendors/lytebox/lytebox.css b/vendors/lytebox/lytebox.css deleted file mode 100644 index 5303fac1b..000000000 --- a/vendors/lytebox/lytebox.css +++ /dev/null @@ -1,93 +0,0 @@ -#lbOverlay { position: fixed; top: 0; left: 0; z-index: 99998; width: 100%; height: 500px; } - #lbOverlay.grey { background-color: #000000; } - #lbOverlay.red { background-color: #330000; } - #lbOverlay.green { background-color: #003300; } - #lbOverlay.blue { background-color: #011D50; } - #lbOverlay.gold { background-color: #666600; } - -#lbMain { position: absolute; left: 0; width: 100%; z-index: 99999; text-align: center; line-height: 0; } -#lbMain a img { border: none; } - -#lbOuterContainer { position: relative; background-color: #fff; width: 200px; height: 200px; margin: 0 auto; } - #lbOuterContainer.grey { border: 3px solid #888888; } - #lbOuterContainer.red { border: 3px solid #DD0000; } - #lbOuterContainer.green { border: 3px solid #00B000; } - #lbOuterContainer.blue { border: 3px solid #5F89D8; } - #lbOuterContainer.gold { border: 3px solid #B0B000; } - -#lbDetailsContainer { font: 10px Verdana, Helvetica, sans-serif; background-color: #fff; width: 100%; line-height: 1.4em; overflow: auto; margin: 0 auto; } - #lbDetailsContainer.grey { border: 3px solid #888888; border-top: none; } - #lbDetailsContainer.red { border: 3px solid #DD0000; border-top: none; } - #lbDetailsContainer.green { border: 3px solid #00B000; border-top: none; } - #lbDetailsContainer.blue { border: 3px solid #5F89D8; border-top: none; } - #lbDetailsContainer.gold { border: 3px solid #B0B000; border-top: none; } - -#lbImageContainer, #lbIframeContainer { padding: 10px; } -#lbLoading { - position: absolute; top: 45%; left: 0%; height: 32px; width: 100%; text-align: center; line-height: 0; background: url(images/loading.gif) center no-repeat; -} - -#lbHoverNav { position: absolute; top: 0; left: 0; height: 100%; width: 100%; z-index: 10; } -#lbImageContainer>#lbHoverNav { left: 0; } -#lbHoverNav a { outline: none; } - -#lbPrev { width: 49%; height: 100%; background: transparent url(images/blank.gif) no-repeat; display: block; left: 0; float: left; } - #lbPrev.grey:hover, #lbPrev.grey:visited:hover { background: url(images/prev_grey.gif) left 15% no-repeat; } - #lbPrev.red:hover, #lbPrev.red:visited:hover { background: url(images/prev_red.gif) left 15% no-repeat; } - #lbPrev.green:hover, #lbPrev.green:visited:hover { background: url(images/prev_green.gif) left 15% no-repeat; } - #lbPrev.blue:hover, #lbPrev.blue:visited:hover { background: url(images/prev_blue.gif) left 15% no-repeat; } - #lbPrev.gold:hover, #lbPrev.gold:visited:hover { background: url(images/prev_gold.gif) left 15% no-repeat; } - -#lbNext { width: 49%; height: 100%; background: transparent url(images/blank.gif) no-repeat; display: block; right: 0; float: right; } - #lbNext.grey:hover, #lbNext.grey:visited:hover { background: url(images/next_grey.gif) right 15% no-repeat; } - #lbNext.red:hover, #lbNext.red:visited:hover { background: url(images/next_red.gif) right 15% no-repeat; } - #lbNext.green:hover, #lbNext.green:visited:hover { background: url(images/next_green.gif) right 15% no-repeat; } - #lbNext.blue:hover, #lbNext.blue:visited:hover { background: url(images/next_blue.gif) right 15% no-repeat; } - #lbNext.gold:hover, #lbNext.gold:visited:hover { background: url(images/next_gold.gif) right 15% no-repeat; } - -#lbPrev2, #lbNext2 { text-decoration: none; font-weight: bold; } - #lbPrev2.grey, #lbNext2.grey, #lbSpacer.grey { color: #333333; } - #lbPrev2.red, #lbNext2.red, #lbSpacer.red { color: #620000; } - #lbPrev2.green, #lbNext2.green, #lbSpacer.green { color: #003300; } - #lbPrev2.blue, #lbNext2.blue, #lbSpacer.blue { color: #01379E; } - #lbPrev2.gold, #lbNext2.gold, #lbSpacer.gold { color: #666600; } - -#lbPrev2_Off, #lbNext2_Off { font-weight: bold; } - #lbPrev2_Off.grey, #lbNext2_Off.grey { color: #CCCCCC; } - #lbPrev2_Off.red, #lbNext2_Off.red { color: #FFCCCC; } - #lbPrev2_Off.green, #lbNext2_Off.green { color: #82FF82; } - #lbPrev2_Off.blue, #lbNext2_Off.blue { color: #B7CAEE; } - #lbPrev2_Off.gold, #lbNext2_Off.gold { color: #E1E100; } - -#lbDetailsData { padding: 0 10px; } - #lbDetailsData.grey { color: #333333; } - #lbDetailsData.red { color: #620000; } - #lbDetailsData.green { color: #003300; } - #lbDetailsData.blue { color: #01379E; } - #lbDetailsData.gold { color: #666600; } - -#lbDetails { width: 60%; float: left; text-align: left; } -#lbCaption { display: block; font-weight: bold; } -#lbNumberDisplay { float: left; display: block; padding-bottom: 1.0em; } -#lbNavDisplay { float: left; display: block; padding-bottom: 1.0em; } - -#lbClose { width: 64px; height: 28px; float: right; margin-bottom: 1px; } - #lbClose.grey { background: url(images/close_grey.png) no-repeat; } - #lbClose.red { background: url(images/close_red.png) no-repeat; } - #lbClose.green { background: url(images/close_green.png) no-repeat; } - #lbClose.blue { background: url(images/close_blue.png) no-repeat; } - #lbClose.gold { background: url(images/close_gold.png) no-repeat; } - -#lbPlay { width: 64px; height: 28px; float: right; margin-bottom: 1px; } - #lbPlay.grey { background: url(images/play_grey.png) no-repeat; } - #lbPlay.red { background: url(images/play_red.png) no-repeat; } - #lbPlay.green { background: url(images/play_green.png) no-repeat; } - #lbPlay.blue { background: url(images/play_blue.png) no-repeat; } - #lbPlay.gold { background: url(images/play_gold.png) no-repeat; } - -#lbPause { width: 64px; height: 28px; float: right; margin-bottom: 1px; } - #lbPause.grey { background: url(images/pause_grey.png) no-repeat; } - #lbPause.red { background: url(images/pause_red.png) no-repeat; } - #lbPause.green { background: url(images/pause_green.png) no-repeat; } - #lbPause.blue { background: url(images/pause_blue.png) no-repeat; } - #lbPause.gold { background: url(images/pause_gold.png) no-repeat; } \ No newline at end of file diff --git a/vendors/lytebox/lytebox.js b/vendors/lytebox/lytebox.js deleted file mode 100644 index 1cf7210d0..000000000 --- a/vendors/lytebox/lytebox.js +++ /dev/null @@ -1,843 +0,0 @@ -//***********************************************************************************************************************************/ -// LyteBox v3.22 -// -// Author: Markus F. Hay -// Website: http://www.dolem.com/lytebox -// Date: October 2, 2007 -// License: Creative Commons Attribution 3.0 License (http://creativecommons.org/licenses/by/3.0/) -// Browsers: Tested successfully on WinXP with the following browsers (using no DOCTYPE and Strict/Transitional/Loose DOCTYPES): -// * Firefox: 2.0.0.7, 1.5.0.12 -// * Internet Explorer: 7.0, 6.0 SP2, 5.5 SP2 -// * Opera: 9.23 -// -// Releases: For up-to-date and complete release information, visit http://www.dolem.com/forum/showthread.php?tid=62 -// * v3.22 (10/02/07) -// * v3.21 (09/30/07) -// * v3.20 (07/12/07) -// * v3.10 (05/28/07) -// * v3.00 (05/15/07) -// * v2.02 (11/13/06) -// -// Credit: LyteBox was originally derived from the Lightbox class (v2.02) that was written by Lokesh Dhakar. For more -// information please visit http://huddletogether.com/projects/lightbox2/ -//***********************************************************************************************************************************/ -Array.prototype.removeDuplicates = function () { for (var i = 1; i < this.length; i++) { if (this[i][0] == this[i-1][0]) { this.splice(i,1); } } } -Array.prototype.empty = function () { for (var i = 0; i <= this.length; i++) { this.shift(); } } -String.prototype.trim = function () { return this.replace(/^\s+|\s+$/g, ''); } - -function LyteBox() { - /*** Start Global Configuration ***/ - this.theme = 'grey'; // themes: grey (default), red, green, blue, gold - this.hideFlash = true; // controls whether or not Flash objects should be hidden - this.outerBorder = true; // controls whether to show the outer grey (or theme) border - this.resizeSpeed = 8; // controls the speed of the image resizing (1=slowest and 10=fastest) - this.maxOpacity = 80; // higher opacity = darker overlay, lower opacity = lighter overlay - this.navType = 1; // 1 = "Prev/Next" buttons on top left and left (default), 2 = "<< prev | next >>" links next to image number - this.autoResize = true; // controls whether or not images should be resized if larger than the browser window dimensions - this.doAnimations = true; // controls whether or not "animate" Lytebox, i.e. resize transition between images, fade in/out effects, etc. - - this.borderSize = 12; // if you adjust the padding in the CSS, you will need to update this variable -- otherwise, leave this alone... - /*** End Global Configuration ***/ - - /*** Configure Slideshow Options ***/ - this.slideInterval = 4000; // Change value (milliseconds) to increase/decrease the time between "slides" (10000 = 10 seconds) - this.showNavigation = true; // true to display Next/Prev buttons/text during slideshow, false to hide - this.showClose = true; // true to display the Close button, false to hide - this.showDetails = true; // true to display image details (caption, count), false to hide - this.showPlayPause = true; // true to display pause/play buttons next to close button, false to hide - this.autoEnd = true; // true to automatically close Lytebox after the last image is reached, false to keep open - this.pauseOnNextClick = false; // true to pause the slideshow when the "Next" button is clicked - this.pauseOnPrevClick = true; // true to pause the slideshow when the "Prev" button is clicked - /*** End Slideshow Configuration ***/ - - if(this.resizeSpeed > 10) { this.resizeSpeed = 10; } - if(this.resizeSpeed < 1) { resizeSpeed = 1; } - this.resizeDuration = (11 - this.resizeSpeed) * 0.15; - this.resizeWTimerArray = new Array(); - this.resizeWTimerCount = 0; - this.resizeHTimerArray = new Array(); - this.resizeHTimerCount = 0; - this.showContentTimerArray = new Array(); - this.showContentTimerCount = 0; - this.overlayTimerArray = new Array(); - this.overlayTimerCount = 0; - this.imageTimerArray = new Array(); - this.imageTimerCount = 0; - this.timerIDArray = new Array(); - this.timerIDCount = 0; - this.slideshowIDArray = new Array(); - this.slideshowIDCount = 0; - this.imageArray = new Array(); - this.activeImage = null; - this.slideArray = new Array(); - this.activeSlide = null; - this.frameArray = new Array(); - this.activeFrame = null; - this.checkFrame(); - this.isSlideshow = false; - this.isLyteframe = false; - /*@cc_on - /*@if (@_jscript) - this.ie = (document.all && !window.opera) ? true : false; - /*@else @*/ - this.ie = false; - /*@end - @*/ - this.ie7 = (this.ie && window.XMLHttpRequest); - this.initialize(); -} -LyteBox.prototype.initialize = function() { - this.updateLyteboxItems(); - var objBody = this.doc.getElementsByTagName("body").item(0); - if (this.doc.getElementById('lbOverlay')) { - objBody.removeChild(this.doc.getElementById("lbOverlay")); - objBody.removeChild(this.doc.getElementById("lbMain")); - } - var objOverlay = this.doc.createElement("div"); - objOverlay.setAttribute('id','lbOverlay'); - objOverlay.setAttribute((this.ie ? 'className' : 'class'), this.theme); - if ((this.ie && !this.ie7) || (this.ie7 && this.doc.compatMode == 'BackCompat')) { - objOverlay.style.position = 'absolute'; - } - objOverlay.style.display = 'none'; - objBody.appendChild(objOverlay); - var objLytebox = this.doc.createElement("div"); - objLytebox.setAttribute('id','lbMain'); - objLytebox.style.display = 'none'; - objBody.appendChild(objLytebox); - var objOuterContainer = this.doc.createElement("div"); - objOuterContainer.setAttribute('id','lbOuterContainer'); - objOuterContainer.setAttribute((this.ie ? 'className' : 'class'), this.theme); - objLytebox.appendChild(objOuterContainer); - var objIframeContainer = this.doc.createElement("div"); - objIframeContainer.setAttribute('id','lbIframeContainer'); - objIframeContainer.style.display = 'none'; - objOuterContainer.appendChild(objIframeContainer); - var objIframe = this.doc.createElement("iframe"); - objIframe.setAttribute('id','lbIframe'); - objIframe.setAttribute('name','lbIframe'); - objIframe.style.display = 'none'; - objIframeContainer.appendChild(objIframe); - var objImageContainer = this.doc.createElement("div"); - objImageContainer.setAttribute('id','lbImageContainer'); - objOuterContainer.appendChild(objImageContainer); - var objLyteboxImage = this.doc.createElement("img"); - objLyteboxImage.setAttribute('id','lbImage'); - objImageContainer.appendChild(objLyteboxImage); - var objLoading = this.doc.createElement("div"); - objLoading.setAttribute('id','lbLoading'); - objOuterContainer.appendChild(objLoading); - var objDetailsContainer = this.doc.createElement("div"); - objDetailsContainer.setAttribute('id','lbDetailsContainer'); - objDetailsContainer.setAttribute((this.ie ? 'className' : 'class'), this.theme); - objLytebox.appendChild(objDetailsContainer); - var objDetailsData =this.doc.createElement("div"); - objDetailsData.setAttribute('id','lbDetailsData'); - objDetailsData.setAttribute((this.ie ? 'className' : 'class'), this.theme); - objDetailsContainer.appendChild(objDetailsData); - var objDetails = this.doc.createElement("div"); - objDetails.setAttribute('id','lbDetails'); - objDetailsData.appendChild(objDetails); - var objCaption = this.doc.createElement("span"); - objCaption.setAttribute('id','lbCaption'); - objDetails.appendChild(objCaption); - var objHoverNav = this.doc.createElement("div"); - objHoverNav.setAttribute('id','lbHoverNav'); - objImageContainer.appendChild(objHoverNav); - var objBottomNav = this.doc.createElement("div"); - objBottomNav.setAttribute('id','lbBottomNav'); - objDetailsData.appendChild(objBottomNav); - var objPrev = this.doc.createElement("a"); - objPrev.setAttribute('id','lbPrev'); - objPrev.setAttribute((this.ie ? 'className' : 'class'), this.theme); - objPrev.setAttribute('href','#'); - objHoverNav.appendChild(objPrev); - var objNext = this.doc.createElement("a"); - objNext.setAttribute('id','lbNext'); - objNext.setAttribute((this.ie ? 'className' : 'class'), this.theme); - objNext.setAttribute('href','#'); - objHoverNav.appendChild(objNext); - var objNumberDisplay = this.doc.createElement("span"); - objNumberDisplay.setAttribute('id','lbNumberDisplay'); - objDetails.appendChild(objNumberDisplay); - var objNavDisplay = this.doc.createElement("span"); - objNavDisplay.setAttribute('id','lbNavDisplay'); - objNavDisplay.style.display = 'none'; - objDetails.appendChild(objNavDisplay); - var objClose = this.doc.createElement("a"); - objClose.setAttribute('id','lbClose'); - objClose.setAttribute((this.ie ? 'className' : 'class'), this.theme); - objClose.setAttribute('href','#'); - objBottomNav.appendChild(objClose); - var objPause = this.doc.createElement("a"); - objPause.setAttribute('id','lbPause'); - objPause.setAttribute((this.ie ? 'className' : 'class'), this.theme); - objPause.setAttribute('href','#'); - objPause.style.display = 'none'; - objBottomNav.appendChild(objPause); - var objPlay = this.doc.createElement("a"); - objPlay.setAttribute('id','lbPlay'); - objPlay.setAttribute((this.ie ? 'className' : 'class'), this.theme); - objPlay.setAttribute('href','#'); - objPlay.style.display = 'none'; - objBottomNav.appendChild(objPlay); -}; -LyteBox.prototype.updateLyteboxItems = function() { - var anchors = (this.isFrame) ? window.parent.frames[window.name].document.getElementsByTagName('a') : document.getElementsByTagName('a'); - for (var i = 0; i < anchors.length; i++) { - var anchor = anchors[i]; - var relAttribute = String(anchor.getAttribute('rel')); - if (anchor.getAttribute('href')) { - if (relAttribute.toLowerCase().match('lytebox')) { - anchor.onclick = function () { myLytebox.start(this, false, false); return false; } - } else if (relAttribute.toLowerCase().match('lyteshow')) { - anchor.onclick = function () { myLytebox.start(this, true, false); return false; } - } else if (relAttribute.toLowerCase().match('lyteframe')) { - anchor.onclick = function () { myLytebox.start(this, false, true); return false; } - } - } - } -}; -LyteBox.prototype.start = function(imageLink, doSlide, doFrame) { - if (this.ie && !this.ie7) { this.toggleSelects('hide'); } - if (this.hideFlash) { this.toggleFlash('hide'); } - this.isLyteframe = (doFrame ? true : false); - var pageSize = this.getPageSize(); - var objOverlay = this.doc.getElementById('lbOverlay'); - var objBody = this.doc.getElementsByTagName("body").item(0); - objOverlay.style.height = pageSize[1] + "px"; - objOverlay.style.display = ''; - this.appear('lbOverlay', (this.doAnimations ? 0 : this.maxOpacity)); - var anchors = (this.isFrame) ? window.parent.frames[window.name].document.getElementsByTagName('a') : document.getElementsByTagName('a'); - if (this.isLyteframe) { - this.frameArray = []; - this.frameNum = 0; - if ((imageLink.getAttribute('rel') == 'lyteframe')) { - var rev = imageLink.getAttribute('rev'); - this.frameArray.push(new Array(imageLink.getAttribute('href'), imageLink.getAttribute('title'), (rev == null || rev == '' ? 'width: 400px; height: 400px; scrolling: auto;' : rev))); - } else { - if (imageLink.getAttribute('rel').indexOf('lyteframe') != -1) { - for (var i = 0; i < anchors.length; i++) { - var anchor = anchors[i]; - if (anchor.getAttribute('href') && (anchor.getAttribute('rel') == imageLink.getAttribute('rel'))) { - var rev = anchor.getAttribute('rev'); - this.frameArray.push(new Array(anchor.getAttribute('href'), anchor.getAttribute('title'), (rev == null || rev == '' ? 'width: 400px; height: 400px; scrolling: auto;' : rev))); - } - } - this.frameArray.removeDuplicates(); - while(this.frameArray[this.frameNum][0] != imageLink.getAttribute('href')) { this.frameNum++; } - } - } - } else { - this.imageArray = []; - this.imageNum = 0; - this.slideArray = []; - this.slideNum = 0; - if ((imageLink.getAttribute('rel') == 'lytebox')) { - this.imageArray.push(new Array(imageLink.getAttribute('href'), imageLink.getAttribute('title'))); - } else { - if (imageLink.getAttribute('rel').indexOf('lytebox') != -1) { - for (var i = 0; i < anchors.length; i++) { - var anchor = anchors[i]; - if (anchor.getAttribute('href') && (anchor.getAttribute('rel') == imageLink.getAttribute('rel'))) { - this.imageArray.push(new Array(anchor.getAttribute('href'), anchor.getAttribute('title'))); - } - } - this.imageArray.removeDuplicates(); - while(this.imageArray[this.imageNum][0] != imageLink.getAttribute('href')) { this.imageNum++; } - } - if (imageLink.getAttribute('rel').indexOf('lyteshow') != -1) { - for (var i = 0; i < anchors.length; i++) { - var anchor = anchors[i]; - if (anchor.getAttribute('href') && (anchor.getAttribute('rel') == imageLink.getAttribute('rel'))) { - this.slideArray.push(new Array(anchor.getAttribute('href'), anchor.getAttribute('title'))); - } - } - this.slideArray.removeDuplicates(); - while(this.slideArray[this.slideNum][0] != imageLink.getAttribute('href')) { this.slideNum++; } - } - } - } - var object = this.doc.getElementById('lbMain'); - object.style.top = (this.getPageScroll() + (pageSize[3] / 15)) + "px"; - object.style.display = ''; - if (!this.outerBorder) { - this.doc.getElementById('lbOuterContainer').style.border = 'none'; - this.doc.getElementById('lbDetailsContainer').style.border = 'none'; - } else { - this.doc.getElementById('lbOuterContainer').style.borderBottom = ''; - this.doc.getElementById('lbOuterContainer').setAttribute((this.ie ? 'className' : 'class'), this.theme); - } - this.doc.getElementById('lbOverlay').onclick = function() { myLytebox.end(); return false; } - this.doc.getElementById('lbMain').onclick = function(e) { - var e = e; - if (!e) { - if (window.parent.frames[window.name] && (parent.document.getElementsByTagName('frameset').length <= 0)) { - e = window.parent.window.event; - } else { - e = window.event; - } - } - var id = (e.target ? e.target.id : e.srcElement.id); - if (id == 'lbMain') { myLytebox.end(); return false; } - } - this.doc.getElementById('lbClose').onclick = function() { myLytebox.end(); return false; } - this.doc.getElementById('lbPause').onclick = function() { myLytebox.togglePlayPause("lbPause", "lbPlay"); return false; } - this.doc.getElementById('lbPlay').onclick = function() { myLytebox.togglePlayPause("lbPlay", "lbPause"); return false; } - this.isSlideshow = doSlide; - this.isPaused = (this.slideNum != 0 ? true : false); - if (this.isSlideshow && this.showPlayPause && this.isPaused) { - this.doc.getElementById('lbPlay').style.display = ''; - this.doc.getElementById('lbPause').style.display = 'none'; - } - if (this.isLyteframe) { - this.changeContent(this.frameNum); - } else { - if (this.isSlideshow) { - this.changeContent(this.slideNum); - } else { - this.changeContent(this.imageNum); - } - } -}; -LyteBox.prototype.changeContent = function(imageNum) { - if (this.isSlideshow) { - for (var i = 0; i < this.slideshowIDCount; i++) { window.clearTimeout(this.slideshowIDArray[i]); } - } - this.activeImage = this.activeSlide = this.activeFrame = imageNum; - if (!this.outerBorder) { - this.doc.getElementById('lbOuterContainer').style.border = 'none'; - this.doc.getElementById('lbDetailsContainer').style.border = 'none'; - } else { - this.doc.getElementById('lbOuterContainer').style.borderBottom = ''; - this.doc.getElementById('lbOuterContainer').setAttribute((this.ie ? 'className' : 'class'), this.theme); - } - this.doc.getElementById('lbLoading').style.display = ''; - this.doc.getElementById('lbImage').style.display = 'none'; - this.doc.getElementById('lbIframe').style.display = 'none'; - this.doc.getElementById('lbPrev').style.display = 'none'; - this.doc.getElementById('lbNext').style.display = 'none'; - this.doc.getElementById('lbIframeContainer').style.display = 'none'; - this.doc.getElementById('lbDetailsContainer').style.display = 'none'; - this.doc.getElementById('lbNumberDisplay').style.display = 'none'; - if (this.navType == 2 || this.isLyteframe) { - object = this.doc.getElementById('lbNavDisplay'); - object.innerHTML = '    || '; - object.style.display = 'none'; - } - if (this.isLyteframe) { - var iframe = myLytebox.doc.getElementById('lbIframe'); - var styles = this.frameArray[this.activeFrame][2]; - var aStyles = styles.split(';'); - for (var i = 0; i < aStyles.length; i++) { - if (aStyles[i].indexOf('width:') >= 0) { - var w = aStyles[i].replace('width:', ''); - iframe.width = w.trim(); - } else if (aStyles[i].indexOf('height:') >= 0) { - var h = aStyles[i].replace('height:', ''); - iframe.height = h.trim(); - } else if (aStyles[i].indexOf('scrolling:') >= 0) { - var s = aStyles[i].replace('scrolling:', ''); - iframe.scrolling = s.trim(); - } else if (aStyles[i].indexOf('border:') >= 0) { - // Not implemented yet, as there are cross-platform issues with setting the border (from a GUI standpoint) - //var b = aStyles[i].replace('border:', ''); - //iframe.style.border = b.trim(); - } - } - this.resizeContainer(parseInt(iframe.width), parseInt(iframe.height)); - } else { - imgPreloader = new Image(); - imgPreloader.onload = function() { - var imageWidth = imgPreloader.width; - var imageHeight = imgPreloader.height; - if (myLytebox.autoResize) { - var pagesize = myLytebox.getPageSize(); - var x = pagesize[2] - 150; - var y = pagesize[3] - 150; - if (imageWidth > x) { - imageHeight = Math.round(imageHeight * (x / imageWidth)); - imageWidth = x; - if (imageHeight > y) { - imageWidth = Math.round(imageWidth * (y / imageHeight)); - imageHeight = y; - } - } else if (imageHeight > y) { - imageWidth = Math.round(imageWidth * (y / imageHeight)); - imageHeight = y; - if (imageWidth > x) { - imageHeight = Math.round(imageHeight * (x / imageWidth)); - imageWidth = x; - } - } - } - var lbImage = myLytebox.doc.getElementById('lbImage') - lbImage.src = (myLytebox.isSlideshow ? myLytebox.slideArray[myLytebox.activeSlide][0] : myLytebox.imageArray[myLytebox.activeImage][0]); - lbImage.width = imageWidth; - lbImage.height = imageHeight; - myLytebox.resizeContainer(imageWidth, imageHeight); - imgPreloader.onload = function() {}; - } - imgPreloader.src = (this.isSlideshow ? this.slideArray[this.activeSlide][0] : this.imageArray[this.activeImage][0]); - } -}; -LyteBox.prototype.resizeContainer = function(imgWidth, imgHeight) { - this.wCur = this.doc.getElementById('lbOuterContainer').offsetWidth; - this.hCur = this.doc.getElementById('lbOuterContainer').offsetHeight; - this.xScale = ((imgWidth + (this.borderSize * 2)) / this.wCur) * 100; - this.yScale = ((imgHeight + (this.borderSize * 2)) / this.hCur) * 100; - var wDiff = (this.wCur - this.borderSize * 2) - imgWidth; - var hDiff = (this.hCur - this.borderSize * 2) - imgHeight; - if (!(hDiff == 0)) { - this.hDone = false; - this.resizeH('lbOuterContainer', this.hCur, imgHeight + this.borderSize*2, this.getPixelRate(this.hCur, imgHeight)); - } else { - this.hDone = true; - } - if (!(wDiff == 0)) { - this.wDone = false; - this.resizeW('lbOuterContainer', this.wCur, imgWidth + this.borderSize*2, this.getPixelRate(this.wCur, imgWidth)); - } else { - this.wDone = true; - } - if ((hDiff == 0) && (wDiff == 0)) { - if (this.ie){ this.pause(250); } else { this.pause(100); } - } - this.doc.getElementById('lbPrev').style.height = imgHeight + "px"; - this.doc.getElementById('lbNext').style.height = imgHeight + "px"; - this.doc.getElementById('lbDetailsContainer').style.width = (imgWidth + (this.borderSize * 2) + (this.ie && this.doc.compatMode == "BackCompat" && this.outerBorder ? 2 : 0)) + "px"; - this.showContent(); -}; -LyteBox.prototype.showContent = function() { - if (this.wDone && this.hDone) { - for (var i = 0; i < this.showContentTimerCount; i++) { window.clearTimeout(this.showContentTimerArray[i]); } - if (this.outerBorder) { - this.doc.getElementById('lbOuterContainer').style.borderBottom = 'none'; - } - this.doc.getElementById('lbLoading').style.display = 'none'; - if (this.isLyteframe) { - this.doc.getElementById('lbIframe').style.display = ''; - this.appear('lbIframe', (this.doAnimations ? 0 : 100)); - } else { - this.doc.getElementById('lbImage').style.display = ''; - this.appear('lbImage', (this.doAnimations ? 0 : 100)); - this.preloadNeighborImages(); - } - if (this.isSlideshow) { - if(this.activeSlide == (this.slideArray.length - 1)) { - if (this.autoEnd) { - this.slideshowIDArray[this.slideshowIDCount++] = setTimeout("myLytebox.end('slideshow')", this.slideInterval); - } - } else { - if (!this.isPaused) { - this.slideshowIDArray[this.slideshowIDCount++] = setTimeout("myLytebox.changeContent("+(this.activeSlide+1)+")", this.slideInterval); - } - } - this.doc.getElementById('lbHoverNav').style.display = (this.showNavigation && this.navType == 1 ? '' : 'none'); - this.doc.getElementById('lbClose').style.display = (this.showClose ? '' : 'none'); - this.doc.getElementById('lbDetails').style.display = (this.showDetails ? '' : 'none'); - this.doc.getElementById('lbPause').style.display = (this.showPlayPause && !this.isPaused ? '' : 'none'); - this.doc.getElementById('lbPlay').style.display = (this.showPlayPause && !this.isPaused ? 'none' : ''); - this.doc.getElementById('lbNavDisplay').style.display = (this.showNavigation && this.navType == 2 ? '' : 'none'); - } else { - this.doc.getElementById('lbHoverNav').style.display = (this.navType == 1 && !this.isLyteframe ? '' : 'none'); - if ((this.navType == 2 && !this.isLyteframe && this.imageArray.length > 1) || (this.frameArray.length > 1 && this.isLyteframe)) { - this.doc.getElementById('lbNavDisplay').style.display = ''; - } else { - this.doc.getElementById('lbNavDisplay').style.display = 'none'; - } - this.doc.getElementById('lbClose').style.display = ''; - this.doc.getElementById('lbDetails').style.display = ''; - this.doc.getElementById('lbPause').style.display = 'none'; - this.doc.getElementById('lbPlay').style.display = 'none'; - } - this.doc.getElementById('lbImageContainer').style.display = (this.isLyteframe ? 'none' : ''); - this.doc.getElementById('lbIframeContainer').style.display = (this.isLyteframe ? '' : 'none'); - try { - this.doc.getElementById('lbIframe').src = this.frameArray[this.activeFrame][0]; - } catch(e) { } - } else { - this.showContentTimerArray[this.showContentTimerCount++] = setTimeout("myLytebox.showContent()", 200); - } -}; -LyteBox.prototype.updateDetails = function() { - var object = this.doc.getElementById('lbCaption'); - var sTitle = (this.isSlideshow ? this.slideArray[this.activeSlide][1] : (this.isLyteframe ? this.frameArray[this.activeFrame][1] : this.imageArray[this.activeImage][1])); - object.style.display = ''; - object.innerHTML = (sTitle == null ? '' : sTitle); - this.updateNav(); - this.doc.getElementById('lbDetailsContainer').style.display = ''; - object = this.doc.getElementById('lbNumberDisplay'); - if (this.isSlideshow && this.slideArray.length > 1) { - object.style.display = ''; - object.innerHTML = "Image " + eval(this.activeSlide + 1) + " of " + this.slideArray.length; - this.doc.getElementById('lbNavDisplay').style.display = (this.navType == 2 && this.showNavigation ? '' : 'none'); - } else if (this.imageArray.length > 1 && !this.isLyteframe) { - object.style.display = ''; - object.innerHTML = "Image " + eval(this.activeImage + 1) + " of " + this.imageArray.length; - this.doc.getElementById('lbNavDisplay').style.display = (this.navType == 2 ? '' : 'none'); - } else if (this.frameArray.length > 1 && this.isLyteframe) { - object.style.display = ''; - object.innerHTML = "Page " + eval(this.activeFrame + 1) + " of " + this.frameArray.length; - this.doc.getElementById('lbNavDisplay').style.display = ''; - } else { - this.doc.getElementById('lbNavDisplay').style.display = 'none'; - } - this.appear('lbDetailsContainer', (this.doAnimations ? 0 : 100)); -}; -LyteBox.prototype.updateNav = function() { - if (this.isSlideshow) { - if (this.activeSlide != 0) { - var object = (this.navType == 2 ? this.doc.getElementById('lbPrev2') : this.doc.getElementById('lbPrev')); - object.style.display = ''; - object.onclick = function() { - if (myLytebox.pauseOnPrevClick) { myLytebox.togglePlayPause("lbPause", "lbPlay"); } - myLytebox.changeContent(myLytebox.activeSlide - 1); return false; - } - } else { - if (this.navType == 2) { this.doc.getElementById('lbPrev2_Off').style.display = ''; } - } - if (this.activeSlide != (this.slideArray.length - 1)) { - var object = (this.navType == 2 ? this.doc.getElementById('lbNext2') : this.doc.getElementById('lbNext')); - object.style.display = ''; - object.onclick = function() { - if (myLytebox.pauseOnNextClick) { myLytebox.togglePlayPause("lbPause", "lbPlay"); } - myLytebox.changeContent(myLytebox.activeSlide + 1); return false; - } - } else { - if (this.navType == 2) { this.doc.getElementById('lbNext2_Off').style.display = ''; } - } - } else if (this.isLyteframe) { - if(this.activeFrame != 0) { - var object = this.doc.getElementById('lbPrev2'); - object.style.display = ''; - object.onclick = function() { - myLytebox.changeContent(myLytebox.activeFrame - 1); return false; - } - } else { - this.doc.getElementById('lbPrev2_Off').style.display = ''; - } - if(this.activeFrame != (this.frameArray.length - 1)) { - var object = this.doc.getElementById('lbNext2'); - object.style.display = ''; - object.onclick = function() { - myLytebox.changeContent(myLytebox.activeFrame + 1); return false; - } - } else { - this.doc.getElementById('lbNext2_Off').style.display = ''; - } - } else { - if(this.activeImage != 0) { - var object = (this.navType == 2 ? this.doc.getElementById('lbPrev2') : this.doc.getElementById('lbPrev')); - object.style.display = ''; - object.onclick = function() { - myLytebox.changeContent(myLytebox.activeImage - 1); return false; - } - } else { - if (this.navType == 2) { this.doc.getElementById('lbPrev2_Off').style.display = ''; } - } - if(this.activeImage != (this.imageArray.length - 1)) { - var object = (this.navType == 2 ? this.doc.getElementById('lbNext2') : this.doc.getElementById('lbNext')); - object.style.display = ''; - object.onclick = function() { - myLytebox.changeContent(myLytebox.activeImage + 1); return false; - } - } else { - if (this.navType == 2) { this.doc.getElementById('lbNext2_Off').style.display = ''; } - } - } - this.enableKeyboardNav(); -}; -LyteBox.prototype.enableKeyboardNav = function() { document.onkeydown = this.keyboardAction; }; -LyteBox.prototype.disableKeyboardNav = function() { document.onkeydown = ''; }; -LyteBox.prototype.keyboardAction = function(e) { - var keycode = key = escape = null; - keycode = (e == null) ? event.keyCode : e.which; - key = String.fromCharCode(keycode).toLowerCase(); - escape = (e == null) ? 27 : e.DOM_VK_ESCAPE; - if ((key == 'x') || (key == 'c') || (keycode == escape)) { - myLytebox.end(); - } else if ((key == 'p') || (keycode == 37)) { - if (myLytebox.isSlideshow) { - if(myLytebox.activeSlide != 0) { - myLytebox.disableKeyboardNav(); - myLytebox.changeContent(myLytebox.activeSlide - 1); - } - } else if (myLytebox.isLyteframe) { - if(myLytebox.activeFrame != 0) { - myLytebox.disableKeyboardNav(); - myLytebox.changeContent(myLytebox.activeFrame - 1); - } - } else { - if(myLytebox.activeImage != 0) { - myLytebox.disableKeyboardNav(); - myLytebox.changeContent(myLytebox.activeImage - 1); - } - } - } else if ((key == 'n') || (keycode == 39)) { - if (myLytebox.isSlideshow) { - if(myLytebox.activeSlide != (myLytebox.slideArray.length - 1)) { - myLytebox.disableKeyboardNav(); - myLytebox.changeContent(myLytebox.activeSlide + 1); - } - } else if (myLytebox.isLyteframe) { - if(myLytebox.activeFrame != (myLytebox.frameArray.length - 1)) { - myLytebox.disableKeyboardNav(); - myLytebox.changeContent(myLytebox.activeFrame + 1); - } - } else { - if(myLytebox.activeImage != (myLytebox.imageArray.length - 1)) { - myLytebox.disableKeyboardNav(); - myLytebox.changeContent(myLytebox.activeImage + 1); - } - } - } -}; -LyteBox.prototype.preloadNeighborImages = function() { - if (this.isSlideshow) { - if ((this.slideArray.length - 1) > this.activeSlide) { - preloadNextImage = new Image(); - preloadNextImage.src = this.slideArray[this.activeSlide + 1][0]; - } - if(this.activeSlide > 0) { - preloadPrevImage = new Image(); - preloadPrevImage.src = this.slideArray[this.activeSlide - 1][0]; - } - } else { - if ((this.imageArray.length - 1) > this.activeImage) { - preloadNextImage = new Image(); - preloadNextImage.src = this.imageArray[this.activeImage + 1][0]; - } - if(this.activeImage > 0) { - preloadPrevImage = new Image(); - preloadPrevImage.src = this.imageArray[this.activeImage - 1][0]; - } - } -}; -LyteBox.prototype.togglePlayPause = function(hideID, showID) { - if (this.isSlideshow && hideID == "lbPause") { - for (var i = 0; i < this.slideshowIDCount; i++) { window.clearTimeout(this.slideshowIDArray[i]); } - } - this.doc.getElementById(hideID).style.display = 'none'; - this.doc.getElementById(showID).style.display = ''; - if (hideID == "lbPlay") { - this.isPaused = false; - if (this.activeSlide == (this.slideArray.length - 1)) { - this.end(); - } else { - this.changeContent(this.activeSlide + 1); - } - } else { - this.isPaused = true; - } -}; -LyteBox.prototype.end = function(caller) { - var closeClick = (caller == 'slideshow' ? false : true); - if (this.isSlideshow && this.isPaused && !closeClick) { return; } - this.disableKeyboardNav(); - this.doc.getElementById('lbMain').style.display = 'none'; - this.fade('lbOverlay', (this.doAnimations ? this.maxOpacity : 0)); - this.toggleSelects('visible'); - if (this.hideFlash) { this.toggleFlash('visible'); } - if (this.isSlideshow) { - for (var i = 0; i < this.slideshowIDCount; i++) { window.clearTimeout(this.slideshowIDArray[i]); } - } - if (this.isLyteframe) { - this.initialize(); - } -}; -LyteBox.prototype.checkFrame = function() { - if (window.parent.frames[window.name] && (parent.document.getElementsByTagName('frameset').length <= 0)) { - this.isFrame = true; - this.lytebox = "window.parent." + window.name + ".myLytebox"; - this.doc = parent.document; - } else { - this.isFrame = false; - this.lytebox = "myLytebox"; - this.doc = document; - } -}; -LyteBox.prototype.getPixelRate = function(cur, img) { - var diff = (img > cur) ? img - cur : cur - img; - if (diff >= 0 && diff <= 100) { return 10; } - if (diff > 100 && diff <= 200) { return 15; } - if (diff > 200 && diff <= 300) { return 20; } - if (diff > 300 && diff <= 400) { return 25; } - if (diff > 400 && diff <= 500) { return 30; } - if (diff > 500 && diff <= 600) { return 35; } - if (diff > 600 && diff <= 700) { return 40; } - if (diff > 700) { return 45; } -}; -LyteBox.prototype.appear = function(id, opacity) { - var object = this.doc.getElementById(id).style; - object.opacity = (opacity / 100); - object.MozOpacity = (opacity / 100); - object.KhtmlOpacity = (opacity / 100); - object.filter = "alpha(opacity=" + (opacity + 10) + ")"; - if (opacity == 100 && (id == 'lbImage' || id == 'lbIframe')) { - try { object.removeAttribute("filter"); } catch(e) {} /* Fix added for IE Alpha Opacity Filter bug. */ - this.updateDetails(); - } else if (opacity >= this.maxOpacity && id == 'lbOverlay') { - for (var i = 0; i < this.overlayTimerCount; i++) { window.clearTimeout(this.overlayTimerArray[i]); } - return; - } else if (opacity >= 100 && id == 'lbDetailsContainer') { - try { object.removeAttribute("filter"); } catch(e) {} /* Fix added for IE Alpha Opacity Filter bug. */ - for (var i = 0; i < this.imageTimerCount; i++) { window.clearTimeout(this.imageTimerArray[i]); } - this.doc.getElementById('lbOverlay').style.height = this.getPageSize()[1] + "px"; - } else { - if (id == 'lbOverlay') { - this.overlayTimerArray[this.overlayTimerCount++] = setTimeout("myLytebox.appear('" + id + "', " + (opacity+20) + ")", 1); - } else { - this.imageTimerArray[this.imageTimerCount++] = setTimeout("myLytebox.appear('" + id + "', " + (opacity+10) + ")", 1); - } - } -}; -LyteBox.prototype.fade = function(id, opacity) { - var object = this.doc.getElementById(id).style; - object.opacity = (opacity / 100); - object.MozOpacity = (opacity / 100); - object.KhtmlOpacity = (opacity / 100); - object.filter = "alpha(opacity=" + opacity + ")"; - if (opacity <= 0) { - try { - object.display = 'none'; - } catch(err) { } - } else if (id == 'lbOverlay') { - this.overlayTimerArray[this.overlayTimerCount++] = setTimeout("myLytebox.fade('" + id + "', " + (opacity-20) + ")", 1); - } else { - this.timerIDArray[this.timerIDCount++] = setTimeout("myLytebox.fade('" + id + "', " + (opacity-10) + ")", 1); - } -}; -LyteBox.prototype.resizeW = function(id, curW, maxW, pixelrate, speed) { - if (!this.hDone) { - this.resizeWTimerArray[this.resizeWTimerCount++] = setTimeout("myLytebox.resizeW('" + id + "', " + curW + ", " + maxW + ", " + pixelrate + ")", 100); - return; - } - var object = this.doc.getElementById(id); - var timer = speed ? speed : (this.resizeDuration/2); - var newW = (this.doAnimations ? curW : maxW); - object.style.width = (newW) + "px"; - if (newW < maxW) { - newW += (newW + pixelrate >= maxW) ? (maxW - newW) : pixelrate; - } else if (newW > maxW) { - newW -= (newW - pixelrate <= maxW) ? (newW - maxW) : pixelrate; - } - this.resizeWTimerArray[this.resizeWTimerCount++] = setTimeout("myLytebox.resizeW('" + id + "', " + newW + ", " + maxW + ", " + pixelrate + ", " + (timer+0.02) + ")", timer+0.02); - if (parseInt(object.style.width) == maxW) { - this.wDone = true; - for (var i = 0; i < this.resizeWTimerCount; i++) { window.clearTimeout(this.resizeWTimerArray[i]); } - } -}; -LyteBox.prototype.resizeH = function(id, curH, maxH, pixelrate, speed) { - var timer = speed ? speed : (this.resizeDuration/2); - var object = this.doc.getElementById(id); - var newH = (this.doAnimations ? curH : maxH); - object.style.height = (newH) + "px"; - if (newH < maxH) { - newH += (newH + pixelrate >= maxH) ? (maxH - newH) : pixelrate; - } else if (newH > maxH) { - newH -= (newH - pixelrate <= maxH) ? (newH - maxH) : pixelrate; - } - this.resizeHTimerArray[this.resizeHTimerCount++] = setTimeout("myLytebox.resizeH('" + id + "', " + newH + ", " + maxH + ", " + pixelrate + ", " + (timer+.02) + ")", timer+.02); - if (parseInt(object.style.height) == maxH) { - this.hDone = true; - for (var i = 0; i < this.resizeHTimerCount; i++) { window.clearTimeout(this.resizeHTimerArray[i]); } - } -}; -LyteBox.prototype.getPageScroll = function() { - if (self.pageYOffset) { - return this.isFrame ? parent.pageYOffset : self.pageYOffset; - } else if (this.doc.documentElement && this.doc.documentElement.scrollTop){ - return this.doc.documentElement.scrollTop; - } else if (document.body) { - return this.doc.body.scrollTop; - } -}; -LyteBox.prototype.getPageSize = function() { - var xScroll, yScroll, windowWidth, windowHeight; - if (window.innerHeight && window.scrollMaxY) { - xScroll = this.doc.scrollWidth; - yScroll = (this.isFrame ? parent.innerHeight : self.innerHeight) + (this.isFrame ? parent.scrollMaxY : self.scrollMaxY); - } else if (this.doc.body.scrollHeight > this.doc.body.offsetHeight){ - xScroll = this.doc.body.scrollWidth; - yScroll = this.doc.body.scrollHeight; - } else { - xScroll = this.doc.getElementsByTagName("html").item(0).offsetWidth; - yScroll = this.doc.getElementsByTagName("html").item(0).offsetHeight; - xScroll = (xScroll < this.doc.body.offsetWidth) ? this.doc.body.offsetWidth : xScroll; - yScroll = (yScroll < this.doc.body.offsetHeight) ? this.doc.body.offsetHeight : yScroll; - } - if (self.innerHeight) { - windowWidth = (this.isFrame) ? parent.innerWidth : self.innerWidth; - windowHeight = (this.isFrame) ? parent.innerHeight : self.innerHeight; - } else if (document.documentElement && document.documentElement.clientHeight) { - windowWidth = this.doc.documentElement.clientWidth; - windowHeight = this.doc.documentElement.clientHeight; - } else if (document.body) { - windowWidth = this.doc.getElementsByTagName("html").item(0).clientWidth; - windowHeight = this.doc.getElementsByTagName("html").item(0).clientHeight; - windowWidth = (windowWidth == 0) ? this.doc.body.clientWidth : windowWidth; - windowHeight = (windowHeight == 0) ? this.doc.body.clientHeight : windowHeight; - } - var pageHeight = (yScroll < windowHeight) ? windowHeight : yScroll; - var pageWidth = (xScroll < windowWidth) ? windowWidth : xScroll; - return new Array(pageWidth, pageHeight, windowWidth, windowHeight); -}; -LyteBox.prototype.toggleFlash = function(state) { - var objects = this.doc.getElementsByTagName("object"); - for (var i = 0; i < objects.length; i++) { - objects[i].style.visibility = (state == "hide") ? 'hidden' : 'visible'; - } - var embeds = this.doc.getElementsByTagName("embed"); - for (var i = 0; i < embeds.length; i++) { - embeds[i].style.visibility = (state == "hide") ? 'hidden' : 'visible'; - } - if (this.isFrame) { - for (var i = 0; i < parent.frames.length; i++) { - try { - objects = parent.frames[i].window.document.getElementsByTagName("object"); - for (var j = 0; j < objects.length; j++) { - objects[j].style.visibility = (state == "hide") ? 'hidden' : 'visible'; - } - } catch(e) { } - try { - embeds = parent.frames[i].window.document.getElementsByTagName("embed"); - for (var j = 0; j < embeds.length; j++) { - embeds[j].style.visibility = (state == "hide") ? 'hidden' : 'visible'; - } - } catch(e) { } - } - } -}; -LyteBox.prototype.toggleSelects = function(state) { - var selects = this.doc.getElementsByTagName("select"); - for (var i = 0; i < selects.length; i++ ) { - selects[i].style.visibility = (state == "hide") ? 'hidden' : 'visible'; - } - if (this.isFrame) { - for (var i = 0; i < parent.frames.length; i++) { - try { - selects = parent.frames[i].window.document.getElementsByTagName("select"); - for (var j = 0; j < selects.length; j++) { - selects[j].style.visibility = (state == "hide") ? 'hidden' : 'visible'; - } - } catch(e) { } - } - } -}; -LyteBox.prototype.pause = function(numberMillis) { - var now = new Date(); - var exitTime = now.getTime() + numberMillis; - while (true) { - now = new Date(); - if (now.getTime() > exitTime) { return; } - } -}; -if (window.addEventListener) { - window.addEventListener("load",initLytebox,false); -} else if (window.attachEvent) { - window.attachEvent("onload",initLytebox); -} else { - window.onload = function() {initLytebox();} -} -function initLytebox() { myLytebox = new LyteBox(); } \ No newline at end of file -- cgit v1.2.3 From be94a34e652571eb61c3e306abfb7cce673823d7 Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 2 Jan 2012 17:49:31 -0500 Subject: fixed group albums --- activate.php | 2 -- pages/photos/album/view.php | 2 +- pages/photos/image/upload.php | 5 ++-- start.php | 35 ++++++++++++++------------- views/default/forms/photos/admin/settings.php | 12 --------- 5 files changed, 22 insertions(+), 34 deletions(-) diff --git a/activate.php b/activate.php index 25d34338c..86706d9a6 100644 --- a/activate.php +++ b/activate.php @@ -41,8 +41,6 @@ $defaults = array( 'album_river_view' => 'set', 'image_sizes' => $image_sizes, - - 'grp_perm_override' => true, ); foreach ($defaults as $name => $value) { diff --git a/pages/photos/album/view.php b/pages/photos/album/view.php index 39816b299..cef3647ee 100644 --- a/pages/photos/album/view.php +++ b/pages/photos/album/view.php @@ -32,7 +32,7 @@ elgg_push_breadcrumb($album->getTitle()); $content = elgg_view_entity($album, array('full_view' => true)); -if ($album->canWriteToContainer()) { +if ($album->getContainerEntity()->canWriteToContainer()) { elgg_register_menu_item('title', array( 'name' => 'upload', 'href' => 'photos/upload/' . $album->getGUID(), diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php index 526972a35..7d9db5ed8 100644 --- a/pages/photos/image/upload.php +++ b/pages/photos/image/upload.php @@ -21,14 +21,15 @@ if (elgg_get_plugin_setting('uploader', 'tidypics') != "disabled") { } $album = get_entity($album_guid); -if (!$album || !$album->canEdit()) { +if (!$album) { // @todo // throw warning and forward to previous page forward(REFERER); } -if (!$album->canEdit()) { +if (!$album->getContainerEntity()->canWriteToContainer()) { // @todo have to be able to edit album to upload photos + forward(REFERER); } // set page owner based on container (user or group) diff --git a/start.php b/start.php index 630068874..1df04876a 100644 --- a/start.php +++ b/start.php @@ -63,6 +63,10 @@ function tidypics_init() { // RSS extensions for embedded media elgg_extend_view('extensions/xmlns', 'extensions/photos/xmlns'); + // allow group members add photos to group albums + elgg_register_plugin_hook_handler('container_permissions_check', 'object', 'tidypics_group_permission_override'); + elgg_register_plugin_hook_handler('permissions_check:metadata', 'object', 'tidypics_group_permission_override'); + /* @@ -71,11 +75,6 @@ function tidypics_init() { //register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus'); - - if (get_plugin_setting('grp_perm_override', 'tidypics') != "disabled") { - register_plugin_hook('permissions_check', 'object', 'tidypics_permission_override'); - } - // Register for notifications register_notification_object('object', 'album', elgg_echo('tidypics:newalbum')); register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message'); @@ -327,7 +326,10 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) { } /** - * Override permissions for group albums and images + * Override permissions for group albums + * + * 1. To write to a container (album) you must be able to write to the owner of the container (odd) + * 2. We also need to change metadata on the album * * @param string $hook * @param string $type @@ -335,18 +337,17 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) { * @param array $params * @return mixed */ -function tidypics_permission_override($hook, $type, $result, $params) { - $entity = $params['entity']; - $user = $params['user']; - - if ($entity->subtype == get_subtype_id('object', 'album')) { - // test that the user can edit the container - return can_write_to_container(0, $entity->container_guid); - } +function tidypics_group_permission_override($hook, $type, $result, $params) { + if (get_input('action') == 'photos/image/upload') { + if (isset($params['container'])) { + $album = $params['container']; + } else { + $album = $params['entity']; + } - if ($entity->subtype == get_subtype_id('object', 'image')) { - // test that the user can edit the container - return can_write_to_container(0, $entity->container_guid); + if (elgg_instanceof($album, 'object', 'album')) { + return $album->getContainerEntity()->canWriteToContainer(); + } } } diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php index 5c71e24f6..f4bafce78 100644 --- a/views/default/forms/photos/admin/settings.php +++ b/views/default/forms/photos/admin/settings.php @@ -105,18 +105,6 @@ echo ''; echo '
          '; -// Group albums -echo '

          ' . elgg_echo('tidypics:settings:heading:groups') . '

          '; -echo '
          '; -$checked = $plugin->grp_perm_override ? 'checked' : false; -echo elgg_view('input/checkbox', array( - 'name' => "params[grp_perm_override]", - 'value' => true, - 'checked' => (bool)$plugin->grp_perm_override, -)); -echo ' ' . elgg_echo("tidypics:settings:grp_perm_override"); -echo '
          '; - echo elgg_view('input/submit', array('value' => elgg_echo("save"))); -- cgit v1.2.3 From 83cbd76b2e11b7d832e212ce1ffc77da7a3dd2a6 Mon Sep 17 00:00:00 2001 From: cash Date: Mon, 2 Jan 2012 21:00:16 -0500 Subject: sorting albums added back --- actions/edit.php | 87 ------------------------------- actions/photos/album/sort.php | 18 +++++++ actions/sortalbum.php | 18 ------- languages/en.php | 2 +- lib/tidypics.php | 50 ++++++++++++++++++ start.php | 14 ++++- views/default/forms/photos/album/sort.php | 2 +- views/default/object/album/full.php | 4 +- 8 files changed, 83 insertions(+), 112 deletions(-) delete mode 100644 actions/edit.php create mode 100644 actions/photos/album/sort.php delete mode 100644 actions/sortalbum.php diff --git a/actions/edit.php b/actions/edit.php deleted file mode 100644 index df65448c8..000000000 --- a/actions/edit.php +++ /dev/null @@ -1,87 +0,0 @@ -canEdit()) { - forward(); -} - -// Get owning user/group -$owner = get_entity($entity->getOwner()); - -// change access only if access is different from current -if ($subtype == 'album' && $entity->access_id != $access) { - $entity->access_id = $access; - - //get images from album and update access on image entities - $images = elgg_get_entities(array( - "type" => "object", - "subtype" => "image", - "container_guid" => $guid, - "limit" => ELGG_ENTITIES_NO_VALUE, - )); - foreach ($images as $im) { - $im->access_id = $access; - $im->save(); - } -} - - -// Set its title and description appropriately -$entity->title = $title; -$entity->description = $body; - -// Before we can set metadata, we need to save the entity -if (!$entity->save()) { - register_error(elgg_echo("album:error")); - $entity->delete(); - forward($_SERVER['HTTP_REFERER']); //failed, so forward to previous page -} - -// Now let's add tags -$tagarray = string_to_tag_array($tags); -$entity->clearMetadata('tags'); -if (is_array($tagarray)) { - $entity->tags = $tagarray; -} - -//if cover meta is sent from image save as metadata -if ($subtype == 'image' && $cover == elgg_echo('album:cover')) { - $album = get_entity($container_guid); - $album->setCoverImageGuid($entity->guid); -} - -// Success message -if ($subtype == 'album') { - system_message(elgg_echo("album:edited")); - // plugins can register to be told when a Tidypics album has been updated - trigger_elgg_event('update', 'tp_album', $entity); -} else { - system_message(elgg_echo('images:edited')); - // plugins can register to be told when a Tidypics image has been updated - trigger_elgg_event('update', 'tp_image', $entity); -} - -forward($entity->getURL()); diff --git a/actions/photos/album/sort.php b/actions/photos/album/sort.php new file mode 100644 index 000000000..613747784 --- /dev/null +++ b/actions/photos/album/sort.php @@ -0,0 +1,18 @@ +setImageList($guids); + +system_message(elgg_echo('tidypics:album:sorted', array($album->title))); +forward($album->getURL()); \ No newline at end of file diff --git a/actions/sortalbum.php b/actions/sortalbum.php deleted file mode 100644 index 1aa0e052f..000000000 --- a/actions/sortalbum.php +++ /dev/null @@ -1,18 +0,0 @@ -setImageList($guids); - -system_message(sprintf(elgg_echo('tidypics:album:sorted'), $album->title)); -forward($album->getURL()); \ No newline at end of file diff --git a/languages/en.php b/languages/en.php index 2276e4b12..6f3de51ef 100644 --- a/languages/en.php +++ b/languages/en.php @@ -96,7 +96,7 @@ $english = array( 'album:addpix' => "Add photos to album", 'album:edit' => "Edit album", 'album:delete' => "Delete album", - 'album:sort' => "Sort album", + 'album:sort' => "Sort", 'image:edit' => "Edit image", 'image:delete' => "Delete image", 'image:download' => "Download image", diff --git a/lib/tidypics.php b/lib/tidypics.php index 4e56ae829..7426a048e 100644 --- a/lib/tidypics.php +++ b/lib/tidypics.php @@ -141,6 +141,56 @@ function tidypics_is_upgrade_available() { } } +/** + * This lists the photos in an album as sorted by metadata + * + * @param array $options + * @return string + */ +function tidypics_list_photos(array $options = array()) { + global $autofeed; + $autofeed = true; + + $defaults = array( + 'offset' => (int) max(get_input('offset', 0), 0), + 'limit' => (int) max(get_input('limit', 10), 0), + 'full_view' => true, + 'list_type_toggle' => false, + 'pagination' => true, + ); + + $options = array_merge($defaults, $options); + + $options['count'] = true; + $count = elgg_get_entities($options); + + $album = get_entity($options['container_guid']); + if ($album) { + $guids = $album->getImageList(); + $guids = array_slice($guids, $options['offset'], $options['limit']); + $options['guids'] = $guids; + unset($options['container_guid']); + } + $options['count'] = false; + $entities = elgg_get_entities($options); + + $keys = array(); + foreach ($entities as $entity) { + $keys[] = $entity->guid; + } + $entities = array_combine($keys, $entities); + + $sorted_entities = array(); + foreach ($guids as $guid) { + if (isset($entities[$guid])) { + $sorted_entities[] = $entities[$guid]; + } + } + + return elgg_view_entity_list($sorted_entities, $options); +} + + /********************************************************************* * the functions below replace broken core functions or add functions * that could/should exist in the core diff --git a/start.php b/start.php index 1df04876a..cebd033b0 100644 --- a/start.php +++ b/start.php @@ -88,13 +88,13 @@ function tidypics_init() { // Register actions $base_dir = elgg_get_plugins_path() . 'tidypics/actions/photos'; elgg_register_action("photos/album/save", "$base_dir/album/save.php"); + elgg_register_action("photos/album/sort", "$base_dir/album/sort.php"); elgg_register_action("photos/delete", "$base_dir/delete.php"); elgg_register_action("photos/image/upload", "$base_dir/image/upload.php"); elgg_register_action("photos/image/save", "$base_dir/image/save.php"); elgg_register_action("photos/batch/edit", "$base_dir/batch/edit.php"); //register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php"); //register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php"); - //register_action("tidypics/sortalbum", false, "$base_dir/sortalbum.php"); elgg_register_action("photos/image/tag", "$base_dir/image/tag.php"); //register_action("tidypics/deletetag", false, "$base_dir/deletetag.php"); @@ -317,9 +317,19 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) { 'name' => 'slideshow', 'text' => elgg_echo('album:slideshow'), 'href' => $slideshow_link, - 'priority' => 90, + 'priority' => 80, ); $return[] = ElggMenuItem::factory($options); + + if ($entity->canEdit()) { + $options = array( + 'name' => 'sort', + 'text' => elgg_echo('album:sort'), + 'href' => "photos/sort/" . $entity->getGUID(), + 'priority' => 90, + ); + $return[] = ElggMenuItem::factory($options); + } } return $return; diff --git a/views/default/forms/photos/album/sort.php b/views/default/forms/photos/album/sort.php index 524112e0c..49bd016aa 100644 --- a/views/default/forms/photos/album/sort.php +++ b/views/default/forms/photos/album/sort.php @@ -21,7 +21,7 @@ echo '
          - - diff --git a/views/default/js/photos/uploading.php b/views/default/js/photos/uploading.php new file mode 100644 index 000000000..59448dd46 --- /dev/null +++ b/views/default/js/photos/uploading.php @@ -0,0 +1,28 @@ + + +elgg.provide('elgg.tidypics.uploading'); + +elgg.tidypics.uploading.init = function() { + $("#uploadify").uploadify({ + 'uploader' : 'mod/tidypics/vendors/uploadify/uploadify.swf', + 'script' : '', + 'fileDataName' : 'Image', + 'multi' : true, + 'auto' : false, + 'wmode' : 'transparent', + 'buttonImg' : " ", + 'height' : 20, + 'width' : 130 + }); +} + +elgg.register_hook_handler('init', 'system', elgg.tidypics.uploading.init); \ No newline at end of file diff --git a/views/default/photos/css.php b/views/default/photos/css.php index 4429ca0c7..3e448f27a 100644 --- a/views/default/photos/css.php +++ b/views/default/photos/css.php @@ -126,6 +126,29 @@ color: #666; } +/* *************************************** + Tagging +*************************************** */ +#tidypics_uploader { +position:relative; +width:400px; +min-height:20px; +} + +#tidypics_choose_button { +position:absolute; +top:0; +left:0; +z-index:0; +display:block; +float:left; +} + +#tidypics_flash_uploader { +position:relative; +z-index:100; +} + -- cgit v1.2.3 From a2e4f84be4da51b7ec8fbe625b1b26dde2ad9289 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Thu, 19 Jan 2012 19:59:48 -0500 Subject: small changes before a preview 2 release --- classes/TidypicsImage.php | 45 +++++---------------------------------------- manifest.xml | 4 ++-- pages/photos/album/sort.php | 2 +- start.php | 2 +- 4 files changed, 9 insertions(+), 44 deletions(-) diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index 7eca2f7c3..b97a2b05e 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -338,55 +338,20 @@ class TidypicsImage extends ElggFile { /** * Get an array of photo tag information * - * @return array of json representations of the tags and the tag link text + * @return array */ public function getPhotoTags() { $tags = array(); - $annotations = get_annotations($this->getGUID(), 'object', 'image', 'phototag'); + $annotations = elgg_get_annotations(array( + 'guid' => $this->getGUID(), + 'annotation_name' => 'phototag', + )); foreach ($annotations as $annotation) { $tags[] = unserialize($annotation->value); } return $tags; - - /* - $photo_tags_json = "["; - foreach ($photo_tags as $p) { - $photo_tag = unserialize($p->value); - - // create link to page with other photos tagged with same tag - $phototag_text = $photo_tag->value; - $phototag_link = $CONFIG->wwwroot . 'search/?tag=' . $phototag_text . '&subtype=image&object=object'; - if ($photo_tag->type === 'user') { - $user = get_entity($photo_tag->value); - if ($user) { - $phototag_text = $user->name; - } else { - $phototag_text = "unknown user"; - } - - $phototag_link = $CONFIG->wwwroot . "pg/photos/tagged/" . $photo_tag->value; - } - - if (isset($photo_tag->x1)) { - // hack to handle format of Pedro Prez's tags - ugh - $photo_tag->coords = "\"x1\":\"{$photo_tag->x1}\",\"y1\":\"{$photo_tag->y1}\",\"width\":\"{$photo_tag->width}\",\"height\":\"{$photo_tag->height}\""; - $photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},'; - } else { - $photo_tags_json .= '{' . $photo_tag->coords . ',"text":"' . $phototag_text . '","id":"' . $p->id . '"},'; - } - - // prepare variable arrays for tagging view - $photo_tag_links[$p->id] = array('text' => $phototag_text, 'url' => $phototag_link); - } - - $photo_tags_json = rtrim($photo_tags_json,','); - $photo_tags_json .= ']'; - - $ret_data = array('json' => $photo_tags_json, 'links' => $photo_tag_links); - return $ret_data; - */ } /** diff --git a/manifest.xml b/manifest.xml index b955ef6bb..d3c884f2f 100644 --- a/manifest.xml +++ b/manifest.xml @@ -2,12 +2,12 @@ Tidypics Photo Gallery Cash Costello - 1.8.0-preview1 + 1.8.0-preview2 A photo gallery with albums, tagging, and a slideshow. content multimedia https://github.com/cash/Tidypics - Cash Costello 2011 + Cash Costello 2011-2012 GNU General Public License Version 2 elgg_release diff --git a/pages/photos/album/sort.php b/pages/photos/album/sort.php index 874da4777..a1d890be1 100644 --- a/pages/photos/album/sort.php +++ b/pages/photos/album/sort.php @@ -31,7 +31,7 @@ if (elgg_instanceof($owner, 'group')) { elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); } elgg_push_breadcrumb($album->title, $album->getURL()); -elgg_push_breadcrumb($title); +elgg_push_breadcrumb(elgg_echo('album:sort')); $content = elgg_view_form('photos/album/sort', array(), array('album' => $album)); diff --git a/start.php b/start.php index 8b336d2ba..f1fdf8434 100644 --- a/start.php +++ b/start.php @@ -195,7 +195,7 @@ function tidypics_page_handler($page) { case "upload": // upload images to album set_input('guid', $page[1]); - set_input('uploader', elgg_extract(2, $page, 'ajax')); + set_input('uploader', elgg_extract(2, $page, 'basic')); require "$base/image/upload.php"; break; -- cgit v1.2.3 From 6064884c3132e55d69f6def45e618655101ad1c3 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Tue, 7 Feb 2012 16:19:51 -0800 Subject: Refs #16. Added stats page. --- languages/en.php | 11 +++++- start.php | 3 +- views/default/admin/statistics/tidypics.php | 57 +++++++++++++++++++++++++++++ views/default/tidypics/admin/stats.php | 36 ------------------ 4 files changed, 69 insertions(+), 38 deletions(-) create mode 100644 views/default/admin/statistics/tidypics.php delete mode 100644 views/default/tidypics/admin/stats.php diff --git a/languages/en.php b/languages/en.php index 6f3de51ef..54cf2f258 100644 --- a/languages/en.php +++ b/languages/en.php @@ -12,6 +12,7 @@ $english = array( 'album' => "Photo Album", 'albums' => "Photo Albums", 'admin:settings:tidypics' => 'Tidypics', + 'admin:statistics:tidypics' => 'Tidypics', 'photos:add' => "Create album", 'images:upload' => "Upload photos", @@ -49,7 +50,7 @@ $english = array( 'tidypics:viewsbyowner' => "by %s users (not including you)", 'tidypics:viewsbyothers' => "(%s by you)", 'tidypics:administration' => 'Tidypics Administration', - 'tidypics:stats' => 'Stats', + 'tidypics:stats' => 'Tidypics Stats', 'tidypics:nophotosingroup' => 'This groups does not have any photos yet', 'tidypics:upgrade' => 'Upgrade', 'tidypics:sort' => 'Sorting the %s album', @@ -89,6 +90,14 @@ $english = array( 'tidypics:option:none' => 'None', 'tidypics:option:cover' => 'Cover', 'tidypics:option:set' => 'Set', + + // stats + 'tidypics:stats:images' => 'Total images', + 'tidypics:stats:albums' => 'Total albums', + 'tidypics:stats:photo_comments' => 'Total comments on photos', + 'tidypics:stats:album_comments' => 'Total comments on albums', + 'tidypics:stats:views' => 'Total views', + 'tidypics:stats:tags' => 'Total tags', //actions 'album:create' => "Create new album", diff --git a/start.php b/start.php index f1fdf8434..5ea04f160 100644 --- a/start.php +++ b/start.php @@ -48,8 +48,9 @@ function tidypics_init() { // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); - // Add admin menu item + // Add admin menu items elgg_register_admin_menu_item('configure', 'tidypics', 'settings'); + elgg_register_admin_menu_item('administer', 'tidypics', 'statistics'); // Register for search elgg_register_entity_type('object', 'image'); diff --git a/views/default/admin/statistics/tidypics.php b/views/default/admin/statistics/tidypics.php new file mode 100644 index 000000000..3e4af782a --- /dev/null +++ b/views/default/admin/statistics/tidypics.php @@ -0,0 +1,57 @@ +dbprefix}entities where subtype={$img_type}"; +$total = get_data_row($query); +$num_images = $total->total; +$stats['images'] = $total->total; + +$img_type = get_subtype_id('object', 'album'); +$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}"; +$total = get_data_row($query); +$num_albums = $total->total; +$stats['albums'] = $total->total; + +$options = array( + 'count' => true, + 'type' => 'object', + 'subtype' => 'image', + 'annotation_name' => 'generic_comment' +); + +$stats['photo_comments'] = elgg_get_annotations($options); + +$options['subtype'] = 'album'; +$stats['album_comments'] = elgg_get_annotations($options); + +$options['subtype'] = 'image'; +$options['annotation_name'] = 'tp_view'; +$stats['views'] = elgg_get_annotations($options); + +if (elgg_get_plugin_setting('tagging', 'tidypics') != 'disabled') { + $options['annotation_name'] = 'phototag'; + $stats['tags'] = elgg_get_annotations($options); +} + +$content = ''; + +foreach ($stats as $str => $value) { + $str = elgg_echo("tidypics:stats:$str"); + $value = (int)$value; + + $content .= << + + + +HTML; +} + +$content .= '
          $str:$value
          '; + +echo elgg_view_module('inline', elgg_echo('tidypics:stats'), $content); \ No newline at end of file diff --git a/views/default/tidypics/admin/stats.php b/views/default/tidypics/admin/stats.php deleted file mode 100644 index 0b088dc2e..000000000 --- a/views/default/tidypics/admin/stats.php +++ /dev/null @@ -1,36 +0,0 @@ -dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_images = $total->total; - -$img_type = get_subtype_id('object', 'album'); -$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_albums = $total->total; - -$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment'); -$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment'); - -$num_views = count_annotations(0, 'object', 'image', 'tp_view'); - -if (get_plugin_setting('tagging', 'tidypics') != "disabled") { - $num_tags = count_annotations(0, 'object', 'image', 'phototag'); -} -?> -

          -
          - Photos:
          - Albums:
          - Comments on photos:
          - Comments on albums:
          - Total views:
          - - Photo tags:
          - -

          \ No newline at end of file -- cgit v1.2.3 From 1c0b514cd009d66544aba2902abc2000f5cb5f43 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Tue, 7 Feb 2012 18:24:42 -0800 Subject: Refs #16. Added server info page. --- languages/en.php | 27 +++- pages/admin.php | 1 + pages/server_analysis.php | 143 --------------------- start.php | 1 + .../administer_utilities/tidypics_server_info.php | 130 +++++++++++++++++++ views/default/admin/statistics/tidypics.php | 6 + views/default/tidypics/admin/settings.php | 2 + views/default/tidypics/admin/tidypics.php | 3 + 8 files changed, 169 insertions(+), 144 deletions(-) delete mode 100644 pages/server_analysis.php create mode 100644 views/default/admin/administer_utilities/tidypics_server_info.php diff --git a/languages/en.php b/languages/en.php index 54cf2f258..4e56c0074 100644 --- a/languages/en.php +++ b/languages/en.php @@ -11,8 +11,11 @@ $english = array( 'photos' => "Photos", 'album' => "Photo Album", 'albums' => "Photo Albums", + 'tidypics:disabled' => 'Disabled', + 'tidypics:enabled' => 'Enabled', 'admin:settings:tidypics' => 'Tidypics', 'admin:statistics:tidypics' => 'Tidypics', + 'admin:administer_utilities:tidypics_server_info' => 'Tidypics Server Analysis', 'photos:add' => "Create album", 'images:upload' => "Upload photos", @@ -98,7 +101,29 @@ $english = array( 'tidypics:stats:album_comments' => 'Total comments on albums', 'tidypics:stats:views' => 'Total views', 'tidypics:stats:tags' => 'Total tags', - + + // server analysis + 'tidypics:server_info:gd_desc' => 'Elgg requires the GD extension to be loaded', + 'tidypics:server_info:exec_desc' => 'Required for ImageMagick command line', + 'tidypics:server_info:memory_limit_desc' => 'Change memory_limit to increase', + 'tidypics:server_info:peak_usage_desc' => 'This is approximately the minimum per page', + 'tidypics:server_info:upload_max_filesize_desc' => 'Max size of an uploaded image', + 'tidypics:server_info:post_max_size_desc' => 'Max post size = sum of images + html form', + 'tidypics:server_info:max_input_time_desc' => 'Time script waits for upload to finish', + 'tidypics:server_info:max_execution_time_desc' => 'Max time a script will run', + 'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions may affect the Flash uploader', + + 'tidypics:server_info:php_version' => 'PHP Version', + 'tidypics:server_info:memory_limit' => 'Memory Available to PHP', + 'tidypics:server_info:peak_usage' => 'Memory Used to Load This Page', + 'tidypics:server_info:upload_max_filesize' => 'Max File Upload Size', + 'tidypics:server_info:post_max_size' => 'Max Post Size', + 'tidypics:server_info:max_input_time' => 'Max Input Time', + 'tidypics:server_info:max_execution_time' => 'Max Execution Time', + 'tidypics:server_info:use_only_cookies' => 'Cookie only sessions', + + 'tidypics:server_configuration_doc' => 'Server configuration documentation', + //actions 'album:create' => "Create new album", 'album:add' => "Add Photo Album", diff --git a/pages/admin.php b/pages/admin.php index 1a04ab279..c6be1212a 100644 --- a/pages/admin.php +++ b/pages/admin.php @@ -1,6 +1,7 @@ -
          - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          PHP version
          GDElgg requires the GD extension to be loaded
          IMagick PHP extension
          exec()Required for ImageMagick command line
          Memory Available to PHPChange memory_limit to increase
          Memory Used to Load This PageThis is approximately the minimum per page
          Max File Upload SizeMax size of an uploaded image
          Max Post SizeMax post size = sum of images + html form
          Max Input Time sTime script waits for upload to finish
          Max Execution Time sMax time a script will run
          GD imagejpeg
          GD imagepng
          GD imagegif
          EXIF
          Cookie only sessionsCookie only sessions may affect the Flash uploader
          - -
          - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          GD
          IMagick
          exec()
          s
          s
          GD imagejpeg
          GD imagepng
          GD imagegif
          EXIF
          + +

          + '/mod/tidypics/docs/configure_server.txt', + 'text' => elgg_echo('tidypics:server_configuration_doc') + )); + ?> +

          +dbprefix}entities where subtype={$img_type}"; $total = get_data_row($query); $num_images = $total->total; $stats['images'] = $total->total; +// number of albums $img_type = get_subtype_id('object', 'album'); $query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}"; $total = get_data_row($query); @@ -24,15 +26,19 @@ $options = array( 'annotation_name' => 'generic_comment' ); +// number of comments on photos $stats['photo_comments'] = elgg_get_annotations($options); +// number of comments on albums $options['subtype'] = 'album'; $stats['album_comments'] = elgg_get_annotations($options); +// number of views on images $options['subtype'] = 'image'; $options['annotation_name'] = 'tp_view'; $stats['views'] = elgg_get_annotations($options); +// number of photo tags on images if (elgg_get_plugin_setting('tagging', 'tidypics') != 'disabled') { $options['annotation_name'] = 'phototag'; $stats['tags'] = elgg_get_annotations($options); diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php index e1d20f953..aff6acc8d 100644 --- a/views/default/tidypics/admin/settings.php +++ b/views/default/tidypics/admin/settings.php @@ -1,6 +1,8 @@ Date: Tue, 7 Feb 2012 19:04:35 -0800 Subject: Refs #16. Added image lib tester to utilities. --- actions/admin/imtest.php | 2 +- languages/en.php | 18 ++- start.php | 2 +- .../administer_utilities/tidypics_server_info.php | 130 ---------------- .../admin/administer_utilities/tidypics_tools.php | 166 +++++++++++++++++++++ views/default/tidypics/admin/imagelib.php | 62 -------- 6 files changed, 185 insertions(+), 195 deletions(-) delete mode 100644 views/default/admin/administer_utilities/tidypics_server_info.php create mode 100644 views/default/admin/administer_utilities/tidypics_tools.php delete mode 100644 views/default/tidypics/admin/imagelib.php diff --git a/actions/admin/imtest.php b/actions/admin/imtest.php index 293a9b2e8..a58643d0e 100644 --- a/actions/admin/imtest.php +++ b/actions/admin/imtest.php @@ -2,7 +2,7 @@ /** * Tidypics ImageMagick Location Test * - * Called through ajax + * Called through ajax. Not a registered Elgg action. */ $location = $_GET['location']; diff --git a/languages/en.php b/languages/en.php index 4e56c0074..cb3b370f9 100644 --- a/languages/en.php +++ b/languages/en.php @@ -15,7 +15,7 @@ $english = array( 'tidypics:enabled' => 'Enabled', 'admin:settings:tidypics' => 'Tidypics', 'admin:statistics:tidypics' => 'Tidypics', - 'admin:administer_utilities:tidypics_server_info' => 'Tidypics Server Analysis', + 'admin:administer_utilities:tidypics_tools' => 'Tidypics Tools', 'photos:add' => "Create album", 'images:upload' => "Upload photos", @@ -103,6 +103,7 @@ $english = array( 'tidypics:stats:tags' => 'Total tags', // server analysis + 'tidypics:server_info' => 'Server information', 'tidypics:server_info:gd_desc' => 'Elgg requires the GD extension to be loaded', 'tidypics:server_info:exec_desc' => 'Required for ImageMagick command line', 'tidypics:server_info:memory_limit_desc' => 'Change memory_limit to increase', @@ -124,6 +125,21 @@ $english = array( 'tidypics:server_configuration_doc' => 'Server configuration documentation', + // library tools + 'tidypics:lib_tools' => 'Image library tools', + 'tidypics:lib_tools:overview' => + 'An image library is required by Tidypics to perform various manipulations: resizing on upload, watermarking, rotation, and cropping. + There are three image library options with Tidypics: PHP extension GD, + ImageMagick called via a system call, and the PHP extension + imagick. GD is the most common of the three on hosted servers but suffers + from serious memory usage problems when resizing photos. If you have access to ImageMagick (whether through system calls or the + PHP extension), we recommend that you use that.', + 'tidypics:lib_tools:testing' => + 'To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can see the + configuration of your server above. Next, you need to determine the path to ImageMagick on your server. Your hosting service should + be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of + ImageMagick installed on your server.', + //actions 'album:create' => "Create new album", 'album:add' => "Add Photo Album", diff --git a/start.php b/start.php index 918b8aea4..1391184c7 100644 --- a/start.php +++ b/start.php @@ -51,7 +51,7 @@ function tidypics_init() { // Add admin menu items elgg_register_admin_menu_item('configure', 'tidypics', 'settings'); elgg_register_admin_menu_item('administer', 'tidypics', 'statistics'); - elgg_register_admin_menu_item('administer', 'tidypics_server_info', 'administer_utilities'); + elgg_register_admin_menu_item('administer', 'tidypics_tools', 'administer_utilities'); // Register for search elgg_register_entity_type('object', 'image'); diff --git a/views/default/admin/administer_utilities/tidypics_server_info.php b/views/default/admin/administer_utilities/tidypics_server_info.php deleted file mode 100644 index 6a034a561..000000000 --- a/views/default/admin/administer_utilities/tidypics_server_info.php +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          GD
          IMagick
          exec()
          s
          s
          GD imagejpeg
          GD imagepng
          GD imagegif
          EXIF
          - -

          - '/mod/tidypics/docs/configure_server.txt', - 'text' => elgg_echo('tidypics:server_configuration_doc') - )); - ?> -

          - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          GD
          IMagick
          exec()
          s
          s
          GD imagejpeg
          GD imagepng
          GD imagegif
          EXIF
          + +

          + '/mod/tidypics/docs/configure_server.txt', + 'text' => elgg_echo('tidypics:server_configuration_doc') + )); + ?> +

          +' . elgg_echo('tidypics:lib_tools:overview') . '

          '; +$content .= '

          ' . elgg_echo('tidypics:lib_tools:testing') . '

          '; +$content .= '

          '; +$content .= '

          '; + +echo elgg_view_module('inline', elgg_echo('tidypics:lib_tools'), $content); + +?> + diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php deleted file mode 100644 index 2b7a3a7b0..000000000 --- a/views/default/tidypics/admin/imagelib.php +++ /dev/null @@ -1,62 +0,0 @@ -dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_images = $total->total; - -$img_type = get_subtype_id('object', 'album'); -$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_albums = $total->total; - -$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment'); -$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment'); - -$num_views = count_annotations(0, 'object', 'image', 'tp_view'); - -if (get_plugin_setting('tagging', 'tidypics') != "disabled") - $num_tags = count_annotations(0, 'object', 'image', 'phototag'); -?> -
          -

          Overview

          -

          - An image library is required by Tidypics to perform various manipulations: resizing on upload, watermarking, rotation, and cropping. - There are three image library options with Tidypics: PHP extension GD, - ImageMagick called via a system call, and the PHP extension - imagick. GD is the most common of the three on hosted servers but suffers - from serious memory usage problems when resizing photos. If you have access to ImageMagick (whether through system calls or the - PHP extension), we recommend that you use that. -

          -

          Testing ImageMagick Commandline

          -

          - To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can check our - server analysis page to find out the - configuration of your server. Next, you need to determine the path to ImageMagick on your server. Your hosting service should - be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of - ImageMagick installed on your server. -

          -
          -

          -
          - - -

          -
          - - \ No newline at end of file -- cgit v1.2.3 From 65f6184aec8f6c6e5d053d4cb0e0925b9f536570 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Thu, 9 Feb 2012 10:24:59 -0800 Subject: Using tabs for admin pages. --- actions/admin/create_thumbnails.php | 60 -------- actions/admin/imtest.php | 18 --- actions/photos/admin/create_thumbnails.php | 70 +++++++++ actions/photos/admin/imtest.php | 18 +++ languages/en.php | 25 +++- start.php | 5 +- .../admin/administer_utilities/tidypics_tools.php | 166 --------------------- views/default/admin/settings/tidypics.php | 78 ++++++++-- views/default/admin/settings/tidypics/help.php | 57 +++++++ .../default/admin/settings/tidypics/image_lib.php | 38 +++++ .../admin/settings/tidypics/server_info.php | 130 ++++++++++++++++ views/default/admin/settings/tidypics/settings.php | 20 +++ views/default/admin/settings/tidypics/stats.php | 63 ++++++++ .../default/admin/settings/tidypics/thumbnail.php | 52 +++++++ views/default/admin/statistics/tidypics.php | 63 -------- views/default/tidypics/admin/help.php | 32 ---- views/default/tidypics/admin/settings.php | 25 ---- views/default/tidypics/admin/thumbnails.php | 33 ---- views/default/tidypics/admin/tidypics.php | 63 -------- views/default/tidypics/admin/upgrade.php | 35 ----- 20 files changed, 533 insertions(+), 518 deletions(-) delete mode 100644 actions/admin/create_thumbnails.php delete mode 100644 actions/admin/imtest.php create mode 100644 actions/photos/admin/create_thumbnails.php create mode 100644 actions/photos/admin/imtest.php delete mode 100644 views/default/admin/administer_utilities/tidypics_tools.php create mode 100644 views/default/admin/settings/tidypics/help.php create mode 100644 views/default/admin/settings/tidypics/image_lib.php create mode 100644 views/default/admin/settings/tidypics/server_info.php create mode 100644 views/default/admin/settings/tidypics/settings.php create mode 100644 views/default/admin/settings/tidypics/stats.php create mode 100644 views/default/admin/settings/tidypics/thumbnail.php delete mode 100644 views/default/admin/statistics/tidypics.php delete mode 100644 views/default/tidypics/admin/help.php delete mode 100644 views/default/tidypics/admin/settings.php delete mode 100644 views/default/tidypics/admin/thumbnails.php delete mode 100644 views/default/tidypics/admin/tidypics.php delete mode 100644 views/default/tidypics/admin/upgrade.php diff --git a/actions/admin/create_thumbnails.php b/actions/admin/create_thumbnails.php deleted file mode 100644 index a09965f65..000000000 --- a/actions/admin/create_thumbnails.php +++ /dev/null @@ -1,60 +0,0 @@ -getFilename(); -$container_guid = $image->container_guid; -if (!$filename || !$container_guid) { - echo "Error retrieving information about the image"; - return; -} - -$title = $image->title; -$prefix = "image/$container_guid/"; -$filestorename = substr($filename, strlen($prefix)); - -$image_lib = get_plugin_setting('image_lib', 'tidypics'); -if (!$image_lib) { - $image_lib = "GD"; -} - -if ($image_lib == 'ImageMagick') { // ImageMagick command line - - if (tp_create_im_cmdline_thumbnails($image, $prefix, $filestorename) != true) { - trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING); - echo "Failed to create thumbnails"; - } - -} else if ($image_lib == 'ImageMagickPHP') { // imagick PHP extension - - if (tp_create_imagick_thumbnails($image, $prefix, $filestorename) != true) { - trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING); - echo "Failed to create thumbnails"; - } - -} else { - - if (tp_create_gd_thumbnails($image, $prefix, $filestorename) != true) { - trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING); - echo "Failed to create thumbnails"; - } - -} // end of image library selector - -echo "wwwroot}mod/tidypics/thumbnail.php?file_guid={$guid}&size=large\" alt=\"{$title}\" />"; diff --git a/actions/admin/imtest.php b/actions/admin/imtest.php deleted file mode 100644 index a58643d0e..000000000 --- a/actions/admin/imtest.php +++ /dev/null @@ -1,18 +0,0 @@ -getFilename(); +$container_guid = $image->container_guid; +if (!$filename || !$container_guid) { + register_error(elgg_echo('tidypics:thumbnail_tool:invalid_image_info')); + forward(REFERER); +} + +$title = $image->title; +$prefix = "image/$container_guid/"; +$filestorename = substr($filename, strlen($prefix)); + +$image_lib = elgg_get_plugin_setting('image_lib', 'tidypics'); +if (!$image_lib) { + $image_lib = "GD"; +} + +// ImageMagick command line +if ($image_lib == 'ImageMagick') { + if (!tp_create_im_cmdline_thumbnails($image, $prefix, $filestorename)) { + trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick command line', E_USER_WARNING); + register_error(elgg_echo('tidypics:thumbnail_tool:create_failed')); + forward(REFERER); + } + +// imagick PHP extension +} else if ($image_lib == 'ImageMagickPHP') { + if (!tp_create_imagick_thumbnails($image, $prefix, $filestorename)) { + trigger_error('Tidypics warning: failed to create thumbnails - ImageMagick PHP', E_USER_WARNING); + register_error(elgg_echo('tidypics:thumbnail_tool:create_failed')); + forward(REFERER); + } +// gd +} else { + if (!tp_create_gd_thumbnails($image, $prefix, $filestorename)) { + trigger_error('Tidypics warning: failed to create thumbnails - GD', E_USER_WARNING); + register_error(elgg_echo('tidypics:thumbnail_tool:create_failed')); + forward(REFERER); + } +} + +$url = elgg_normalize_url("photos/thumbnail/$guid/large"); +system_message(elgg_echo('tidypics:thumbnail_tool:created')); + +if (elgg_is_xhr()) { + echo json_encode(array( + 'guid' => $guid, + 'title' => $title, + 'thumbnail_src' => $url + )); +} + +forward(REFERER); \ No newline at end of file diff --git a/actions/photos/admin/imtest.php b/actions/photos/admin/imtest.php new file mode 100644 index 000000000..a58643d0e --- /dev/null +++ b/actions/photos/admin/imtest.php @@ -0,0 +1,18 @@ + "by %s users (not including you)", 'tidypics:viewsbyothers' => "(%s by you)", 'tidypics:administration' => 'Tidypics Administration', - 'tidypics:stats' => 'Tidypics Stats', + 'tidypics:stats' => 'Stats', 'tidypics:nophotosingroup' => 'This groups does not have any photos yet', 'tidypics:upgrade' => 'Upgrade', 'tidypics:sort' => 'Sorting the %s album', @@ -103,7 +103,7 @@ $english = array( 'tidypics:stats:tags' => 'Total tags', // server analysis - 'tidypics:server_info' => 'Server information', + 'tidypics:server_info' => 'Server Information', 'tidypics:server_info:gd_desc' => 'Elgg requires the GD extension to be loaded', 'tidypics:server_info:exec_desc' => 'Required for ImageMagick command line', 'tidypics:server_info:memory_limit_desc' => 'Change memory_limit to increase', @@ -136,9 +136,24 @@ $english = array( PHP extension), we recommend that you use that.', 'tidypics:lib_tools:testing' => 'To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can see the - configuration of your server above. Next, you need to determine the path to ImageMagick on your server. Your hosting service should - be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of - ImageMagick installed on your server.', + configuration of your server on the "Server Information" tab.. Next, you need to determine the path to + ImageMagick on your server. Your hosting service should be able to provide this to you. You can test + if the location is correct below. If successful, it should display the version of ImageMagick installed + on your server.', + + // thumbnail tool + 'tidypics:thumbnail_tool' => 'Thumbnail Creation', + 'tidypics:thumbnail_tool_blurb' => + 'This page allows you to create thumbnails for images when the thumbnail creation failed during upload. + You may experience problems with thumbnail creation if your image library is not configured properly or + if there is not enough memory for the GD library to load and resize an image. If your users have + experienced problems with thumbnail creation and you have corrected your configuration, you can try to redo the + thumbnails. Find the unique identifier of the photo (it is the number near the end of the url when viewing + a photo) and enter it below.', + 'tidypics:thumbnail_tool:unknown_image' => 'Unable to get original image', + 'tidypics:thumbnail_tool:invalid_image_info' => 'Error retrieving information about the image', + 'tidypics:thumbnail_tool:create_failed' => 'Failed to create thumbnails', + 'tidypics:thumbnail_tool:created' => 'Created thumbnails.', //actions 'album:create' => "Create new album", diff --git a/start.php b/start.php index 1391184c7..ad540bc8f 100644 --- a/start.php +++ b/start.php @@ -48,10 +48,8 @@ function tidypics_init() { // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); - // Add admin menu items + // Add admin menu item elgg_register_admin_menu_item('configure', 'tidypics', 'settings'); - elgg_register_admin_menu_item('administer', 'tidypics', 'statistics'); - elgg_register_admin_menu_item('administer', 'tidypics_tools', 'administer_utilities'); // Register for search elgg_register_entity_type('object', 'image'); @@ -107,6 +105,7 @@ function tidypics_init() { //register_action("tidypics/deletetag", false, "$base_dir/deletetag.php"); elgg_register_action("photos/admin/settings", "$base_dir/admin/settings.php", 'admin'); + elgg_register_action("photos/admin/create_thumbnails", "$base_dir/admin/create_thumbnails.php", 'admin'); elgg_register_action("photos/admin/upgrade", "$base_dir/admin/upgrade.php", 'admin'); // Register libraries diff --git a/views/default/admin/administer_utilities/tidypics_tools.php b/views/default/admin/administer_utilities/tidypics_tools.php deleted file mode 100644 index 1df664be8..000000000 --- a/views/default/admin/administer_utilities/tidypics_tools.php +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
          GD
          IMagick
          exec()
          s
          s
          GD imagejpeg
          GD imagepng
          GD imagegif
          EXIF
          - -

          - '/mod/tidypics/docs/configure_server.txt', - 'text' => elgg_echo('tidypics:server_configuration_doc') - )); - ?> -

          -' . elgg_echo('tidypics:lib_tools:overview') . '

          '; -$content .= '

          ' . elgg_echo('tidypics:lib_tools:testing') . '

          '; -$content .= '

          '; -$content .= '

          '; - -echo elgg_view_module('inline', elgg_echo('tidypics:lib_tools'), $content); - -?> - diff --git a/views/default/admin/settings/tidypics.php b/views/default/admin/settings/tidypics.php index 2e7d79942..7b1764fed 100644 --- a/views/default/admin/settings/tidypics.php +++ b/views/default/admin/settings/tidypics.php @@ -6,18 +6,66 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 */ -if (tidypics_is_upgrade_available()) { - echo '
          '; - echo '

          '; - echo elgg_view('output/url', array( - 'text' => elgg_echo('tidypics:upgrade'), - 'href' => 'action/photos/admin/upgrade', - 'is_action' => true, - )); - echo '

          '; - echo '
          '; -} - -echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions'))); - -echo elgg_view_form('photos/admin/settings'); +$tab = get_input('tab', 'settings'); + +echo elgg_view('navigation/tabs', array( + 'tabs' => array( + array( + 'text' => elgg_echo('settings'), + 'href' => '/admin/settings/tidypics', + 'selected' => ($tab == 'settings'), + ), + array( + 'text' => elgg_echo('tidypics:server_info'), + 'href' => '/admin/settings/tidypics?tab=server_info', + 'selected' => ($tab == 'server_info'), + ), + array( + 'text' => elgg_echo('tidypics:stats'), + 'href' => '/admin/settings/tidypics?tab=stats', + 'selected' => ($tab == 'stats'), + ), + array( + 'text' => elgg_echo('tidypics:settings:image_lib'), + 'href' => '/admin/settings/tidypics?tab=image_lib', + 'selected' => ($tab == 'image_lib'), + ), + array( + 'text' => elgg_echo('tidypics:settings:thumbnail'), + 'href' => '/admin/settings/tidypics?tab=thumbnail', + 'selected' => ($tab == 'thumbnail'), + ), + array( + 'text' => elgg_echo('tidypics:settings:help'), + 'href' => '/admin/settings/tidypics?tab=help', + 'selected' => ($tab == 'help'), + ), + ) +)); + +switch ($tab) { + case 'server_info': + echo elgg_view('admin/settings/tidypics/server_info'); + break; + + case 'stats': + echo elgg_view('admin/settings/tidypics/stats'); + break; + + case 'image_lib': + echo elgg_view('admin/settings/tidypics/image_lib'); + break; + + case 'thumbnail': + echo elgg_view('admin/settings/tidypics/thumbnail'); + break; + + case 'help': + echo elgg_view('admin/settings/tidypics/help'); + break; + + default: + case 'settings': + echo elgg_view('admin/settings/tidypics/settings'); + break; +} \ No newline at end of file diff --git a/views/default/admin/settings/tidypics/help.php b/views/default/admin/settings/tidypics/help.php new file mode 100644 index 000000000..bf08de284 --- /dev/null +++ b/views/default/admin/settings/tidypics/help.php @@ -0,0 +1,57 @@ + +Tidypics tries to calculate the maximum size of an image that your server will support. If it +guesses incorrectly and someone uploads a photo that is too large, the script may crash when +resizing the image if you are using GD. The easiest way to test this is to set display_errors +to 1 in your .htaccess file and upload large images. If this causes a problem, a php memory error +should display on the screen. You can increased your php memory limit (see the docs directory). +A better option is to use ImageMagick if your server supports it (again see the docs directory). +

          +

          +If it is not a memory issue, you should see some other error appear. Once you have fixed the error, +change display_error back to 0. +

          +HTML; + +echo elgg_view_module('inline', $title, $body); + +$title = 'Question mark images appear'; +$body =<< +If you see question mark images when you look at your albums, this means the resizing of the images +failed. This could be due to the memory limits as described above. There are other causes. Tidypics +tries to detect these problems and write the cause to the error log. You should check your server +error log right after an upload that results in a question mark for these error messages. The messages +will begin with "Tidypics warning:". It is possible if you have turned off php warnings that you will +not see these warnings. +

          +

          +Another possible cause is using ImageMagick when your server does not support it or specifying +the wrong path to the ImageMagick executables. +

          +HTML; + +echo elgg_view_module('inline', $title, $body); + + +$title = 'Unable to save settings'; +$body =<<If you are unable to settings, there are two possible causes. First, +Apache can be configured to block pages that use file paths as Tidypics +does when setting the location of the ImageMagick executable. In this case, +leave that field blank. Second, there is some bad code in the Izaps video +plugin that can prevent the settings from being saved. Try disabling that plugin. +

          +HTML; + +echo elgg_view_module('inline', $title, $body); + diff --git a/views/default/admin/settings/tidypics/image_lib.php b/views/default/admin/settings/tidypics/image_lib.php new file mode 100644 index 000000000..44a7eb847 --- /dev/null +++ b/views/default/admin/settings/tidypics/image_lib.php @@ -0,0 +1,38 @@ +' . elgg_echo('tidypics:lib_tools:overview') . '

          '; +$content .= '

          ' . elgg_echo('tidypics:lib_tools:testing') . '

          '; +$content .= '

          '; +$content .= '

          '; + +echo elgg_view_module('inline', elgg_echo('tidypics:lib_tools'), $content); + +?> + diff --git a/views/default/admin/settings/tidypics/server_info.php b/views/default/admin/settings/tidypics/server_info.php new file mode 100644 index 000000000..96ccc555f --- /dev/null +++ b/views/default/admin/settings/tidypics/server_info.php @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          GD
          IMagick
          exec()
          s
          s
          GD imagejpeg
          GD imagepng
          GD imagegif
          EXIF
          + +

          + '/mod/tidypics/docs/configure_server.txt', + 'text' => elgg_echo('tidypics:server_configuration_doc') + )); + ?> +

          +'; + echo '

          '; + echo elgg_view('output/url', array( + 'text' => elgg_echo('tidypics:upgrade'), + 'href' => 'action/photos/admin/upgrade', + 'is_action' => true, + )); + echo '

          '; + echo '
          '; +} + +echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions'))); + +echo elgg_view_form('photos/admin/settings'); \ No newline at end of file diff --git a/views/default/admin/settings/tidypics/stats.php b/views/default/admin/settings/tidypics/stats.php new file mode 100644 index 000000000..25ace77da --- /dev/null +++ b/views/default/admin/settings/tidypics/stats.php @@ -0,0 +1,63 @@ +dbprefix}entities where subtype={$img_type}"; +$total = get_data_row($query); +$num_images = $total->total; +$stats['images'] = $total->total; + +// number of albums +$img_type = get_subtype_id('object', 'album'); +$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}"; +$total = get_data_row($query); +$num_albums = $total->total; +$stats['albums'] = $total->total; + +$options = array( + 'count' => true, + 'type' => 'object', + 'subtype' => 'image', + 'annotation_name' => 'generic_comment' +); + +// number of comments on photos +$stats['photo_comments'] = elgg_get_annotations($options); + +// number of comments on albums +$options['subtype'] = 'album'; +$stats['album_comments'] = elgg_get_annotations($options); + +// number of views on images +$options['subtype'] = 'image'; +$options['annotation_name'] = 'tp_view'; +$stats['views'] = elgg_get_annotations($options); + +// number of photo tags on images +if (elgg_get_plugin_setting('tagging', 'tidypics') != 'disabled') { + $options['annotation_name'] = 'phototag'; + $stats['tags'] = elgg_get_annotations($options); +} + +$content = ''; + +foreach ($stats as $str => $value) { + $str = elgg_echo("tidypics:stats:$str"); + $value = (int)$value; + + $content .= << + + + +HTML; +} + +$content .= '
          $str:$value
          '; + +echo elgg_view_module('inline', elgg_echo('tidypics:stats'), $content); \ No newline at end of file diff --git a/views/default/admin/settings/tidypics/thumbnail.php b/views/default/admin/settings/tidypics/thumbnail.php new file mode 100644 index 000000000..502b5739e --- /dev/null +++ b/views/default/admin/settings/tidypics/thumbnail.php @@ -0,0 +1,52 @@ +' . elgg_echo('tidypics:thumbnail_tool_blurb') . '

          '; +$im_id = elgg_echo('tidypics:settings:im_id'); +$input = elgg_view('input/text', array( + 'name' => 'image_id' +)); +$submit = elgg_view('input/submit', array( + 'value' => elgg_echo('submit'), + 'id' => 'elgg-tidypics-im-test' +)); + +$body .=<< + + $submit +
          +

          +HTML; + +echo elgg_view_module('inline', $title, $body); + +?> + + \ No newline at end of file diff --git a/views/default/admin/statistics/tidypics.php b/views/default/admin/statistics/tidypics.php deleted file mode 100644 index 25ace77da..000000000 --- a/views/default/admin/statistics/tidypics.php +++ /dev/null @@ -1,63 +0,0 @@ -dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_images = $total->total; -$stats['images'] = $total->total; - -// number of albums -$img_type = get_subtype_id('object', 'album'); -$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_albums = $total->total; -$stats['albums'] = $total->total; - -$options = array( - 'count' => true, - 'type' => 'object', - 'subtype' => 'image', - 'annotation_name' => 'generic_comment' -); - -// number of comments on photos -$stats['photo_comments'] = elgg_get_annotations($options); - -// number of comments on albums -$options['subtype'] = 'album'; -$stats['album_comments'] = elgg_get_annotations($options); - -// number of views on images -$options['subtype'] = 'image'; -$options['annotation_name'] = 'tp_view'; -$stats['views'] = elgg_get_annotations($options); - -// number of photo tags on images -if (elgg_get_plugin_setting('tagging', 'tidypics') != 'disabled') { - $options['annotation_name'] = 'phototag'; - $stats['tags'] = elgg_get_annotations($options); -} - -$content = ''; - -foreach ($stats as $str => $value) { - $str = elgg_echo("tidypics:stats:$str"); - $value = (int)$value; - - $content .= << - - - -HTML; -} - -$content .= '
          $str:$value
          '; - -echo elgg_view_module('inline', elgg_echo('tidypics:stats'), $content); \ No newline at end of file diff --git a/views/default/tidypics/admin/help.php b/views/default/tidypics/admin/help.php deleted file mode 100644 index b939a74a8..000000000 --- a/views/default/tidypics/admin/help.php +++ /dev/null @@ -1,32 +0,0 @@ -
          -

          White screen when uploading images

          -

          -Tidypics tries to calculate the maximum size of an image that your server will support. If it -guesses incorrectly and someone uploads a photo that is too large, the script may crash when -resizing the image if you are using GD. The easiest way to test this is to set display_errors -to 1 in your .htaccess file and upload large images. If this causes a problem, a php memory error -should display on the screen. You can increased your php memory limit (see the docs directory). -A better option is to use ImageMagick if your server supports it (again see the docs directory). -

          -If it is not a memory issue, you should see some other error appear. Once you have fixed the error, -change display_error back to 0. -

          -

          Question mark images appear

          -

          -If you see question mark images when you look at your albums, this means the resizing of the images -failed. This could be due to the memory limits as described above. There are other causes. Tidypics -tries to detect these problems and write the cause to the error log. You should check your server -error log right after an upload that results in a question mark for these error messages. The messages -will begin with "Tidypics warning:". It is possible if you have turned off php warnings that you will -not see these warnings. -

          -Another possible cause is using ImageMagick when your server does not support it or specifying -the wrong path to the ImageMagick executables. -

          -

          Unable to save settings

          -

          If you are unable to settings, there are two possible causes. First, -Apache can be configured to block pages that use file paths as Tidypics -does when setting the location of the ImageMagick executable. In this case, -leave that field blank. Second, there is some bad code in the Izaps video -plugin that can prevent the settings from being saved. Try disabling that plugin. -

          \ No newline at end of file diff --git a/views/default/tidypics/admin/settings.php b/views/default/tidypics/admin/settings.php deleted file mode 100644 index aff6acc8d..000000000 --- a/views/default/tidypics/admin/settings.php +++ /dev/null @@ -1,25 +0,0 @@ - "{$vars['url']}mod/tidypics/pages/server_analysis.php", - 'text' => elgg_echo('tidypics:settings:server:analysis'), -)); - -echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions'))); - -echo '

          '; -echo elgg_view('tidypics/admin/upgrade'); -echo $server_analysis_link; -echo '

          '; - -echo elgg_view('input/form', array( - 'body' => $form_body, - 'action' => $vars['url'] . 'action/tidypics/admin/settings', -)); diff --git a/views/default/tidypics/admin/thumbnails.php b/views/default/tidypics/admin/thumbnails.php deleted file mode 100644 index 5884b9dc3..000000000 --- a/views/default/tidypics/admin/thumbnails.php +++ /dev/null @@ -1,33 +0,0 @@ -
          -

          Overview

          -

          -This page allows you to create thumbnails for images when the thumbnail creation failed during upload. -You may experience problems with thumbnail creation if your image library is not configured properly or -if there is not enough memory for the GD library to load and resize an image. If your users have -experienced problems with thumbnail creation and you have corrected your configuration, you can try to redo the -thumbnails. Find the unique identifier of the photo (it is the number near the end of the url when viewing -a photo) and enter it below. -

          -

          Thumbnail Creation

          -

          -: - - -

          -
          - \ No newline at end of file diff --git a/views/default/tidypics/admin/tidypics.php b/views/default/tidypics/admin/tidypics.php deleted file mode 100644 index 479eb86e2..000000000 --- a/views/default/tidypics/admin/tidypics.php +++ /dev/null @@ -1,63 +0,0 @@ - -
          -
          -
            -
          • >
            • -
          • >
            • -
          • >
            • -
          • >
            • -
          • >
            • -
          -
          - -
          diff --git a/views/default/tidypics/admin/upgrade.php b/views/default/tidypics/admin/upgrade.php deleted file mode 100644 index bb0a12467..000000000 --- a/views/default/tidypics/admin/upgrade.php +++ /dev/null @@ -1,35 +0,0 @@ -pluginspath}tidypics/version.php"; - -$upgrade_url = "{$vars['url']}action/tidypics/admin/upgrade"; - -// determine whether an upgrade is required -$local_version = get_plugin_setting('version', 'tidypics'); -if ($local_version === FALSE) { - // no version set so either new install or really old one - if (!get_subtype_class('object', 'image') || !get_subtype_class('object', 'album')) { - $local_version = 0; - } else { - // set initial version for new install - set_plugin_setting('version', $version, 'tidypics'); - $local_version = $version; - } -} elseif ($local_version == '1.62') { - // special work around to handle old upgrade system - $local_version = 2010010101; - set_plugin_setting('version', $local_version, 'tidypics'); -} -if ($local_version == $version) { - // no upgrade required - return TRUE; -} - -echo elgg_view('output/url', array( - 'text' => elgg_echo('tidypics:upgrade'), - 'href' => $upgrade_url, - 'is_action' => TRUE) -); - -echo '
          '; -- cgit v1.2.3 From 67d855d73499f36f15331e1ff18cccd13aa8aa74 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Thu, 9 Feb 2012 10:25:57 -0800 Subject: Fixes #16. Removed stats. --- languages/en.php | 8 ---- views/default/admin/settings/tidypics.php | 9 ---- views/default/admin/settings/tidypics/stats.php | 63 ------------------------- 3 files changed, 80 deletions(-) delete mode 100644 views/default/admin/settings/tidypics/stats.php diff --git a/languages/en.php b/languages/en.php index dd6d91e96..dc109dd05 100644 --- a/languages/en.php +++ b/languages/en.php @@ -94,14 +94,6 @@ $english = array( 'tidypics:option:cover' => 'Cover', 'tidypics:option:set' => 'Set', - // stats - 'tidypics:stats:images' => 'Total images', - 'tidypics:stats:albums' => 'Total albums', - 'tidypics:stats:photo_comments' => 'Total comments on photos', - 'tidypics:stats:album_comments' => 'Total comments on albums', - 'tidypics:stats:views' => 'Total views', - 'tidypics:stats:tags' => 'Total tags', - // server analysis 'tidypics:server_info' => 'Server Information', 'tidypics:server_info:gd_desc' => 'Elgg requires the GD extension to be loaded', diff --git a/views/default/admin/settings/tidypics.php b/views/default/admin/settings/tidypics.php index 7b1764fed..cc9875c3b 100644 --- a/views/default/admin/settings/tidypics.php +++ b/views/default/admin/settings/tidypics.php @@ -20,11 +20,6 @@ echo elgg_view('navigation/tabs', array( 'href' => '/admin/settings/tidypics?tab=server_info', 'selected' => ($tab == 'server_info'), ), - array( - 'text' => elgg_echo('tidypics:stats'), - 'href' => '/admin/settings/tidypics?tab=stats', - 'selected' => ($tab == 'stats'), - ), array( 'text' => elgg_echo('tidypics:settings:image_lib'), 'href' => '/admin/settings/tidypics?tab=image_lib', @@ -48,10 +43,6 @@ switch ($tab) { echo elgg_view('admin/settings/tidypics/server_info'); break; - case 'stats': - echo elgg_view('admin/settings/tidypics/stats'); - break; - case 'image_lib': echo elgg_view('admin/settings/tidypics/image_lib'); break; diff --git a/views/default/admin/settings/tidypics/stats.php b/views/default/admin/settings/tidypics/stats.php deleted file mode 100644 index 25ace77da..000000000 --- a/views/default/admin/settings/tidypics/stats.php +++ /dev/null @@ -1,63 +0,0 @@ -dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_images = $total->total; -$stats['images'] = $total->total; - -// number of albums -$img_type = get_subtype_id('object', 'album'); -$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_albums = $total->total; -$stats['albums'] = $total->total; - -$options = array( - 'count' => true, - 'type' => 'object', - 'subtype' => 'image', - 'annotation_name' => 'generic_comment' -); - -// number of comments on photos -$stats['photo_comments'] = elgg_get_annotations($options); - -// number of comments on albums -$options['subtype'] = 'album'; -$stats['album_comments'] = elgg_get_annotations($options); - -// number of views on images -$options['subtype'] = 'image'; -$options['annotation_name'] = 'tp_view'; -$stats['views'] = elgg_get_annotations($options); - -// number of photo tags on images -if (elgg_get_plugin_setting('tagging', 'tidypics') != 'disabled') { - $options['annotation_name'] = 'phototag'; - $stats['tags'] = elgg_get_annotations($options); -} - -$content = ''; - -foreach ($stats as $str => $value) { - $str = elgg_echo("tidypics:stats:$str"); - $value = (int)$value; - - $content .= << - - - -HTML; -} - -$content .= '
          $str:$value
          '; - -echo elgg_view_module('inline', elgg_echo('tidypics:stats'), $content); \ No newline at end of file -- cgit v1.2.3 From 894ea6758f3f99c49807df99ef4bbd95f74273dc Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Mon, 13 Feb 2012 15:39:45 -0800 Subject: Fixes #11. Added notifications back. --- actions/photos/image/upload.php | 25 ++++++++++-- activate.php | 2 + classes/TidypicsAlbum.php | 13 +++++++ languages/en.php | 8 ++-- start.php | 44 +++++++++++++--------- upgrades/2010102801.php | 2 +- upgrades/2012020901.php | 26 +++++++++++++ version.php | 2 +- .../default/river/object/tidypics_batch/create.php | 8 +++- 9 files changed, 102 insertions(+), 28 deletions(-) create mode 100644 upgrades/2012020901.php diff --git a/actions/photos/image/upload.php b/actions/photos/image/upload.php index 3a1970367..29df59b63 100644 --- a/actions/photos/image/upload.php +++ b/actions/photos/image/upload.php @@ -7,7 +7,6 @@ */ elgg_load_library('tidypics:upload'); - $img_river_view = elgg_get_plugin_setting('img_river_view', 'tidypics'); $guid = (int) get_input('guid'); @@ -86,17 +85,35 @@ if (count($uploaded_images)) { $album->prependImageList($uploaded_images); + // "added images to album" river if ($img_river_view == "batch" && $album->new_album == false) { add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID()); } + // "created album" river if ($album->new_album) { $album->new_album = false; + $album->first_upload = true; + add_to_river('river/object/album/create', 'create', $album->getOwnerGUID(), $album->getGUID()); - // we throw the notification manually here so users are not told about the new album until there - // is at least a few photos in it - object_notifications('create', 'object', $album); + // "created album" notifications + // we throw the notification manually here so users are not told about the new album until + // there are at least a few photos in it + if ($album->shouldNotify()) { + object_notifications('create', 'object', $album); + $album->last_notified = time(); + } + } else { + // "added image to album" notifications + if ($album->first_upload) { + $album->first_upload = false; + } + + if ($album->shouldNotify()) { + object_notifications('create', 'object', $album); + $album->last_notified = time(); + } } } diff --git a/activate.php b/activate.php index 86706d9a6..6b8390406 100644 --- a/activate.php +++ b/activate.php @@ -41,6 +41,8 @@ $defaults = array( 'album_river_view' => 'set', 'image_sizes' => $image_sizes, + + 'notify_interval' => 60 * 60 * 24, ); foreach ($defaults as $name => $value) { diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php index e04344a6b..d069117bf 100644 --- a/classes/TidypicsAlbum.php +++ b/classes/TidypicsAlbum.php @@ -38,6 +38,10 @@ class TidypicsAlbum extends ElggObject { $this->new_album = true; } + if (!isset($this->last_notified)) { + $this->last_notified = 0; + } + if (!parent::save()) { return false; } @@ -267,6 +271,15 @@ class TidypicsAlbum extends ElggObject { return true; } + /** + * Has enough time elapsed between the last_notified and notify_interval setting? + * + * @return bool + */ + public function shouldNotify() { + return time() - $this->last_notified > elgg_get_plugin_setting('notify_interval', 'tidypics'); + } + /** * Delete all the images in this album */ diff --git a/languages/en.php b/languages/en.php index dc109dd05..69ba9d245 100644 --- a/languages/en.php +++ b/languages/en.php @@ -219,8 +219,7 @@ The photo can be viewed here: %s", // river 'river:create:object:image' => "%s uploaded the photo %s", - 'river:create:object:tidypics_batch' => "%s uploaded some photos", - 'image:river:created' => "%s added the photo %s to the album %s", + 'image:river:created' => "%s added a photo to the album %s", 'image:river:created:multiple' => "%s added %u photos to the album %s", 'image:river:item' => "a photo", 'image:river:annotate' => "a comment on the photo", @@ -234,8 +233,9 @@ The photo can be viewed here: %s", 'river:comment:object:album' => '%s commented on the album %s', // notifications - 'tidypics:newalbum' => 'New photo album', - + 'tidypics:newalbum_subject' => 'New photo album', + 'tidypics:newalbum' => '%s created a new photo album', + 'tidypics:updatealbum' => "%s uploaded new photos to the album %s", // Status messages 'tidypics:upl_success' => "Your images uploaded successfully.", diff --git a/start.php b/start.php index ad540bc8f..a2dc75ab1 100644 --- a/start.php +++ b/start.php @@ -73,17 +73,13 @@ function tidypics_init() { elgg_register_plugin_hook_handler('container_permissions_check', 'object', 'tidypics_group_permission_override'); elgg_register_plugin_hook_handler('permissions_check:metadata', 'object', 'tidypics_group_permission_override'); -/* - - - - // register for menus - //register_elgg_event_handler('pagesetup', 'system', 'tidypics_submenus'); + // notifications + register_notification_object('object', 'album', elgg_echo('tidypics:newalbum_subject')); + elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'tidypics_notify_message'); +/* // Register for notifications - register_notification_object('object', 'album', elgg_echo('tidypics:newalbum')); - register_plugin_hook('notify:entity:message', 'object', 'tidypics_notify_message'); // slideshow plugin hook register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow'); @@ -370,7 +366,10 @@ function tidypics_group_permission_override($hook, $type, $result, $params) { /** - * Notification message handler + * Notification message handler. + * + * Notifies when an album is first populated via explicit call in the upload action. + * * @param string $hook * @param string $type * @param bool $result @@ -381,18 +380,29 @@ function tidypics_notify_message($hook, $type, $result, $params) { $entity = $params['entity']; $to_entity = $params['to_entity']; $method = $params['method']; - if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'album')) { - - // block notification message when the album doesn't have any photos - if ($entity->new_album == TP_NEW_ALBUM) { + + if (elgg_instanceof($entity, 'object', 'album')) { + if ($entity->new_album) { return false; } + + if ($entity->first_upload) { + $descr = $entity->description; + $title = $entity->title; + $owner = $entity->getOwnerEntity(); + return elgg_echo('tidypics:newalbum', array($owner->name)) + . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); + } else { + if ($entity->shouldNotify()) { + $descr = $entity->description; + $title = $entity->title; + $owner = $entity->getOwnerEntity(); - $descr = $entity->description; - $title = $entity->title; - $owner = $entity->getOwnerEntity(); - return sprintf(elgg_echo('album:river:created'), $owner->name) . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); + return elgg_echo('tidypics:updatealbum', array($owner->name, $title)) . ': ' . $entity->getURL(); + } + } } + return null; } diff --git a/upgrades/2010102801.php b/upgrades/2010102801.php index 9190912fe..5bd5f78b4 100644 --- a/upgrades/2010102801.php +++ b/upgrades/2010102801.php @@ -23,4 +23,4 @@ while ($item = mysql_fetch_object($river_items)) { } } } -} +} \ No newline at end of file diff --git a/upgrades/2012020901.php b/upgrades/2012020901.php new file mode 100644 index 000000000..793279b38 --- /dev/null +++ b/upgrades/2012020901.php @@ -0,0 +1,26 @@ + 'object', + 'subtype' => 'album', + 'limit' => 0 +); + +$prefix = elgg_get_config('dbprefix'); +$batch = new ElggBatch('elgg_get_entities', $options); + +foreach ($batch as $album) { + // grab earliest picture and use that as the notification time + // in old version of tidypics notifications went out only when a new album was populated. + $q = "SELECT MIN(time_created) as ts FROM {$prefix}entities WHERE container_guid = $album->guid"; + $row = get_data_row($q); + + if ($row) { + $album->last_notified = $row->ts; + } +} diff --git a/version.php b/version.php index d125847d8..f2817c5e9 100644 --- a/version.php +++ b/version.php @@ -5,4 +5,4 @@ * Used for the upgrade system. */ -$version = 2010102801; +$version = 2012020901; diff --git a/views/default/river/object/tidypics_batch/create.php b/views/default/river/object/tidypics_batch/create.php index 44c40c110..418cf1ac3 100644 --- a/views/default/river/object/tidypics_batch/create.php +++ b/views/default/river/object/tidypics_batch/create.php @@ -43,8 +43,14 @@ if (count($images)) { $attachments .= '
        '; } +if (count($images) == 1) { + $summary = elgg_echo('image:river:created', array($subject_link, $album_link)); +} else { + $summary = elgg_echo('image:river:created:multiple', array($subject_link, count($images), $album_link)); +} + echo elgg_view('river/elements/layout', array( 'item' => $vars['item'], 'attachments' => $attachments, - 'summary' => elgg_echo('image:river:created:multiple', array($subject_link, count($images), $album_link)), + 'summary' => $summary )); -- cgit v1.2.3 From b09db0ec2a35590cb13cda6ed053edc10e671035 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Fri, 17 Feb 2012 16:19:56 -0800 Subject: Refs #18. Doing an access check on TidypicsAlbum->getImageList() to only return images the current user can access. This is a simple fix, but requires an extra DB call for the first getImageList() call. --- classes/TidypicsAlbum.php | 19 +++++++++++++++---- lib/tidypics.php | 10 ++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php index d069117bf..3d7d12b32 100644 --- a/classes/TidypicsAlbum.php +++ b/classes/TidypicsAlbum.php @@ -9,7 +9,6 @@ class TidypicsAlbum extends ElggObject { - /** * Sets the internal attributes */ @@ -186,6 +185,17 @@ class TidypicsAlbum extends ElggObject { return array(); } $list = unserialize($listString); + + // check access levels + $guidsString = implode(',', $list); + $options = array( + 'wheres' => array("e.guid IN ($guidsString)"), + 'order_by' => "FIELD (e.guid, $guidsString)", + 'callback' => 'tp_guid_callback', + 'limit' => ELGG_ENTITIES_NO_VALUE + ); + + $list = elgg_get_entities($options); return $list; } @@ -211,7 +221,7 @@ class TidypicsAlbum extends ElggObject { } /** - * Get the previous image in the album + * Get the previous image in the album. Wraps around to the last image if given the first. * * @param int $guid GUID of the current image * @return TidypicsImage @@ -230,7 +240,7 @@ class TidypicsAlbum extends ElggObject { } /** - * Get the next image in the album + * Get the next image in the album. Wraps around to the first image if given the last. * * @param int $guid GUID of the current image * @return TidypicsImage @@ -282,9 +292,10 @@ class TidypicsAlbum extends ElggObject { /** * Delete all the images in this album + * + * @todo ElggBatch? */ protected function deleteImages() { - // get all the images from this album as long as less than 999 images $images = elgg_get_entities(array( "type=" => "object", "subtype" => "image", diff --git a/lib/tidypics.php b/lib/tidypics.php index 7426a048e..38c6b31a8 100644 --- a/lib/tidypics.php +++ b/lib/tidypics.php @@ -190,6 +190,16 @@ function tidypics_list_photos(array $options = array()) { return elgg_view_entity_list($sorted_entities, $options); } +/** + * Returns just a guid from a database $row. Used in elgg_get_entities()'s callback. + * + * @param stdClass $row + * @return type + */ +function tp_guid_callback($row) { + return ($row->guid) ? $row->guid : false; +} + /********************************************************************* * the functions below replace broken core functions or add functions -- cgit v1.2.3 From ee6da62511660cf5849fea1a39a3e94c1f2867c7 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Fri, 17 Feb 2012 17:26:45 -0800 Subject: Fixes #15. Added untagging. --- actions/photos/image/untag.php | 24 ++++++++++++++++++++++++ classes/TidypicsImage.php | 4 +++- languages/en.php | 11 +++++++---- start.php | 2 +- views/default/js/photos/tagging.php | 13 ++++++++----- views/default/photos/tagging/tag.php | 16 +++++++++++++++- 6 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 actions/photos/image/untag.php diff --git a/actions/photos/image/untag.php b/actions/photos/image/untag.php new file mode 100644 index 000000000..012f98930 --- /dev/null +++ b/actions/photos/image/untag.php @@ -0,0 +1,24 @@ +name != 'phototag') { + register_error(elgg_echo("tidypics:phototagging:delete:error")); + forward(REFERER); +} + +if (!$annotation->canEdit()) { + register_error(elgg_echo("tidypics:phototagging:delete:error")); + forward(REFERER); +} + +if ($annotation->delete()) { + system_message(elgg_echo("tidypics:phototagging:delete:success")); +} else { + system_message(elgg_echo("tidypics:phototagging:delete:error")); +} + +forward(REFERER); diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index b97a2b05e..a64743017 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -348,7 +348,9 @@ class TidypicsImage extends ElggFile { 'annotation_name' => 'phototag', )); foreach ($annotations as $annotation) { - $tags[] = unserialize($annotation->value); + $tag = unserialize($annotation->value); + $tag->annotation_id = $annotation->id; + $tags[] = $tag; } return $tags; diff --git a/languages/en.php b/languages/en.php index 69ba9d245..efae155b3 100644 --- a/languages/en.php +++ b/languages/en.php @@ -187,18 +187,21 @@ $english = array( // tagging 'tidypics:taginstruct' => 'Select the area that you want to tag or %s', - 'tidypics:deltag_title' => 'Select tags to delete', 'tidypics:finish_tagging' => 'Stop tagging', 'tidypics:tagthisphoto' => 'Tag this photo', - 'tidypics:deletetag' => 'Delete a photo tag', 'tidypics:actiontag' => 'Tag', - 'tidypics:actiondelete' => 'Delete', 'tidypics:actioncancel' => 'Cancel', 'tidypics:inthisphoto' => 'In this photo', 'tidypics:usertag' => "Photos tagged with user %s", 'tidypics:phototagging:success' => 'Photo tag was successfully added', 'tidypics:phototagging:error' => 'Unexpected error occurred during tagging', - 'tidypics:deletetag:success' => 'Selected tags were successfully deleted', + + 'tidypics:phototagging:delete:success' => 'Photo tag was removed.', + 'tidypics:phototagging:delete:error' => 'Unexpceted error occurred when removing photo tag.', + 'tidypics:phototagging:delete:confirm' => 'Remove this tag?', + + + 'tidypics:tag:subject' => "You have been tagged in a photo", 'tidypics:tag:body' => "You have been tagged in the photo %s by %s. diff --git a/start.php b/start.php index a2dc75ab1..6ef3af541 100644 --- a/start.php +++ b/start.php @@ -98,7 +98,7 @@ function tidypics_init() { //register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php"); //register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php"); elgg_register_action("photos/image/tag", "$base_dir/image/tag.php"); - //register_action("tidypics/deletetag", false, "$base_dir/deletetag.php"); + elgg_register_action("photos/image/untag", "$base_dir/image/untag.php"); elgg_register_action("photos/admin/settings", "$base_dir/admin/settings.php", 'admin'); elgg_register_action("photos/admin/create_thumbnails", "$base_dir/admin/create_thumbnails.php", 'admin'); diff --git a/views/default/js/photos/tagging.php b/views/default/js/photos/tagging.php index a3c7efc1c..f444aa44c 100644 --- a/views/default/js/photos/tagging.php +++ b/views/default/js/photos/tagging.php @@ -7,7 +7,7 @@ */ ?> - +// - - -- cgit v1.2.3 From 54707bb3188d3e29259586226631d65c49ece721 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 11:32:14 -0400 Subject: removed some deprecated functions --- lib/resize.php | 6 +++--- lib/watermark.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/resize.php b/lib/resize.php index 78b5290e6..b06f317ca 100644 --- a/lib/resize.php +++ b/lib/resize.php @@ -193,7 +193,7 @@ function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheig * @return bool TRUE on success */ function tp_create_imagick_thumbnails($file, $prefix, $filestorename) { - $image_sizes = get_plugin_setting('image_sizes', 'tidypics'); + $image_sizes = elgg_get_plugin_setting('image_sizes', 'tidypics'); if (!$image_sizes) { register_error(elgg_echo('tidypics:nosettings')); return FALSE; @@ -319,7 +319,7 @@ function tp_imagick_resize($input_name, $output_name, $maxwidth, $maxheight, $sq * @return bool TRUE on success */ function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) { - $image_sizes = get_plugin_setting('image_sizes', 'tidypics'); + $image_sizes = elgg_get_plugin_setting('image_sizes', 'tidypics'); if (!$image_sizes) { register_error(elgg_echo('tidypics:nosettings')); return FALSE; @@ -423,7 +423,7 @@ function tp_im_cmdline_resize($input_name, $output_name, $maxwidth, $maxheight, return FALSE; } - $im_path = get_plugin_setting('im_path', 'tidypics'); + $im_path = elgg_get_plugin_setting('im_path', 'tidypics'); if (!$im_path) { $im_path = "/usr/bin/"; } diff --git a/lib/watermark.php b/lib/watermark.php index 5b9a4abcd..a2aebffd9 100644 --- a/lib/watermark.php +++ b/lib/watermark.php @@ -138,7 +138,7 @@ function tp_imagick_watermark($filename) { */ function tp_im_cmdline_watermark($filename) { - $watermark_text = get_plugin_setting('watermark_text', 'tidypics'); + $watermark_text = elgg_get_plugin_setting('watermark_text', 'tidypics'); if (!$watermark_text) { return; } @@ -148,7 +148,7 @@ function tp_im_cmdline_watermark($filename) { return; } - $im_path = get_plugin_setting('im_path', 'tidypics'); + $im_path = elgg_get_plugin_setting('im_path', 'tidypics'); if (!$im_path) { $im_path = "/usr/bin/"; } -- cgit v1.2.3 From ab58e6bc96758eda0c2b293b98240fba0f305ae1 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 11:45:05 -0400 Subject: removed an add check that causes albums to lose photos --- classes/TidypicsAlbum.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php index e36b28488..a03df2d37 100644 --- a/classes/TidypicsAlbum.php +++ b/classes/TidypicsAlbum.php @@ -207,7 +207,7 @@ class TidypicsAlbum extends ElggObject { $list = unserialize($listString); // if empty don't need to check the permissions. - if (!$list || $list[0] == '') { + if (!$list) { return array(); } -- cgit v1.2.3 From e52870068d67a2360769f76a13d35318a8ec14ef Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 11:59:19 -0400 Subject: Fixes #18 adds forwarding when no access --- pages/photos/album/view.php | 5 +++-- pages/photos/image/view.php | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pages/photos/album/view.php b/pages/photos/album/view.php index cef3647ee..100cc44c6 100644 --- a/pages/photos/album/view.php +++ b/pages/photos/album/view.php @@ -12,8 +12,9 @@ group_gatekeeper(); $album_guid = (int) get_input('guid'); $album = get_entity($album_guid); if (!$album) { - // @todo album deleted or don't have access - forward('photos/all'); + register_error(elgg_echo('noaccess')); + $_SESSION['last_forward_from'] = current_page_url(); + forward(''); } elgg_set_page_owner_guid($album->getContainerGUID()); diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index 6bd0257e0..1d359b6c7 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -12,7 +12,9 @@ group_gatekeeper(); $photo_guid = (int) get_input('guid'); $photo = get_entity($photo_guid); if (!$photo) { - + register_error(elgg_echo('noaccess')); + $_SESSION['last_forward_from'] = current_page_url(); + forward(''); } $photo->addView(); -- cgit v1.2.3 From f7f38da31ca53c25775d1a28668a1dd9aefd5277 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 12:49:21 -0400 Subject: cleaning up the admin area --- languages/en.php | 4 +- pages/admin.php | 16 --- start.php | 2 +- views/default/admin/settings/photos.php | 71 ++++++++++++ views/default/admin/settings/photos/help.php | 14 +++ views/default/admin/settings/photos/image_lib.php | 38 +++++++ .../admin/settings/photos/server_config.php | 14 +++ .../default/admin/settings/photos/server_info.php | 120 ++++++++++++++++++++ views/default/admin/settings/photos/settings.php | 20 ++++ views/default/admin/settings/photos/thumbnail.php | 54 +++++++++ views/default/admin/settings/tidypics.php | 71 ------------ views/default/admin/settings/tidypics/help.php | 14 --- .../default/admin/settings/tidypics/image_lib.php | 38 ------- .../admin/settings/tidypics/server_config.php | 14 --- .../admin/settings/tidypics/server_info.php | 122 --------------------- views/default/admin/settings/tidypics/settings.php | 20 ---- .../default/admin/settings/tidypics/thumbnail.php | 54 --------- 17 files changed, 333 insertions(+), 353 deletions(-) delete mode 100644 pages/admin.php create mode 100644 views/default/admin/settings/photos.php create mode 100644 views/default/admin/settings/photos/help.php create mode 100644 views/default/admin/settings/photos/image_lib.php create mode 100644 views/default/admin/settings/photos/server_config.php create mode 100644 views/default/admin/settings/photos/server_info.php create mode 100644 views/default/admin/settings/photos/settings.php create mode 100644 views/default/admin/settings/photos/thumbnail.php delete mode 100644 views/default/admin/settings/tidypics.php delete mode 100644 views/default/admin/settings/tidypics/help.php delete mode 100644 views/default/admin/settings/tidypics/image_lib.php delete mode 100644 views/default/admin/settings/tidypics/server_config.php delete mode 100644 views/default/admin/settings/tidypics/server_info.php delete mode 100644 views/default/admin/settings/tidypics/settings.php delete mode 100644 views/default/admin/settings/tidypics/thumbnail.php diff --git a/languages/en.php b/languages/en.php index 36ac38877..0177678c6 100644 --- a/languages/en.php +++ b/languages/en.php @@ -13,9 +13,7 @@ $english = array( 'albums' => "Photo Albums", 'tidypics:disabled' => 'Disabled', 'tidypics:enabled' => 'Enabled', - 'admin:settings:tidypics' => 'Tidypics', - 'admin:statistics:tidypics' => 'Tidypics', - 'admin:administer_utilities:tidypics_tools' => 'Tidypics Tools', + 'admin:settings:photos' => 'Tidypics', 'photos:add' => "Create album", 'images:upload' => "Upload photos", diff --git a/pages/admin.php b/pages/admin.php deleted file mode 100644 index c6be1212a..000000000 --- a/pages/admin.php +++ /dev/null @@ -1,16 +0,0 @@ - $tab)); - -page_draw(elgg_echo('tidypics:administration'), elgg_view_layout("two_column_left_sidebar", '', $body)); diff --git a/start.php b/start.php index 1228fe3f1..9295dc7eb 100644 --- a/start.php +++ b/start.php @@ -52,7 +52,7 @@ function tidypics_init() { elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); // Add admin menu item - elgg_register_admin_menu_item('configure', 'tidypics', 'settings'); + elgg_register_admin_menu_item('configure', 'photos', 'settings'); // Register for search elgg_register_entity_type('object', 'image'); diff --git a/views/default/admin/settings/photos.php b/views/default/admin/settings/photos.php new file mode 100644 index 000000000..cc3592f37 --- /dev/null +++ b/views/default/admin/settings/photos.php @@ -0,0 +1,71 @@ + array( + array( + 'text' => elgg_echo('settings'), + 'href' => '/admin/settings/photos', + 'selected' => ($tab == 'settings'), + ), + array( + 'text' => elgg_echo('tidypics:server_info'), + 'href' => '/admin/settings/photos?tab=server_info', + 'selected' => ($tab == 'server_info'), + ), + array( + 'text' => elgg_echo('tidypics:server_config'), + 'href' => '/admin/settings/photos?tab=server_config', + 'selected' => ($tab == 'server_config'), + ), + array( + 'text' => 'ImageMagick', + 'href' => '/admin/settings/photos?tab=image_lib', + 'selected' => ($tab == 'image_lib'), + ), + array( + 'text' => elgg_echo('tidypics:settings:thumbnail'), + 'href' => '/admin/settings/photos?tab=thumbnail', + 'selected' => ($tab == 'thumbnail'), + ), + array( + 'text' => elgg_echo('tidypics:settings:help'), + 'href' => '/admin/settings/photos?tab=help', + 'selected' => ($tab == 'help'), + ), + ) +)); + +switch ($tab) { + case 'server_info': + echo elgg_view('admin/settings/photos/server_info'); + break; + + case 'server_config': + echo elgg_view('admin/settings/photos/server_config'); + break; + + case 'image_lib': + echo elgg_view('admin/settings/photos/image_lib'); + break; + + case 'thumbnail': + echo elgg_view('admin/settings/photos/thumbnail'); + break; + + case 'help': + echo elgg_view('admin/settings/photos/help'); + break; + + default: + case 'settings': + echo elgg_view('admin/settings/photos/settings'); + break; +} diff --git a/views/default/admin/settings/photos/help.php b/views/default/admin/settings/photos/help.php new file mode 100644 index 000000000..c3ac2477e --- /dev/null +++ b/views/default/admin/settings/photos/help.php @@ -0,0 +1,14 @@ +$text
      "; + +echo elgg_view_module('inline', elgg_echo('tidypics:settings:help'), $content); diff --git a/views/default/admin/settings/photos/image_lib.php b/views/default/admin/settings/photos/image_lib.php new file mode 100644 index 000000000..6e519b607 --- /dev/null +++ b/views/default/admin/settings/photos/image_lib.php @@ -0,0 +1,38 @@ +' . elgg_echo('tidypics:lib_tools:testing') . '

      '; +$content .= '

      '; +$content .= elgg_view('input/submit', array( + 'value' => elgg_echo('submit'), + 'id' => 'tidypics-im-test' +)); +$content .= '

      '; +$content .= '

      '; + +echo elgg_view_module('inline', 'ImageMagick', $content); + +?> + diff --git a/views/default/admin/settings/photos/server_config.php b/views/default/admin/settings/photos/server_config.php new file mode 100644 index 000000000..8268b646a --- /dev/null +++ b/views/default/admin/settings/photos/server_config.php @@ -0,0 +1,14 @@ +$text
      "; + +echo elgg_view_module('inline', elgg_echo('tidypics:server_config'), $content); diff --git a/views/default/admin/settings/photos/server_info.php b/views/default/admin/settings/photos/server_info.php new file mode 100644 index 000000000..c100b0de2 --- /dev/null +++ b/views/default/admin/settings/photos/server_info.php @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      GD
      imagick
      exec()
      s
      s
      GD imagejpeg
      GD imagepng
      GD imagegif
      EXIF
      + +'; + echo '

      '; + echo elgg_view('output/url', array( + 'text' => elgg_echo('tidypics:upgrade'), + 'href' => 'action/photos/admin/upgrade', + 'is_action' => true, + )); + echo '

      '; + echo '
'; +} + +echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions'))); + +echo elgg_view_form('photos/admin/settings'); \ No newline at end of file diff --git a/views/default/admin/settings/photos/thumbnail.php b/views/default/admin/settings/photos/thumbnail.php new file mode 100644 index 000000000..5f9769e91 --- /dev/null +++ b/views/default/admin/settings/photos/thumbnail.php @@ -0,0 +1,54 @@ +' . elgg_echo('tidypics:thumbnail_tool_blurb') . '

'; +$im_id = elgg_echo('tidypics:settings:im_id'); +$input = elgg_view('input/text', array( + 'name' => 'image_id' +)); +$submit = elgg_view('input/submit', array( + 'value' => elgg_echo('submit'), + 'id' => 'elgg-tidypics-im-test' +)); + +$body .=<< + +

+

+ $submit +

+

+HTML; + +echo elgg_view_module('inline', $title, $body); + +?> + + \ No newline at end of file diff --git a/views/default/admin/settings/tidypics.php b/views/default/admin/settings/tidypics.php deleted file mode 100644 index fcb96b6c8..000000000 --- a/views/default/admin/settings/tidypics.php +++ /dev/null @@ -1,71 +0,0 @@ - array( - array( - 'text' => elgg_echo('settings'), - 'href' => '/admin/settings/tidypics', - 'selected' => ($tab == 'settings'), - ), - array( - 'text' => elgg_echo('tidypics:server_info'), - 'href' => '/admin/settings/tidypics?tab=server_info', - 'selected' => ($tab == 'server_info'), - ), - array( - 'text' => elgg_echo('tidypics:server_config'), - 'href' => '/admin/settings/tidypics?tab=server_config', - 'selected' => ($tab == 'server_config'), - ), - array( - 'text' => 'ImageMagick', - 'href' => '/admin/settings/tidypics?tab=image_lib', - 'selected' => ($tab == 'image_lib'), - ), - array( - 'text' => elgg_echo('tidypics:settings:thumbnail'), - 'href' => '/admin/settings/tidypics?tab=thumbnail', - 'selected' => ($tab == 'thumbnail'), - ), - array( - 'text' => elgg_echo('tidypics:settings:help'), - 'href' => '/admin/settings/tidypics?tab=help', - 'selected' => ($tab == 'help'), - ), - ) -)); - -switch ($tab) { - case 'server_info': - echo elgg_view('admin/settings/tidypics/server_info'); - break; - - case 'server_config': - echo elgg_view('admin/settings/tidypics/server_config'); - break; - - case 'image_lib': - echo elgg_view('admin/settings/tidypics/image_lib'); - break; - - case 'thumbnail': - echo elgg_view('admin/settings/tidypics/thumbnail'); - break; - - case 'help': - echo elgg_view('admin/settings/tidypics/help'); - break; - - default: - case 'settings': - echo elgg_view('admin/settings/tidypics/settings'); - break; -} \ No newline at end of file diff --git a/views/default/admin/settings/tidypics/help.php b/views/default/admin/settings/tidypics/help.php deleted file mode 100644 index c3ac2477e..000000000 --- a/views/default/admin/settings/tidypics/help.php +++ /dev/null @@ -1,14 +0,0 @@ -$text
"; - -echo elgg_view_module('inline', elgg_echo('tidypics:settings:help'), $content); diff --git a/views/default/admin/settings/tidypics/image_lib.php b/views/default/admin/settings/tidypics/image_lib.php deleted file mode 100644 index 6e519b607..000000000 --- a/views/default/admin/settings/tidypics/image_lib.php +++ /dev/null @@ -1,38 +0,0 @@ -' . elgg_echo('tidypics:lib_tools:testing') . '

'; -$content .= '

'; -$content .= elgg_view('input/submit', array( - 'value' => elgg_echo('submit'), - 'id' => 'tidypics-im-test' -)); -$content .= '

'; -$content .= '

'; - -echo elgg_view_module('inline', 'ImageMagick', $content); - -?> - diff --git a/views/default/admin/settings/tidypics/server_config.php b/views/default/admin/settings/tidypics/server_config.php deleted file mode 100644 index 8268b646a..000000000 --- a/views/default/admin/settings/tidypics/server_config.php +++ /dev/null @@ -1,14 +0,0 @@ -$text
"; - -echo elgg_view_module('inline', elgg_echo('tidypics:server_config'), $content); diff --git a/views/default/admin/settings/tidypics/server_info.php b/views/default/admin/settings/tidypics/server_info.php deleted file mode 100644 index 1f32ab008..000000000 --- a/views/default/admin/settings/tidypics/server_info.php +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
GD
IMagick
exec()
s
s
GD imagejpeg
GD imagepng
GD imagegif
EXIF
- -'; - echo '

'; - echo elgg_view('output/url', array( - 'text' => elgg_echo('tidypics:upgrade'), - 'href' => 'action/photos/admin/upgrade', - 'is_action' => true, - )); - echo '

'; - echo '
'; -} - -echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions'))); - -echo elgg_view_form('photos/admin/settings'); \ No newline at end of file diff --git a/views/default/admin/settings/tidypics/thumbnail.php b/views/default/admin/settings/tidypics/thumbnail.php deleted file mode 100644 index 5f9769e91..000000000 --- a/views/default/admin/settings/tidypics/thumbnail.php +++ /dev/null @@ -1,54 +0,0 @@ -' . elgg_echo('tidypics:thumbnail_tool_blurb') . '

'; -$im_id = elgg_echo('tidypics:settings:im_id'); -$input = elgg_view('input/text', array( - 'name' => 'image_id' -)); -$submit = elgg_view('input/submit', array( - 'value' => elgg_echo('submit'), - 'id' => 'elgg-tidypics-im-test' -)); - -$body .=<< - -

-

- $submit -

-

-HTML; - -echo elgg_view_module('inline', $title, $body); - -?> - - \ No newline at end of file -- cgit v1.2.3 From 65548983c054a48fe0adb94c327847a7101db390 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 13:13:46 -0400 Subject: admin settings form divided into subviews --- languages/en.php | 3 +- views/default/admin/settings/photos/settings.php | 6 +- views/default/forms/photos/admin/settings.php | 107 +++------------------ .../forms/photos/admin/settings/activity.php | 31 ++++++ .../forms/photos/admin/settings/image_lib.php | 20 ++++ views/default/forms/photos/admin/settings/main.php | 28 ++++++ .../forms/photos/admin/settings/thumbnails.php | 33 +++++++ 7 files changed, 127 insertions(+), 101 deletions(-) create mode 100644 views/default/forms/photos/admin/settings/activity.php create mode 100644 views/default/forms/photos/admin/settings/image_lib.php create mode 100644 views/default/forms/photos/admin/settings/main.php create mode 100644 views/default/forms/photos/admin/settings/thumbnails.php diff --git a/languages/en.php b/languages/en.php index 0177678c6..0fe3996f1 100644 --- a/languages/en.php +++ b/languages/en.php @@ -59,8 +59,7 @@ $english = array( //settings 'tidypics:settings' => 'Settings', - 'tidypics:settings:server:analysis' => 'Run Server Analysis', - 'tidypics:admin:instructions' => 'These are the core Tidypics settings. Change them for your setup and then click save.', + 'tidypics:settings:main' => 'Primary settings', 'tidypics:settings:image_lib' => "Image Library", 'tidypics:settings:thumbnail' => "Thumbnail Creation", 'tidypics:settings:help' => "Help", diff --git a/views/default/admin/settings/photos/settings.php b/views/default/admin/settings/photos/settings.php index 3645e749a..6ea444392 100644 --- a/views/default/admin/settings/photos/settings.php +++ b/views/default/admin/settings/photos/settings.php @@ -1,6 +1,6 @@ '; } -echo elgg_view('output/longtext', array('value' => elgg_echo('tidypics:admin:instructions'))); - -echo elgg_view_form('photos/admin/settings'); \ No newline at end of file +echo elgg_view_form('photos/admin/settings'); diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php index 16d5eb0ce..2b6399a67 100644 --- a/views/default/forms/photos/admin/settings.php +++ b/views/default/forms/photos/admin/settings.php @@ -7,104 +7,21 @@ $plugin = elgg_get_plugin_from_id('tidypics'); -// main settings -$checkboxes = array('tagging', 'view_count', 'uploader', 'exif', 'download_link'); -foreach ($checkboxes as $checkbox) { - echo '
'; - $checked = $plugin->$checkbox ? 'checked' : false; - echo elgg_view('input/checkbox', array( - 'name' => "params[$checkbox]", - 'value' => true, - 'checked' => (bool)$plugin->$checkbox, - )); - echo ' ' . elgg_echo("tidypics:settings:$checkbox"); - echo '
'; -} - -// max image size -echo '
'; -echo elgg_echo('tidypics:settings:maxfilesize'); -echo elgg_view('input/text', array( - 'name' => 'params[maxfilesize]', - 'value' => $plugin->maxfilesize, -)); -echo '
'; - -// image library -echo '

' . elgg_echo('tidypics:settings:heading:img_lib') . '

'; -echo'
'; -echo elgg_echo('tidypics:settings:image_lib') . ': '; -echo elgg_view('input/dropdown', array( - 'name' => 'params[image_lib]', - 'options_values' => tidypics_get_image_libraries(), - 'value' => $plugin->image_lib, -)); -echo '
'; -echo '
'; -echo elgg_echo('tidypics:settings:im_path') . ' '; -echo elgg_view("input/text", array('name' => 'params[im_path]', 'value' => $plugin->im_path)); -echo '
'; - +$title = elgg_echo('tidypics:settings:main'); +$content = elgg_view('forms/photos/admin/settings/main', array('plugin' => $plugin)); +echo elgg_view_module('inline', $title, $content); -// river integration -echo '

' . elgg_echo('tidypics:settings:heading:river') . '

'; -echo '
'; -echo elgg_echo('tidypics:settings:img_river_view') . ': '; -echo elgg_view('input/dropdown', array( - 'name' => 'params[img_river_view]', - 'options_values' => array( - 'all' => elgg_echo('tidypics:option:all'), - 'batch' => '1', - 'none' => elgg_echo('tidypics:option:none'), - ), - 'value' => $plugin->img_river_view, -)); -echo '
'; -echo '
'; -echo elgg_echo('tidypics:settings:album_river_view') . ': '; -echo elgg_view('input/dropdown', array( - 'name' => 'params[album_river_view]', - 'options_values' => array( - 'cover' => elgg_echo('tidypics:option:cover'), - 'set' => elgg_echo('tidypics:option:set'), - ), - 'value' => $plugin->album_river_view, -)); -echo '
'; - - -// thumbnail sizes -echo '
'; -echo '

' . elgg_echo('tidypics:settings:heading:sizes') . '

'; -echo '
' . elgg_echo('tidypics:settings:sizes:instructs') . '
'; -$image_sizes = unserialize($plugin->image_sizes); -echo ''; -$sizes = array('large', 'small', 'tiny'); -foreach ($sizes as $size) { - echo ''; - echo ''; - echo ''; -} -echo '
'; - echo elgg_echo("tidypics:settings:{$size}size"); - echo ''; - echo 'width: '; - echo elgg_view('input/text', array( - 'name' => "{$size}_image_width", - 'value' => $image_sizes["{$size}_image_width"], - 'class' => 'tidypics-input-thin', - )); - echo ''; - echo 'height: '; - echo elgg_view('input/text', array( - 'name' => "{$size}_image_height", - 'value' => $image_sizes["{$size}_image_height"], - 'class' => 'tidypics-input-thin', - )); - echo '
'; -echo '
'; +$title = elgg_echo('tidypics:settings:heading:img_lib'); +$content = elgg_view('forms/photos/admin/settings/image_lib', array('plugin' => $plugin)); +echo elgg_view_module('inline', $title, $content); +$title = elgg_echo('tidypics:settings:heading:river'); +$content = elgg_view('forms/photos/admin/settings/activity', array('plugin' => $plugin)); +echo elgg_view_module('inline', $title, $content); +$title = elgg_echo('tidypics:settings:heading:sizes'); +$content = elgg_view('forms/photos/admin/settings/thumbnails', array('plugin' => $plugin)); +echo elgg_view_module('inline', $title, $content); echo elgg_view('input/submit', array('value' => elgg_echo("save"))); diff --git a/views/default/forms/photos/admin/settings/activity.php b/views/default/forms/photos/admin/settings/activity.php new file mode 100644 index 000000000..d62901af6 --- /dev/null +++ b/views/default/forms/photos/admin/settings/activity.php @@ -0,0 +1,31 @@ +'; +echo elgg_echo('tidypics:settings:img_river_view') . ': '; +echo elgg_view('input/dropdown', array( + 'name' => 'params[img_river_view]', + 'options_values' => array( + 'all' => elgg_echo('tidypics:option:all'), + 'batch' => '1', + 'none' => elgg_echo('tidypics:option:none'), + ), + 'value' => $plugin->img_river_view, +)); +echo '
'; +echo '
'; +echo elgg_echo('tidypics:settings:album_river_view') . ': '; +echo elgg_view('input/dropdown', array( + 'name' => 'params[album_river_view]', + 'options_values' => array( + 'cover' => elgg_echo('tidypics:option:cover'), + 'set' => elgg_echo('tidypics:option:set'), + ), + 'value' => $plugin->album_river_view, +)); +echo '
'; + diff --git a/views/default/forms/photos/admin/settings/image_lib.php b/views/default/forms/photos/admin/settings/image_lib.php new file mode 100644 index 000000000..4e3f7f2a0 --- /dev/null +++ b/views/default/forms/photos/admin/settings/image_lib.php @@ -0,0 +1,20 @@ +'; +echo elgg_echo('tidypics:settings:image_lib') . ': '; +echo elgg_view('input/dropdown', array( + 'name' => 'params[image_lib]', + 'options_values' => tidypics_get_image_libraries(), + 'value' => $plugin->image_lib, +)); +echo '
'; +echo '
'; +echo elgg_echo('tidypics:settings:im_path') . ' '; +echo elgg_view("input/text", array('name' => 'params[im_path]', 'value' => $plugin->im_path)); +echo '
'; + diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php new file mode 100644 index 000000000..349c951f9 --- /dev/null +++ b/views/default/forms/photos/admin/settings/main.php @@ -0,0 +1,28 @@ +'; + $checked = $plugin->$checkbox ? 'checked' : false; + echo elgg_view('input/checkbox', array( + 'name' => "params[$checkbox]", + 'value' => true, + 'checked' => (bool)$plugin->$checkbox, + )); + echo ' ' . elgg_echo("tidypics:settings:$checkbox"); + echo '
'; +} + +// max image size +echo '
'; +echo elgg_echo('tidypics:settings:maxfilesize'); +echo elgg_view('input/text', array( + 'name' => 'params[maxfilesize]', + 'value' => $plugin->maxfilesize, +)); +echo '
'; diff --git a/views/default/forms/photos/admin/settings/thumbnails.php b/views/default/forms/photos/admin/settings/thumbnails.php new file mode 100644 index 000000000..ec7a6d1b2 --- /dev/null +++ b/views/default/forms/photos/admin/settings/thumbnails.php @@ -0,0 +1,33 @@ +' . elgg_echo('tidypics:settings:sizes:instructs') . ''; +$image_sizes = unserialize($plugin->image_sizes); +echo ''; +$sizes = array('large', 'small', 'tiny'); +foreach ($sizes as $size) { + echo ''; + echo ''; + echo ''; +} +echo '
'; + echo elgg_echo("tidypics:settings:{$size}size"); + echo ''; + echo 'width: '; + echo elgg_view('input/text', array( + 'name' => "{$size}_image_width", + 'value' => $image_sizes["{$size}_image_width"], + 'class' => 'tidypics-input-thin', + )); + echo ''; + echo 'height: '; + echo elgg_view('input/text', array( + 'name' => "{$size}_image_height", + 'value' => $image_sizes["{$size}_image_height"], + 'class' => 'tidypics-input-thin', + )); + echo '
'; -- cgit v1.2.3 From 0eec78495e5f63a80c2b04fcb87bda1ccb2b6648 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 14:42:37 -0400 Subject: added exif back --- classes/TidypicsImage.php | 3 ++- lib/exif.php | 39 ++++++++++++++++++----------------- pages/photos/image/view.php | 2 +- start.php | 1 + views/default/photos/sidebar.php | 12 +++++++++++ views/default/photos/sidebar/exif.php | 20 ++++++++++++++++++ views/default/tidypics/exif.php | 14 ------------- 7 files changed, 56 insertions(+), 35 deletions(-) create mode 100644 views/default/photos/sidebar.php create mode 100644 views/default/photos/sidebar/exif.php delete mode 100644 views/default/tidypics/exif.php diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index 26a3483a9..9081bc1fe 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -38,6 +38,7 @@ class TidypicsImage extends ElggFile { $this->simpletype = "image"; $this->saveImageFile($data); $this->saveThumbnails(); + $this->extractExifData(); } return true; @@ -326,7 +327,7 @@ class TidypicsImage extends ElggFile { * @warning image file must be saved first */ public function extractExifData() { - include_once dirname(dirname(__FILE__)) . "/lib/exif.php"; + elgg_load_library('tidypics:exif'); td_get_exif($this); } diff --git a/lib/exif.php b/lib/exif.php index 43a640336..8ca0dde0c 100644 --- a/lib/exif.php +++ b/lib/exif.php @@ -8,47 +8,48 @@ /** * Pull EXIF data from image file * - * @param TidypicsImage $file + * @param TidypicsImage $image */ -function td_get_exif($file) { +function td_get_exif($image) { // catch for those who don't have exif module loaded if (!is_callable('exif_read_data')) { return; } - $mime = $file->mimetype; + $mime = $image->mimetype; if ($mime != 'image/jpeg' && $mime != 'image/pjpeg') { return; } - $filename = $file->getFilenameOnFilestore(); - $exif = exif_read_data($filename); - create_metadata($file->getGUID(), "tp_exif", serialize($exif), "text", $file->getOwnerGUID(), ACCESS_PUBLIC); + $filename = $image->getFilenameOnFilestore(); + $exif = exif_read_data($filename, 'IFD0,EXIF', true); + if (is_array($exif)) { + $data = array_merge($exif['IFD0'], $exif['EXIF']); + foreach ($data as $key => $value) { + if (is_string($value)) { + // there are sometimes unicode characters that cause problems with serialize + $data[$key] = preg_replace( '/[^[:print:]]/', '', $value); + } + } + $image->tp_exif = serialize($data); + } } /** * Grab array of EXIF data for display * - * @param int $file_guid GUID of TidypicsImage + * @param TidypicsImage $image * @return array|false */ -function tp_exif_formatted($file_guid) { - - $metadata_exif = get_metadata_byname($file_guid, "tp_exif"); - if (!$metadata_exif) { - // //try to load it from the file if its not in the database - $file = new ElggFile($file_guid); - td_get_exif($file); - unset($file); - $metadata_exif = get_metadata_byname($file_guid, "tp_exif"); - } +function tp_exif_formatted($image) { - if (!$metadata_exif) { + $exif = $image->tp_exif; + if (!$exif) { return false; } - $exif = unserialize($metadata_exif["value"]); + $exif = unserialize($exif); $model = $exif['Model']; if (!$model) { diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index 1d359b6c7..fc4a01320 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -57,7 +57,7 @@ $body = elgg_view_layout('content', array( 'filter' => false, 'content' => $content, 'title' => $photo->getTitle(), - 'sidebar' => elgg_view('tidypics/sidebar', array( + 'sidebar' => elgg_view('photos/sidebar', array( 'page' => 'view', 'image' => $photo, )), diff --git a/start.php b/start.php index 9295dc7eb..1e851b8f3 100644 --- a/start.php +++ b/start.php @@ -17,6 +17,7 @@ function tidypics_init() { elgg_register_library('tidypics:core', "$base_dir/tidypics.php"); elgg_register_library('tidypics:upload', "$base_dir/upload.php"); elgg_register_library('tidypics:resize', "$base_dir/resize.php"); + elgg_register_library('tidypics:exif', "$base_dir/exif.php"); elgg_load_library('tidypics:core'); // Set up site menu diff --git a/views/default/photos/sidebar.php b/views/default/photos/sidebar.php new file mode 100644 index 000000000..4c0feb72c --- /dev/null +++ b/views/default/photos/sidebar.php @@ -0,0 +1,12 @@ +'; + foreach ($exif as $key => $value) { + $body .= "$key$value"; + } + $body .= ''; + + echo elgg_view_module('aside', $title, $body); +} diff --git a/views/default/tidypics/exif.php b/views/default/tidypics/exif.php deleted file mode 100644 index f21e2eff7..000000000 --- a/views/default/tidypics/exif.php +++ /dev/null @@ -1,14 +0,0 @@ -'; - foreach ($exif as $name => $value) { - echo $name . ': ' . $value . '
'; - } - echo '
'; -} - -?> \ No newline at end of file -- cgit v1.2.3 From 3639cba1b20c4227def597e67274a184d1ea87d7 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 14:46:00 -0400 Subject: removed old code --- views/default/tidypics/gallery.php | 71 -------- views/default/tidypics/image_menu.php | 50 ------ views/default/tidypics/js/slideshow.php | 2 - views/default/tidypics/js/tagging.php | 304 -------------------------------- views/default/tidypics/tagging.php | 88 --------- 5 files changed, 515 deletions(-) delete mode 100644 views/default/tidypics/gallery.php delete mode 100644 views/default/tidypics/image_menu.php delete mode 100644 views/default/tidypics/js/slideshow.php delete mode 100644 views/default/tidypics/js/tagging.php delete mode 100644 views/default/tidypics/tagging.php diff --git a/views/default/tidypics/gallery.php b/views/default/tidypics/gallery.php deleted file mode 100644 index ba6f7b11d..000000000 --- a/views/default/tidypics/gallery.php +++ /dev/null @@ -1,71 +0,0 @@ - 0 && $viewtypetoggle) { - $nav .= elgg_view('navigation/viewtype', array( - 'baseurl' => $baseurl, - 'offset' => $offset, - 'count' => $count, - 'viewtype' => $viewtype, - )); -} - -if ($pagination) { - $nav .= elgg_view('navigation/pagination',array( - 'baseurl' => $baseurl, - 'offset' => $offset, - 'count' => $count, - 'limit' => $limit, - )); -} - -$html .= $nav; - -if (is_array($entities) && sizeof($entities) > 0) { - $counter = 0; - foreach($entities as $entity) { - if ($counter % $num_wide == 0) { - $html .= "
"; - } - $html .= elgg_view_entity($entity, $fullview); - $counter++; - } -} - -$html .= '
'; - -if ($count) { - $html .= $nav; -} - -echo $html; \ No newline at end of file diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php deleted file mode 100644 index 50ada2193..000000000 --- a/views/default/tidypics/image_menu.php +++ /dev/null @@ -1,50 +0,0 @@ -container_guid); - if ($container instanceof ElggGroup) { - $can_tag = $viewer && $container->isMember($viewer); - } else { - $can_tag = $viewer && $viewer->guid == $owner->guid || user_is_friend($owner->guid, $viewer->guid); - } - - // only owner and friends of owner can tag - if ($can_tag) { -?> -
    • -guid == $owner->guid) { -?> -
    • - -
    • -mod/tidypics/vendors/PicLensLite/piclens_optimized.js"> diff --git a/views/default/tidypics/js/tagging.php b/views/default/tidypics/js/tagging.php deleted file mode 100644 index 3ffa20cfb..000000000 --- a/views/default/tidypics/js/tagging.php +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php deleted file mode 100644 index 2993fe71b..000000000 --- a/views/default/tidypics/tagging.php +++ /dev/null @@ -1,88 +0,0 @@ -getPhotoTags(); - -// defining json text as "" makes sure the tagging javascript code doesn't throw errors if no tags -$photo_tags_json = "\"\""; -if ($tag_info) { - $photo_tags_json = $tag_info['json']; -} - -if ($tag_info) { -?> -
    -

    - -
    - -
    -
    -
    -
    -
    -

    - "; - $content .= ""; - $content .= ""; - $content .= ""; - $content .= ""; - - $content .= "
    "; - - $content .= "
    "; - - echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content)); - } - - ?> -
    -
    -
    -

    - - guid}' />"; - foreach ($tag_info['links'] as $id => $link) { - $text = htmlentities($link['text'], ENT_QUOTES, 'UTF-8'); - $content .= "
    "; - } - - $content .= ""; - $content .= ""; - - echo elgg_view('input/form', array('internalname' => 'phototag_deletetag_form', 'action' => "{$vars['url']}action/tidypics/deletetag", 'method' => 'post', 'body' => $content)); - - } -?> -
    - $photo_tags_json,) ); -- cgit v1.2.3 From 2893bbf881b1bdca005b4751fbb4e7e1c52f31f8 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 14:53:40 -0400 Subject: removed deprecated functions --- actions/photos/image/untag.php | 2 +- classes/TidypicsImage.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/actions/photos/image/untag.php b/actions/photos/image/untag.php index 012f98930..11c433a61 100644 --- a/actions/photos/image/untag.php +++ b/actions/photos/image/untag.php @@ -3,7 +3,7 @@ * Remove photo tag action */ -$annotation = get_annotation(get_input('annotation_id')); +$annotation = elgg_get_annotation_from_id(get_input('annotation_id')); if (!$annotation instanceof ElggAnnotation || $annotation->name != 'phototag') { register_error(elgg_echo("tidypics:phototagging:delete:error")); diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index 9081bc1fe..672a0df20 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -380,21 +380,21 @@ class TidypicsImage extends ElggFile { //delete standard thumbnail image if ($thumbnail) { $delfile = new ElggFile(); - $delfile->owner_guid = $this->getOwner(); + $delfile->owner_guid = $this->getOwnerGUID(); $delfile->setFilename($thumbnail); $delfile->delete(); } //delete small thumbnail image if ($smallthumb) { $delfile = new ElggFile(); - $delfile->owner_guid = $this->getOwner(); + $delfile->owner_guid = $this->getOwnerGUID(); $delfile->setFilename($smallthumb); $delfile->delete(); } //delete large thumbnail image if ($largethumb) { $delfile = new ElggFile(); - $delfile->owner_guid = $this->getOwner(); + $delfile->owner_guid = $this->getOwnerGUID(); $delfile->setFilename($largethumb); $delfile->delete(); } -- cgit v1.2.3 From 2d8b04169dda48a5dba8503d9943bdeee2c64685 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 15:15:30 -0400 Subject: watermarking returns --- lib/watermark.php | 10 +++++----- views/default/forms/photos/admin/settings.php | 4 ---- views/default/forms/photos/admin/settings/main.php | 8 ++++++++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/watermark.php b/lib/watermark.php index a2aebffd9..f7c228af1 100644 --- a/lib/watermark.php +++ b/lib/watermark.php @@ -54,11 +54,11 @@ function tp_gd_watermark($image) { } // plugins can do their own watermark and return false to prevent this function from running - if (trigger_plugin_hook('tp_watermark', 'gd', $image, true) === false) { + if (elgg_trigger_plugin_hook('tp_watermark', 'gd', $image, true) === false) { return; } - $owner = elgg_get_logged_in_user_guid(); + $owner = elgg_get_logged_in_user_entity(); $watermark_text = tp_process_watermark_text($watermark_text, $owner); @@ -101,7 +101,7 @@ function tp_imagick_watermark($filename) { return true; } - $owner = get_loggedin_user(); + $owner = elgg_get_logged_in_user_entity(); $watermark_text = tp_process_watermark_text($watermark_text, $owner); @@ -144,7 +144,7 @@ function tp_im_cmdline_watermark($filename) { } // plugins can do their own watermark and return false to prevent this function from running - if (trigger_plugin_hook('tp_watermark', 'imagemagick', $filename, true) === false) { + if (elgg_trigger_plugin_hook('tp_watermark', 'imagemagick', $filename, true) === false) { return; } @@ -159,7 +159,7 @@ function tp_im_cmdline_watermark($filename) { } - $owner = get_loggedin_user(); + $owner = elgg_get_logged_in_user_entity(); $watermark_text = tp_process_watermark_text($watermark_text, $owner); diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php index 2b6399a67..7e9c17ac2 100644 --- a/views/default/forms/photos/admin/settings.php +++ b/views/default/forms/photos/admin/settings.php @@ -28,10 +28,6 @@ echo elgg_view('input/submit', array('value' => elgg_echo("save"))); return true; -// Watermark Text -$form_body .= "

    " . elgg_echo('tidypics:settings:watermark') . "
    "; -$form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "

    "; - // Quota Size $quota = $plugin->quota; if (!$quota) { diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php index 349c951f9..352a9c5a1 100644 --- a/views/default/forms/photos/admin/settings/main.php +++ b/views/default/forms/photos/admin/settings/main.php @@ -26,3 +26,11 @@ echo elgg_view('input/text', array( 'value' => $plugin->maxfilesize, )); echo ''; + +// Watermark Text +echo '
    ' . elgg_echo('tidypics:settings:watermark'); +echo elgg_view("input/text", array( + 'name' => 'params[watermark_text]', + 'value' => $plugin->watermark_text, +)); +echo '
    '; -- cgit v1.2.3 From c7bd5fb64003c42f9299b7203af9a13bcd48948f Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 15:50:06 -0400 Subject: added quota back --- classes/TidypicsImage.php | 6 ++++- languages/en.php | 5 ++-- lib/upload.php | 6 ++--- pages/photos/image/upload.php | 1 + views/default/forms/photos/admin/settings.php | 14 +---------- views/default/forms/photos/admin/settings/main.php | 12 ++++++++++ views/default/forms/photos/ajax_upload.php | 23 ++++-------------- views/default/forms/photos/basic_upload.php | 27 ---------------------- views/default/photos/sidebar.php | 6 +++++ views/default/photos/sidebar/quota.php | 27 ++++++++++++++++++++++ 10 files changed, 63 insertions(+), 64 deletions(-) create mode 100644 views/default/photos/sidebar/quota.php diff --git a/classes/TidypicsImage.php b/classes/TidypicsImage.php index 672a0df20..5a8d42ccc 100644 --- a/classes/TidypicsImage.php +++ b/classes/TidypicsImage.php @@ -217,11 +217,15 @@ class TidypicsImage extends ElggFile { } $owner = $this->getOwnerEntity(); - $owner->image_repo_size = (int)$owner->image_repo_size + $size; + $owner->image_repo_size = (int)$owner->image_repo_size + $this->size(); return true; } + /** + * Need to restore sanity to this function + * @param type $data + */ protected function checkUploadErrors($data) { // check for upload errors if ($data['error']) { diff --git a/languages/en.php b/languages/en.php index 0fe3996f1..007dc5785 100644 --- a/languages/en.php +++ b/languages/en.php @@ -71,7 +71,7 @@ $english = array( 'tidypics:settings:uploader' => "Use Flash uploader", 'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums", 'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):", - 'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota", + 'tidypics:settings:quota' => "User Quota (MB) - 0 equals no quota", 'tidypics:settings:watermark' => "Enter text to appear in the watermark", 'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands", 'tidypics:settings:img_river_view' => "How many entries in activity river for each batch of uploaded images", @@ -153,12 +153,13 @@ $english = array( 'album:tags' => "Tags", 'album:cover' => "Make image album cover?", 'album:cover_link' => 'Set cover image', + 'tidypics:title:quota' => 'Quota', 'tidypics:quota' => "Quota usage:", 'tidypics:uploader:choose' => "Choose photos", 'tidypics:uploader:upload' => "Upload photos", 'tidypics:uploader:describe' => "Describe photos", 'tidypics:uploader:filedesc' => 'Image files (jpeg, png, gif)', - 'tidypics:uploader:instructs' => 'There are three easy steps for adding photos to your album using this uploader: choosing, uploading, and describing them. If you do not have Flash, there is also a basic uploader available.', + 'tidypics:uploader:instructs' => 'There are three easy steps for adding photos to your album using this uploader: choosing, uploading, and describing them. There is a %s MB maximum per photo. If you do not have Flash, there is also a basic uploader available.', 'tidypics:uploader:basic' => 'You can upload up to 10 photos at a time (%s MB maximum per photo)', 'tidypics:sort:instruct' => 'Sort the album photos by dragging and dropping the images. Then click the save button.', 'tidypics:sort:no_images' => 'No images found to sort. Upload images using the link above.', diff --git a/lib/upload.php b/lib/upload.php index 0b034517c..a83323f16 100644 --- a/lib/upload.php +++ b/lib/upload.php @@ -111,9 +111,9 @@ function tp_upload_check_quota($image_size, $owner_guid) { // no quota return true; } - - $image_repo_size_md = get_metadata_byname($owner_guid, "image_repo_size"); - $image_repo_size = (int)$image_repo_size_md->value; + + $owner = get_entity($owner_guid); + $image_repo_size_md = (int)$owner->image_repo_size; return ($image_repo_size + $image_size) < $quota; } \ No newline at end of file diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php index 3d3e67b58..425d5689a 100644 --- a/pages/photos/image/upload.php +++ b/pages/photos/image/upload.php @@ -52,6 +52,7 @@ $body = elgg_view_layout('content', array( 'content' => $content, 'title' => $title, 'filter' => '', + 'sidebar' => elgg_view('photos/sidebar', array('page' => 'upload')), )); echo elgg_view_page($title, $body); diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php index 7e9c17ac2..403203f69 100644 --- a/views/default/forms/photos/admin/settings.php +++ b/views/default/forms/photos/admin/settings.php @@ -2,7 +2,7 @@ /** * Tidypics admin settings form body * - * @todo watermark, quota, remove original image, group only upload not delete + * @todo remove original image, group only upload not delete */ $plugin = elgg_get_plugin_from_id('tidypics'); @@ -24,15 +24,3 @@ $content = elgg_view('forms/photos/admin/settings/thumbnails', array('plugin' => echo elgg_view_module('inline', $title, $content); echo elgg_view('input/submit', array('value' => elgg_echo("save"))); - -return true; - - -// Quota Size -$quota = $plugin->quota; -if (!$quota) { - $quota = 0; -} -$form_body .= "

    " . elgg_echo('tidypics:settings:quota') . "
    "; -$form_body .= elgg_view("input/text",array('internalname' => 'params[quota]', 'value' => $quota)) . "

    "; - diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php index 352a9c5a1..c99b9d688 100644 --- a/views/default/forms/photos/admin/settings/main.php +++ b/views/default/forms/photos/admin/settings/main.php @@ -34,3 +34,15 @@ echo elgg_view("input/text", array( 'value' => $plugin->watermark_text, )); echo ''; + +// Quota Size +$quota = $plugin->quota; +if (!$quota) { + $quota = 0; +} +echo '
    ' . elgg_echo('tidypics:settings:quota'); +echo elgg_view('input/text', array( + 'name' => 'params[quota]', + 'value' => $quota, +)); +echo '
    '; diff --git a/views/default/forms/photos/ajax_upload.php b/views/default/forms/photos/ajax_upload.php index be25d628e..3ab578a38 100644 --- a/views/default/forms/photos/ajax_upload.php +++ b/views/default/forms/photos/ajax_upload.php @@ -17,26 +17,13 @@ if (!$maxfilesize) { $maxfilesize = 5; } -$quota = elgg_get_plugin_setting('quota', 'tidypics'); -if ($quota) { - $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); - $image_repo_size = (int)$image_repo_size_md->value; - $image_repo_size = $image_repo_size / 1024 / 1024; - $quote_percentage = round(100 * ($image_repo_size / $quota)); - // for small quotas, so one decimal place - if ($quota < 10) { - $image_repo_size = sprintf('%.1f', $image_repo_size); - } else { - $image_repo_size = round($image_repo_size); - } - if ($image_repo_size > $quota) { - $image_repo_size = $quota; - } -} - ?> -

    +

    + +

    • diff --git a/views/default/forms/photos/basic_upload.php b/views/default/forms/photos/basic_upload.php index e4535814b..ba849d1b4 100644 --- a/views/default/forms/photos/basic_upload.php +++ b/views/default/forms/photos/basic_upload.php @@ -15,33 +15,6 @@ $album = $vars['entity']; $access_id = $album->access_id; $maxfilesize = (float) elgg_get_plugin_setting('maxfilesize', 'tidypics'); -$quota = elgg_get_plugin_setting('quota', 'tidypics'); -/* -if ($quota) { - $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); - $image_repo_size = (int)$image_repo_size_md->value; - $image_repo_size = $image_repo_size / 1024 / 1024; - $quote_percentage = round(100 * ($image_repo_size / $quota)); - // for small quotas, so one decimal place - if ($quota < 10) { - $image_repo_size = sprintf('%.1f', $image_repo_size); - } else { - $image_repo_size = round($image_repo_size); - } - if ($image_repo_size > $quota) { - $image_repo_size = $quota; - } -} - -
      - - - * -*/ $instructions = elgg_echo("tidypics:uploader:upload"); $max = elgg_echo('tidypics:uploader:basic', array($maxfilesize)); diff --git a/views/default/photos/sidebar.php b/views/default/photos/sidebar.php index 4c0feb72c..fd5202691 100644 --- a/views/default/photos/sidebar.php +++ b/views/default/photos/sidebar.php @@ -10,3 +10,9 @@ if ($image && $page == 'view') { echo elgg_view('photos/sidebar/exif', $vars); } } + +if ($page == 'upload') { + if (elgg_get_plugin_setting('quota', 'tidypics')) { + echo elgg_view('photos/sidebar/quota', $vars); + } +} \ No newline at end of file diff --git a/views/default/photos/sidebar/quota.php b/views/default/photos/sidebar/quota.php new file mode 100644 index 000000000..16b7885c4 --- /dev/null +++ b/views/default/photos/sidebar/quota.php @@ -0,0 +1,27 @@ +image_repo_size; + $image_repo_size = $image_repo_size / 1024 / 1024; + $quote_percentage = round(100 * ($image_repo_size / $quota)); + // for small quotas, so one decimal place + if ($quota < 10) { + $image_repo_size = sprintf('%.1f', $image_repo_size); + } else { + $image_repo_size = round($image_repo_size); + } + if ($image_repo_size > $quota) { + $image_repo_size = $quota; + } + + $title = elgg_echo('tidypics:title:quota'); + $body = elgg_echo("tidypics:quota") . ' ' . $image_repo_size . '/' . $quota . " MB ({$quote_percentage}%)"; + echo elgg_view_module('aside', $title, $body); +} -- cgit v1.2.3 From 57b8fb7a439fb181d2c2fac4a06e178c17b3b4ca Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 15:53:09 -0400 Subject: better language for setting album cover --- languages/en.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/en.php b/languages/en.php index 007dc5785..62b43673d 100644 --- a/languages/en.php +++ b/languages/en.php @@ -151,8 +151,8 @@ $english = array( 'album:title' => "Title", 'album:desc' => "Description", 'album:tags' => "Tags", - 'album:cover' => "Make image album cover?", - 'album:cover_link' => 'Set cover image', + 'album:cover' => "Make this image the album cover?", + 'album:cover_link' => 'Make cover', 'tidypics:title:quota' => 'Quota', 'tidypics:quota' => "Quota usage:", 'tidypics:uploader:choose' => "Choose photos", -- cgit v1.2.3 From ad34c437251fe2194ea482b58fcaad4459bf6b37 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 14 Jul 2012 15:57:13 -0400 Subject: 1.8.0 Release Candidate 1 --- contributions.txt | 14 ++++++++++++++ manifest.xml | 2 +- version.php | 1 - 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/contributions.txt b/contributions.txt index 6ab7253f9..f12a4713b 100644 --- a/contributions.txt +++ b/contributions.txt @@ -1,5 +1,19 @@ Changelog and contributors list +------------------------------------------------------------------------ +Version 1.8.0 RC1 Change List +Release Date: 07/14/2012 +------------------------------------------------------------------------ +BEGIN VERSION 1.8.0 RC1 CHANGES +------------------------------------------------------------------------ + * Updated for Elgg 1.8 +Contributors: + * Cash Costello + * Brett Profitt +------------------------------------------------------------------------ +END VERSION 1.7.3 CHANGES +------------------------------------------------------------------------ + ------------------------------------------------------------------------ Version 1.7.3 Change List Release Date: 11/09/2011 diff --git a/manifest.xml b/manifest.xml index d3c884f2f..3f4025988 100644 --- a/manifest.xml +++ b/manifest.xml @@ -2,7 +2,7 @@ Tidypics Photo Gallery Cash Costello - 1.8.0-preview2 + 1.8.0-rc1 A photo gallery with albums, tagging, and a slideshow. content multimedia diff --git a/version.php b/version.php index f2817c5e9..68817c053 100644 --- a/version.php +++ b/version.php @@ -1,5 +1,4 @@ Date: Sun, 15 Jul 2012 03:27:30 +0300 Subject: Updated German language file: more or less completely new translation to mirror English language file of Tidypics 1.8.0-RC1, fixing of spelling errors, more consistent translation. --- languages/de.php | 354 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 221 insertions(+), 133 deletions(-) diff --git a/languages/de.php b/languages/de.php index 555c42058..1f439e981 100644 --- a/languages/de.php +++ b/languages/de.php @@ -1,9 +1,4 @@ "Bild", 'images' => "Bilder", 'caption' => "Beschreibung", - 'photos' => "Fotos", - 'images:upload' => "Fotos hochladen", - 'images:multiupload' => "Flash Multi-Upload Tool", - 'images:multiupload:todo' => "Ein oder mehrere Bilder zum Hochladen wählen!", - 'album' => "Fotoalbum", - 'albums' => "Fotoalben", + 'photos' => "Bilder", + 'album' => "Bilderalbum", + 'albums' => "Bilderalben", + 'tidypics:disabled' => 'Deaktiviert', + 'tidypics:enabled' => 'Aktiviert', + 'admin:settings:photos' => 'Tidypics', + + 'photos:add' => "Album hinzufügen", + 'images:upload' => "Bilder hochladen", + 'album:slideshow' => "Diashow ansehen", - 'album:yours' => "Deine Fotoalben", - 'album:yours:friends' => "Fotoalben deiner Freunde", - 'album:user' => "%s's Fotoalben", - 'album:friends' => "Fotoalben von %s's Freunden", - 'album:all' => "Alle Fotoalben", - 'album:group' => "Gruppen-Alben", - 'item:object:image' => "Fotos", + 'album:yours' => "Deine Bilderalben", + 'album:yours:friends' => "Bilderalben Deiner Freunde", + 'album:user' => "Bilderalben von %s", + 'album:friends' => "Bilderalben von Freunden", + 'album:all' => "Alle Bilderalben", + 'photos:group' => "Gruppen-Bilder", + 'item:object:image' => "Bilder", 'item:object:album' => "Alben", - 'tidypics:uploading:images' => "Die Bilder werden hochgeladen", - 'tidypics:enablephotos' => 'Schalte Gruppenalben frei', + 'tidypics:uploading:images' => "Die Bilder werden hochgeladen.", + 'tidypics:enablephotos' => 'Gruppen-Alben aktivieren', 'tidypics:editprops' => 'Bild bearbeiten', - 'tidypics:mostcommented' => 'meist kommentierte', - 'tidypics:mostcommentedthismonth' => 'Meist kommentierte des Monats', - 'tidypics:mostcommentedtoday' => 'Meist kommentierte des Tages', - 'tidypics:mostviewed' => 'Meist gesehene Bilder', - 'tidypics:mostvieweddashboard' => 'Meist gesehene dashboard', - 'tidypics:mostviewedthisyear' => 'Meist gesehene des Jahres', - 'tidypics:mostviewedthismonth' => 'Meist gesehene des Monats', - 'tidypics:mostviewedlastmonth' => 'Meist gesehen im letzten Monat', - 'tidypics:mostviewedtoday' => 'Am häufigsten gezeigte des Tages', - 'tidypics:recentlyviewed' => 'Zuletzt angezeigt', - 'tidypics:recentlycommented' => 'Zuletzt kommentiert', - 'tidypics:mostrecent' => 'Community neue Bilder', - 'tidypics:yourmostviewed' => 'Deine meist gesehene', - 'tidypics:yourmostrecent' => 'Zuletzt hochgeladen', - 'tidypics:friendmostviewed' => "%s's meist gesehene", - 'tidypics:friendmostrecent' => "Zuletzt hochgeladen von %s", - 'tidypics:highestrated' => "Am höchsten bewertet", - 'tidypics:views' => "Zugriffe: %s", - 'tidypics:viewsbyowner' => "Zugriffe: %s von %s Mitglieder (du ausgeschlossen)", - 'tidypics:viewsbyothers' => "Zugriffe: %s (%s deine)", - 'tidypics:administration' => 'Tidypics Administration', - 'tidypics:stats' => 'Statitik', + 'tidypics:mostcommented' => 'Meist kommentierte Bilder', + 'tidypics:mostcommentedthismonth' => 'Meist kommentierte Bilder des Monats', + 'tidypics:mostcommentedtoday' => 'Meist kommentierte Bilder des Tages', + 'tidypics:mostviewed' => 'Am häufigsten angesehene Bilder', + 'tidypics:mostvieweddashboard' => 'Am häufigsten angesehene Bilder auf Dashboard', + 'tidypics:mostviewedthisyear' => 'Am häufigsten angesehene Bilder des Jahres', + 'tidypics:mostviewedthismonth' => 'Am häufigsten angesehene Bilder des Monats', + 'tidypics:mostviewedlastmonth' => 'Am häufigsten angesehene Bilder im letzten Monat', + 'tidypics:mostviewedtoday' => 'Am häufigsten angesehene Bilder des Tages', + 'tidypics:recentlyviewed' => 'Zuletzt angesehene Bilder', + 'tidypics:recentlycommented' => 'Zuletzt kommentierte Bilder', + 'tidypics:mostrecent' => 'Neue Bilder der Community-Seite', + 'tidypics:yourmostviewed' => 'Deine am häufigsten angesehenen Bilder', + 'tidypics:yourmostrecent' => 'Zuletzt hochgeladene Bilder', + 'tidypics:friendmostviewed' => "Am häufigsten angesehene Bilder von %s", + 'tidypics:friendmostrecent' => "Zuletzt hochgeladene Bilder von %s", + 'tidypics:highestrated' => "Am höchsten bewertete Bilder", + 'tidypics:views' => "%s Zugriffe", + 'tidypics:viewsbyowner' => "Zugriffe: %s von %s Mitglieder (Dich nicht mitgerechnet)", + 'tidypics:viewsbyothers' => "Zugriffe: %s (%s von Dir)", + 'tidypics:administration' => 'Tidypics-Administration', + 'tidypics:stats' => 'Statistik', + 'tidypics:nophotosingroup' => 'Diese Gruppe hat noch keine Bilder.', + 'tidypics:upgrade' => 'Aktualisieren', + 'tidypics:sort' => 'Umsortieren des %s-Bilderalbums', + 'tidypics:none' => 'Keine Bilderalben vorhanden.', //settings 'tidypics:settings' => 'Einstellungen', - 'tidypics:admin:instructions' => 'Das sind die Tidypics Einstellungen', - 'tidypics:settings:image_lib' => "Image Library: ", - 'tidypics:settings:thumbnail' => "Thumbnail Creation", + 'tidypics:settings:main' => 'Grundeinstellungen', + 'tidypics:settings:image_lib' => "Image Library", + 'tidypics:settings:thumbnail' => "Erzeugung von Vorschaubildern", + 'tidypics:settings:help' => "Hilfe", 'tidypics:settings:download_link' => "Zeige Download-Link", - 'tidypics:settings:tagging' => "Erlaube Foto-Links", - 'tidypics:settings:photo_ratings' => "Erlaube Foto Bewertungen (benötigt rate plugin of Miguel Montes oder passendes)", - 'tidypics:settings:exif' => "Zeige EXIF data", - 'tidypics:settings:view_count' => "Zeige Zähler", - 'tidypics:settings:grp_perm_override' => "Erlaube den Gruppen-Mitgliedern unbeschränkten zugagn zur verwaltung von Gruppen-Alben", - 'tidypics:settings:maxfilesize' => "Maximale Bildgröße in Megabytes (MB):", - 'tidypics:settings:quota' => "Benutzer/Gruppen Speicherplatz in (MB) (0 = Kein Speicherplatz)", - 'tidypics:settings:watermark' => "Gib den Text für den Wasserzeichen ein - ImageMagick Cmdline muss ausgewählt sein für die Bildbibliothek", - 'tidypics:settings:im_path' => "Gib den Pfad zu ImageMagick Befehle (mit abschließendem Slasch)", - 'tidypics:settings:img_river_view' => "Wie viele Einträge in der aktivitäten Liste beim Upload von mehreren Bildern", - 'tidypics:settings:album_river_view' => "Zeige Albumcover oder ein Set von Fotos für neuen Album", - 'tidypics:settings:largesize' => "Bild-Größe", - 'tidypics:settings:smallsize' => "Album-Tumbnail Bild-Größe", - 'tidypics:settings:thumbsize' => "Thumbnail Bild-Größe", - 'tidypics:settings:im_id' => "Bild ID", + 'tidypics:settings:tagging' => "Tagging von Bildern erlauben", + 'tidypics:settings:photo_ratings' => "Bewerten von Bildern erlauben (benötigt das Elggx Fivestar-Plugin oder ein vergleichbares)", + 'tidypics:settings:exif' => "EXIF-Daten anzeigen", + 'tidypics:settings:view_count' => "Zugriffszähler anzeigen", + 'tidypics:settings:uploader' => "Flash-Uploader verwenden", + 'tidypics:settings:grp_perm_override' => "Gruppen-Mitgliedern unbeschränkten Zugriff auf die Verwaltung von Gruppen-Alben geben", + 'tidypics:settings:maxfilesize' => "Maximal erlaubte Bildgröße in Megabytes (MB):", + 'tidypics:settings:quota' => "Quota für Benutzer in Megabytes (MB) (0 = kein Quota)", + 'tidypics:settings:watermark' => "Gib den Text ein, der als Wasserzeichen eingefügt wird", + 'tidypics:settings:im_path' => "Der Pfad zu den ImageMagick-Kommandozeilentools auf dem Server", + 'tidypics:settings:img_river_view' => "Anzahl der Einträge im River beim gleichzeitigen Hochladen mehrerer Bilder", + 'tidypics:settings:album_river_view' => "Anzeige des Albumcovers oder eines Sets von Bildern für neue Alben", + 'tidypics:settings:largesize' => "Bildgröße in der Hauptansicht", + 'tidypics:settings:smallsize' => "Bildgröße in der Alben-Ansicht", + 'tidypics:settings:tinysize' => "Bildgröße von Vorschaubildern", + 'tidypics:settings:sizes:instructs' => 'Du mußt eventuell die CSS-Einstellungen anpassen, falls Du die vorgegebenen Standard-Bildgrößen änderst.', + 'tidypics:settings:im_id' => "Bilder-ID", + 'tidypics:settings:heading:img_lib' => "Image-Library-Einstellungen", + 'tidypics:settings:heading:main' => "Grundeinstellungen", + 'tidypics:settings:heading:river' => "Einstellungen für die River-Integration", + 'tidypics:settings:heading:sizes' => "Größe der Vorschaubilder", + 'tidypics:settings:heading:groups' => "Einstellungen für die Gruppen-Integration", + 'tidypics:option:all' => 'Alle', + 'tidypics:option:none' => 'Keine', + 'tidypics:option:cover' => 'Cover', + 'tidypics:option:set' => 'Set', + + // server analysis + 'tidypics:server_info' => 'Informationen über den Server', + 'tidypics:server_info:gd_desc' => 'Elgg setzt voraus, dass die GD-PHP-Erweiterung verfügbar ist.', + 'tidypics:server_info:exec_desc' => 'Benötigt für die ImageMagick-Kommandozeilentools.', + 'tidypics:server_info:memory_limit_desc' => 'Passe die PHP-Variable memory_limit an, um mehr Speicher zur Verfügung zu stellen.', + 'tidypics:server_info:peak_usage_desc' => 'Dies ist ungefähr der Mindest-Speicherbedarf pro Seite.', + 'tidypics:server_info:upload_max_filesize_desc' => 'Maximal erlaubte Dateigröße für ein einzelnes hochzuladendes Bild.', + 'tidypics:server_info:post_max_size_desc' => '"Max post size" abzüglich der Größe der HTML-Form = Maximal mögliche Gesamtgröße von gleichzeitig hochzuladenden Bildern.', + 'tidypics:server_info:max_input_time_desc' => 'Maximale erlaubte Dauer, in der das Hochladen von Daten auf den Server abgeschlossen sein muss.', + 'tidypics:server_info:max_execution_time_desc' => 'Maximal erlaubte Ausführdauer für ein Skript auf dem Server.', + 'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions können den Flash-Uploader beeinträchtigen.', + 'tidypics:server_info:php_version' => 'PHP-Version', + 'tidypics:server_info:memory_limit' => 'Für PHP verfügbarer Speicher', + 'tidypics:server_info:peak_usage' => 'Genutzer Speicher, um diese Seite zu laden', + 'tidypics:server_info:upload_max_filesize' => 'PHP-Einstellung von upload_max_filesize', + 'tidypics:server_info:post_max_size' => 'PHP-Einstellung von post_max_size', + 'tidypics:server_info:max_input_time' => 'PHP-Einstellung von max_input_time', + 'tidypics:server_info:max_execution_time' => 'PHP-Einstellung von max_execution_time', + 'tidypics:server_info:use_only_cookies' => 'PHP-Einstellung von session.use_only_cookies', + + 'tidypics:server_config' => 'Server-Konfiguration', + 'tidypics:server_configuration_doc' => 'Dokumentation über die Konfigurierung des Servers', + + // ImageMagick test + 'tidypics:lib_tools:testing' => + 'Tidypics benötigt den Pfad auf dem Server zu den ImageMagick-Kommandozeilentools, falls Du diese als Image-Library verwenden willst. Dein Webhoster sollte Dir diese Information mitteilen können. Du kannst im folgenden prüfen, ob dieser Pfad korrekt ist. Wenn der Test erfolgreich ist, sollten Informationen über die auf dem Server installierte Version von ImageMagick angezeigt werden.', + + // thumbnail tool + 'tidypics:thumbnail_tool' => 'Vorschaubild-Erzeugung', + 'tidypics:thumbnail_tool_blurb' => + 'Im Folgenden kannst Du Vorschaubilder von Bildern erzeugen, falls dies beim Hochladen der Bilder fehlgeschlagen ist. Die Erzeugung der Vorschaubilder kann fehlschlagen, wenn die Image-Library nicht richtig eingerichtet ist oder falls für die GD-PHP-Erweiterung nicht genügend Arbeitsspeicher verfügbar ist, um das Bild zu laden und die Größe zu ändern. Falls die Mitglieder Deiner Seite bei der Erzeugung der Vorschaubilder für ihre hochgeladenen Bilder Probleme hatten, kannst Du im folgenden die Erzeugung der Vorschaubilder wiederholen, nachdem Du den Server bzw. Tidypics richtig konfiguriert hast. Bestimme die GUID des Bildes, für das Du Vorschaubilder erzeugen willst (dies ist die Nummer, die fast am Ende der URL enthalten ist, wenn Du dieses Bilder auf Deiner Seite anschaust) und gebe diese Nummer im folgenden Eingabefeld ein.', + 'tidypics:thumbnail_tool:unknown_image' => 'Das Originalbild kann nicht gefunden werden.', + 'tidypics:thumbnail_tool:invalid_image_info' => 'Beim Abrufen Bildinformationen ist ein Fehler aufgetreten.', + 'tidypics:thumbnail_tool:create_failed' => 'Die Erzeugung der Vorschaubilder ist fehlgeschlagen.', + 'tidypics:thumbnail_tool:created' => 'Die Vorschaubilder wurden erzeugt.', //actions - 'album:create' => "Album hinzufügen", + 'album:create' => "Neues Album hinzufügen", 'album:add' => "Neues Album hinzufügen", - 'album:addpix' => "Fotos hinzufügen", + 'album:addpix' => "Bilder hinzufügen", 'album:edit' => "Album bearbeiten", 'album:delete' => "Album löschen", + 'album:sort' => "Umsortieren", 'image:edit' => "Bild bearbeiten", 'image:delete' => "Bild löschen", 'image:download' => "Bild herunterladen", @@ -90,100 +142,136 @@ $german = array( //forms 'album:title' => "Titel", 'album:desc' => "Beschreibung", - 'album:tags' => "Stichwörter", - 'album:cover' => "Das bild als Albumcover nutzen", - 'tidypics:quota' => "Speicherplatz:", + 'album:tags' => "Tags", + 'album:cover' => "Dieses Bild als Albumcover verwenden?", + 'album:cover_link' => 'Zum Albumcover machen', + 'tidypics:title:quota' => 'Quota', + 'tidypics:quota' => "Quota-Ausnutzung:", + 'tidypics:uploader:choose' => "Wähle die Bilder aus", + 'tidypics:uploader:upload' => "Lade die Bilder hoch", + 'tidypics:uploader:describe' => "Gebe Beschreibungen für die Bilder ein", + 'tidypics:uploader:filedesc' => 'Bilddateien (jpeg, png, gif)', + 'tidypics:uploader:instructs' => 'Das Hochladen von Bilder erfolgt in drei einfachen Schritten: Bilder zum Hochladen auswählen, diese Bilder hochladen und dann Beschreibungen für diese Bilder eingeben. Pro Bilddatei gibt es eine Größenbeschränkung von %s MB. Falls Du auf Deinem Computer Flash nicht installiert hast, ist auch ein Alternativer Uploader verfügbar.', + 'tidypics:uploader:basic' => 'Du kannst bis zu 10 Bilder auf einmal hochladen (maximale Dteigröße %s MB pro Bild).', + 'tidypics:sort:instruct' => 'Sortiere die Bilder im Album durch Drag-and-Drop um. Dann speichere Deine Änderungen.', + 'tidypics:sort:no_images' => 'Es wurden keine Bilder gefunden, die umsortiert werden könnten. Lade Bilder hoch, indem Du dem obigen Link folgst.', + + // albums + 'album:num' => '%s Bilder', //views 'image:total' => "Bilder im Album:", 'image:by' => "Bild hinzugefügt von", - 'album:by' => "Album erstellt von:", + 'album:by' => "Album erstellt von", 'album:created:on' => "Erstellt", - 'image:none' => "Noch keine Bilder hinzugefügt.", + 'image:none' => "Es wurden noch keine Bilder hinzugefügt.", 'image:back' => "Vorheriges", 'image:next' => "Nächstes", + 'image:index' => "%u von %u", // tagging - 'tidypics:taginstruct' => 'Wähle ein Bereich auf dem Foto den du Verlinken willst', - 'tidypics:deltag_title' => 'Wähle zu löschende Links', - 'tidypics:finish_tagging' => 'Abbrechen', - 'tidypics:tagthisphoto' => 'Link zum Foto hinzufügen', - 'tidypics:deletetag' => 'Lösche Foto-Link', - 'tidypics:actiontag' => 'Link', - 'tidypics:actiondelete' => 'Löschen', + 'tidypics:taginstruct' => 'Wähle den Bereich auf dem Bild, für das Du ein Tag setzen willst, oder %s.', + 'tidypics:finish_tagging' => 'Taggen beenden', + 'tidypics:deltag_title' => 'Wähle die Tags, die gelöscht werden sollen', + 'tidypics:finish_tagging' => 'Tagging abbrechen', + 'tidypics:tagthisphoto' => 'Bild taggen', + 'tidypics:actiontag' => 'Tag setzen', 'tidypics:actioncancel' => 'Abbrechen', - 'tidypics:inthisphoto' => 'Links in dem Foto', - 'tidypics:usertag' => "Foto verlinkt mit Mitglied %s", - 'tidypics:phototagging:success' => 'Foto-Link erfolgreich hinzugefügt', - 'tidypics:phototagging:error' => 'Unerwarteter Fehler beim verlinken', - 'tidypics:deletetag:success' => 'Ausgewählte Links wurden erfolgreich gelöscht', - 'tidypics:tag:subject' => "Du wurdest in einem Foto verlinkt", - 'tidypics:tag:body' => "Du wurdest in diesem Foto verlinkt %s von %s. - -Das Foto kanns du hier sehen: %s", + 'tidypics:inthisphoto' => 'Tags in diesem Bild', + 'tidypics:usertag' => "Bilder mit Tags, die sich auf %s beziehen", + 'tidypics:phototagging:success' => 'Das Bild wurde getaggt.', + 'tidypics:phototagging:error' => 'Beim Hinzufügen des Tags ist ein Fehler aufgetreten.', + + 'tidypics:phototagging:delete:success' => 'Das Tag wurde entfernt.', + 'tidypics:phototagging:delete:error' => 'Beim Entfernen des Tags ist ein Fehler aufgetreten.', + 'tidypics:phototagging:delete:confirm' => 'Dieses Tag entfernen?', + + 'tidypics:tag:subject' => "Du wurdest in einem Bild getaggt", + 'tidypics:tag:body' => "Du wurdest im Bild %s von %s getaggt. + +Um das Bild zu sehen, folge diesem Link: %s", //rss - 'tidypics:posted' => 'Das Bild eingestellt:', + 'tidypics:posted' => 'hat ein Bild hinzugefügt:', //widgets - 'tidypics:widget:albums' => "Fotoalben", - 'tidypics:widget:album_descr' => "Zeige neuste Alben", - 'tidypics:widget:num_albums' => "Anzahl der Alben", - 'tidypics:widget:latest' => "Neuste Bilder", - 'tidypics:widget:latest_descr' => "Zeige neuste Bilder", - 'tidypics:widget:num_latest' => "Anzahl der Bilder", - 'album:more' => "Alle Alben ansehen", + 'tidypics:widget:albums' => "Bilderalben", + 'tidypics:widget:album_descr' => "Auflistung Deiner neuesten Bilderalben", + 'tidypics:widget:num_albums' => "Anzahl der anzuzeigenden Alben", + 'tidypics:widget:latest' => "Neueste Bilder", + 'tidypics:widget:latest_descr' => "Auflistung Deiner neuesten Bilder", + 'tidypics:widget:num_latest' => "Anzahl der anzuzeigenden Bilder", + 'album:more' => "Alle Alben anzeigen", //river - 'image:river:created' => "%s hat ein Bild %s zum Album %s hinzugefügt", + 'river:create:object:image' => "%s hat das Bild %s hochgeladen.", + 'image:river:created' => "%s hat ein Bild zum Album %s hinzugefügt.", + 'image:river:created:multiple' => "%s hat %u Bilder zum Album %s hinzugefügt.", 'image:river:item' => "ein Bild", 'image:river:annotate' => "einen Kommentar zum Bild", - 'image:river:tagged' => "war im Foto verlinkt", - 'album:river:created' => "%s hat ein neues Album erstellt", + 'image:river:tagged' => "%s hat %s im Bild %s getaggt.", + 'image:river:tagged:unknown' => "%s hat %s in einem Bild getaggt.", + 'river:create:object:album' => "%s hat das neue Bilderalbum %s hinzugefügt.", 'album:river:group' => "in der Gruppe", 'album:river:item' => "ein Album", - 'album:river:annotate' => "einen Kommentar zum Album", - - //notifications - 'tidypics:newalbum' => 'Neues Fotoalbum', + 'album:river:annotate' => "einen Kommentar zum Bilderalbum", + 'river:comment:object:image' => '%s hat einen Kommentar zum Bild %s geschrieben.', + 'river:comment:object:album' => '%s hat einen Kommentar zum Bilderalbum %s geschrieben.', + // notifications + 'tidypics:newalbum_subject' => 'Neues Bilderalbum', + 'tidypics:newalbum' => '%s hat ein neues Bilderalbum hinzugefügt.', + 'tidypics:updatealbum' => "%s hat neue Bilder zum Album %s hinzugefügt.", // Status messages - 'tidypics:upl_success' => "Die Bilder sind erfolgreich hochgeladen", - 'image:saved' => "Das Bild wurde gespeichert", - 'images:saved' => "Alle Bilder sind gespeichert", - 'image:deleted' => "Das Bild wurde gelöscht", - 'image:delete:confirm' => "Willst du das Bild wirklich löschen?", - 'images:edited' => "Das Bild wurde aktualisiert", - 'album:edited' => "Das Album wurde aktualisiert", - 'album:saved' => "Das Album wurde gespeichert", - 'album:deleted' => "Das Album wurde gelöscht", - 'album:delete:confirm' => "Willst du das Album wirklich löschen?", - 'album:created' => "Dein neues Album ist erstellt", - 'tidypics:settings:save:ok' => 'Tidypics Einstellungen erfolgreich gespeichert', - 'tidypics:upgrade:success' => 'Upgrade von Tidypics erfolgreich', + 'tidypics:upl_success' => "Deine Bilder wurden hochgeladen.", + 'image:saved' => "Das Bild wurde gespeichert.", + 'images:saved' => "Alle Bilder wurden gespeichert.", + 'image:deleted' => "Das Bild wurde gelöscht.", + 'image:delete:confirm' => "Bist Du sicher, dass Du das Bild löschen willst?", + 'images:edited' => "Die Einstellungen für Deine Bilder wurden aktualisiert.", + 'album:edited' => "Die Einstellungen für Dein Album wurden aktualisiert.", + 'album:saved' => "Das Album wurde hinzugefügt.", + 'album:deleted' => "Das Album wurde gelöscht.", + 'album:delete:confirm' => "Bist Du sicher, dass Du das Album löschen willst?", + 'album:created' => "Dein neues Album wurde hinzugefügt.", + 'album:save_cover_image' => 'Das Albumcover wurde gespeichert.', + 'tidypics:settings:save:ok' => 'Die Einstellungen für das Tidypics-Plugin wurden gespeichert.', + 'tidypics:album:sorted' => 'Das Bilderalbum %s wurde umsortiert.', + 'tidypics:album:could_not_sort' => 'Das Bilderalbum %s konnte nicht umsortiert werden. Vergewissere Dich, dass in diesem Album Bilder vorhanden sind und versuche es noch einmal.', + 'tidypics:upgrade:success' => 'Das Upgrade des Tidypics-Plugins war erfolgreich.', //Error messages - 'tidypics:partialuploadfailure' => "Es sind Fehler beim Hochladen einiger Bilder aufgetreten (%s von %s Bildern)", - 'tidypics:completeuploadfailure' => "Bilder-Upload fehlgeschlagen", - 'tidypics:exceedpostlimit' => "Zuviele große Bilder auf einmal - versuche weniger oder kleinere Bilder hochzuladen", - 'tidypics:noimages' => "Keine Bilder zum Upload ausgewählt", - 'tidypics:image_mem' => "Das Bild ist zu groß", - 'tidypics:image_pixels' => "Das Bild hat zuviele Pixel", - 'tidypics:unk_error' => "Unbekannte Fehler beim Upload ", - 'tidypics:save_error' => "Unbekanntes Fehler beim speichern des Bildes auf dem Server", - 'tidypics:not_image' => "Das Bild-Typ wurde nicht erkannt", - 'image:deletefailed' => "Dein Bild konnte nicht gelöscht werden", - 'image:downloadfailed' => "Fehler: Das Bild ist zur Zeit nicht verfügbar", - 'tidypics:nosettings' => "Admin dieser Seite hat keine Einstellungen für Fotoalben vorgenommen", - 'tidypics:exceed_quota' => "Dir zugewiesener Speicherplatz ist ausgeschöpft!", - 'images:notedited' => "Nicht alle Bilder konnten erfolgreich upgedated werden", - 'album:none' => "Bis jetzt keine Alben erstellt", - 'album:uploadfailed' => "Dein Album konnte nicht gespeichert werden", - 'album:deletefailed' => "Dein Album konnte nicht gelöscht werden", - 'album:blank' => "Bitte gib diesem Album einen Titel und eine Beschreibung", - 'tidypics:upgrade:failed' => "Upgrade von Tidypics gescheitert", -); - -add_translation("de", $german); + 'tidypics:baduploadform' => "Es gab ein unerwartetes Problem mit dem Uploader.", + 'tidypics:partialuploadfailure' => "Beim Hochladen einiger Bilder sind Fehler aufgetreten (bei %s von %s Bildern).", + 'tidypics:completeuploadfailure' => "Das Hochladen der Bilder ist fehlgeschlagen.", + 'tidypics:exceedpostlimit' => "Zu viele große Bilder auf einmal - versuche weniger Bilder auf einmal oder kleinere Bilder hochzuladen.", + 'tidypics:noimages' => "Es wurden keine Bilder zum Hochladen ausgewählt.", + 'tidypics:image_mem' => "Die Bilddatei ist zu groß.", + 'tidypics:image_pixels' => "Das Bild hat zu viele Pixel.", + 'tidypics:unk_error' => "Unbekannter Fehler beim Hochladen.", + 'tidypics:save_error' => "Unbekannter Fehler beim Speichern des Bildes auf dem Server.", + 'tidypics:not_image' => "Das Dateiformat des Bildes wurde nicht erkannt oder wird nicht unterstützt.", + 'tidypics:deletefailed' => "Beim Löschen ist ein Fehler aufgetreten.", + 'tidypics:deleted' => "Das Löschen war erfolgreich.", + 'tidypics:nosettings' => "Der Administrator dieser Community-Seite hat leider bisher keine Einstellungen für Bilderalben vorgenommen.", + 'tidypics:exceed_quota' => "Du hast die von Administrator dieser Community-Seite gesetze Quota für Bilder überschritten.", + 'tidypics:cannot_upload_exceeds_quota' => 'Das Bild wurde nicht hochgeladen. Die Dateigröße übersteigt die verfügbare Quota.', + + 'album:none' => "Es wurden noch keine Alben hinzugefügt.", + 'album:uploadfailed' => "Beim Hinzufügen des Bilderalbums ist ein Fehler aufgetreten.", + 'album:deletefailed' => "Beim Löschen des Bilderalbums ist ein Fehler aufgetreten.", + 'album:blank' => "Bitte gib diesem Album einen Titel.", + 'album:invalid_album' => 'Unzulässiges Bilderalbum.', + 'album:cannot_save_cover_image' => 'Das Albumcover kann nicht gespeichert werden.', + + 'image:downloadfailed' => "Entschuldigung. Das Bild ist nicht verfügbar.", + 'images:notedited' => "Es konnten nicht alle Bilder fehlerfrei hochgeladen werden.", + 'image:blank' => 'Bitte gib diesem Bild einen Titel.', + 'image:error' => 'Das Bild konnte nicht gespeichert werden.', + + 'tidypics:upgrade:failed' => "Das Upgrade des Tidypics-Plugins ist gescheitert", + ); + + add_translation("de",$german); -- cgit v1.2.3 From 3cc5e98299630bf2acae83ec964343309d16392e Mon Sep 17 00:00:00 2001 From: Sem Date: Sat, 28 Jul 2012 20:03:37 +0200 Subject: Removed watermark utility. --- languages/da.php | 1 - languages/de.php | 1 - languages/en.php | 1 - languages/es.php | 1 - languages/fr.php | 1 - languages/he.php | 1 - lib/resize.php | 17 +- lib/watermark.php | 193 --------------------- views/default/forms/photos/admin/settings/main.php | 8 - 9 files changed, 1 insertion(+), 223 deletions(-) delete mode 100644 lib/watermark.php diff --git a/languages/da.php b/languages/da.php index 78113d467..37ab3bfc6 100644 --- a/languages/da.php +++ b/languages/da.php @@ -63,7 +63,6 @@ $danish = array( 'tidypics:settings:grp_perm_override' => "Giv gruppens medlemmer fuld adgang til gruppe-album", 'tidypics:settings:maxfilesize' => "Maksimal billedstørrelse i megabytes (MB):", 'tidypics:settings:quota' => "Tildelt plads til brugere / grupper (MB) (0 = Ingen plads)", - 'tidypics:settings:watermark' => "Indtast teksten for vandmærke - ImageMagick cmdline skal vælges for billedbiblioteket", 'tidypics:settings:im_path' => "Angiv stien til ImageMagick kommandoer (som slutter med et Slash/)", 'tidypics:settings:img_river_view' => "Hvor mange poster i aktivitetslisten for hvert parti af uploadede billeder", 'tidypics:settings:album_river_view' => "Vis albumcover eller et sæt af fotos til nye album", diff --git a/languages/de.php b/languages/de.php index 1f439e981..a02f34f89 100644 --- a/languages/de.php +++ b/languages/de.php @@ -72,7 +72,6 @@ $german = array( 'tidypics:settings:grp_perm_override' => "Gruppen-Mitgliedern unbeschränkten Zugriff auf die Verwaltung von Gruppen-Alben geben", 'tidypics:settings:maxfilesize' => "Maximal erlaubte Bildgröße in Megabytes (MB):", 'tidypics:settings:quota' => "Quota für Benutzer in Megabytes (MB) (0 = kein Quota)", - 'tidypics:settings:watermark' => "Gib den Text ein, der als Wasserzeichen eingefügt wird", 'tidypics:settings:im_path' => "Der Pfad zu den ImageMagick-Kommandozeilentools auf dem Server", 'tidypics:settings:img_river_view' => "Anzahl der Einträge im River beim gleichzeitigen Hochladen mehrerer Bilder", 'tidypics:settings:album_river_view' => "Anzeige des Albumcovers oder eines Sets von Bildern für neue Alben", diff --git a/languages/en.php b/languages/en.php index 62b43673d..6f3f8a0d6 100644 --- a/languages/en.php +++ b/languages/en.php @@ -72,7 +72,6 @@ $english = array( 'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums", 'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):", 'tidypics:settings:quota' => "User Quota (MB) - 0 equals no quota", - 'tidypics:settings:watermark' => "Enter text to appear in the watermark", 'tidypics:settings:im_path' => "Enter the path to your ImageMagick commands", 'tidypics:settings:img_river_view' => "How many entries in activity river for each batch of uploaded images", 'tidypics:settings:album_river_view' => "Show the album cover or a set of photos for new album", diff --git a/languages/es.php b/languages/es.php index 704f01979..b6cbf723c 100644 --- a/languages/es.php +++ b/languages/es.php @@ -59,7 +59,6 @@ $spanish = array( 'tidypics:settings:grp_perm_override' => "Permitir acceso completo a los miembros de este grupo al album de fotos", 'tidypics:settings:maxfilesize' => "Tamaño máximo de la imagen en megabytes (MB):", 'tidypics:settings:quota' => "Usuario/Grupo Cuota (MB) - 0 MB de cuota", - 'tidypics:settings:watermark' => "Introduce el texto que aparecerá en la marca de agua - ImageMagick Cmdline debe ser seleccionado para la libreria de imagenes", 'tidypics:settings:im_path' => "Ingresa la ruta de tu ImageMagick commands (incluye el slash)", 'tidypics:settings:img_river_view' => "¿Cuántas entradas deseas para cada grupo de imágenes cargadas?", 'tidypics:settings:album_river_view' => "Muestra la portada del álbum o el set de fotos para el álbum nuevo", diff --git a/languages/fr.php b/languages/fr.php index 375159e0b..0ca141ea2 100644 --- a/languages/fr.php +++ b/languages/fr.php @@ -59,7 +59,6 @@ $french = array( 'tidypics:settings:grp_perm_override' => "Autoriser l'acés total aux membres du groupe" , 'tidypics:settings:maxfilesize' => "Taille maximum des images en Mb:" , 'tidypics:settings:quota' => "Quota Utilisateur/Groupe (Mb) - O égal pas de quota" , - 'tidypics:settings:watermark' => "Entrez le texte qui doit figure sur le WaterMark - fonction non vraiment sure." , 'tidypics:settings:im_path' => "Chemin de l'exécutable ImageMagick, terminé par un slash" , 'tidypics:settings:img_river_view' => "Combien d'entrées dans le river pour chaque lot de traitement des fichiers chargés" , 'tidypics:settings:album_river_view' => "Montrer la couverture de l'album ou un ensemble de photos pour tout nouvel album" , diff --git a/languages/he.php b/languages/he.php index 5f232daf6..ebb3608aa 100644 --- a/languages/he.php +++ b/languages/he.php @@ -54,7 +54,6 @@ $hebrew = array( 'tidypics:settings:grp_perm_override' => "אפשר לחברי קבוצה גישה מלאה לאלבומים קבוצתיים" , 'tidypics:settings:maxfilesize' => "גודל תמונה מירבי בMB" , 'tidypics:settings:quota' => "מכסה בMB למשתמש/קבוצה - 0 שווה ללא מכסה" , - 'tidypics:settings:watermark' => "הזן טקסט אשר יופיע בסימן המים - יש לבחור ב ImageMagick Cmdline עבור ספריית התמונות" , 'tidypics:settings:im_path' => "הזן את הנטיב לפקודות ImageMagick ללא לוכסן בסוף" , 'tidypics:settings:img_river_view' => "כמה רשומות במה חדש עבור כל מקבץ תמונות אשר נוסף" , 'tidypics:settings:album_river_view' => "הצג תמונה אחת או מקבץ תמונות עבור אלבום חדש" , diff --git a/lib/resize.php b/lib/resize.php index b06f317ca..380e0c406 100644 --- a/lib/resize.php +++ b/lib/resize.php @@ -5,8 +5,6 @@ * @package TidypicsImageResize */ -include dirname(__FILE__) . "/watermark.php"; - /** * Create thumbnails using PHP GD Library @@ -37,7 +35,6 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) { $thumbname = $thumb->getFilenameOnFilestore(); $rtn_code = tp_gd_resize( $file->getFilenameOnFilestore(), $thumbname, - FALSE, $image_sizes['tiny_image_width'], $image_sizes['tiny_image_height'], TRUE); @@ -53,7 +50,6 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) { $thumbname = $thumb->getFilenameOnFilestore(); $rtn_code = tp_gd_resize( $file->getFilenameOnFilestore(), $thumbname, - FALSE, $image_sizes['small_image_width'], $image_sizes['small_image_height'], TRUE); @@ -68,7 +64,6 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) { $thumbname = $thumb->getFilenameOnFilestore(); $rtn_code = tp_gd_resize( $file->getFilenameOnFilestore(), $thumbname, - TRUE, $image_sizes['large_image_width'], $image_sizes['large_image_height'], FALSE); @@ -89,13 +84,12 @@ function tp_create_gd_thumbnails($file, $prefix, $filestorename) { * * @param string $input_name The name of the file on the disk * @param string $output_name The name of the file to be written - * @param bool - watermark this image? * @param int $maxwidth The maximum width of the resized image * @param int $maxheight The maximum height of the resized image * @param TRUE|FALSE $square If set to TRUE, will take the smallest of maxwidth and maxheight and use it to set the dimensions on all size; the image will be cropped. * @return bool TRUE on success or FALSE on failure */ -function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheight, $square = FALSE, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) { +function tp_gd_resize($input_name, $output_name, $maxwidth, $maxheight, $square = FALSE, $x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0) { // Get the size information from the image $imgsizearray = getimagesize($input_name); @@ -159,10 +153,6 @@ function tp_gd_resize($input_name, $output_name, $watermark, $maxwidth, $maxheig return $rtn_code; } - if ($watermark) { - tp_gd_watermark($newimage); - } - switch ($imgsizearray['mime']) { case 'image/jpeg': case 'image/pjpeg': @@ -243,8 +233,6 @@ function tp_create_imagick_thumbnails($file, $prefix, $filestorename) { } $file->largethumb = $prefix."largethumb".$filestorename; - tp_imagick_watermark($thumbname); - unset($thumb); return TRUE; @@ -370,9 +358,6 @@ function tp_create_im_cmdline_thumbnails($file, $prefix, $filestorename) { } $file->largethumb = $prefix."largethumb".$filestorename; - - tp_im_cmdline_watermark($thumbname); - unset($thumb); return TRUE; diff --git a/lib/watermark.php b/lib/watermark.php deleted file mode 100644 index f7c228af1..000000000 --- a/lib/watermark.php +++ /dev/null @@ -1,193 +0,0 @@ -name, $text); - $text = str_replace("%sitename%", $CONFIG->sitename, $text); - - return $text; -} - -/** - * Create the watermark image filename - * - * @param string $text - * @param ElggUser $owner - * @return string - */ -function tp_get_watermark_filename($text, $owner) { - - $base = elgg_strtolower($text); - $base = preg_replace("/[^\w-]+/", "-", $base); - $base = trim($base, '-'); - - $filename = tp_get_img_dir(); - $filename .= elgg_strtolower($owner->username . "_" . $base . "_stamp"); - - return $filename; -} - -/** - * Use GD to apply watermark to image - * - * @param resource $image GD image resource - */ -function tp_gd_watermark($image) { - global $CONFIG; - - $watermark_text = elgg_get_plugin_setting('watermark_text', 'tidypics'); - if (!$watermark_text) { - return; - } - - // plugins can do their own watermark and return false to prevent this function from running - if (elgg_trigger_plugin_hook('tp_watermark', 'gd', $image, true) === false) { - return; - } - - $owner = elgg_get_logged_in_user_entity(); - - $watermark_text = tp_process_watermark_text($watermark_text, $owner); - - // transparent gray - imagealphablending($image, true); - $textcolor = imagecolorallocatealpha($image, 50, 50, 50, 60); - - // font and location - $font = $CONFIG->pluginspath . "tidypics/fonts/LiberationSerif-Regular.ttf"; - $bbox = imagettfbbox(20, 0, $font, $watermark_text); - - $text_width = $bbox[2] - $bbox[0]; - $text_height = $bbox[1] - $bbox[7]; - - $image_width = imagesx($image); - $image_height = imagesy($image); - - $left = $image_width / 2 - $text_width / 2; - $top = $image_height - 20; - - // write the text on the image - imagettftext($image, 20, 0, $left, $top, $textcolor, $font, $watermark_text); -} - -/** - * imagick watermarking - * - * @param string $filename - * @return bool - */ -function tp_imagick_watermark($filename) { - - $watermark_text = elgg_get_plugin_setting('watermark_text', 'tidypics'); - if (!$watermark_text) { - return false; - } - - // plugins can do their own watermark and return false to prevent this function from running - if (elgg_trigger_plugin_hook('tp_watermark', 'imagick', $filename, true) === false) { - return true; - } - - $owner = elgg_get_logged_in_user_entity(); - - $watermark_text = tp_process_watermark_text($watermark_text, $owner); - - $img = new Imagick($filename); - - $img->readImage($image); - - $draw = new ImagickDraw(); - - //$draw->setFont(""); - - $draw->setFontSize(28); - - $draw->setFillOpacity(0.5); - - $draw->setGravity(Imagick::GRAVITY_SOUTH); - - $img->annotateImage($draw, 0, 0, 0, $watermark_text); - - if ($img->writeImage($filename) != true) { - $img->destroy(); - return false; - } - - $img->destroy(); - - return true; -} - -/** - * ImageMagick watermarking - * - * @param string $filename - */ -function tp_im_cmdline_watermark($filename) { - - $watermark_text = elgg_get_plugin_setting('watermark_text', 'tidypics'); - if (!$watermark_text) { - return; - } - - // plugins can do their own watermark and return false to prevent this function from running - if (elgg_trigger_plugin_hook('tp_watermark', 'imagemagick', $filename, true) === false) { - return; - } - - $im_path = elgg_get_plugin_setting('im_path', 'tidypics'); - if (!$im_path) { - $im_path = "/usr/bin/"; - } - - // make sure end of path is / - if (substr($im_path, strlen($im_path)-1, 1) != "/") { - $im_path .= "/"; - } - - - $owner = elgg_get_logged_in_user_entity(); - - $watermark_text = tp_process_watermark_text($watermark_text, $owner); - - $ext = ".png"; - - $user_stamp_base = tp_get_watermark_filename($watermark_text, $owner); - - - if ( !file_exists( $user_stamp_base . $ext )) { - //create the watermark image if it doesn't exist - $commands = array(); - $commands[] = $im_path . 'convert -size 300x50 xc:grey30 -pointsize 20 -gravity center -draw "fill grey70 text 0,0 \''. $watermark_text . '\'" "'. $user_stamp_base . '_fgnd' . $ext . '"'; - $commands[] = $im_path . 'convert -size 300x50 xc:black -pointsize 20 -gravity center -draw "fill white text 1,1 \''. $watermark_text . '\' text 0,0 \''. $watermark_text . '\' fill black text -1,-1 \''. $watermark_text . '\'" +matte ' . $user_stamp_base . '_mask' . $ext; - $commands[] = $im_path . 'composite -compose CopyOpacity "' . $user_stamp_base . "_mask" . $ext . '" "' . $user_stamp_base . '_fgnd' . $ext . '" "' . $user_stamp_base . $ext . '"'; - $commands[] = $im_path . 'mogrify -trim +repage "' . $user_stamp_base . $ext . '"'; - $commands[] = 'rm "' . $user_stamp_base . '_mask' . $ext . '"'; - $commands[] = 'rm "' . $user_stamp_base . '_fgnd' . $ext . '"'; - - foreach( $commands as $command ) { - exec( $command ); - } - } - - //apply the watermark - $commands = array(); - $commands[] = $im_path . 'composite -gravity south -geometry +0+10 "' . $user_stamp_base . $ext . '" "' . $filename . '" "' . $filename . '_watermarked"'; - $commands[] = "mv \"$filename" . "_watermarked\" \"$filename\""; - foreach( $commands as $command ) { - exec( $command ); - } -} diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php index c99b9d688..c2ae523c1 100644 --- a/views/default/forms/photos/admin/settings/main.php +++ b/views/default/forms/photos/admin/settings/main.php @@ -27,14 +27,6 @@ echo elgg_view('input/text', array( )); echo ''; -// Watermark Text -echo '
      ' . elgg_echo('tidypics:settings:watermark'); -echo elgg_view("input/text", array( - 'name' => 'params[watermark_text]', - 'value' => $plugin->watermark_text, -)); -echo '
      '; - // Quota Size $quota = $plugin->quota; if (!$quota) { -- cgit v1.2.3 From 0fa29b2fd0501a2fde5e086be5da22fe1f47f040 Mon Sep 17 00:00:00 2001 From: Sem Date: Sat, 28 Jul 2012 21:12:24 +0200 Subject: Removed flash uploader. --- actions/photos/image/ajax_upload.php | 57 ------------- actions/photos/image/ajax_upload_complete.php | 74 ----------------- languages/da.php | 1 - languages/de.php | 4 +- languages/en.php | 4 +- languages/es.php | 1 - languages/fr.php | 1 - languages/it.php | 1 - pages/photos/image/upload.php | 10 +-- start.php | 94 +--------------------- views/default/forms/photos/admin/settings/main.php | 2 +- views/default/forms/photos/ajax_upload.php | 54 ------------- views/default/js/photos/uploading.php | 94 ---------------------- views/default/photos/css.php | 59 -------------- 14 files changed, 5 insertions(+), 451 deletions(-) delete mode 100644 actions/photos/image/ajax_upload.php delete mode 100644 actions/photos/image/ajax_upload_complete.php delete mode 100644 views/default/forms/photos/ajax_upload.php delete mode 100644 views/default/js/photos/uploading.php diff --git a/actions/photos/image/ajax_upload.php b/actions/photos/image/ajax_upload.php deleted file mode 100644 index 312bc598c..000000000 --- a/actions/photos/image/ajax_upload.php +++ /dev/null @@ -1,57 +0,0 @@ -container_guid = $album->getGUID(); -$image->setMimeType($mime); -$image->access_id = $album->access_id; -$image->batch = $batch; - -try { - $image->save($file); - $album->prependImageList(array($image->guid)); - - if (elgg_get_plugin_setting('img_river_view', 'tidypics') === "all") { - add_to_river('river/object/image/create', 'create', $image->getOwnerGUID(), $image->getGUID()); - } - - echo elgg_echo('success'); -} catch (Exception $e) { - // remove the bits that were saved - $image->delete(); - echo $e->getMessage(); -} - -exit; \ No newline at end of file diff --git a/actions/photos/image/ajax_upload_complete.php b/actions/photos/image/ajax_upload_complete.php deleted file mode 100644 index 358a4fc6f..000000000 --- a/actions/photos/image/ajax_upload_complete.php +++ /dev/null @@ -1,74 +0,0 @@ - 'object', - 'subtype' => 'image', - 'metadata_names' => 'batch', - 'metadata_values' => $batch, - 'limit' => 0 -); - -$images = elgg_get_entities_from_metadata($params); -if ($images) { - // Create a new batch object to contain these photos - $batch = new ElggObject(); - $batch->subtype = "tidypics_batch"; - $batch->access_id = ACCESS_PUBLIC; - $batch->container_guid = $album->guid; - - if ($batch->save()) { - foreach ($images as $image) { - add_entity_relationship($image->guid, "belongs_to_batch", $batch->getGUID()); - } - } -} else { - // @todo some sort of message to edit them manually. - exit; -} - -// "added images to album" river -if ($img_river_view == "batch" && $album->new_album == false) { - add_to_river('river/object/tidypics_batch/create', 'create', $batch->getOwnerGUID(), $batch->getGUID()); -} - -// "created album" river -if ($album->new_album) { - $album->new_album = false; - $album->first_upload = true; - - add_to_river('river/object/album/create', 'create', $album->getOwnerGUID(), $album->getGUID()); - - // "created album" notifications - // we throw the notification manually here so users are not told about the new album until - // there are at least a few photos in it - if ($album->shouldNotify()) { - object_notifications('create', 'object', $album); - $album->last_notified = time(); - } -} else { - // "added image to album" notifications - if ($album->first_upload) { - $album->first_upload = false; - } - - if ($album->shouldNotify()) { - object_notifications('create', 'object', $album); - $album->last_notified = time(); - } -} - -echo json_encode(array('batch_guid' => $batch->getGUID())); -exit; \ No newline at end of file diff --git a/languages/da.php b/languages/da.php index 78113d467..c90e8f55d 100644 --- a/languages/da.php +++ b/languages/da.php @@ -92,7 +92,6 @@ $danish = array( 'tidypics:uploader:choose' => "Vælg fotos", 'tidypics:uploader:upload' => "Upload fotos", 'tidypics:uploader:describe' => "Beskriv fotos", - 'tidypics:uploader:instructs' => 'Med tre nemme trin kan du tilføje fotos i dit album ved hjælp af denne uploader: vælg, upload og beskriv fotos. Hvis du ikke har Flash, er der også en standard uploader til rådighed.', 'tidypics:uploader:basic' => 'Du kan uploade op til 10 fotos ad gangen (%s MB maksimum pr. foto)', 'tidypics:sort:instruct' => 'Sortér fotos i albummet ved hjælp af drag and drop. Klik derefter på knappen Gem.', diff --git a/languages/de.php b/languages/de.php index 1f439e981..b6817c589 100644 --- a/languages/de.php +++ b/languages/de.php @@ -68,7 +68,6 @@ $german = array( 'tidypics:settings:photo_ratings' => "Bewerten von Bildern erlauben (benötigt das Elggx Fivestar-Plugin oder ein vergleichbares)", 'tidypics:settings:exif' => "EXIF-Daten anzeigen", 'tidypics:settings:view_count' => "Zugriffszähler anzeigen", - 'tidypics:settings:uploader' => "Flash-Uploader verwenden", 'tidypics:settings:grp_perm_override' => "Gruppen-Mitgliedern unbeschränkten Zugriff auf die Verwaltung von Gruppen-Alben geben", 'tidypics:settings:maxfilesize' => "Maximal erlaubte Bildgröße in Megabytes (MB):", 'tidypics:settings:quota' => "Quota für Benutzer in Megabytes (MB) (0 = kein Quota)", @@ -101,8 +100,7 @@ $german = array( 'tidypics:server_info:post_max_size_desc' => '"Max post size" abzüglich der Größe der HTML-Form = Maximal mögliche Gesamtgröße von gleichzeitig hochzuladenden Bildern.', 'tidypics:server_info:max_input_time_desc' => 'Maximale erlaubte Dauer, in der das Hochladen von Daten auf den Server abgeschlossen sein muss.', 'tidypics:server_info:max_execution_time_desc' => 'Maximal erlaubte Ausführdauer für ein Skript auf dem Server.', - 'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions können den Flash-Uploader beeinträchtigen.', - + 'tidypics:server_info:php_version' => 'PHP-Version', 'tidypics:server_info:memory_limit' => 'Für PHP verfügbarer Speicher', 'tidypics:server_info:peak_usage' => 'Genutzer Speicher, um diese Seite zu laden', diff --git a/languages/en.php b/languages/en.php index 62b43673d..1c40e5e0a 100644 --- a/languages/en.php +++ b/languages/en.php @@ -68,7 +68,6 @@ $english = array( 'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)", 'tidypics:settings:exif' => "Display EXIF data", 'tidypics:settings:view_count' => "Display view count", - 'tidypics:settings:uploader' => "Use Flash uploader", 'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums", 'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):", 'tidypics:settings:quota' => "User Quota (MB) - 0 equals no quota", @@ -101,8 +100,7 @@ $english = array( 'tidypics:server_info:post_max_size_desc' => 'Max post size = sum of images + html form', 'tidypics:server_info:max_input_time_desc' => 'Time script waits for upload to finish', 'tidypics:server_info:max_execution_time_desc' => 'Max time a script will run', - 'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions may affect the Flash uploader', - + 'tidypics:server_info:php_version' => 'PHP Version', 'tidypics:server_info:memory_limit' => 'Memory Available to PHP', 'tidypics:server_info:peak_usage' => 'Memory Used to Load This Page', diff --git a/languages/es.php b/languages/es.php index 704f01979..efe65d976 100644 --- a/languages/es.php +++ b/languages/es.php @@ -11,7 +11,6 @@ $spanish = array( 'caption' => "Título", 'photos' => "Fotos", 'images:upload' => "Cargar Imagenes", - 'images:multiupload' => "Herramienta MultiCarga de Flash", 'images:multiupload:todo' => "Selecciona uno a más archivos para cargar..", 'album' => "Álbum de Fotos", 'albums' => "Álbumnes de Fotos", diff --git a/languages/fr.php b/languages/fr.php index 375159e0b..1c653daa1 100644 --- a/languages/fr.php +++ b/languages/fr.php @@ -9,7 +9,6 @@ $french = array( 'caption' => "Légende" , 'photos' => "Photos" , 'images:upload' => "Charger des images" , - 'images:multiupload' => "Outil Flash de chargement multi fichiers" , 'images:multiupload:todo' => "Sélectionnez un ou plusieurs fichiers à charger." , 'album' => "Album photo" , 'albums' => "Albums photo" , diff --git a/languages/it.php b/languages/it.php index 764ecf5f7..27a9654a6 100644 --- a/languages/it.php +++ b/languages/it.php @@ -51,7 +51,6 @@ $italian = array( 'tidypics:uploader:choose' => "Scegli le Foto", 'tidypics:uploader:upload' => "Carica le Foto", 'tidypics:uploader:describe' => "Descrivi le Foto", - 'tidypics:uploader:instructs' => 'Ci sono tre semplici passaggi per aggiungere le Foto al tuo Album usando questo caricatore: la scelta, il caricamento e il descriverle. Se non hai Flash, è disponibile anche un caricatore di base.', 'tidypics:uploader:basic' => 'Puoi caricare fino a 10 Foto alla volta (%s MB massimo per foto)', 'tidypics:sort:instruct' => 'Ordina i Foto Album trascinando le immagini. Poi clicca il bottone salva.', diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php index 425d5689a..61be8523b 100644 --- a/pages/photos/image/upload.php +++ b/pages/photos/image/upload.php @@ -38,15 +38,7 @@ elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); elgg_push_breadcrumb($album->getTitle(), $album->getURL()); elgg_push_breadcrumb(elgg_echo('album:addpix')); -$uploader = get_input('uploader'); -if ($uploader == 'basic') { - $content = elgg_view('forms/photos/basic_upload', array('entity' => $album)); -} else { - elgg_load_js('swfobject'); - elgg_load_js('jquery.uploadify-tp'); - elgg_load_js('tidypics:uploading'); - $content = elgg_view('forms/photos/ajax_upload', array('entity' => $album)); -} +$content = elgg_view('forms/photos/basic_upload', array('entity' => $album)); $body = elgg_view_layout('content', array( 'content' => $content, diff --git a/start.php b/start.php index 1e851b8f3..45e9257f5 100644 --- a/start.php +++ b/start.php @@ -41,14 +41,9 @@ function tidypics_init() { $js = elgg_get_simplecache_url('js', 'photos/tagging'); elgg_register_simplecache_view('js/photos/tagging'); elgg_register_js('tidypics:tagging', $js, 'footer'); - $js = elgg_get_simplecache_url('js', 'photos/uploading'); - elgg_register_simplecache_view('js/photos/uploading'); - elgg_register_js('tidypics:uploading', $js, 'footer'); elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer'); - elgg_register_js('swfobject', 'mod/tidypics/vendors/uploadify/swfobject.js', 'footer'); - elgg_register_js('jquery.uploadify-tp', 'mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js', 'footer'); - + // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); @@ -81,12 +76,6 @@ function tidypics_init() { register_notification_object('object', 'album', elgg_echo('tidypics:newalbum_subject')); elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'tidypics_notify_message'); - // allow people in a walled garden to use flash uploader - elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'tidypics_walled_garden_override'); - - // flash session work around for uploads when use_only_cookies is set - elgg_register_plugin_hook_handler('forward', 'csrf', 'tidypics_ajax_session_handler'); - // Register actions $base_dir = elgg_get_plugins_path() . 'tidypics/actions/photos'; elgg_register_action("photos/delete", "$base_dir/delete.php"); @@ -439,87 +428,6 @@ function tidypics_notify_message($hook, $type, $result, $params) { return null; } -/** - * Allows the flash uploader actions through walled garden since - * they come without the session cookie - */ -function tidypics_walled_garden_override($hook, $type, $pages) { - $pages[] = 'action/photos/image/ajax_upload'; - $pages[] = 'action/photos/image/ajax_upload_complete'; - return $pages; -} - -/** - * Work around for Flash/session issues - * - * Catches Elgg attempting to forward the Flash uploader because it doesn't - * have a session cookie. Instead manually runs the action. - * - * @param string $hook The name of the hook - * @param string $type The type of the hook - * @param string $value Location being forwarded to - * @param array $params Parameters related to the forward() call - * @return void - */ -function tidypics_ajax_session_handler($hook, $type, $value, $params) { - $www_root = elgg_get_config('wwwroot'); - $url = $params['current_url']; - - if ($url !== "{$www_root}action/photos/image/ajax_upload") { - return; - } - - if (elgg_get_logged_in_user_guid() != 0) { - return; - } - - // action_gatekeeper rejected ajax call from Flash due to session issue - - // Validate token - $token = get_input('__elgg_token'); - $ts = get_input('__elgg_ts'); - $session_id = get_input('Elgg'); - $session_token = get_input('session_token'); - $tidypics_token = get_input('tidypics_token'); - $user_guid = get_input('user_guid'); - $user = get_user($user_guid); - $timeout = elgg_get_config('action_token_timeout'); - if (!$timeout) { - $timeout = 2; - } - - if (!$user) { - trigger_error('Tidypics warning: failed to get user in flash uploader', E_USER_WARNING); - return; - } - - if (!$token || !$ts || !$session_id || !$tidypics_token) { - trigger_error('Tidypics warning: token information missing in flash uploader', E_USER_WARNING); - return; - } - - $hour = 60*60; - $now = time(); - if ($ts < $now-$hour || $ts > $now+$hour) { - trigger_error('Tidypics warning: failed time check in flash uploader', E_USER_WARNING); - return; - } - - $generated_token = md5($session_id . get_site_secret() . $ts . $user->salt); - - if ($tidypics_token !== $generated_token) { - trigger_error('Tidypics warning: token check failed in flash uploader', E_USER_WARNING); - return; - } - - // passed token test, so login and process action - login($user); - $actions = elgg_get_config('actions'); - include $actions['photos/image/ajax_upload']['file']; - - exit; -} - /** * Sets up submenus for tidypics most viewed pages */ diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php index c99b9d688..f7950a7ad 100644 --- a/views/default/forms/photos/admin/settings/main.php +++ b/views/default/forms/photos/admin/settings/main.php @@ -5,7 +5,7 @@ $plugin = $vars['plugin']; -$checkboxes = array('tagging', 'view_count', 'uploader', 'exif', 'download_link'); +$checkboxes = array('tagging', 'view_count', 'exif', 'download_link'); foreach ($checkboxes as $checkbox) { echo '
      '; $checked = $plugin->$checkbox ? 'checked' : false; diff --git a/views/default/forms/photos/ajax_upload.php b/views/default/forms/photos/ajax_upload.php deleted file mode 100644 index 3ab578a38..000000000 --- a/views/default/forms/photos/ajax_upload.php +++ /dev/null @@ -1,54 +0,0 @@ -salt); -$basic_uploader_url = current_page_url() . '/basic'; - -$maxfilesize = (float) elgg_get_plugin_setting('maxfilesize', 'tidypics'); -if (!$maxfilesize) { - $maxfilesize = 5; -} - -?> - -

      - -

      - - diff --git a/views/default/js/photos/uploading.php b/views/default/js/photos/uploading.php deleted file mode 100644 index 465f937ab..000000000 --- a/views/default/js/photos/uploading.php +++ /dev/null @@ -1,94 +0,0 @@ - - -// - - - - - - -
      - -

      Cancel All Uploads

      - - diff --git a/vendors/uploadify/example/scripts/_notes/dwsync.xml b/vendors/uploadify/example/scripts/_notes/dwsync.xml deleted file mode 100644 index 13ca04347..000000000 --- a/vendors/uploadify/example/scripts/_notes/dwsync.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/vendors/uploadify/example/scripts/check.php b/vendors/uploadify/example/scripts/check.php deleted file mode 100644 index d7dc57177..000000000 --- a/vendors/uploadify/example/scripts/check.php +++ /dev/null @@ -1,35 +0,0 @@ - $value) { - if ($key != 'folder') { - if (file_exists($_SERVER['DOCUMENT_ROOT'] . $_POST['folder'] . '/' . $value)) { - $fileArray[$key] = $value; - } - } -} -echo json_encode($fileArray); -?> \ No newline at end of file diff --git a/vendors/uploadify/example/scripts/expressInstall.swf b/vendors/uploadify/example/scripts/expressInstall.swf deleted file mode 100644 index 0fbf8fca9..000000000 Binary files a/vendors/uploadify/example/scripts/expressInstall.swf and /dev/null differ diff --git a/vendors/uploadify/example/scripts/jquery-1.3.2.min.js b/vendors/uploadify/example/scripts/jquery-1.3.2.min.js deleted file mode 100644 index b1ae21d8b..000000000 --- a/vendors/uploadify/example/scripts/jquery-1.3.2.min.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - * jQuery JavaScript Library v1.3.2 - * http://jquery.com/ - * - * Copyright (c) 2009 John Resig - * Dual licensed under the MIT and GPL licenses. - * http://docs.jquery.com/License - * - * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) - * Revision: 6246 - */ -(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
      "]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
      ","
      "]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); -/* - * Sizzle CSS Selector Engine - v0.9.3 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

      ";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
      ";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
      ").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
      ';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); \ No newline at end of file diff --git a/vendors/uploadify/example/scripts/jquery.uploadify.v2.1.0.min.js b/vendors/uploadify/example/scripts/jquery.uploadify.v2.1.0.min.js deleted file mode 100644 index 04592ffec..000000000 --- a/vendors/uploadify/example/scripts/jquery.uploadify.v2.1.0.min.js +++ /dev/null @@ -1,26 +0,0 @@ -/* -Uploadify v2.1.0 -Release Date: August 24, 2009 - -Copyright (c) 2009 Ronnie Garcia, Travis Nickels - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -if(jQuery){(function(a){a.extend(a.fn,{uploadify:function(b){a(this).each(function(){settings=a.extend({id:a(this).attr("id"),uploader:"uploadify.swf",script:"uploadify.php",expressInstall:null,folder:"",height:30,width:110,cancelImg:"cancel.png",wmode:"opaque",scriptAccess:"sameDomain",fileDataName:"Filedata",method:"POST",queueSizeLimit:999,simUploadLimit:1,queueID:false,displayData:"percentage",onInit:function(){},onSelect:function(){},onQueueFull:function(){},onCheck:function(){},onCancel:function(){},onError:function(){},onProgress:function(){},onComplete:function(){},onAllComplete:function(){}},b);var e=location.pathname;e=e.split("/");e.pop();e=e.join("/")+"/";var f={};f.uploadifyID=settings.id;f.pagepath=e;if(settings.buttonImg){f.buttonImg=escape(settings.buttonImg)}if(settings.buttonText){f.buttonText=escape(settings.buttonText)}if(settings.rollover){f.rollover=true}f.script=settings.script;f.folder=escape(settings.folder);if(settings.scriptData){var g="";for(var d in settings.scriptData){g+="&"+d+"="+settings.scriptData[d]}f.scriptData=escape(g.substr(1))}f.width=settings.width;f.height=settings.height;f.wmode=settings.wmode;f.method=settings.method;f.queueSizeLimit=settings.queueSizeLimit;f.simUploadLimit=settings.simUploadLimit;if(settings.hideButton){f.hideButton=true}if(settings.fileDesc){f.fileDesc=settings.fileDesc}if(settings.fileExt){f.fileExt=settings.fileExt}if(settings.multi){f.multi=true}if(settings.auto){f.auto=true}if(settings.sizeLimit){f.sizeLimit=settings.sizeLimit}if(settings.checkScript){f.checkScript=settings.checkScript}if(settings.fileDataName){f.fileDataName=settings.fileDataName}if(settings.queueID){f.queueID=settings.queueID}if(settings.onInit()!==false){a(this).css("display","none");a(this).after('
      ');swfobject.embedSWF(settings.uploader,settings.id+"Uploader",settings.width,settings.height,"9.0.24",settings.expressInstall,f,{quality:"high",wmode:settings.wmode,allowScriptAccess:settings.scriptAccess});if(settings.queueID==false){a("#"+a(this).attr("id")+"Uploader").after('
      ')}}if(typeof(settings.onOpen)=="function"){a(this).bind("uploadifyOpen",settings.onOpen)}a(this).bind("uploadifySelect",{action:settings.onSelect,queueID:settings.queueID},function(j,h,i){if(j.data.action(j,h,i)!==false){var k=Math.round(i.size/1024*100)*0.01;var l="KB";if(k>1000){k=Math.round(k*0.001*100)*0.01;l="MB"}var m=k.toString().split(".");if(m.length>1){k=m[0]+"."+m[1].substr(0,2)}else{k=m[0]}if(i.name.length>20){fileName=i.name.substr(0,20)+"..."}else{fileName=i.name}queue="#"+a(this).attr("id")+"Queue";if(j.data.queueID){queue="#"+j.data.queueID}a(queue).append('
      '+fileName+" ("+k+l+')
      ')}});if(typeof(settings.onSelectOnce)=="function"){a(this).bind("uploadifySelectOnce",settings.onSelectOnce)}a(this).bind("uploadifyQueueFull",{action:settings.onQueueFull},function(h,i){if(h.data.action(h,i)!==false){alert("The queue is full. The max size is "+i+".")}});a(this).bind("uploadifyCheckExist",{action:settings.onCheck},function(m,l,k,j,o){var i=new Object();i=k;i.folder=e+j;if(o){for(var h in k){var n=h}}a.post(l,i,function(r){for(var p in r){if(m.data.action(m,l,k,j,o)!==false){var q=confirm("Do you want to replace the file "+r[p]+"?");if(!q){document.getElementById(a(m.target).attr("id")+"Uploader").cancelFileUpload(p,true,true)}}}if(o){document.getElementById(a(m.target).attr("id")+"Uploader").startFileUpload(n,true)}else{document.getElementById(a(m.target).attr("id")+"Uploader").startFileUpload(null,true)}},"json")});a(this).bind("uploadifyCancel",{action:settings.onCancel},function(l,h,k,m,j){if(l.data.action(l,h,k,m,j)!==false){var i=(j==true)?0:250;a("#"+a(this).attr("id")+h).fadeOut(i,function(){a(this).remove()})}});if(typeof(settings.onClearQueue)=="function"){a(this).bind("uploadifyClearQueue",settings.onClearQueue)}var c=[];a(this).bind("uploadifyError",{action:settings.onError},function(l,h,k,j){if(l.data.action(l,h,k,j)!==false){var i=new Array(h,k,j);c.push(i);a("#"+a(this).attr("id")+h+" .percentage").text(" - "+j.type+" Error");a("#"+a(this).attr("id")+h).addClass("uploadifyError")}});a(this).bind("uploadifyProgress",{action:settings.onProgress,toDisplay:settings.displayData},function(j,h,i,k){if(j.data.action(j,h,i,k)!==false){a("#"+a(this).attr("id")+h+"ProgressBar").css("width",k.percentage+"%");if(j.data.toDisplay=="percentage"){displayData=" - "+k.percentage+"%"}if(j.data.toDisplay=="speed"){displayData=" - "+k.speed+"KB/s"}if(j.data.toDisplay==null){displayData=" "}a("#"+a(this).attr("id")+h+" .percentage").text(displayData)}});a(this).bind("uploadifyComplete",{action:settings.onComplete},function(k,h,j,i,l){if(k.data.action(k,h,j,unescape(i),l)!==false){a("#"+a(this).attr("id")+h+" .percentage").text(" - Completed");a("#"+a(this).attr("id")+h).fadeOut(250,function(){a(this).remove()})}});if(typeof(settings.onAllComplete)=="function"){a(this).bind("uploadifyAllComplete",{action:settings.onAllComplete},function(h,i){if(h.data.action(h,i)!==false){c=[]}})}})},uploadifySettings:function(f,j,c){var g=false;a(this).each(function(){if(f=="scriptData"&&j!=null){if(c){var i=j}else{var i=a.extend(settings.scriptData,j)}var l="";for(var k in i){l+="&"+k+"="+escape(i[k])}j=l.substr(1)}g=document.getElementById(a(this).attr("id")+"Uploader").updateSettings(f,j)});if(j==null){if(f=="scriptData"){var b=unescape(g).split("&");var e=new Object();for(var d=0;d - is released under the MIT License -*/ -var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad'}}aa.outerHTML='"+af+"";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab \ No newline at end of file diff --git a/vendors/uploadify/example/scripts/uploadify.swf b/vendors/uploadify/example/scripts/uploadify.swf deleted file mode 100644 index 4d27952f5..000000000 Binary files a/vendors/uploadify/example/scripts/uploadify.swf and /dev/null differ diff --git a/vendors/uploadify/expressInstall.swf b/vendors/uploadify/expressInstall.swf deleted file mode 100644 index 0fbf8fca9..000000000 Binary files a/vendors/uploadify/expressInstall.swf and /dev/null differ diff --git a/vendors/uploadify/jquery-1.3.2.min.js b/vendors/uploadify/jquery-1.3.2.min.js deleted file mode 100644 index b1ae21d8b..000000000 --- a/vendors/uploadify/jquery-1.3.2.min.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - * jQuery JavaScript Library v1.3.2 - * http://jquery.com/ - * - * Copyright (c) 2009 John Resig - * Dual licensed under the MIT and GPL licenses. - * http://docs.jquery.com/License - * - * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) - * Revision: 6246 - */ -(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
      "]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
      ","
      "]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); -/* - * Sizzle CSS Selector Engine - v0.9.3 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

      ";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
      ";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
      ").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
      ';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); \ No newline at end of file diff --git a/vendors/uploadify/jquery.uploadify.v2.1.1.js b/vendors/uploadify/jquery.uploadify.v2.1.1.js deleted file mode 100644 index f2b1f8f6f..000000000 --- a/vendors/uploadify/jquery.uploadify.v2.1.1.js +++ /dev/null @@ -1,259 +0,0 @@ -/* -Uploadify v2.1.1 -Release Date: October 30, 2010 - -Copyright (c) 2010 Ronnie Garcia, Travis Nickels, Cash Costello - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ - -if(jQuery)( - function(jQuery){ - jQuery.extend(jQuery.fn,{ - uploadify:function(options) { - jQuery(this).each(function(){ - settings = jQuery.extend({ - id : jQuery(this).attr('id'), // The ID of the object being Uploadified - uploader : 'uploadify.swf', // The path to the uploadify swf file - script : 'uploadify.php', // The path to the uploadify backend upload script - expressInstall : null, // The path to the express install swf file - folder : '', // The path to the upload folder - height : 30, // The height of the flash button - width : 110, // The width of the flash button - cancelImg : 'cancel.png', // The path to the cancel image for the default file queue item container - wmode : 'opaque', // The wmode of the flash file - scriptAccess : 'sameDomain', // Set to "always" to allow script access across domains - fileDataName : 'Filedata', // The name of the file collection object in the backend upload script - method : 'POST', // The method for sending variables to the backend upload script - queueSizeLimit : 999, // The maximum size of the file queue - simUploadLimit : 1, // The number of simultaneous uploads allowed - queueID : false, // The optional ID of the queue container - displayData : 'percentage', // Set to "speed" to show the upload speed in the default queue item - onInit : function() {}, // Function to run when uploadify is initialized - onEmbedFlash : function() {}, // Function to run after the flash object has been embedded - onSelect : function() {}, // Function to run when a file is selected - onQueueFull : function() {}, // Function to run when the queue reaches capacity - onCheck : function() {}, // Function to run when script checks for duplicate files on the server - onCancel : function() {}, // Function to run when an item is cleared from the queue - onError : function() {}, // Function to run when an upload item returns an error - onProgress : function() {}, // Function to run each time the upload progress is updated - onComplete : function() {}, // Function to run when an upload is completed - onAllComplete : function() {} // Functino to run when all uploads are completed - }, options); - var pagePath = location.pathname; - pagePath = pagePath.split('/'); - pagePath.pop(); - pagePath = pagePath.join('/') + '/'; - var data = {}; - data.uploadifyID = settings.id; - data.pagepath = pagePath; - if (settings.buttonImg) data.buttonImg = escape(settings.buttonImg); - if (settings.buttonText) data.buttonText = escape(settings.buttonText); - if (settings.rollover) data.rollover = true; - data.script = settings.script; - data.folder = escape(settings.folder); - if (settings.scriptData) { - var scriptDataString = ''; - for (var name in settings.scriptData) { - scriptDataString += '&' + name + '=' + settings.scriptData[name]; - } - data.scriptData = escape(scriptDataString.substr(1)); - } - data.width = settings.width; - data.height = settings.height; - data.wmode = settings.wmode; - data.method = settings.method; - data.queueSizeLimit = settings.queueSizeLimit; - data.simUploadLimit = settings.simUploadLimit; - if (settings.hideButton) data.hideButton = true; - if (settings.fileDesc) data.fileDesc = settings.fileDesc; - if (settings.fileExt) data.fileExt = settings.fileExt; - if (settings.multi) data.multi = true; - if (settings.auto) data.auto = true; - if (settings.sizeLimit) data.sizeLimit = settings.sizeLimit; - if (settings.checkScript) data.checkScript = settings.checkScript; - if (settings.fileDataName) data.fileDataName = settings.fileDataName; - if (settings.queueID) data.queueID = settings.queueID; - if (settings.onInit() !== false) { - jQuery(this).css('display','none'); - jQuery(this).after('
      '); - swfobject.embedSWF(settings.uploader, settings.id + 'Uploader', settings.width, settings.height, '9.0.24', settings.expressInstall, data, {'quality':'high','wmode':settings.wmode,'allowScriptAccess':settings.scriptAccess}, {}, settings.onEmbedFlash); - if (settings.queueID == false) { - jQuery("#" + jQuery(this).attr('id') + "Uploader").after('
      '); - } - } - if (typeof(settings.onOpen) == 'function') { - jQuery(this).bind("uploadifyOpen", settings.onOpen); - } - jQuery(this).bind("uploadifySelect", {'action': settings.onSelect, 'queueID': settings.queueID}, function(event, ID, fileObj) { - if (event.data.action(event, ID, fileObj) !== false) { - var byteSize = Math.round(fileObj.size / 1024 * 100) * .01; - var suffix = 'KB'; - if (byteSize > 1000) { - byteSize = Math.round(byteSize *.001 * 100) * .01; - suffix = 'MB'; - } - var sizeParts = byteSize.toString().split('.'); - if (sizeParts.length > 1) { - byteSize = sizeParts[0] + '.' + sizeParts[1].substr(0,2); - } else { - byteSize = sizeParts[0]; - } - if (fileObj.name.length > 20) { - fileName = fileObj.name.substr(0,20) + '...'; - } else { - fileName = fileObj.name; - } - queue = '#' + jQuery(this).attr('id') + 'Queue'; - if (event.data.queueID) { - queue = '#' + event.data.queueID; - } - jQuery(queue).append('
      \ -
      \ - \ -
      \ - ' + fileName + ' (' + byteSize + suffix + ')\ -
      \ -
      \ -
      \ -
      '); - } - }); - if (typeof(settings.onSelectOnce) == 'function') { - jQuery(this).bind("uploadifySelectOnce", settings.onSelectOnce); - } - jQuery(this).bind("uploadifyQueueFull", {'action': settings.onQueueFull}, function(event, queueSizeLimit) { - if (event.data.action(event, queueSizeLimit) !== false) { - alert('The queue is full. The max size is ' + queueSizeLimit + '.'); - } - }); - jQuery(this).bind("uploadifyCheckExist", {'action': settings.onCheck}, function(event, checkScript, fileQueueObj, folder, single) { - var postData = new Object(); - postData = fileQueueObj; - postData.folder = pagePath + folder; - if (single) { - for (var ID in fileQueueObj) { - var singleFileID = ID; - } - } - jQuery.post(checkScript, postData, function(data) { - for(var key in data) { - if (event.data.action(event, checkScript, fileQueueObj, folder, single) !== false) { - var replaceFile = confirm("Do you want to replace the file " + data[key] + "?"); - if (!replaceFile) { - document.getElementById(jQuery(event.target).attr('id') + 'Uploader').cancelFileUpload(key, true,true); - } - } - } - if (single) { - document.getElementById(jQuery(event.target).attr('id') + 'Uploader').startFileUpload(singleFileID, true); - } else { - document.getElementById(jQuery(event.target).attr('id') + 'Uploader').startFileUpload(null, true); - } - }, "json"); - }); - jQuery(this).bind("uploadifyCancel", {'action': settings.onCancel}, function(event, ID, fileObj, data, clearFast) { - if (event.data.action(event, ID, fileObj, data, clearFast) !== false) { - var fadeSpeed = (clearFast == true) ? 0 : 250; - jQuery("#" + jQuery(this).attr('id') + ID).fadeOut(fadeSpeed, function() { jQuery(this).remove() }); - } - }); - if (typeof(settings.onClearQueue) == 'function') { - jQuery(this).bind("uploadifyClearQueue", settings.onClearQueue); - } - var errorArray = []; - jQuery(this).bind("uploadifyError", {'action': settings.onError}, function(event, ID, fileObj, errorObj) { - if (event.data.action(event, ID, fileObj, errorObj) !== false) { - var fileArray = new Array(ID, fileObj, errorObj); - errorArray.push(fileArray); - jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(" - " + errorObj.type + " Error"); - jQuery("#" + jQuery(this).attr('id') + ID).addClass('uploadifyError'); - } - }); - jQuery(this).bind("uploadifyProgress", {'action': settings.onProgress, 'toDisplay': settings.displayData}, function(event, ID, fileObj, data) { - if (event.data.action(event, ID, fileObj, data) !== false) { - jQuery("#" + jQuery(this).attr('id') + ID + "ProgressBar").css('width', data.percentage + '%'); - if (event.data.toDisplay == 'percentage') displayData = ' - ' + data.percentage + '%'; - if (event.data.toDisplay == 'speed') displayData = ' - ' + data.speed + 'KB/s'; - if (event.data.toDisplay == null) displayData = ' '; - jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(displayData); - } - }); - jQuery(this).bind("uploadifyComplete", {'action': settings.onComplete}, function(event, ID, fileObj, response, data) { - if (event.data.action(event, ID, fileObj, unescape(response), data) !== false) { - jQuery("#" + jQuery(this).attr('id') + ID + " .percentage").text(' - Completed'); - jQuery("#" + jQuery(this).attr('id') + ID).fadeOut(250, function() { jQuery(this).remove()}); - } - }); - if (typeof(settings.onAllComplete) == 'function') { - jQuery(this).bind("uploadifyAllComplete", {'action': settings.onAllComplete}, function(event, uploadObj) { - if (event.data.action(event, uploadObj) !== false) { - errorArray = []; - } - }); - } - }); - }, - uploadifySettings:function(settingName, settingValue, resetObject) { - var returnValue = false; - jQuery(this).each(function() { - if (settingName == 'scriptData' && settingValue != null) { - if (resetObject) { - var scriptData = settingValue; - } else { - var scriptData = jQuery.extend(settings.scriptData, settingValue); - } - var scriptDataString = ''; - for (var name in scriptData) { - scriptDataString += '&' + name + '=' + escape(scriptData[name]); - } - settingValue = scriptDataString.substr(1); - } - returnValue = document.getElementById(jQuery(this).attr('id') + 'Uploader').updateSettings(settingName, settingValue); - }); - if (settingValue == null) { - if (settingName == 'scriptData') { - var returnSplit = unescape(returnValue).split('&'); - var returnObj = new Object(); - for (var i = 0; i < returnSplit.length; i++) { - var iSplit = returnSplit[i].split('='); - returnObj[iSplit[0]] = iSplit[1]; - } - returnValue = returnObj; - } - return returnValue; - } - }, - uploadifyUpload:function(ID) { - jQuery(this).each(function() { - document.getElementById(jQuery(this).attr('id') + 'Uploader').startFileUpload(ID, false); - }); - }, - uploadifyCancel:function(ID) { - jQuery(this).each(function() { - document.getElementById(jQuery(this).attr('id') + 'Uploader').cancelFileUpload(ID, true, false); - }); - }, - uploadifyClearQueue:function() { - jQuery(this).each(function() { - document.getElementById(jQuery(this).attr('id') + 'Uploader').clearFileUploadQueue(false); - }); - } - }) -})(jQuery); \ No newline at end of file diff --git a/vendors/uploadify/jquery.uploadify.v2.1.1.min.js b/vendors/uploadify/jquery.uploadify.v2.1.1.min.js deleted file mode 100644 index 0a5ff7bea..000000000 --- a/vendors/uploadify/jquery.uploadify.v2.1.1.min.js +++ /dev/null @@ -1 +0,0 @@ -if(jQuery){(function(jQuery){jQuery.extend(jQuery.fn,{uploadify:function(options){jQuery(this).each(function(){settings=jQuery.extend({id:jQuery(this).attr("id"),uploader:"uploadify.swf",script:"uploadify.php",expressInstall:null,folder:"",height:30,width:110,cancelImg:"cancel.png",wmode:"opaque",scriptAccess:"sameDomain",fileDataName:"Filedata",method:"POST",queueSizeLimit:999,simUploadLimit:1,queueID:false,displayData:"percentage",onInit:function(){},onEmbedFlash:function(){},onSelect:function(){},onQueueFull:function(){},onCheck:function(){},onCancel:function(){},onError:function(){},onProgress:function(){},onComplete:function(){},onAllComplete:function(){}},options);var pagePath=location.pathname;pagePath=pagePath.split("/");pagePath.pop();pagePath=pagePath.join("/")+"/";var data={};data.uploadifyID=settings.id;data.pagepath=pagePath;if(settings.buttonImg){data.buttonImg=escape(settings.buttonImg)}if(settings.buttonText){data.buttonText=escape(settings.buttonText)}if(settings.rollover){data.rollover=true}data.script=settings.script;data.folder=escape(settings.folder);if(settings.scriptData){var scriptDataString="";for(var name in settings.scriptData){scriptDataString+="&"+name+"="+settings.scriptData[name]}data.scriptData=escape(scriptDataString.substr(1))}data.width=settings.width;data.height=settings.height;data.wmode=settings.wmode;data.method=settings.method;data.queueSizeLimit=settings.queueSizeLimit;data.simUploadLimit=settings.simUploadLimit;if(settings.hideButton){data.hideButton=true}if(settings.fileDesc){data.fileDesc=settings.fileDesc}if(settings.fileExt){data.fileExt=settings.fileExt}if(settings.multi){data.multi=true}if(settings.auto){data.auto=true}if(settings.sizeLimit){data.sizeLimit=settings.sizeLimit}if(settings.checkScript){data.checkScript=settings.checkScript}if(settings.fileDataName){data.fileDataName=settings.fileDataName}if(settings.queueID){data.queueID=settings.queueID}if(settings.onInit()!==false){jQuery(this).css("display","none");jQuery(this).after('
      ');swfobject.embedSWF(settings.uploader,settings.id+"Uploader",settings.width,settings.height,"9.0.24",settings.expressInstall,data,{quality:"high",wmode:settings.wmode,allowScriptAccess:settings.scriptAccess},{},settings.onEmbedFlash);if(settings.queueID==false){jQuery("#"+jQuery(this).attr("id")+"Uploader").after('
      ')}}if(typeof(settings.onOpen)=="function"){jQuery(this).bind("uploadifyOpen",settings.onOpen)}jQuery(this).bind("uploadifySelect",{action:settings.onSelect,queueID:settings.queueID},function(event,ID,fileObj){if(event.data.action(event,ID,fileObj)!==false){var byteSize=Math.round(fileObj.size/1024*100)*0.01;var suffix="KB";if(byteSize>1000){byteSize=Math.round(byteSize*0.001*100)*0.01;suffix="MB"}var sizeParts=byteSize.toString().split(".");if(sizeParts.length>1){byteSize=sizeParts[0]+"."+sizeParts[1].substr(0,2)}else{byteSize=sizeParts[0]}if(fileObj.name.length>20){fileName=fileObj.name.substr(0,20)+"..."}else{fileName=fileObj.name}queue="#"+jQuery(this).attr("id")+"Queue";if(event.data.queueID){queue="#"+event.data.queueID}jQuery(queue).append('
      '+fileName+" ("+byteSize+suffix+')
      ')}});if(typeof(settings.onSelectOnce)=="function"){jQuery(this).bind("uploadifySelectOnce",settings.onSelectOnce)}jQuery(this).bind("uploadifyQueueFull",{action:settings.onQueueFull},function(event,queueSizeLimit){if(event.data.action(event,queueSizeLimit)!==false){alert("The queue is full. The max size is "+queueSizeLimit+".")}});jQuery(this).bind("uploadifyCheckExist",{action:settings.onCheck},function(event,checkScript,fileQueueObj,folder,single){var postData=new Object();postData=fileQueueObj;postData.folder=pagePath+folder;if(single){for(var ID in fileQueueObj){var singleFileID=ID}}jQuery.post(checkScript,postData,function(data){for(var key in data){if(event.data.action(event,checkScript,fileQueueObj,folder,single)!==false){var replaceFile=confirm("Do you want to replace the file "+data[key]+"?");if(!replaceFile){document.getElementById(jQuery(event.target).attr("id")+"Uploader").cancelFileUpload(key,true,true)}}}if(single){document.getElementById(jQuery(event.target).attr("id")+"Uploader").startFileUpload(singleFileID,true)}else{document.getElementById(jQuery(event.target).attr("id")+"Uploader").startFileUpload(null,true)}},"json")});jQuery(this).bind("uploadifyCancel",{action:settings.onCancel},function(event,ID,fileObj,data,clearFast){if(event.data.action(event,ID,fileObj,data,clearFast)!==false){var fadeSpeed=(clearFast==true)?0:250;jQuery("#"+jQuery(this).attr("id")+ID).fadeOut(fadeSpeed,function(){jQuery(this).remove()})}});if(typeof(settings.onClearQueue)=="function"){jQuery(this).bind("uploadifyClearQueue",settings.onClearQueue)}var errorArray=[];jQuery(this).bind("uploadifyError",{action:settings.onError},function(event,ID,fileObj,errorObj){if(event.data.action(event,ID,fileObj,errorObj)!==false){var fileArray=new Array(ID,fileObj,errorObj);errorArray.push(fileArray);jQuery("#"+jQuery(this).attr("id")+ID+" .percentage").text(" - "+errorObj.type+" Error");jQuery("#"+jQuery(this).attr("id")+ID).addClass("uploadifyError")}});jQuery(this).bind("uploadifyProgress",{action:settings.onProgress,toDisplay:settings.displayData},function(event,ID,fileObj,data){if(event.data.action(event,ID,fileObj,data)!==false){jQuery("#"+jQuery(this).attr("id")+ID+"ProgressBar").css("width",data.percentage+"%");if(event.data.toDisplay=="percentage"){displayData=" - "+data.percentage+"%"}if(event.data.toDisplay=="speed"){displayData=" - "+data.speed+"KB/s"}if(event.data.toDisplay==null){displayData=" "}jQuery("#"+jQuery(this).attr("id")+ID+" .percentage").text(displayData)}});jQuery(this).bind("uploadifyComplete",{action:settings.onComplete},function(event,ID,fileObj,response,data){if(event.data.action(event,ID,fileObj,unescape(response),data)!==false){jQuery("#"+jQuery(this).attr("id")+ID+" .percentage").text(" - Completed");jQuery("#"+jQuery(this).attr("id")+ID).fadeOut(250,function(){jQuery(this).remove()})}});if(typeof(settings.onAllComplete)=="function"){jQuery(this).bind("uploadifyAllComplete",{action:settings.onAllComplete},function(event,uploadObj){if(event.data.action(event,uploadObj)!==false){errorArray=[]}})}})},uploadifySettings:function(settingName,settingValue,resetObject){var returnValue=false;jQuery(this).each(function(){if(settingName=="scriptData"&&settingValue!=null){if(resetObject){var scriptData=settingValue}else{var scriptData=jQuery.extend(settings.scriptData,settingValue)}var scriptDataString="";for(var name in scriptData){scriptDataString+="&"+name+"="+escape(scriptData[name])}settingValue=scriptDataString.substr(1)}returnValue=document.getElementById(jQuery(this).attr("id")+"Uploader").updateSettings(settingName,settingValue)});if(settingValue==null){if(settingName=="scriptData"){var returnSplit=unescape(returnValue).split("&");var returnObj=new Object();for(var i=0;i - is released under the MIT License -*/ -var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad'}}aa.outerHTML='"+af+"";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab \ No newline at end of file diff --git a/vendors/uploadify/uploadify.swf b/vendors/uploadify/uploadify.swf deleted file mode 100644 index 0385d9e6e..000000000 Binary files a/vendors/uploadify/uploadify.swf and /dev/null differ -- cgit v1.2.3 From 12a88208acec40e190b0729887e28c9d9add26c3 Mon Sep 17 00:00:00 2001 From: Sem Date: Sat, 28 Jul 2012 23:08:10 +0200 Subject: Removed photo-tagging feature. --- actions/photos/image/tag.php | 109 -------------- actions/photos/image/untag.php | 24 ---- languages/da.php | 19 --- languages/de.php | 28 +--- languages/en.php | 28 +--- languages/es.php | 18 --- languages/fr.php | 15 -- languages/he.php | 11 -- languages/it.php | 2 - lib/tidypics.php | 45 ------ pages/photos/image/view.php | 5 - pages/tagged.php | 48 ------- start.php | 26 +--- views/default/forms/photos/admin/settings/main.php | 2 +- views/default/forms/photos/image/tag.php | 33 ----- views/default/js/photos/tagging.php | 159 --------------------- views/default/object/image.php | 20 --- views/default/object/image/full.php | 3 - views/default/photos/css.php | 79 ---------- views/default/photos/tagging/help.php | 19 --- views/default/photos/tagging/select.php | 16 --- views/default/photos/tagging/tag.php | 50 ------- views/default/photos/tagging/tags.php | 14 -- views/default/river/object/image/tag.php | 26 ---- 24 files changed, 4 insertions(+), 795 deletions(-) delete mode 100644 actions/photos/image/tag.php delete mode 100644 actions/photos/image/untag.php delete mode 100644 pages/tagged.php delete mode 100644 views/default/forms/photos/image/tag.php delete mode 100644 views/default/js/photos/tagging.php delete mode 100644 views/default/photos/tagging/help.php delete mode 100644 views/default/photos/tagging/select.php delete mode 100644 views/default/photos/tagging/tag.php delete mode 100644 views/default/photos/tagging/tags.php delete mode 100644 views/default/river/object/image/tag.php diff --git a/actions/photos/image/tag.php b/actions/photos/image/tag.php deleted file mode 100644 index e623bd546..000000000 --- a/actions/photos/image/tag.php +++ /dev/null @@ -1,109 +0,0 @@ -guid; -} - -/* // not adding as plain tag yet -$new_word_tag = false; -if ($user_id != 0) { - $relationships_type = 'user'; - $value = $user_id; -} else { - $relationships_type = 'word'; - $value = $word; - - // check to see if the photo has this tag and add if not - if (!is_array($image->tags)) { - if ($image->tags != $word) { - $new_word_tag = true; - $tagarray = $image->tags . ',' . $word; - $tagarray = string_to_tag_array($tagarray); - } - } else { - if (!in_array($word, $image->tags)) { - $new_word_tag = true; - $tagarray = $image->tags; - $tagarray[] = $word; - } - } -} - -// add new tag now so it is available in search -if ($new_word_tag) { - $image->clearMetadata('tags'); - $image->tags = $tagarray; -} -*/ - -$tag = new stdClass(); -$tag->coords = $coordinates_str; -$tag->type = $relationships_type; -$tag->value = $value; -$access_id = $image->getAccessID(); - -$annotation_id = $image->annotate('phototag', serialize($tag), $access_id); -if ($annotation_id) { - // if tag is a user id, add relationship for searching (find all images with user x) - if ($tag->type === 'user') { - if (!check_entity_relationship($tag->value, 'phototag', $image_guid)) { - add_entity_relationship($tag->value, 'phototag', $image_guid); -/* - // also add this to the river - subject is image, object is the tagged user - add_to_river('river/object/image/tag', 'tag', $tagger->guid, $user_id, $access_id, 0, $annotation_id); - - // notify user of tagging as long as not self - if ($owner_id != $user_id) { - notify_user( - $user_id, - $owner_id, - elgg_echo('tidypics:tag:subject'), - sprintf( - elgg_echo('tidypics:tag:body'), - $image->getTitle(), - $tagger->name, - $image->getURL() - ) - ); - } - * - */ - } - } - - system_message(elgg_echo("tidypics:phototagging:success")); -} - -forward(REFERER); diff --git a/actions/photos/image/untag.php b/actions/photos/image/untag.php deleted file mode 100644 index 11c433a61..000000000 --- a/actions/photos/image/untag.php +++ /dev/null @@ -1,24 +0,0 @@ -name != 'phototag') { - register_error(elgg_echo("tidypics:phototagging:delete:error")); - forward(REFERER); -} - -if (!$annotation->canEdit()) { - register_error(elgg_echo("tidypics:phototagging:delete:error")); - forward(REFERER); -} - -if ($annotation->delete()) { - system_message(elgg_echo("tidypics:phototagging:delete:success")); -} else { - system_message(elgg_echo("tidypics:phototagging:delete:error")); -} - -forward(REFERER); diff --git a/languages/da.php b/languages/da.php index 78113d467..eb75e86f2 100644 --- a/languages/da.php +++ b/languages/da.php @@ -56,7 +56,6 @@ $danish = array( 'tidypics:admin:instructions' => 'Dette er de centrale Tidypics indstillinger. Tilpas dem til din opsætning og klik derefter på Gem.', 'tidypics:settings:image_lib' => "Foto arkiv: ", 'tidypics:settings:download_link' => "Vis download-link", - 'tidypics:settings:tagging' => "Tillad fotolinks", 'tidypics:settings:photo_ratings' => "Tillad karakterergivning af foto (kræver plugin af Miguel Montes eller andet kompatibelt plugin)", 'tidypics:settings:exif' => "Vis EXIF data", 'tidypics:settings:view_count' => "Vis tæller", @@ -105,22 +104,6 @@ $danish = array( 'image:back' => "Forrige", 'image:next' => "Næste", - // tagging - 'tidypics:taginstruct' => 'Vælg et område på billedet, som du ønsker at linke', - 'tidypics:deltag_title' => 'Vælg at slette links', - 'tidypics:finish_tagging' => 'Annuller', - 'tidypics:tagthisphoto' => 'Tilføj link til foto', - 'tidypics:deletetag' => 'Slet foto link', - 'tidypics:actiontag' => 'Link', - 'tidypics:actiondelete' => 'Slet', - 'tidypics:actioncancel' => 'Annuller', - 'tidypics:inthisphoto' => 'Links i billedet', - 'tidypics:usertag' => "Foto links til medlem %s", - 'tidypics:phototagging:success' => 'Foto link tilføjet', - 'tidypics:phototagging:error' => 'Uventet fejl ved linket', - 'tidypics:deletetag:success' => 'Udvalgte links er blevet fjernet', - - //rss 'tidypics:posted' => 'Billedet indstilles individuelt:', @@ -138,8 +121,6 @@ $danish = array( 'image:river:created:multiple' => "%s added %u photos to album %s", 'image:river:item' => "et billede", 'image:river:annotate' => "en kommentar til billedet", - 'image:river:tagged' => "%s tagged %s in the photo %s", - 'image:river:tagged:unknown' => "%s tagged %s in a photo", 'album:river:created' => "%s har tilføjet et nyt album", 'album:river:group' => "i gruppen", 'album:river:item' => "et album", diff --git a/languages/de.php b/languages/de.php index 1f439e981..e7b70d9c3 100644 --- a/languages/de.php +++ b/languages/de.php @@ -64,7 +64,6 @@ $german = array( 'tidypics:settings:thumbnail' => "Erzeugung von Vorschaubildern", 'tidypics:settings:help' => "Hilfe", 'tidypics:settings:download_link' => "Zeige Download-Link", - 'tidypics:settings:tagging' => "Tagging von Bildern erlauben", 'tidypics:settings:photo_ratings' => "Bewerten von Bildern erlauben (benötigt das Elggx Fivestar-Plugin oder ein vergleichbares)", 'tidypics:settings:exif' => "EXIF-Daten anzeigen", 'tidypics:settings:view_count' => "Zugriffszähler anzeigen", @@ -102,7 +101,7 @@ $german = array( 'tidypics:server_info:max_input_time_desc' => 'Maximale erlaubte Dauer, in der das Hochladen von Daten auf den Server abgeschlossen sein muss.', 'tidypics:server_info:max_execution_time_desc' => 'Maximal erlaubte Ausführdauer für ein Skript auf dem Server.', 'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions können den Flash-Uploader beeinträchtigen.', - + 'tidypics:server_info:php_version' => 'PHP-Version', 'tidypics:server_info:memory_limit' => 'Für PHP verfügbarer Speicher', 'tidypics:server_info:peak_usage' => 'Genutzer Speicher, um diese Seite zu laden', @@ -169,29 +168,6 @@ $german = array( 'image:next' => "Nächstes", 'image:index' => "%u von %u", - // tagging - 'tidypics:taginstruct' => 'Wähle den Bereich auf dem Bild, für das Du ein Tag setzen willst, oder %s.', - 'tidypics:finish_tagging' => 'Taggen beenden', - 'tidypics:deltag_title' => 'Wähle die Tags, die gelöscht werden sollen', - 'tidypics:finish_tagging' => 'Tagging abbrechen', - 'tidypics:tagthisphoto' => 'Bild taggen', - 'tidypics:actiontag' => 'Tag setzen', - 'tidypics:actioncancel' => 'Abbrechen', - 'tidypics:inthisphoto' => 'Tags in diesem Bild', - 'tidypics:usertag' => "Bilder mit Tags, die sich auf %s beziehen", - 'tidypics:phototagging:success' => 'Das Bild wurde getaggt.', - 'tidypics:phototagging:error' => 'Beim Hinzufügen des Tags ist ein Fehler aufgetreten.', - - 'tidypics:phototagging:delete:success' => 'Das Tag wurde entfernt.', - 'tidypics:phototagging:delete:error' => 'Beim Entfernen des Tags ist ein Fehler aufgetreten.', - 'tidypics:phototagging:delete:confirm' => 'Dieses Tag entfernen?', - - 'tidypics:tag:subject' => "Du wurdest in einem Bild getaggt", - 'tidypics:tag:body' => "Du wurdest im Bild %s von %s getaggt. - -Um das Bild zu sehen, folge diesem Link: %s", - - //rss 'tidypics:posted' => 'hat ein Bild hinzugefügt:', @@ -210,8 +186,6 @@ Um das Bild zu sehen, folge diesem Link: %s", 'image:river:created:multiple' => "%s hat %u Bilder zum Album %s hinzugefügt.", 'image:river:item' => "ein Bild", 'image:river:annotate' => "einen Kommentar zum Bild", - 'image:river:tagged' => "%s hat %s im Bild %s getaggt.", - 'image:river:tagged:unknown' => "%s hat %s in einem Bild getaggt.", 'river:create:object:album' => "%s hat das neue Bilderalbum %s hinzugefügt.", 'album:river:group' => "in der Gruppe", 'album:river:item' => "ein Album", diff --git a/languages/en.php b/languages/en.php index 62b43673d..b51987315 100644 --- a/languages/en.php +++ b/languages/en.php @@ -64,7 +64,6 @@ $english = array( 'tidypics:settings:thumbnail' => "Thumbnail Creation", 'tidypics:settings:help' => "Help", 'tidypics:settings:download_link' => "Show download link", - 'tidypics:settings:tagging' => "Enable photo tagging", 'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)", 'tidypics:settings:exif' => "Display EXIF data", 'tidypics:settings:view_count' => "Display view count", @@ -102,7 +101,7 @@ $english = array( 'tidypics:server_info:max_input_time_desc' => 'Time script waits for upload to finish', 'tidypics:server_info:max_execution_time_desc' => 'Max time a script will run', 'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions may affect the Flash uploader', - + 'tidypics:server_info:php_version' => 'PHP Version', 'tidypics:server_info:memory_limit' => 'Memory Available to PHP', 'tidypics:server_info:peak_usage' => 'Memory Used to Load This Page', @@ -177,29 +176,6 @@ $english = array( 'image:next' => "Next", 'image:index' => "%u of %u", - // tagging - 'tidypics:taginstruct' => 'Select the area that you want to tag or %s', - 'tidypics:finish_tagging' => 'Stop tagging', - 'tidypics:tagthisphoto' => 'Tag this photo', - 'tidypics:actiontag' => 'Tag', - 'tidypics:actioncancel' => 'Cancel', - 'tidypics:inthisphoto' => 'In this photo', - 'tidypics:usertag' => "Photos tagged with user %s", - 'tidypics:phototagging:success' => 'Photo tag was successfully added', - 'tidypics:phototagging:error' => 'Unexpected error occurred during tagging', - - 'tidypics:phototagging:delete:success' => 'Photo tag was removed.', - 'tidypics:phototagging:delete:error' => 'Unexpceted error occurred when removing photo tag.', - 'tidypics:phototagging:delete:confirm' => 'Remove this tag?', - - - - 'tidypics:tag:subject' => "You have been tagged in a photo", - 'tidypics:tag:body' => "You have been tagged in the photo %s by %s. - -The photo can be viewed here: %s", - - //rss 'tidypics:posted' => 'posted a photo:', @@ -218,8 +194,6 @@ The photo can be viewed here: %s", 'image:river:created:multiple' => "%s added %u photos to the album %s", 'image:river:item' => "a photo", 'image:river:annotate' => "a comment on the photo", - 'image:river:tagged' => "%s tagged %s in the photo %s", - 'image:river:tagged:unknown' => "%s tagged %s in a photo", 'river:create:object:album' => "%s created a new photo album %s", 'album:river:group' => "in the group", 'album:river:item' => "an album", diff --git a/languages/es.php b/languages/es.php index 704f01979..7a2437889 100644 --- a/languages/es.php +++ b/languages/es.php @@ -52,7 +52,6 @@ $spanish = array( 'tidypics:admin:instructions' => 'Este es el corazón de las preferencias de Tidypics. Cambialas y luego guardalas.', 'tidypics:settings:image_lib' => "Libreria de Imagenes: ", 'tidypics:settings:download_link' => "Mostrar vinculo de descarga", - 'tidypics:settings:tagging' => "Habilitar etiquetas en las fotos", 'tidypics:settings:photo_ratings' => "Habilitar ratings de fotos(requiere instalar el e plugin de Miguel Montes o compatible)", 'tidypics:settings:exif' => "Mostrar data de EXIF", 'tidypics:settings:view_count' => "Ver contador", @@ -93,22 +92,6 @@ $spanish = array( 'image:back' => "Anterior", 'image:next' => "Siguiente", - // tagging - 'tidypics:taginstruct' => 'Seleccciona el área que deseas etiquetar', - 'tidypics:deltag_title' => 'Seleccionas las etiquetas a borrar', - 'tidypics:finish_tagging' => 'Detener etiquetado', - 'tidypics:tagthisphoto' => 'Etiquetar esta foto', - 'tidypics:deletetag' => 'Borrar etiqueta de la foto', - 'tidypics:actiontag' => 'Etiqueta', - 'tidypics:actiondelete' => 'Borrar', - 'tidypics:actioncancel' => 'Cancelar', - 'tidypics:inthisphoto' => 'En esta foto', - 'tidypics:usertag' => "Fotos etiquetadas con %s", - 'tidypics:phototagging:success' => 'La etiqueta de la foto fue añadida exitosamente', - 'tidypics:phototagging:error' => 'Ocurrió un error inesperado durante el etiquetado', - 'tidypics:deletetag:success' => 'Las etiquetas seleccionadas fueron borradas exitosamente', - - //rss 'tidypics:posted' => 'publicar una foto:', @@ -125,7 +108,6 @@ $spanish = array( 'image:river:created' => "%s añadio la foto %s al álbum %s", 'image:river:item' => "una foto", 'image:river:annotate' => "un comentario en la foto", - 'image:river:tagged' => "fue etiquetada en la foto", 'album:river:created' => "%s creo un nuevo álbum de fotos", 'album:river:group' => "en el grupo", 'album:river:item' => "un álbum", diff --git a/languages/fr.php b/languages/fr.php index 375159e0b..bb309c225 100644 --- a/languages/fr.php +++ b/languages/fr.php @@ -52,7 +52,6 @@ $french = array( 'tidypics:settings:image_lib' => "Librairie graphique" , 'tidypics:settings:thumbnail' => "Création des vignettes" , 'tidypics:settings:download_link' => "Voir le lien de download" , - 'tidypics:settings:tagging' => "Activer les tags sur les photos" , 'tidypics:settings:photo_ratings' => "Activer les notations des photos (nécessite le rate plugin de Miguel Montes ou compatible)" , 'tidypics:settings:exif' => "Voir les données EXIF" , 'tidypics:settings:view_count' => "Voir le compteur" , @@ -87,22 +86,9 @@ $french = array( 'image:none' => "Aucune image n'a encore été ajoutée" , 'image:back' => "Précédent" , 'image:next' => "Suivant" , - 'tidypics:taginstruct' => "Sélectionnez la zone que vous souhaitez tagger" , - 'tidypics:deltag_title' => "Sélectionnez le tag à supprimer" , - 'tidypics:finish_tagging' => "Arrêter de tagger" , - 'tidypics:tagthisphoto' => "Tagger cette photo" , - 'tidypics:deletetag' => "Supprimer le tag d'une photo" , - 'tidypics:actiontag' => "Tag" , 'tidypics:actiondelete' => "Supprimer" , 'tidypics:actioncancel' => "Annuler" , 'tidypics:inthisphoto' => "Dans cette photo" , - 'tidypics:usertag' => "Photo taggée par %s" , - 'tidypics:phototagging:success' => "La photo a été correctement taggée." , - 'tidypics:phototagging:error' => "Erreur innatendue durant le taggage" , - 'tidypics:deletetag:success' => "Les tags sélectionnés ont correctement été supprimés" , - 'tidypics:tag:subject' => "Vous avez été taggé dans une photo !!!" , - 'tidypics:tag:body' => "Vous avez été taggé dans la photo %s par %s !!! -La photo peut être consultée ici: %s" , 'tidypics:posted' => "a posté une photo" , 'tidypics:widget:albums' => "Albums photo" , 'tidypics:widget:album_descr' => "Échantillon de vos albums photo" , @@ -114,7 +100,6 @@ La photo peut être consultée ici: %s" , 'image:river:created' => "%s a ajouté la photo %s à l'album %s" , 'image:river:item' => "une photo" , 'image:river:annotate' => "commentaire sur la photo" , - 'image:river:tagged' => "a été taggé sur la photo" , 'album:river:created' => "%s a créé un nouvel album photo" , 'album:river:group' => "dans le groupe" , 'album:river:item' => "un album" , diff --git a/languages/he.php b/languages/he.php index 5f232daf6..af425ec49 100644 --- a/languages/he.php +++ b/languages/he.php @@ -47,7 +47,6 @@ $hebrew = array( 'tidypics:admin:instructions' => "אלה הגדרות הליבה של Tidypics. שנה אותן לפי הצורך ולחץ על שמור" , 'tidypics:settings:image_lib' => "ספריית תמונות:" , 'tidypics:settings:download_link' => "הצג לינק להורדה" , - 'tidypics:settings:tagging' => "אפשר תיוג תמונות" , 'tidypics:settings:photo_ratings' => "אפשר דירוג תמונות, דורש תוסף דירוג של Miguel Montes או דומה" , 'tidypics:settings:exif' => "הצג נתוני EXIF" , 'tidypics:settings:view_count' => "מונה צפיה" , @@ -81,19 +80,9 @@ $hebrew = array( 'image:none' => "טרם נוספו תמונות" , 'image:back' => "הקודם" , 'image:next' => "הבא" , - 'tidypics:taginstruct' => "בחר אזור להוספת תג" , - 'tidypics:deltag_title' => "בחר תגים למחיקה" , - 'tidypics:finish_tagging' => "הפסק לתייג" , - 'tidypics:tagthisphoto' => "תייג תמונה זו" , - 'tidypics:deletetag' => "מחק תג תמונה" , - 'tidypics:actiontag' => "תג" , 'tidypics:actiondelete' => "מחיקה" , 'tidypics:actioncancel' => "ביטול" , 'tidypics:inthisphoto' => "בתמונה זו" , - 'tidypics:usertag' => "תמונות המתוייגות במשתמש %s" , - 'tidypics:phototagging:success' => "התג נוסף בהצלחה" , - 'tidypics:phototagging:error' => "אירע שגיאה בתהליך התיוג" , - 'tidypics:deletetag:success' => "התגים נמחקו בהצלחה" , 'tidypics:posted' => "הוסיף/ה תמונה" , 'tidypics:widget:albums' => "אלבומי תמונות" , 'tidypics:widget:album_descr' => "הצג את האלבומים החדשים שלך" , diff --git a/languages/it.php b/languages/it.php index 764ecf5f7..dd10384fe 100644 --- a/languages/it.php +++ b/languages/it.php @@ -76,8 +76,6 @@ $italian = array( 'image:river:created:multiple' => "%s added %u photos to album %s", 'image:river:item' => "una immagine", 'image:river:annotate' => "a comment on the image", - 'image:river:tagged' => "%s tagged %s in the photo %s", - 'image:river:tagged:unknown' => "%s tagged %s in a photo", 'album:river:created' => "%s created a new photo album: ", 'album:river:item' => "an album", 'album:river:annotate' => "un commento nel foto album", diff --git a/lib/tidypics.php b/lib/tidypics.php index 9439bed39..953c68b76 100644 --- a/lib/tidypics.php +++ b/lib/tidypics.php @@ -351,51 +351,6 @@ function tp_is_person() { return false; } -/** - * get a list of people that can be tagged in an image - * - * @param $viewer entity - * @return array of guid->name for tagging - */ -function tp_get_tag_list($viewer) { - $friends = get_user_friends($viewer->getGUID(), '', 999, 0); - $friend_list = array(); - if ($friends) { - foreach($friends as $friend) { - //error_log("friend $friend->name"); - $friend_list[$friend->guid] = $friend->name; - } - } - - // is this a group - $is_group = tp_is_group_page(); - if ($is_group) { - $group_guid = page_owner(); - $viewer_guid = $viewer->guid; - $members = get_group_members($group_guid, 999); - if (is_array($members)) { - foreach ($members as $member) { - if ($viewer_guid != $member->guid) { - $group_list[$member->guid] = $member->name; - //error_log("group $member->name"); - } - } - - // combine group and friends list - $intersect = array_intersect_key($friend_list, $group_list); - $unique_friends = array_diff_key($friend_list, $group_list); - $unique_members = array_diff_key($group_list, $friend_list); - //$friend_list = array_merge($friend_list, $group_list); - //$friend_list = array_unique($friend_list); - $friend_list = $intersect + $unique_friends + $unique_members; - } - } - - asort($friend_list); - - return $friend_list; -} - /** * Convenience function for listing recent images * diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index fc4a01320..e30bed70a 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -19,11 +19,6 @@ if (!$photo) { $photo->addView(); -if (elgg_get_plugin_setting('tagging', 'tidypics')) { - elgg_load_js('tidypics:tagging'); - elgg_load_js('jquery.imgareaselect'); -} - // set page owner based on owner of photo album $album = $photo->getContainerEntity(); if ($album) { diff --git a/pages/tagged.php b/pages/tagged.php deleted file mode 100644 index 34ea8a709..000000000 --- a/pages/tagged.php +++ /dev/null @@ -1,48 +0,0 @@ -name); -} else { - $title = "User does not exist"; -} - - -// create main column -$body = elgg_view_title($title); - -set_context('search'); -set_input('search_viewtype', 'gallery'); // need to force gallery view -$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); - -// Set up submenus -if (isloggedin()) { - add_submenu_item( elgg_echo("album:yours"), - $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, - 'tidypics-b' ); -} -add_submenu_item( elgg_echo('album:all'), - $CONFIG->wwwroot . "pg/photos/world/", - 'tidypics-z'); -add_submenu_item( elgg_echo('tidypics:mostrecent'), - $CONFIG->wwwroot . 'pg/photos/mostrecent', - 'tidypics-z'); - - - -$body = elgg_view_layout('two_column_left_sidebar', '', $body); - - -page_draw($title, $body); diff --git a/start.php b/start.php index 1e851b8f3..8c3dcf7b2 100644 --- a/start.php +++ b/start.php @@ -38,9 +38,6 @@ function tidypics_init() { $js = elgg_get_simplecache_url('js', 'photos/tidypics'); elgg_register_simplecache_view('js/photos/tidypics'); elgg_register_js('tidypics', $js, 'footer'); - $js = elgg_get_simplecache_url('js', 'photos/tagging'); - elgg_register_simplecache_view('js/photos/tagging'); - elgg_register_js('tidypics:tagging', $js, 'footer'); $js = elgg_get_simplecache_url('js', 'photos/uploading'); elgg_register_simplecache_view('js/photos/uploading'); elgg_register_js('tidypics:uploading', $js, 'footer'); @@ -48,7 +45,7 @@ function tidypics_init() { elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer'); elgg_register_js('swfobject', 'mod/tidypics/vendors/uploadify/swfobject.js', 'footer'); elgg_register_js('jquery.uploadify-tp', 'mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js', 'footer'); - + // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); @@ -99,8 +96,6 @@ function tidypics_init() { elgg_register_action("photos/image/save", "$base_dir/image/save.php"); elgg_register_action("photos/image/ajax_upload", "$base_dir/image/ajax_upload.php", 'logged_in'); elgg_register_action("photos/image/ajax_upload_complete", "$base_dir/image/ajax_upload_complete.php", 'logged_in'); - elgg_register_action("photos/image/tag", "$base_dir/image/tag.php"); - elgg_register_action("photos/image/untag", "$base_dir/image/untag.php"); elgg_register_action("photos/batch/edit", "$base_dir/batch/edit.php"); @@ -216,13 +211,6 @@ function tidypics_page_handler($page) { include "$base/image/download.php"; break; - case "tagged": // all photos tagged with user - if (isset($page[1])) { - set_input('guid', $page[1]); - } - include($CONFIG->pluginspath . "tidypics/pages/tagged.php"); - break; - case "mostviewed": // images with the most views if (isset($page[1])) { set_input('username', $page[1]); @@ -329,18 +317,6 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) { ); $return[] = ElggMenuItem::factory($options); } - - if (elgg_get_plugin_setting('tagging', 'tidypics')) { - $options = array( - 'name' => 'tagging', - 'text' => elgg_echo('tidypics:actiontag'), - 'href' => '#', - 'title' => elgg_echo('tidypics:tagthisphoto'), - 'rel' => 'photo-tagging', - 'priority' => 80, - ); - $return[] = ElggMenuItem::factory($options); - } } // only show these options if there are images diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php index c99b9d688..ab5e7e24a 100644 --- a/views/default/forms/photos/admin/settings/main.php +++ b/views/default/forms/photos/admin/settings/main.php @@ -5,7 +5,7 @@ $plugin = $vars['plugin']; -$checkboxes = array('tagging', 'view_count', 'uploader', 'exif', 'download_link'); +$checkboxes = array('view_count', 'uploader', 'exif', 'download_link'); foreach ($checkboxes as $checkbox) { echo '
      '; $checked = $plugin->$checkbox ? 'checked' : false; diff --git a/views/default/forms/photos/image/tag.php b/views/default/forms/photos/image/tag.php deleted file mode 100644 index 31869be9e..000000000 --- a/views/default/forms/photos/image/tag.php +++ /dev/null @@ -1,33 +0,0 @@ -'; - -echo elgg_view('input/autocomplete', array( - 'name' => 'username', - 'match_on' => 'friends', -)); - -echo elgg_view('input/hidden', array( - 'name' => 'guid', - 'value' => $vars['entity']->getGUID(), -)); - -echo elgg_view('input/hidden', array( - 'name' => 'coordinates', -)); - -echo '
      '; - -echo '
      '; -echo elgg_view('input/submit', array( - 'value' => elgg_echo('tidypics:actiontag'), -)); -echo '
      '; diff --git a/views/default/js/photos/tagging.php b/views/default/js/photos/tagging.php deleted file mode 100644 index f444aa44c..000000000 --- a/views/default/js/photos/tagging.php +++ /dev/null @@ -1,159 +0,0 @@ - -// + + + + + \ No newline at end of file diff --git a/vendors/jquery-file-upload/cors/result.html b/vendors/jquery-file-upload/cors/result.html new file mode 100644 index 000000000..7c9802684 --- /dev/null +++ b/vendors/jquery-file-upload/cors/result.html @@ -0,0 +1,20 @@ + + + + + +jQuery Iframe Transport Plugin Redirect Page + + + \ No newline at end of file diff --git a/vendors/jquery-file-upload/css/jquery.fileupload-ui.css b/vendors/jquery-file-upload/css/jquery.fileupload-ui.css new file mode 100644 index 000000000..bb706ff06 --- /dev/null +++ b/vendors/jquery-file-upload/css/jquery.fileupload-ui.css @@ -0,0 +1,107 @@ +@charset 'UTF-8'; +/* + * jQuery File Upload UI Plugin CSS 6.3 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +.fileinput-button { + position: relative; + overflow: hidden; + float: left; + margin-right: 5px; +} +.fileinput-button input { + position: absolute; + top: 0; + right: 0; + margin: 0; + border: solid transparent; + border-width: 0 0 100px 200px; + opacity: 0; + filter: alpha(opacity=0); + -moz-transform: translate(-300px, 0) scale(4); + direction: ltr; + cursor: pointer; +} +.fileupload-buttonbar .ui-button, +.fileupload-buttonbar .toggle { + margin-bottom: 5px; +} +.files .progress { + width: 200px; +} +.files .progress, +.fileupload-buttonbar .progress { + height: 20px; +} +.files .ui-progressbar-value, +.fileupload-buttonbar .ui-progressbar-value { + background: url(../img/progressbar.gif); +} +.fileupload-buttonbar .fade, +.files .fade { + display: none; +} +.fileupload-loading { + position: absolute; + left: 50%; + width: 128px; + height: 128px; + background: url(../img/loading.gif) center no-repeat; + display: none; +} +.fileupload-processing .fileupload-loading { + display: block; +} + +/* Fix for IE 6: */ +*html .fileinput-button { + margin-right: -2px; +} +*html .fileinput-button .ui-button-text { + line-height: 24px; +} +*html .fileupload-buttonbar .ui-button { + margin-left: 3px; +} + +/* Fix for IE 7: */ +*+html .fileinput-button { + margin-right: 1px; +} +*+html .fileinput-button .ui-button-text { + line-height: 24px; +} +*+html .fileupload-buttonbar .ui-button { + margin-left: 3px; +} + +@media (max-width: 480px) { + .files .preview * { + width: 40px; + } + .files .name * { + width: 80px; + display: inline-block; + word-wrap: break-word; + } + .files .progress { + width: 20px; + } + .files .delete { + width: 60px; + } +} + +/* Fix for Webkit (Safari, Chrome) */ +@media screen and (-webkit-min-device-pixel-ratio:0) { + .fileinput-button { + margin-top: 2px; + } +} diff --git a/vendors/jquery-file-upload/css/style.css b/vendors/jquery-file-upload/css/style.css new file mode 100644 index 000000000..6ed82e679 --- /dev/null +++ b/vendors/jquery-file-upload/css/style.css @@ -0,0 +1,92 @@ +@charset 'UTF-8'; +/* + * jQuery File Upload Plugin CSS Example 1.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + line-height: 18px; + width: 960px; + margin: 10px auto; +} +a { + color: #08C; + text-decoration: none; +} +a:hover, +.active a { + color: #005580; + text-decoration: underline; +} +td { + padding: 5px; +} +img { + border: 0; +} +.nav-collapse, +ul.nav, +ul.nav li { + display: inline-block; + margin-right: 10px; +} +.navbar .brand { + font-size: 16px; +} +.row { + zoom: 1; +} +.row:before, .row:after { + display: table; + content: ""; +} +.row:after { + clear: both; +} +.span5 { + width: 400px; + float: left; +} +.span7 { + width: 560px ; + float: left; +} + +/* Fix for IE 6: */ +*html .nav-collapse, +*html ul.nav, +*html ul.nav li { + display: inline; +} +*html .navbar-fixed-top { + margin-bottom: 35px; +} + +/* Fix for IE 7: */ +*+html .nav-collapse, +*+html ul.nav, +*+html ul.nav li { + display: inline; +} +*+html .navbar-fixed-top { + margin-bottom: 35px; +} + +@media (max-width: 980px) { + body { + width: auto; + padding: 10px; + } + .span5, + .span7 { + width: auto; + } +} diff --git a/vendors/jquery-file-upload/img/loading.gif b/vendors/jquery-file-upload/img/loading.gif new file mode 100644 index 000000000..90f28cbdb Binary files /dev/null and b/vendors/jquery-file-upload/img/loading.gif differ diff --git a/vendors/jquery-file-upload/img/progressbar.gif b/vendors/jquery-file-upload/img/progressbar.gif new file mode 100644 index 000000000..fbcce6bc9 Binary files /dev/null and b/vendors/jquery-file-upload/img/progressbar.gif differ diff --git a/vendors/jquery-file-upload/index.html b/vendors/jquery-file-upload/index.html new file mode 100644 index 000000000..a57d6fa55 --- /dev/null +++ b/vendors/jquery-file-upload/index.html @@ -0,0 +1,234 @@ + + + + + + + +jQuery File Upload Demo + + + + + + + + + + + + + + +
      +
      +
      + + + + + + jQuery File Upload +
      + + +
      +
      +
      +
      +
      +
      +

      jQuery File Upload Demo

      +
      +
      +

      File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery.
      + Supports cross-domain, chunked and resumable file uploads and client-side image resizing.
      + Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.

      +
      +
      + +
      + +
      +
      + + + + Add files... + + + + + + +
      + +
      + +
      +
      +
      + +
       
      +
      +
      + +
      +
      + + +
      +
      +
      +

      Demo Notes

      +
        +
      • The maximum file size for uploads in this demo is 5 MB (default file size is unlimited).
        • +
      • Only image files (JPG, GIF, PNG) are allowed in this demo (by default there is no file type restriction).
        • +
      • Uploaded files will be deleted automatically after 5 minutes (demo setting).
        • +
      • You can drag & drop files from your desktop on this webpage with Google Chrome, Mozilla Firefox and Apple Safari.
        • +
      • Please refer to the project website and documentation for more information.
        • +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vendors/jquery-file-upload/js/cors/jquery.postmessage-transport.js b/vendors/jquery-file-upload/js/cors/jquery.postmessage-transport.js new file mode 100644 index 000000000..931b6352b --- /dev/null +++ b/vendors/jquery-file-upload/js/cors/jquery.postmessage-transport.js @@ -0,0 +1,117 @@ +/* + * jQuery postMessage Transport Plugin 1.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2011, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint unparam: true, nomen: true */ +/*global define, window, document */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define(['jquery'], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + + var counter = 0, + names = [ + 'accepts', + 'cache', + 'contents', + 'contentType', + 'crossDomain', + 'data', + 'dataType', + 'headers', + 'ifModified', + 'mimeType', + 'password', + 'processData', + 'timeout', + 'traditional', + 'type', + 'url', + 'username' + ], + convert = function (p) { + return p; + }; + + $.ajaxSetup({ + converters: { + 'postmessage text': convert, + 'postmessage json': convert, + 'postmessage html': convert + } + }); + + $.ajaxTransport('postmessage', function (options) { + if (options.postMessage && window.postMessage) { + var iframe, + loc = $('').prop('href', options.postMessage)[0], + target = loc.protocol + '//' + loc.host, + xhrUpload = options.xhr().upload; + return { + send: function (_, completeCallback) { + var message = { + id: 'postmessage-transport-' + (counter += 1) + }, + eventName = 'message.' + message.id; + iframe = $( + '' + ).bind('load', function () { + $.each(names, function (i, name) { + message[name] = options[name]; + }); + message.dataType = message.dataType.replace('postmessage ', ''); + $(window).bind(eventName, function (e) { + e = e.originalEvent; + var data = e.data, + ev; + if (e.origin === target && data.id === message.id) { + if (data.type === 'progress') { + ev = document.createEvent('Event'); + ev.initEvent(data.type, false, true); + $.extend(ev, data); + xhrUpload.dispatchEvent(ev); + } else { + completeCallback( + data.status, + data.statusText, + {postmessage: data.result}, + data.headers + ); + iframe.remove(); + $(window).unbind(eventName); + } + } + }); + iframe[0].contentWindow.postMessage( + message, + target + ); + }).appendTo(document.body); + }, + abort: function () { + if (iframe) { + iframe.remove(); + } + } + }; + } + }); + +})); diff --git a/vendors/jquery-file-upload/js/cors/jquery.xdr-transport.js b/vendors/jquery-file-upload/js/cors/jquery.xdr-transport.js new file mode 100644 index 000000000..c42c54828 --- /dev/null +++ b/vendors/jquery-file-upload/js/cors/jquery.xdr-transport.js @@ -0,0 +1,85 @@ +/* + * jQuery XDomainRequest Transport Plugin 1.1.2 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2011, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + * + * Based on Julian Aubourg's ajaxHooks xdr.js: + * https://github.com/jaubourg/ajaxHooks/ + */ + +/*jslint unparam: true */ +/*global define, window, XDomainRequest */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define(['jquery'], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + if (window.XDomainRequest && !$.support.cors) { + $.ajaxTransport(function (s) { + if (s.crossDomain && s.async) { + if (s.timeout) { + s.xdrTimeout = s.timeout; + delete s.timeout; + } + var xdr; + return { + send: function (headers, completeCallback) { + function callback(status, statusText, responses, responseHeaders) { + xdr.onload = xdr.onerror = xdr.ontimeout = $.noop; + xdr = null; + completeCallback(status, statusText, responses, responseHeaders); + } + xdr = new XDomainRequest(); + // XDomainRequest only supports GET and POST: + if (s.type === 'DELETE') { + s.url = s.url + (/\?/.test(s.url) ? '&' : '?') + + '_method=DELETE'; + s.type = 'POST'; + } else if (s.type === 'PUT') { + s.url = s.url + (/\?/.test(s.url) ? '&' : '?') + + '_method=PUT'; + s.type = 'POST'; + } + xdr.open(s.type, s.url); + xdr.onload = function () { + callback( + 200, + 'OK', + {text: xdr.responseText}, + 'Content-Type: ' + xdr.contentType + ); + }; + xdr.onerror = function () { + callback(404, 'Not Found'); + }; + if (s.xdrTimeout) { + xdr.ontimeout = function () { + callback(0, 'timeout'); + }; + xdr.timeout = s.xdrTimeout; + } + xdr.send((s.hasContent && s.data) || null); + }, + abort: function () { + if (xdr) { + xdr.onerror = $.noop(); + xdr.abort(); + } + } + }; + } + }); + } +})); diff --git a/vendors/jquery-file-upload/js/jquery.fileupload-fp.js b/vendors/jquery-file-upload/js/jquery.fileupload-fp.js new file mode 100644 index 000000000..634fb5e4e --- /dev/null +++ b/vendors/jquery-file-upload/js/jquery.fileupload-fp.js @@ -0,0 +1,219 @@ +/* + * jQuery File Upload File Processing Plugin 1.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true, unparam: true, regexp: true */ +/*global define, window, document */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'load-image', + 'canvas-to-blob', + './jquery.fileupload' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery, + window.loadImage + ); + } +}(function ($, loadImage) { + 'use strict'; + + // The File Upload IP version extends the basic fileupload widget + // with file processing functionality: + $.widget('blueimpFP.fileupload', $.blueimp.fileupload, { + + options: { + // The list of file processing actions: + process: [ + /* + { + action: 'load', + fileTypes: /^image\/(gif|jpeg|png)$/, + maxFileSize: 20000000 // 20MB + }, + { + action: 'resize', + maxWidth: 1920, + maxHeight: 1200, + minWidth: 800, + minHeight: 600 + }, + { + action: 'save' + } + */ + ], + + // The add callback is invoked as soon as files are added to the + // fileupload widget (via file input selection, drag & drop or add + // API call). See the basic file upload widget for more information: + add: function (e, data) { + $(this).fileupload('process', data).done(function () { + data.submit(); + }); + } + }, + + processActions: { + // Loads the image given via data.files and data.index + // as canvas element. + // Accepts the options fileTypes (regular expression) + // and maxFileSize (integer) to limit the files to load: + load: function (data, options) { + var that = this, + file = data.files[data.index], + dfd = $.Deferred(); + if (window.HTMLCanvasElement && + window.HTMLCanvasElement.prototype.toBlob && + ($.type(options.maxFileSize) !== 'number' || + file.size < options.maxFileSize) && + (!options.fileTypes || + options.fileTypes.test(file.type))) { + loadImage( + file, + function (canvas) { + data.canvas = canvas; + dfd.resolveWith(that, [data]); + }, + {canvas: true} + ); + } else { + dfd.rejectWith(that, [data]); + } + return dfd.promise(); + }, + // Resizes the image given as data.canvas and updates + // data.canvas with the resized image. + // Accepts the options maxWidth, maxHeight, minWidth and + // minHeight to scale the given image: + resize: function (data, options) { + if (data.canvas) { + var canvas = loadImage.scale(data.canvas, options); + if (canvas.width !== data.canvas.width || + canvas.height !== data.canvas.height) { + data.canvas = canvas; + data.processed = true; + } + } + return data; + }, + // Saves the processed image given as data.canvas + // inplace at data.index of data.files: + save: function (data, options) { + // Do nothing if no processing has happened: + if (!data.canvas || !data.processed) { + return data; + } + var that = this, + file = data.files[data.index], + name = file.name, + dfd = $.Deferred(), + callback = function (blob) { + if (!blob.name) { + if (file.type === blob.type) { + blob.name = file.name; + } else if (file.name) { + blob.name = file.name.replace( + /\..+$/, + '.' + blob.type.substr(6) + ); + } + } + // Store the created blob at the position + // of the original file in the files list: + data.files[data.index] = blob; + dfd.resolveWith(that, [data]); + }; + // Use canvas.mozGetAsFile directly, to retain the filename, as + // Gecko doesn't support the filename option for FormData.append: + if (data.canvas.mozGetAsFile) { + callback(data.canvas.mozGetAsFile( + (/^image\/(jpeg|png)$/.test(file.type) && name) || + ((name && name.replace(/\..+$/, '')) || + 'blob') + '.png', + file.type + )); + } else { + data.canvas.toBlob(callback, file.type); + } + return dfd.promise(); + } + }, + + // Resizes the file at the given index and stores the created blob at + // the original position of the files list, returns a Promise object: + _processFile: function (files, index, options) { + var that = this, + dfd = $.Deferred().resolveWith(that, [{ + files: files, + index: index + }]), + chain = dfd.promise(); + that._processing += 1; + $.each(options.process, function (i, settings) { + chain = chain.pipe(function (data) { + return that.processActions[settings.action] + .call(this, data, settings); + }); + }); + chain.always(function () { + that._processing -= 1; + if (that._processing === 0) { + that.element + .removeClass('fileupload-processing'); + } + }); + if (that._processing === 1) { + that.element.addClass('fileupload-processing'); + } + return chain; + }, + + // Processes the files given as files property of the data parameter, + // returns a Promise object that allows to bind a done handler, which + // will be invoked after processing all files (inplace) is done: + process: function (data) { + var that = this, + options = $.extend({}, this.options, data); + if (options.process && options.process.length && + this._isXHRUpload(options)) { + $.each(data.files, function (index, file) { + that._processingQueue = that._processingQueue.pipe( + function () { + var dfd = $.Deferred(); + that._processFile(data.files, index, options) + .always(function () { + dfd.resolveWith(that); + }); + return dfd.promise(); + } + ); + }); + } + return this._processingQueue; + }, + + _create: function () { + $.blueimp.fileupload.prototype._create.call(this); + this._processing = 0; + this._processingQueue = $.Deferred().resolveWith(this) + .promise(); + } + + }); + +})); diff --git a/vendors/jquery-file-upload/js/jquery.fileupload-jui.js b/vendors/jquery-file-upload/js/jquery.fileupload-jui.js new file mode 100644 index 000000000..69736a4a4 --- /dev/null +++ b/vendors/jquery-file-upload/js/jquery.fileupload-jui.js @@ -0,0 +1,141 @@ +/* + * jQuery File Upload jQuery UI Plugin 1.2 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true */ +/*global define, window */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define(['jquery', './jquery.fileupload-ui.js'], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + $.widget('blueimpJUI.fileupload', $.blueimpUI.fileupload, { + options: { + sent: function (e, data) { + if (data.context && data.dataType && + data.dataType.substr(0, 6) === 'iframe') { + // Iframe Transport does not support progress events. + // In lack of an indeterminate progress bar, we set + // the progress to 100%, showing the full animated bar: + data.context + .find('.progress').progressbar( + 'option', + 'value', + 100 + ); + } + }, + progress: function (e, data) { + if (data.context) { + data.context.find('.progress').progressbar( + 'option', + 'value', + parseInt(data.loaded / data.total * 100, 10) + ); + } + }, + progressall: function (e, data) { + var $this = $(this); + $this.find('.fileupload-progress') + .find('.progress').progressbar( + 'option', + 'value', + parseInt(data.loaded / data.total * 100, 10) + ).end() + .find('.progress-extended').each(function () { + $(this).html( + $this.data('fileupload') + ._renderExtendedProgress(data) + ); + }); + } + }, + _renderUpload: function (func, files) { + var node = $.blueimpUI.fileupload.prototype + ._renderUpload.call(this, func, files), + showIconText = $(window).width() > 480; + node.find('.progress').empty().progressbar(); + node.find('.start button').button({ + icons: {primary: 'ui-icon-circle-arrow-e'}, + text: showIconText + }); + node.find('.cancel button').button({ + icons: {primary: 'ui-icon-cancel'}, + text: showIconText + }); + return node; + }, + _renderDownload: function (func, files) { + var node = $.blueimpUI.fileupload.prototype + ._renderDownload.call(this, func, files), + showIconText = $(window).width() > 480; + node.find('.delete button').button({ + icons: {primary: 'ui-icon-trash'}, + text: showIconText + }); + return node; + }, + _transition: function (node) { + var that = this, + deferred = $.Deferred(); + if (node.hasClass('fade')) { + node.fadeToggle(function () { + deferred.resolveWith(node); + }); + } else { + deferred.resolveWith(node); + } + return deferred; + }, + _create: function () { + $.blueimpUI.fileupload.prototype._create.call(this); + this.element + .find('.fileupload-buttonbar') + .find('.fileinput-button').each(function () { + var input = $(this).find('input:file').detach(); + $(this) + .button({icons: {primary: 'ui-icon-plusthick'}}) + .append(input); + }) + .end().find('.start') + .button({icons: {primary: 'ui-icon-circle-arrow-e'}}) + .end().find('.cancel') + .button({icons: {primary: 'ui-icon-cancel'}}) + .end().find('.delete') + .button({icons: {primary: 'ui-icon-trash'}}) + .end().find('.progress').empty().progressbar(); + }, + destroy: function () { + this.element + .find('.fileupload-buttonbar') + .find('.fileinput-button').each(function () { + var input = $(this).find('input:file').detach(); + $(this) + .button('destroy') + .append(input); + }) + .end().find('.start') + .button('destroy') + .end().find('.cancel') + .button('destroy') + .end().find('.delete') + .button('destroy') + .end().find('.progress').progressbar('destroy'); + $.blueimpUI.fileupload.prototype.destroy.call(this); + } + }); +})); diff --git a/vendors/jquery-file-upload/js/jquery.fileupload-ui.js b/vendors/jquery-file-upload/js/jquery.fileupload-ui.js new file mode 100644 index 000000000..4c36f0086 --- /dev/null +++ b/vendors/jquery-file-upload/js/jquery.fileupload-ui.js @@ -0,0 +1,736 @@ +/* + * jQuery File Upload User Interface Plugin 6.9.4 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true, unparam: true, regexp: true */ +/*global define, window, document, URL, webkitURL, FileReader */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'tmpl', + 'load-image', + './jquery.fileupload-fp' + ], factory); + } else { + // Browser globals: + factory( + window.jQuery, + window.tmpl, + window.loadImage + ); + } +}(function ($, tmpl, loadImage) { + 'use strict'; + + // The UI version extends the FP (file processing) version or the basic + // file upload widget and adds complete user interface interaction: + var parentWidget = ($.blueimpFP || $.blueimp).fileupload; + $.widget('blueimpUI.fileupload', parentWidget, { + + options: { + // By default, files added to the widget are uploaded as soon + // as the user clicks on the start buttons. To enable automatic + // uploads, set the following option to true: + autoUpload: false, + // The following option limits the number of files that are + // allowed to be uploaded using this widget: + maxNumberOfFiles: undefined, + // The maximum allowed file size: + maxFileSize: undefined, + // The minimum allowed file size: + minFileSize: undefined, + // The regular expression for allowed file types, matches + // against either file type or file name: + acceptFileTypes: /.+$/i, + // The regular expression to define for which files a preview + // image is shown, matched against the file type: + previewSourceFileTypes: /^image\/(gif|jpeg|png)$/, + // The maximum file size of images that are to be displayed as preview: + previewSourceMaxFileSize: 5000000, // 5MB + // The maximum width of the preview images: + previewMaxWidth: 80, + // The maximum height of the preview images: + previewMaxHeight: 80, + // By default, preview images are displayed as canvas elements + // if supported by the browser. Set the following option to false + // to always display preview images as img elements: + previewAsCanvas: true, + // The ID of the upload template: + uploadTemplateId: 'template-upload', + // The ID of the download template: + downloadTemplateId: 'template-download', + // The container for the list of files. If undefined, it is set to + // an element with class "files" inside of the widget element: + filesContainer: undefined, + // By default, files are appended to the files container. + // Set the following option to true, to prepend files instead: + prependFiles: false, + // The expected data type of the upload response, sets the dataType + // option of the $.ajax upload requests: + dataType: 'json', + + // The add callback is invoked as soon as files are added to the fileupload + // widget (via file input selection, drag & drop or add API call). + // See the basic file upload widget for more information: + add: function (e, data) { + var that = $(this).data('fileupload'), + options = that.options, + files = data.files; + $(this).fileupload('process', data).done(function () { + that._adjustMaxNumberOfFiles(-files.length); + data.maxNumberOfFilesAdjusted = true; + data.files.valid = data.isValidated = that._validate(files); + data.context = that._renderUpload(files).data('data', data); + options.filesContainer[ + options.prependFiles ? 'prepend' : 'append' + ](data.context); + that._renderPreviews(files, data.context); + that._forceReflow(data.context); + that._transition(data.context).done( + function () { + if ((that._trigger('added', e, data) !== false) && + (options.autoUpload || data.autoUpload) && + data.autoUpload !== false && data.isValidated) { + data.submit(); + } + } + ); + }); + }, + // Callback for the start of each file upload request: + send: function (e, data) { + var that = $(this).data('fileupload'); + if (!data.isValidated) { + if (!data.maxNumberOfFilesAdjusted) { + that._adjustMaxNumberOfFiles(-data.files.length); + data.maxNumberOfFilesAdjusted = true; + } + if (!that._validate(data.files)) { + return false; + } + } + if (data.context && data.dataType && + data.dataType.substr(0, 6) === 'iframe') { + // Iframe Transport does not support progress events. + // In lack of an indeterminate progress bar, we set + // the progress to 100%, showing the full animated bar: + data.context + .find('.progress').addClass( + !$.support.transition && 'progress-animated' + ) + .attr('aria-valuenow', 100) + .find('.bar').css( + 'width', + '100%' + ); + } + return that._trigger('sent', e, data); + }, + // Callback for successful uploads: + done: function (e, data) { + var that = $(this).data('fileupload'), + template; + if (data.context) { + data.context.each(function (index) { + var file = ($.isArray(data.result) && + data.result[index]) || {error: 'emptyResult'}; + if (file.error) { + that._adjustMaxNumberOfFiles(1); + } + that._transition($(this)).done( + function () { + var node = $(this); + template = that._renderDownload([file]) + .replaceAll(node); + that._forceReflow(template); + that._transition(template).done( + function () { + data.context = $(this); + that._trigger('completed', e, data); + } + ); + } + ); + }); + } else { + if ($.isArray(data.result)) { + $.each(data.result, function (index, file) { + if (data.maxNumberOfFilesAdjusted && file.error) { + that._adjustMaxNumberOfFiles(1); + } else if (!data.maxNumberOfFilesAdjusted && + !file.error) { + that._adjustMaxNumberOfFiles(-1); + } + }); + data.maxNumberOfFilesAdjusted = true; + } + template = that._renderDownload(data.result) + .appendTo(that.options.filesContainer); + that._forceReflow(template); + that._transition(template).done( + function () { + data.context = $(this); + that._trigger('completed', e, data); + } + ); + } + }, + // Callback for failed (abort or error) uploads: + fail: function (e, data) { + var that = $(this).data('fileupload'), + template; + if (data.maxNumberOfFilesAdjusted) { + that._adjustMaxNumberOfFiles(data.files.length); + } + if (data.context) { + data.context.each(function (index) { + if (data.errorThrown !== 'abort') { + var file = data.files[index]; + file.error = file.error || data.errorThrown || + true; + that._transition($(this)).done( + function () { + var node = $(this); + template = that._renderDownload([file]) + .replaceAll(node); + that._forceReflow(template); + that._transition(template).done( + function () { + data.context = $(this); + that._trigger('failed', e, data); + } + ); + } + ); + } else { + that._transition($(this)).done( + function () { + $(this).remove(); + that._trigger('failed', e, data); + } + ); + } + }); + } else if (data.errorThrown !== 'abort') { + data.context = that._renderUpload(data.files) + .appendTo(that.options.filesContainer) + .data('data', data); + that._forceReflow(data.context); + that._transition(data.context).done( + function () { + data.context = $(this); + that._trigger('failed', e, data); + } + ); + } else { + that._trigger('failed', e, data); + } + }, + // Callback for upload progress events: + progress: function (e, data) { + if (data.context) { + var progress = parseInt(data.loaded / data.total * 100, 10); + data.context.find('.progress') + .attr('aria-valuenow', progress) + .find('.bar').css( + 'width', + progress + '%' + ); + } + }, + // Callback for global upload progress events: + progressall: function (e, data) { + var $this = $(this), + progress = parseInt(data.loaded / data.total * 100, 10), + globalProgressNode = $this.find('.fileupload-progress'), + extendedProgressNode = globalProgressNode + .find('.progress-extended'); + if (extendedProgressNode.length) { + extendedProgressNode.html( + $this.data('fileupload')._renderExtendedProgress(data) + ); + } + globalProgressNode + .find('.progress') + .attr('aria-valuenow', progress) + .find('.bar').css( + 'width', + progress + '%' + ); + }, + // Callback for uploads start, equivalent to the global ajaxStart event: + start: function (e) { + var that = $(this).data('fileupload'); + that._transition($(this).find('.fileupload-progress')).done( + function () { + that._trigger('started', e); + } + ); + }, + // Callback for uploads stop, equivalent to the global ajaxStop event: + stop: function (e) { + var that = $(this).data('fileupload'); + that._transition($(this).find('.fileupload-progress')).done( + function () { + $(this).find('.progress') + .attr('aria-valuenow', '0') + .find('.bar').css('width', '0%'); + $(this).find('.progress-extended').html(' '); + that._trigger('stopped', e); + } + ); + }, + // Callback for file deletion: + destroy: function (e, data) { + var that = $(this).data('fileupload'); + if (data.url) { + $.ajax(data); + that._adjustMaxNumberOfFiles(1); + } + that._transition(data.context).done( + function () { + $(this).remove(); + that._trigger('destroyed', e, data); + } + ); + } + }, + + // Link handler, that allows to download files + // by drag & drop of the links to the desktop: + _enableDragToDesktop: function () { + var link = $(this), + url = link.prop('href'), + name = link.prop('download'), + type = 'application/octet-stream'; + link.bind('dragstart', function (e) { + try { + e.originalEvent.dataTransfer.setData( + 'DownloadURL', + [type, name, url].join(':') + ); + } catch (err) {} + }); + }, + + _adjustMaxNumberOfFiles: function (operand) { + if (typeof this.options.maxNumberOfFiles === 'number') { + this.options.maxNumberOfFiles += operand; + if (this.options.maxNumberOfFiles < 1) { + this._disableFileInputButton(); + } else { + this._enableFileInputButton(); + } + } + }, + + _formatFileSize: function (bytes) { + if (typeof bytes !== 'number') { + return ''; + } + if (bytes >= 1000000000) { + return (bytes / 1000000000).toFixed(2) + ' GB'; + } + if (bytes >= 1000000) { + return (bytes / 1000000).toFixed(2) + ' MB'; + } + return (bytes / 1000).toFixed(2) + ' KB'; + }, + + _formatBitrate: function (bits) { + if (typeof bits !== 'number') { + return ''; + } + if (bits >= 1000000000) { + return (bits / 1000000000).toFixed(2) + ' Gbit/s'; + } + if (bits >= 1000000) { + return (bits / 1000000).toFixed(2) + ' Mbit/s'; + } + if (bits >= 1000) { + return (bits / 1000).toFixed(2) + ' kbit/s'; + } + return bits + ' bit/s'; + }, + + _formatTime: function (seconds) { + var date = new Date(seconds * 1000), + days = parseInt(seconds / 86400, 10); + days = days ? days + 'd ' : ''; + return days + + ('0' + date.getUTCHours()).slice(-2) + ':' + + ('0' + date.getUTCMinutes()).slice(-2) + ':' + + ('0' + date.getUTCSeconds()).slice(-2); + }, + + _formatPercentage: function (floatValue) { + return (floatValue * 100).toFixed(2) + ' %'; + }, + + _renderExtendedProgress: function (data) { + return this._formatBitrate(data.bitrate) + ' | ' + + this._formatTime( + (data.total - data.loaded) * 8 / data.bitrate + ) + ' | ' + + this._formatPercentage( + data.loaded / data.total + ) + ' | ' + + this._formatFileSize(data.loaded) + ' / ' + + this._formatFileSize(data.total); + }, + + _hasError: function (file) { + if (file.error) { + return file.error; + } + // The number of added files is subtracted from + // maxNumberOfFiles before validation, so we check if + // maxNumberOfFiles is below 0 (instead of below 1): + if (this.options.maxNumberOfFiles < 0) { + return 'maxNumberOfFiles'; + } + // Files are accepted if either the file type or the file name + // matches against the acceptFileTypes regular expression, as + // only browsers with support for the File API report the type: + if (!(this.options.acceptFileTypes.test(file.type) || + this.options.acceptFileTypes.test(file.name))) { + return 'acceptFileTypes'; + } + if (this.options.maxFileSize && + file.size > this.options.maxFileSize) { + return 'maxFileSize'; + } + if (typeof file.size === 'number' && + file.size < this.options.minFileSize) { + return 'minFileSize'; + } + return null; + }, + + _validate: function (files) { + var that = this, + valid = !!files.length; + $.each(files, function (index, file) { + file.error = that._hasError(file); + if (file.error) { + valid = false; + } + }); + return valid; + }, + + _renderTemplate: function (func, files) { + if (!func) { + return $(); + } + var result = func({ + files: files, + formatFileSize: this._formatFileSize, + options: this.options + }); + if (result instanceof $) { + return result; + } + return $(this.options.templatesContainer).html(result).children(); + }, + + _renderPreview: function (file, node) { + var that = this, + options = this.options, + dfd = $.Deferred(); + return ((loadImage && loadImage( + file, + function (img) { + node.append(img); + that._forceReflow(node); + that._transition(node).done(function () { + dfd.resolveWith(node); + }); + if (!$.contains(document.body, node[0])) { + // If the element is not part of the DOM, + // transition events are not triggered, + // so we have to resolve manually: + dfd.resolveWith(node); + } + }, + { + maxWidth: options.previewMaxWidth, + maxHeight: options.previewMaxHeight, + canvas: options.previewAsCanvas + } + )) || dfd.resolveWith(node)) && dfd; + }, + + _renderPreviews: function (files, nodes) { + var that = this, + options = this.options; + nodes.find('.preview span').each(function (index, element) { + var file = files[index]; + if (options.previewSourceFileTypes.test(file.type) && + ($.type(options.previewSourceMaxFileSize) !== 'number' || + file.size < options.previewSourceMaxFileSize)) { + that._processingQueue = that._processingQueue.pipe(function () { + var dfd = $.Deferred(); + that._renderPreview(file, $(element)).done( + function () { + dfd.resolveWith(that); + } + ); + return dfd.promise(); + }); + } + }); + return this._processingQueue; + }, + + _renderUpload: function (files) { + return this._renderTemplate( + this.options.uploadTemplate, + files + ); + }, + + _renderDownload: function (files) { + return this._renderTemplate( + this.options.downloadTemplate, + files + ).find('a[download]').each(this._enableDragToDesktop).end(); + }, + + _startHandler: function (e) { + e.preventDefault(); + var button = $(this), + template = button.closest('.template-upload'), + data = template.data('data'); + if (data && data.submit && !data.jqXHR && data.submit()) { + button.prop('disabled', true); + } + }, + + _cancelHandler: function (e) { + e.preventDefault(); + var template = $(this).closest('.template-upload'), + data = template.data('data') || {}; + if (!data.jqXHR) { + data.errorThrown = 'abort'; + e.data.fileupload._trigger('fail', e, data); + } else { + data.jqXHR.abort(); + } + }, + + _deleteHandler: function (e) { + e.preventDefault(); + var button = $(this); + e.data.fileupload._trigger('destroy', e, { + context: button.closest('.template-download'), + url: button.attr('data-url'), + type: button.attr('data-type') || 'DELETE', + dataType: e.data.fileupload.options.dataType + }); + }, + + _forceReflow: function (node) { + return $.support.transition && node.length && + node[0].offsetWidth; + }, + + _transition: function (node) { + var dfd = $.Deferred(); + if ($.support.transition && node.hasClass('fade')) { + node.bind( + $.support.transition.end, + function (e) { + // Make sure we don't respond to other transitions events + // in the container element, e.g. from button elements: + if (e.target === node[0]) { + node.unbind($.support.transition.end); + dfd.resolveWith(node); + } + } + ).toggleClass('in'); + } else { + node.toggleClass('in'); + dfd.resolveWith(node); + } + return dfd; + }, + + _initButtonBarEventHandlers: function () { + var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'), + filesList = this.options.filesContainer, + ns = this.options.namespace; + fileUploadButtonBar.find('.start') + .bind('click.' + ns, function (e) { + e.preventDefault(); + filesList.find('.start button').click(); + }); + fileUploadButtonBar.find('.cancel') + .bind('click.' + ns, function (e) { + e.preventDefault(); + filesList.find('.cancel button').click(); + }); + fileUploadButtonBar.find('.delete') + .bind('click.' + ns, function (e) { + e.preventDefault(); + filesList.find('.delete input:checked') + .siblings('button').click(); + fileUploadButtonBar.find('.toggle') + .prop('checked', false); + }); + fileUploadButtonBar.find('.toggle') + .bind('change.' + ns, function (e) { + filesList.find('.delete input').prop( + 'checked', + $(this).is(':checked') + ); + }); + }, + + _destroyButtonBarEventHandlers: function () { + this.element.find('.fileupload-buttonbar button') + .unbind('click.' + this.options.namespace); + this.element.find('.fileupload-buttonbar .toggle') + .unbind('change.' + this.options.namespace); + }, + + _initEventHandlers: function () { + parentWidget.prototype._initEventHandlers.call(this); + var eventData = {fileupload: this}; + this.options.filesContainer + .delegate( + '.start button', + 'click.' + this.options.namespace, + eventData, + this._startHandler + ) + .delegate( + '.cancel button', + 'click.' + this.options.namespace, + eventData, + this._cancelHandler + ) + .delegate( + '.delete button', + 'click.' + this.options.namespace, + eventData, + this._deleteHandler + ); + this._initButtonBarEventHandlers(); + }, + + _destroyEventHandlers: function () { + var options = this.options; + this._destroyButtonBarEventHandlers(); + options.filesContainer + .undelegate('.start button', 'click.' + options.namespace) + .undelegate('.cancel button', 'click.' + options.namespace) + .undelegate('.delete button', 'click.' + options.namespace); + parentWidget.prototype._destroyEventHandlers.call(this); + }, + + _enableFileInputButton: function () { + this.element.find('.fileinput-button input') + .prop('disabled', false) + .parent().removeClass('disabled'); + }, + + _disableFileInputButton: function () { + this.element.find('.fileinput-button input') + .prop('disabled', true) + .parent().addClass('disabled'); + }, + + _initTemplates: function () { + var options = this.options; + options.templatesContainer = document.createElement( + options.filesContainer.prop('nodeName') + ); + if (tmpl) { + if (options.uploadTemplateId) { + options.uploadTemplate = tmpl(options.uploadTemplateId); + } + if (options.downloadTemplateId) { + options.downloadTemplate = tmpl(options.downloadTemplateId); + } + } + }, + + _initFilesContainer: function () { + var options = this.options; + if (options.filesContainer === undefined) { + options.filesContainer = this.element.find('.files'); + } else if (!(options.filesContainer instanceof $)) { + options.filesContainer = $(options.filesContainer); + } + }, + + _stringToRegExp: function (str) { + var parts = str.split('/'), + modifiers = parts.pop(); + parts.shift(); + return new RegExp(parts.join('/'), modifiers); + }, + + _initRegExpOptions: function () { + var options = this.options; + if ($.type(options.acceptFileTypes) === 'string') { + options.acceptFileTypes = this._stringToRegExp( + options.acceptFileTypes + ); + } + if ($.type(options.previewSourceFileTypes) === 'string') { + options.previewSourceFileTypes = this._stringToRegExp( + options.previewSourceFileTypes + ); + } + }, + + _initSpecialOptions: function () { + parentWidget.prototype._initSpecialOptions.call(this); + this._initFilesContainer(); + this._initTemplates(); + this._initRegExpOptions(); + }, + + _create: function () { + parentWidget.prototype._create.call(this); + this._refreshOptionsList.push( + 'filesContainer', + 'uploadTemplateId', + 'downloadTemplateId' + ); + if (!$.blueimpFP) { + this._processingQueue = $.Deferred().resolveWith(this).promise(); + this.process = function () { + return this._processingQueue; + }; + } + }, + + enable: function () { + parentWidget.prototype.enable.call(this); + this.element.find('input, button').prop('disabled', false); + this._enableFileInputButton(); + }, + + disable: function () { + this.element.find('input, button').prop('disabled', true); + this._disableFileInputButton(); + parentWidget.prototype.disable.call(this); + } + + }); + +})); diff --git a/vendors/jquery-file-upload/js/jquery.fileupload.js b/vendors/jquery-file-upload/js/jquery.fileupload.js new file mode 100644 index 000000000..4bbd28729 --- /dev/null +++ b/vendors/jquery-file-upload/js/jquery.fileupload.js @@ -0,0 +1,972 @@ +/* + * jQuery File Upload Plugin 5.13 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true, unparam: true, regexp: true */ +/*global define, window, document, Blob, FormData, location */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define([ + 'jquery', + 'jquery.ui.widget' + ], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + + // The FileReader API is not actually used, but works as feature detection, + // as e.g. Safari supports XHR file uploads via the FormData API, + // but not non-multipart XHR file uploads: + $.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader); + $.support.xhrFormDataFileUpload = !!window.FormData; + + // The fileupload widget listens for change events on file input fields defined + // via fileInput setting and paste or drop events of the given dropZone. + // In addition to the default jQuery Widget methods, the fileupload widget + // exposes the "add" and "send" methods, to add or directly send files using + // the fileupload API. + // By default, files added via file input selection, paste, drag & drop or + // "add" method are uploaded immediately, but it is possible to override + // the "add" callback option to queue file uploads. + $.widget('blueimp.fileupload', { + + options: { + // The namespace used for event handler binding on the dropZone and + // fileInput collections. + // If not set, the name of the widget ("fileupload") is used. + namespace: undefined, + // The drop target collection, by the default the complete document. + // Set to null or an empty collection to disable drag & drop support: + dropZone: $(document), + // The file input field collection, that is listened for change events. + // If undefined, it is set to the file input fields inside + // of the widget element on plugin initialization. + // Set to null or an empty collection to disable the change listener. + fileInput: undefined, + // By default, the file input field is replaced with a clone after + // each input field change event. This is required for iframe transport + // queues and allows change events to be fired for the same file + // selection, but can be disabled by setting the following option to false: + replaceFileInput: true, + // The parameter name for the file form data (the request argument name). + // If undefined or empty, the name property of the file input field is + // used, or "files[]" if the file input name property is also empty, + // can be a string or an array of strings: + paramName: undefined, + // By default, each file of a selection is uploaded using an individual + // request for XHR type uploads. Set to false to upload file + // selections in one request each: + singleFileUploads: true, + // To limit the number of files uploaded with one XHR request, + // set the following option to an integer greater than 0: + limitMultiFileUploads: undefined, + // Set the following option to true to issue all file upload requests + // in a sequential order: + sequentialUploads: false, + // To limit the number of concurrent uploads, + // set the following option to an integer greater than 0: + limitConcurrentUploads: undefined, + // Set the following option to true to force iframe transport uploads: + forceIframeTransport: false, + // Set the following option to the location of a redirect url on the + // origin server, for cross-domain iframe transport uploads: + redirect: undefined, + // The parameter name for the redirect url, sent as part of the form + // data and set to 'redirect' if this option is empty: + redirectParamName: undefined, + // Set the following option to the location of a postMessage window, + // to enable postMessage transport uploads: + postMessage: undefined, + // By default, XHR file uploads are sent as multipart/form-data. + // The iframe transport is always using multipart/form-data. + // Set to false to enable non-multipart XHR uploads: + multipart: true, + // To upload large files in smaller chunks, set the following option + // to a preferred maximum chunk size. If set to 0, null or undefined, + // or the browser does not support the required Blob API, files will + // be uploaded as a whole. + maxChunkSize: undefined, + // When a non-multipart upload or a chunked multipart upload has been + // aborted, this option can be used to resume the upload by setting + // it to the size of the already uploaded bytes. This option is most + // useful when modifying the options object inside of the "add" or + // "send" callbacks, as the options are cloned for each file upload. + uploadedBytes: undefined, + // By default, failed (abort or error) file uploads are removed from the + // global progress calculation. Set the following option to false to + // prevent recalculating the global progress data: + recalculateProgress: true, + // Interval in milliseconds to calculate and trigger progress events: + progressInterval: 100, + // Interval in milliseconds to calculate progress bitrate: + bitrateInterval: 500, + + // Additional form data to be sent along with the file uploads can be set + // using this option, which accepts an array of objects with name and + // value properties, a function returning such an array, a FormData + // object (for XHR file uploads), or a simple object. + // The form of the first fileInput is given as parameter to the function: + formData: function (form) { + return form.serializeArray(); + }, + + // The add callback is invoked as soon as files are added to the fileupload + // widget (via file input selection, drag & drop, paste or add API call). + // If the singleFileUploads option is enabled, this callback will be + // called once for each file in the selection for XHR file uplaods, else + // once for each file selection. + // The upload starts when the submit method is invoked on the data parameter. + // The data object contains a files property holding the added files + // and allows to override plugin options as well as define ajax settings. + // Listeners for this callback can also be bound the following way: + // .bind('fileuploadadd', func); + // data.submit() returns a Promise object and allows to attach additional + // handlers using jQuery's Deferred callbacks: + // data.submit().done(func).fail(func).always(func); + add: function (e, data) { + data.submit(); + }, + + // Other callbacks: + // Callback for the submit event of each file upload: + // submit: function (e, data) {}, // .bind('fileuploadsubmit', func); + // Callback for the start of each file upload request: + // send: function (e, data) {}, // .bind('fileuploadsend', func); + // Callback for successful uploads: + // done: function (e, data) {}, // .bind('fileuploaddone', func); + // Callback for failed (abort or error) uploads: + // fail: function (e, data) {}, // .bind('fileuploadfail', func); + // Callback for completed (success, abort or error) requests: + // always: function (e, data) {}, // .bind('fileuploadalways', func); + // Callback for upload progress events: + // progress: function (e, data) {}, // .bind('fileuploadprogress', func); + // Callback for global upload progress events: + // progressall: function (e, data) {}, // .bind('fileuploadprogressall', func); + // Callback for uploads start, equivalent to the global ajaxStart event: + // start: function (e) {}, // .bind('fileuploadstart', func); + // Callback for uploads stop, equivalent to the global ajaxStop event: + // stop: function (e) {}, // .bind('fileuploadstop', func); + // Callback for change events of the fileInput collection: + // change: function (e, data) {}, // .bind('fileuploadchange', func); + // Callback for paste events to the dropZone collection: + // paste: function (e, data) {}, // .bind('fileuploadpaste', func); + // Callback for drop events of the dropZone collection: + // drop: function (e, data) {}, // .bind('fileuploaddrop', func); + // Callback for dragover events of the dropZone collection: + // dragover: function (e) {}, // .bind('fileuploaddragover', func); + + // The plugin options are used as settings object for the ajax calls. + // The following are jQuery ajax settings required for the file uploads: + processData: false, + contentType: false, + cache: false + }, + + // A list of options that require a refresh after assigning a new value: + _refreshOptionsList: [ + 'namespace', + 'dropZone', + 'fileInput', + 'multipart', + 'forceIframeTransport' + ], + + _BitrateTimer: function () { + this.timestamp = +(new Date()); + this.loaded = 0; + this.bitrate = 0; + this.getBitrate = function (now, loaded, interval) { + var timeDiff = now - this.timestamp; + if (!this.bitrate || !interval || timeDiff > interval) { + this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8; + this.loaded = loaded; + this.timestamp = now; + } + return this.bitrate; + }; + }, + + _isXHRUpload: function (options) { + return !options.forceIframeTransport && + ((!options.multipart && $.support.xhrFileUpload) || + $.support.xhrFormDataFileUpload); + }, + + _getFormData: function (options) { + var formData; + if (typeof options.formData === 'function') { + return options.formData(options.form); + } + if ($.isArray(options.formData)) { + return options.formData; + } + if (options.formData) { + formData = []; + $.each(options.formData, function (name, value) { + formData.push({name: name, value: value}); + }); + return formData; + } + return []; + }, + + _getTotal: function (files) { + var total = 0; + $.each(files, function (index, file) { + total += file.size || 1; + }); + return total; + }, + + _onProgress: function (e, data) { + if (e.lengthComputable) { + var now = +(new Date()), + total, + loaded; + if (data._time && data.progressInterval && + (now - data._time < data.progressInterval) && + e.loaded !== e.total) { + return; + } + data._time = now; + total = data.total || this._getTotal(data.files); + loaded = parseInt( + e.loaded / e.total * (data.chunkSize || total), + 10 + ) + (data.uploadedBytes || 0); + this._loaded += loaded - (data.loaded || data.uploadedBytes || 0); + data.lengthComputable = true; + data.loaded = loaded; + data.total = total; + data.bitrate = data._bitrateTimer.getBitrate( + now, + loaded, + data.bitrateInterval + ); + // Trigger a custom progress event with a total data property set + // to the file size(s) of the current upload and a loaded data + // property calculated accordingly: + this._trigger('progress', e, data); + // Trigger a global progress event for all current file uploads, + // including ajax calls queued for sequential file uploads: + this._trigger('progressall', e, { + lengthComputable: true, + loaded: this._loaded, + total: this._total, + bitrate: this._bitrateTimer.getBitrate( + now, + this._loaded, + data.bitrateInterval + ) + }); + } + }, + + _initProgressListener: function (options) { + var that = this, + xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr(); + // Accesss to the native XHR object is required to add event listeners + // for the upload progress event: + if (xhr.upload) { + $(xhr.upload).bind('progress', function (e) { + var oe = e.originalEvent; + // Make sure the progress event properties get copied over: + e.lengthComputable = oe.lengthComputable; + e.loaded = oe.loaded; + e.total = oe.total; + that._onProgress(e, options); + }); + options.xhr = function () { + return xhr; + }; + } + }, + + _initXHRData: function (options) { + var formData, + file = options.files[0], + // Ignore non-multipart setting if not supported: + multipart = options.multipart || !$.support.xhrFileUpload, + paramName = options.paramName[0]; + if (!multipart || options.blob) { + // For non-multipart uploads and chunked uploads, + // file meta data is not part of the request body, + // so we transmit this data as part of the HTTP headers. + // For cross domain requests, these headers must be allowed + // via Access-Control-Allow-Headers or removed using + // the beforeSend callback: + options.headers = $.extend(options.headers, { + 'X-File-Name': file.name, + 'X-File-Type': file.type, + 'X-File-Size': file.size + }); + if (!options.blob) { + // Non-chunked non-multipart upload: + options.contentType = file.type; + options.data = file; + } else if (!multipart) { + // Chunked non-multipart upload: + options.contentType = 'application/octet-stream'; + options.data = options.blob; + } + } + if (multipart && $.support.xhrFormDataFileUpload) { + if (options.postMessage) { + // window.postMessage does not allow sending FormData + // objects, so we just add the File/Blob objects to + // the formData array and let the postMessage window + // create the FormData object out of this array: + formData = this._getFormData(options); + if (options.blob) { + formData.push({ + name: paramName, + value: options.blob + }); + } else { + $.each(options.files, function (index, file) { + formData.push({ + name: options.paramName[index] || paramName, + value: file + }); + }); + } + } else { + if (options.formData instanceof FormData) { + formData = options.formData; + } else { + formData = new FormData(); + $.each(this._getFormData(options), function (index, field) { + formData.append(field.name, field.value); + }); + } + if (options.blob) { + formData.append(paramName, options.blob, file.name); + } else { + $.each(options.files, function (index, file) { + // File objects are also Blob instances. + // This check allows the tests to run with + // dummy objects: + if (file instanceof Blob) { + formData.append( + options.paramName[index] || paramName, + file, + file.name + ); + } + }); + } + } + options.data = formData; + } + // Blob reference is not needed anymore, free memory: + options.blob = null; + }, + + _initIframeSettings: function (options) { + // Setting the dataType to iframe enables the iframe transport: + options.dataType = 'iframe ' + (options.dataType || ''); + // The iframe transport accepts a serialized array as form data: + options.formData = this._getFormData(options); + // Add redirect url to form data on cross-domain uploads: + if (options.redirect && $('').prop('href', options.url) + .prop('host') !== location.host) { + options.formData.push({ + name: options.redirectParamName || 'redirect', + value: options.redirect + }); + } + }, + + _initDataSettings: function (options) { + if (this._isXHRUpload(options)) { + if (!this._chunkedUpload(options, true)) { + if (!options.data) { + this._initXHRData(options); + } + this._initProgressListener(options); + } + if (options.postMessage) { + // Setting the dataType to postmessage enables the + // postMessage transport: + options.dataType = 'postmessage ' + (options.dataType || ''); + } + } else { + this._initIframeSettings(options, 'iframe'); + } + }, + + _getParamName: function (options) { + var fileInput = $(options.fileInput), + paramName = options.paramName; + if (!paramName) { + paramName = []; + fileInput.each(function () { + var input = $(this), + name = input.prop('name') || 'files[]', + i = (input.prop('files') || [1]).length; + while (i) { + paramName.push(name); + i -= 1; + } + }); + if (!paramName.length) { + paramName = [fileInput.prop('name') || 'files[]']; + } + } else if (!$.isArray(paramName)) { + paramName = [paramName]; + } + return paramName; + }, + + _initFormSettings: function (options) { + // Retrieve missing options from the input field and the + // associated form, if available: + if (!options.form || !options.form.length) { + options.form = $(options.fileInput.prop('form')); + } + options.paramName = this._getParamName(options); + if (!options.url) { + options.url = options.form.prop('action') || location.href; + } + // The HTTP request method must be "POST" or "PUT": + options.type = (options.type || options.form.prop('method') || '') + .toUpperCase(); + if (options.type !== 'POST' && options.type !== 'PUT') { + options.type = 'POST'; + } + }, + + _getAJAXSettings: function (data) { + var options = $.extend({}, this.options, data); + this._initFormSettings(options); + this._initDataSettings(options); + return options; + }, + + // Maps jqXHR callbacks to the equivalent + // methods of the given Promise object: + _enhancePromise: function (promise) { + promise.success = promise.done; + promise.error = promise.fail; + promise.complete = promise.always; + return promise; + }, + + // Creates and returns a Promise object enhanced with + // the jqXHR methods abort, success, error and complete: + _getXHRPromise: function (resolveOrReject, context, args) { + var dfd = $.Deferred(), + promise = dfd.promise(); + context = context || this.options.context || promise; + if (resolveOrReject === true) { + dfd.resolveWith(context, args); + } else if (resolveOrReject === false) { + dfd.rejectWith(context, args); + } + promise.abort = dfd.promise; + return this._enhancePromise(promise); + }, + + // Uploads a file in multiple, sequential requests + // by splitting the file up in multiple blob chunks. + // If the second parameter is true, only tests if the file + // should be uploaded in chunks, but does not invoke any + // upload requests: + _chunkedUpload: function (options, testOnly) { + var that = this, + file = options.files[0], + fs = file.size, + ub = options.uploadedBytes = options.uploadedBytes || 0, + mcs = options.maxChunkSize || fs, + // Use the Blob methods with the slice implementation + // according to the W3C Blob API specification: + slice = file.webkitSlice || file.mozSlice || file.slice, + upload, + n, + jqXHR, + pipe; + if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) || + options.data) { + return false; + } + if (testOnly) { + return true; + } + if (ub >= fs) { + file.error = 'uploadedBytes'; + return this._getXHRPromise( + false, + options.context, + [null, 'error', file.error] + ); + } + // n is the number of blobs to upload, + // calculated via filesize, uploaded bytes and max chunk size: + n = Math.ceil((fs - ub) / mcs); + // The chunk upload method accepting the chunk number as parameter: + upload = function (i) { + if (!i) { + return that._getXHRPromise(true, options.context); + } + // Upload the blobs in sequential order: + return upload(i -= 1).pipe(function () { + // Clone the options object for each chunk upload: + var o = $.extend({}, options); + o.blob = slice.call( + file, + ub + i * mcs, + ub + (i + 1) * mcs + ); + // Expose the chunk index: + o.chunkIndex = i; + // Expose the number of chunks: + o.chunksNumber = n; + // Store the current chunk size, as the blob itself + // will be dereferenced after data processing: + o.chunkSize = o.blob.size; + // Process the upload data (the blob and potential form data): + that._initXHRData(o); + // Add progress listeners for this chunk upload: + that._initProgressListener(o); + jqXHR = ($.ajax(o) || that._getXHRPromise(false, o.context)) + .done(function () { + // Create a progress event if upload is done and + // no progress event has been invoked for this chunk: + if (!o.loaded) { + that._onProgress($.Event('progress', { + lengthComputable: true, + loaded: o.chunkSize, + total: o.chunkSize + }), o); + } + options.uploadedBytes = o.uploadedBytes += + o.chunkSize; + }); + return jqXHR; + }); + }; + // Return the piped Promise object, enhanced with an abort method, + // which is delegated to the jqXHR object of the current upload, + // and jqXHR callbacks mapped to the equivalent Promise methods: + pipe = upload(n); + pipe.abort = function () { + return jqXHR.abort(); + }; + return this._enhancePromise(pipe); + }, + + _beforeSend: function (e, data) { + if (this._active === 0) { + // the start callback is triggered when an upload starts + // and no other uploads are currently running, + // equivalent to the global ajaxStart event: + this._trigger('start'); + // Set timer for global bitrate progress calculation: + this._bitrateTimer = new this._BitrateTimer(); + } + this._active += 1; + // Initialize the global progress values: + this._loaded += data.uploadedBytes || 0; + this._total += this._getTotal(data.files); + }, + + _onDone: function (result, textStatus, jqXHR, options) { + if (!this._isXHRUpload(options)) { + // Create a progress event for each iframe load: + this._onProgress($.Event('progress', { + lengthComputable: true, + loaded: 1, + total: 1 + }), options); + } + options.result = result; + options.textStatus = textStatus; + options.jqXHR = jqXHR; + this._trigger('done', null, options); + }, + + _onFail: function (jqXHR, textStatus, errorThrown, options) { + options.jqXHR = jqXHR; + options.textStatus = textStatus; + options.errorThrown = errorThrown; + this._trigger('fail', null, options); + if (options.recalculateProgress) { + // Remove the failed (error or abort) file upload from + // the global progress calculation: + this._loaded -= options.loaded || options.uploadedBytes || 0; + this._total -= options.total || this._getTotal(options.files); + } + }, + + _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) { + this._active -= 1; + options.textStatus = textStatus; + if (jqXHRorError && jqXHRorError.always) { + options.jqXHR = jqXHRorError; + options.result = jqXHRorResult; + } else { + options.jqXHR = jqXHRorResult; + options.errorThrown = jqXHRorError; + } + this._trigger('always', null, options); + if (this._active === 0) { + // The stop callback is triggered when all uploads have + // been completed, equivalent to the global ajaxStop event: + this._trigger('stop'); + // Reset the global progress values: + this._loaded = this._total = 0; + this._bitrateTimer = null; + } + }, + + _onSend: function (e, data) { + var that = this, + jqXHR, + slot, + pipe, + options = that._getAJAXSettings(data), + send = function (resolve, args) { + that._sending += 1; + // Set timer for bitrate progress calculation: + options._bitrateTimer = new that._BitrateTimer(); + jqXHR = jqXHR || ( + (resolve !== false && + that._trigger('send', e, options) !== false && + (that._chunkedUpload(options) || $.ajax(options))) || + that._getXHRPromise(false, options.context, args) + ).done(function (result, textStatus, jqXHR) { + that._onDone(result, textStatus, jqXHR, options); + }).fail(function (jqXHR, textStatus, errorThrown) { + that._onFail(jqXHR, textStatus, errorThrown, options); + }).always(function (jqXHRorResult, textStatus, jqXHRorError) { + that._sending -= 1; + that._onAlways( + jqXHRorResult, + textStatus, + jqXHRorError, + options + ); + if (options.limitConcurrentUploads && + options.limitConcurrentUploads > that._sending) { + // Start the next queued upload, + // that has not been aborted: + var nextSlot = that._slots.shift(); + while (nextSlot) { + if (!nextSlot.isRejected()) { + nextSlot.resolve(); + break; + } + nextSlot = that._slots.shift(); + } + } + }); + return jqXHR; + }; + this._beforeSend(e, options); + if (this.options.sequentialUploads || + (this.options.limitConcurrentUploads && + this.options.limitConcurrentUploads <= this._sending)) { + if (this.options.limitConcurrentUploads > 1) { + slot = $.Deferred(); + this._slots.push(slot); + pipe = slot.pipe(send); + } else { + pipe = (this._sequence = this._sequence.pipe(send, send)); + } + // Return the piped Promise object, enhanced with an abort method, + // which is delegated to the jqXHR object of the current upload, + // and jqXHR callbacks mapped to the equivalent Promise methods: + pipe.abort = function () { + var args = [undefined, 'abort', 'abort']; + if (!jqXHR) { + if (slot) { + slot.rejectWith(args); + } + return send(false, args); + } + return jqXHR.abort(); + }; + return this._enhancePromise(pipe); + } + return send(); + }, + + _onAdd: function (e, data) { + var that = this, + result = true, + options = $.extend({}, this.options, data), + limit = options.limitMultiFileUploads, + paramName = this._getParamName(options), + paramNameSet, + paramNameSlice, + fileSet, + i; + if (!(options.singleFileUploads || limit) || + !this._isXHRUpload(options)) { + fileSet = [data.files]; + paramNameSet = [paramName]; + } else if (!options.singleFileUploads && limit) { + fileSet = []; + paramNameSet = []; + for (i = 0; i < data.files.length; i += limit) { + fileSet.push(data.files.slice(i, i + limit)); + paramNameSlice = paramName.slice(i, i + limit); + if (!paramNameSlice.length) { + paramNameSlice = paramName; + } + paramNameSet.push(paramNameSlice); + } + } else { + paramNameSet = paramName; + } + data.originalFiles = data.files; + $.each(fileSet || data.files, function (index, element) { + var newData = $.extend({}, data); + newData.files = fileSet ? element : [element]; + newData.paramName = paramNameSet[index]; + newData.submit = function () { + newData.jqXHR = this.jqXHR = + (that._trigger('submit', e, this) !== false) && + that._onSend(e, this); + return this.jqXHR; + }; + return (result = that._trigger('add', e, newData)); + }); + return result; + }, + + // File Normalization for Gecko 1.9.1 (Firefox 3.5) support: + _normalizeFile: function (index, file) { + if (file.name === undefined && file.size === undefined) { + file.name = file.fileName; + file.size = file.fileSize; + } + }, + + _replaceFileInput: function (input) { + var inputClone = input.clone(true); + $('
      ').append(inputClone)[0].reset(); + // Detaching allows to insert the fileInput on another form + // without loosing the file input value: + input.after(inputClone).detach(); + // Avoid memory leaks with the detached file input: + $.cleanData(input.unbind('remove')); + // Replace the original file input element in the fileInput + // collection with the clone, which has been copied including + // event handlers: + this.options.fileInput = this.options.fileInput.map(function (i, el) { + if (el === input[0]) { + return inputClone[0]; + } + return el; + }); + // If the widget has been initialized on the file input itself, + // override this.element with the file input clone: + if (input[0] === this.element[0]) { + this.element = inputClone; + } + }, + + _getFileInputFiles: function (fileInput) { + fileInput = $(fileInput); + var files = $.each($.makeArray(fileInput.prop('files')), this._normalizeFile), + value; + if (!files.length) { + value = fileInput.prop('value'); + if (!value) { + return []; + } + // If the files property is not available, the browser does not + // support the File API and we add a pseudo File object with + // the input value as name with path information removed: + files = [{name: value.replace(/^.*\\/, '')}]; + } + return files; + }, + + _onChange: function (e) { + var that = e.data.fileupload, + data = { + fileInput: $(e.target), + form: $(e.target.form) + }; + data.files = that._getFileInputFiles(data.fileInput); + if (that.options.replaceFileInput) { + that._replaceFileInput(data.fileInput); + } + if (that._trigger('change', e, data) === false || + that._onAdd(e, data) === false) { + return false; + } + }, + + _onPaste: function (e) { + var that = e.data.fileupload, + cbd = e.originalEvent.clipboardData, + items = (cbd && cbd.items) || [], + data = {files: []}; + $.each(items, function (index, item) { + var file = item.getAsFile && item.getAsFile(); + if (file) { + data.files.push(file); + } + }); + if (that._trigger('paste', e, data) === false || + that._onAdd(e, data) === false) { + return false; + } + }, + + _onDrop: function (e) { + var that = e.data.fileupload, + dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer, + data = { + files: $.each( + $.makeArray(dataTransfer && dataTransfer.files), + that._normalizeFile + ) + }; + if (that._trigger('drop', e, data) === false || + that._onAdd(e, data) === false) { + return false; + } + e.preventDefault(); + }, + + _onDragOver: function (e) { + var that = e.data.fileupload, + dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer; + if (that._trigger('dragover', e) === false) { + return false; + } + if (dataTransfer) { + dataTransfer.dropEffect = 'copy'; + } + e.preventDefault(); + }, + + _initEventHandlers: function () { + var ns = this.options.namespace; + if (this._isXHRUpload(this.options)) { + this.options.dropZone + .bind('dragover.' + ns, {fileupload: this}, this._onDragOver) + .bind('drop.' + ns, {fileupload: this}, this._onDrop) + .bind('paste.' + ns, {fileupload: this}, this._onPaste); + } + this.options.fileInput + .bind('change.' + ns, {fileupload: this}, this._onChange); + }, + + _destroyEventHandlers: function () { + var ns = this.options.namespace; + this.options.dropZone + .unbind('dragover.' + ns, this._onDragOver) + .unbind('drop.' + ns, this._onDrop) + .unbind('paste.' + ns, this._onPaste); + this.options.fileInput + .unbind('change.' + ns, this._onChange); + }, + + _setOption: function (key, value) { + var refresh = $.inArray(key, this._refreshOptionsList) !== -1; + if (refresh) { + this._destroyEventHandlers(); + } + $.Widget.prototype._setOption.call(this, key, value); + if (refresh) { + this._initSpecialOptions(); + this._initEventHandlers(); + } + }, + + _initSpecialOptions: function () { + var options = this.options; + if (options.fileInput === undefined) { + options.fileInput = this.element.is('input:file') ? + this.element : this.element.find('input:file'); + } else if (!(options.fileInput instanceof $)) { + options.fileInput = $(options.fileInput); + } + if (!(options.dropZone instanceof $)) { + options.dropZone = $(options.dropZone); + } + }, + + _create: function () { + var options = this.options; + // Initialize options set via HTML5 data-attributes: + $.extend(options, $(this.element[0].cloneNode(false)).data()); + options.namespace = options.namespace || this.widgetName; + this._initSpecialOptions(); + this._slots = []; + this._sequence = this._getXHRPromise(true); + this._sending = this._active = this._loaded = this._total = 0; + this._initEventHandlers(); + }, + + destroy: function () { + this._destroyEventHandlers(); + $.Widget.prototype.destroy.call(this); + }, + + enable: function () { + $.Widget.prototype.enable.call(this); + this._initEventHandlers(); + }, + + disable: function () { + this._destroyEventHandlers(); + $.Widget.prototype.disable.call(this); + }, + + // This method is exposed to the widget API and allows adding files + // using the fileupload API. The data parameter accepts an object which + // must have a files property and can contain additional options: + // .fileupload('add', {files: filesList}); + add: function (data) { + if (!data || this.options.disabled) { + return; + } + if (data.fileInput && !data.files) { + data.files = this._getFileInputFiles(data.fileInput); + } else { + data.files = $.each($.makeArray(data.files), this._normalizeFile); + } + this._onAdd(null, data); + }, + + // This method is exposed to the widget API and allows sending files + // using the fileupload API. The data parameter accepts an object which + // must have a files property and can contain additional options: + // .fileupload('send', {files: filesList}); + // The method returns a Promise object for the file upload call. + send: function (data) { + if (data && !this.options.disabled) { + if (data.fileInput && !data.files) { + data.files = this._getFileInputFiles(data.fileInput); + } else { + data.files = $.each($.makeArray(data.files), this._normalizeFile); + } + if (data.files.length) { + return this._onSend(null, data); + } + } + return this._getXHRPromise(false, data && data.context); + } + + }); + +})); diff --git a/vendors/jquery-file-upload/js/jquery.iframe-transport.js b/vendors/jquery-file-upload/js/jquery.iframe-transport.js new file mode 100644 index 000000000..04a566230 --- /dev/null +++ b/vendors/jquery-file-upload/js/jquery.iframe-transport.js @@ -0,0 +1,171 @@ +/* + * jQuery Iframe Transport Plugin 1.4 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2011, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint unparam: true, nomen: true */ +/*global define, window, document */ + +(function (factory) { + 'use strict'; + if (typeof define === 'function' && define.amd) { + // Register as an anonymous AMD module: + define(['jquery'], factory); + } else { + // Browser globals: + factory(window.jQuery); + } +}(function ($) { + 'use strict'; + + // Helper variable to create unique names for the transport iframes: + var counter = 0; + + // The iframe transport accepts three additional options: + // options.fileInput: a jQuery collection of file input fields + // options.paramName: the parameter name for the file form data, + // overrides the name property of the file input field(s), + // can be a string or an array of strings. + // options.formData: an array of objects with name and value properties, + // equivalent to the return data of .serializeArray(), e.g.: + // [{name: 'a', value: 1}, {name: 'b', value: 2}] + $.ajaxTransport('iframe', function (options) { + if (options.async && (options.type === 'POST' || options.type === 'GET')) { + var form, + iframe; + return { + send: function (_, completeCallback) { + form = $('
      '); + // javascript:false as initial iframe src + // prevents warning popups on HTTPS in IE6. + // IE versions below IE8 cannot set the name property of + // elements that have already been added to the DOM, + // so we set the name along with the iframe HTML markup: + iframe = $( + '' + ).bind('load', function () { + var fileInputClones, + paramNames = $.isArray(options.paramName) ? + options.paramName : [options.paramName]; + iframe + .unbind('load') + .bind('load', function () { + var response; + // Wrap in a try/catch block to catch exceptions thrown + // when trying to access cross-domain iframe contents: + try { + response = iframe.contents(); + // Google Chrome and Firefox do not throw an + // exception when calling iframe.contents() on + // cross-domain requests, so we unify the response: + if (!response.length || !response[0].firstChild) { + throw new Error(); + } + } catch (e) { + response = undefined; + } + // The complete callback returns the + // iframe content document as response object: + completeCallback( + 200, + 'success', + {'iframe': response} + ); + // Fix for IE endless progress bar activity bug + // (happens on form submits to iframe targets): + $('') + .appendTo(form); + form.remove(); + }); + form + .prop('target', iframe.prop('name')) + .prop('action', options.url) + .prop('method', options.type); + if (options.formData) { + $.each(options.formData, function (index, field) { + $('') + .prop('name', field.name) + .val(field.value) + .appendTo(form); + }); + } + if (options.fileInput && options.fileInput.length && + options.type === 'POST') { + fileInputClones = options.fileInput.clone(); + // Insert a clone for each file input field: + options.fileInput.after(function (index) { + return fileInputClones[index]; + }); + if (options.paramName) { + options.fileInput.each(function (index) { + $(this).prop( + 'name', + paramNames[index] || options.paramName + ); + }); + } + // Appending the file input fields to the hidden form + // removes them from their original location: + form + .append(options.fileInput) + .prop('enctype', 'multipart/form-data') + // enctype must be set as encoding for IE: + .prop('encoding', 'multipart/form-data'); + } + form.submit(); + // Insert the file input fields at their original location + // by replacing the clones with the originals: + if (fileInputClones && fileInputClones.length) { + options.fileInput.each(function (index, input) { + var clone = $(fileInputClones[index]); + $(input).prop('name', clone.prop('name')); + clone.replaceWith(input); + }); + } + }); + form.append(iframe).appendTo(document.body); + }, + abort: function () { + if (iframe) { + // javascript:false as iframe src aborts the request + // and prevents warning popups on HTTPS in IE6. + // concat is used to avoid the "Script URL" JSLint error: + iframe + .unbind('load') + .prop('src', 'javascript'.concat(':false;')); + } + if (form) { + form.remove(); + } + } + }; + } + }); + + // The iframe transport returns the iframe content document as response. + // The following adds converters from iframe to text, json, html, and script: + $.ajaxSetup({ + converters: { + 'iframe text': function (iframe) { + return $(iframe[0].body).text(); + }, + 'iframe json': function (iframe) { + return $.parseJSON($(iframe[0].body).text()); + }, + 'iframe html': function (iframe) { + return $(iframe[0].body).html(); + }, + 'iframe script': function (iframe) { + return $.globalEval($(iframe[0].body).text()); + } + } + }); + +})); diff --git a/vendors/jquery-file-upload/js/locale.js b/vendors/jquery-file-upload/js/locale.js new file mode 100644 index 000000000..ea64b0a87 --- /dev/null +++ b/vendors/jquery-file-upload/js/locale.js @@ -0,0 +1,29 @@ +/* + * jQuery File Upload Plugin Localization Example 6.5.1 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*global window */ + +window.locale = { + "fileupload": { + "errors": { + "maxFileSize": "File is too big", + "minFileSize": "File is too small", + "acceptFileTypes": "Filetype not allowed", + "maxNumberOfFiles": "Max number of files exceeded", + "uploadedBytes": "Uploaded bytes exceed file size", + "emptyResult": "Empty file upload result" + }, + "error": "Error", + "start": "Start", + "cancel": "Cancel", + "destroy": "Delete" + } +}; diff --git a/vendors/jquery-file-upload/js/main.js b/vendors/jquery-file-upload/js/main.js new file mode 100644 index 000000000..67109588d --- /dev/null +++ b/vendors/jquery-file-upload/js/main.js @@ -0,0 +1,93 @@ +/* + * jQuery File Upload Plugin JS Example 6.7 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true, unparam: true, regexp: true */ +/*global $, window, document */ + +$(function () { + 'use strict'; + + // Initialize the jQuery File Upload widget: + $('#fileupload').fileupload(); + + // Enable iframe cross-domain access via redirect option: + $('#fileupload').fileupload( + 'option', + 'redirect', + window.location.href.replace( + /\/[^\/]*$/, + '/cors/result.html?%s' + ) + ); + + if (window.location.hostname === 'blueimp.github.com') { + // Demo settings: + $('#fileupload').fileupload('option', { + url: '//jquery-file-upload.appspot.com/', + maxFileSize: 5000000, + acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, + process: [ + { + action: 'load', + fileTypes: /^image\/(gif|jpeg|png)$/, + maxFileSize: 20000000 // 20MB + }, + { + action: 'resize', + maxWidth: 1440, + maxHeight: 900 + }, + { + action: 'save' + } + ] + }); + // Upload server status check for browsers with CORS support: + if ($.support.cors) { + $.ajax({ + url: '//jquery-file-upload.appspot.com/', + type: 'HEAD' + }).fail(function () { + $('') + .text('Upload server currently unavailable - ' + + new Date()) + .appendTo('#fileupload'); + }); + } + } else { + // Load existing files: + $('#fileupload').each(function () { + var that = this; + $.getJSON(this.action, function (result) { + if (result && result.length) { + $(that).fileupload('option', 'done') + .call(that, null, {result: result}); + } + }); + }); + } + + // Initialize the Image Gallery widget: + $('#fileupload .files').imagegallery(); + + // Initialize the theme switcher: + $('#theme-switcher').change(function () { + var theme = $('#theme'); + theme.prop( + 'href', + theme.prop('href').replace( + /[\w\-]+\/jquery-ui.css/, + $(this).val() + '/jquery-ui.css' + ) + ); + }); + +}); diff --git a/vendors/jquery-file-upload/js/vendor/jquery.ui.widget.js b/vendors/jquery-file-upload/js/vendor/jquery.ui.widget.js new file mode 100644 index 000000000..b980122a3 --- /dev/null +++ b/vendors/jquery-file-upload/js/vendor/jquery.ui.widget.js @@ -0,0 +1,282 @@ +/* + * jQuery UI Widget 1.8.22+amd + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Widget + */ + +(function (factory) { + if (typeof define === "function" && define.amd) { + // Register as an anonymous AMD module: + define(["jquery"], factory); + } else { + // Browser globals: + factory(jQuery); + } +}(function( $, undefined ) { + +// jQuery 1.4+ +if ( $.cleanData ) { + var _cleanData = $.cleanData; + $.cleanData = function( elems ) { + for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { + try { + $( elem ).triggerHandler( "remove" ); + // http://bugs.jquery.com/ticket/8235 + } catch( e ) {} + } + _cleanData( elems ); + }; +} else { + var _remove = $.fn.remove; + $.fn.remove = function( selector, keepData ) { + return this.each(function() { + if ( !keepData ) { + if ( !selector || $.filter( selector, [ this ] ).length ) { + $( "*", this ).add( [ this ] ).each(function() { + try { + $( this ).triggerHandler( "remove" ); + // http://bugs.jquery.com/ticket/8235 + } catch( e ) {} + }); + } + } + return _remove.call( $(this), selector, keepData ); + }); + }; +} + +$.widget = function( name, base, prototype ) { + var namespace = name.split( "." )[ 0 ], + fullName; + name = name.split( "." )[ 1 ]; + fullName = namespace + "-" + name; + + if ( !prototype ) { + prototype = base; + base = $.Widget; + } + + // create selector for plugin + $.expr[ ":" ][ fullName ] = function( elem ) { + return !!$.data( elem, name ); + }; + + $[ namespace ] = $[ namespace ] || {}; + $[ namespace ][ name ] = function( options, element ) { + // allow instantiation without initializing for simple inheritance + if ( arguments.length ) { + this._createWidget( options, element ); + } + }; + + var basePrototype = new base(); + // we need to make the options hash a property directly on the new instance + // otherwise we'll modify the options hash on the prototype that we're + // inheriting from +// $.each( basePrototype, function( key, val ) { +// if ( $.isPlainObject(val) ) { +// basePrototype[ key ] = $.extend( {}, val ); +// } +// }); + basePrototype.options = $.extend( true, {}, basePrototype.options ); + $[ namespace ][ name ].prototype = $.extend( true, basePrototype, { + namespace: namespace, + widgetName: name, + widgetEventPrefix: $[ namespace ][ name ].prototype.widgetEventPrefix || name, + widgetBaseClass: fullName + }, prototype ); + + $.widget.bridge( name, $[ namespace ][ name ] ); +}; + +$.widget.bridge = function( name, object ) { + $.fn[ name ] = function( options ) { + var isMethodCall = typeof options === "string", + args = Array.prototype.slice.call( arguments, 1 ), + returnValue = this; + + // allow multiple hashes to be passed on init + options = !isMethodCall && args.length ? + $.extend.apply( null, [ true, options ].concat(args) ) : + options; + + // prevent calls to internal methods + if ( isMethodCall && options.charAt( 0 ) === "_" ) { + return returnValue; + } + + if ( isMethodCall ) { + this.each(function() { + var instance = $.data( this, name ), + methodValue = instance && $.isFunction( instance[options] ) ? + instance[ options ].apply( instance, args ) : + instance; + // TODO: add this back in 1.9 and use $.error() (see #5972) +// if ( !instance ) { +// throw "cannot call methods on " + name + " prior to initialization; " + +// "attempted to call method '" + options + "'"; +// } +// if ( !$.isFunction( instance[options] ) ) { +// throw "no such method '" + options + "' for " + name + " widget instance"; +// } +// var methodValue = instance[ options ].apply( instance, args ); + if ( methodValue !== instance && methodValue !== undefined ) { + returnValue = methodValue; + return false; + } + }); + } else { + this.each(function() { + var instance = $.data( this, name ); + if ( instance ) { + instance.option( options || {} )._init(); + } else { + $.data( this, name, new object( options, this ) ); + } + }); + } + + return returnValue; + }; +}; + +$.Widget = function( options, element ) { + // allow instantiation without initializing for simple inheritance + if ( arguments.length ) { + this._createWidget( options, element ); + } +}; + +$.Widget.prototype = { + widgetName: "widget", + widgetEventPrefix: "", + options: { + disabled: false + }, + _createWidget: function( options, element ) { + // $.widget.bridge stores the plugin instance, but we do it anyway + // so that it's stored even before the _create function runs + $.data( element, this.widgetName, this ); + this.element = $( element ); + this.options = $.extend( true, {}, + this.options, + this._getCreateOptions(), + options ); + + var self = this; + this.element.bind( "remove." + this.widgetName, function() { + self.destroy(); + }); + + this._create(); + this._trigger( "create" ); + this._init(); + }, + _getCreateOptions: function() { + return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ]; + }, + _create: function() {}, + _init: function() {}, + + destroy: function() { + this.element + .unbind( "." + this.widgetName ) + .removeData( this.widgetName ); + this.widget() + .unbind( "." + this.widgetName ) + .removeAttr( "aria-disabled" ) + .removeClass( + this.widgetBaseClass + "-disabled " + + "ui-state-disabled" ); + }, + + widget: function() { + return this.element; + }, + + option: function( key, value ) { + var options = key; + + if ( arguments.length === 0 ) { + // don't return a reference to the internal hash + return $.extend( {}, this.options ); + } + + if (typeof key === "string" ) { + if ( value === undefined ) { + return this.options[ key ]; + } + options = {}; + options[ key ] = value; + } + + this._setOptions( options ); + + return this; + }, + _setOptions: function( options ) { + var self = this; + $.each( options, function( key, value ) { + self._setOption( key, value ); + }); + + return this; + }, + _setOption: function( key, value ) { + this.options[ key ] = value; + + if ( key === "disabled" ) { + this.widget() + [ value ? "addClass" : "removeClass"]( + this.widgetBaseClass + "-disabled" + " " + + "ui-state-disabled" ) + .attr( "aria-disabled", value ); + } + + return this; + }, + + enable: function() { + return this._setOption( "disabled", false ); + }, + disable: function() { + return this._setOption( "disabled", true ); + }, + + _trigger: function( type, event, data ) { + var prop, orig, + callback = this.options[ type ]; + + data = data || {}; + event = $.Event( event ); + event.type = ( type === this.widgetEventPrefix ? + type : + this.widgetEventPrefix + type ).toLowerCase(); + // the original event may come from any element + // so we need to reset the target on the new event + event.target = this.element[ 0 ]; + + // copy original event properties over to the new event + orig = event.originalEvent; + if ( orig ) { + for ( prop in orig ) { + if ( !( prop in event ) ) { + event[ prop ] = orig[ prop ]; + } + } + } + + this.element.trigger( event, data ); + + return !( $.isFunction(callback) && + callback.call( this.element[0], event, data ) === false || + event.isDefaultPrevented() ); + } +}; + +})); diff --git a/vendors/jquery-file-upload/package.json b/vendors/jquery-file-upload/package.json new file mode 100644 index 000000000..56f9d5f25 --- /dev/null +++ b/vendors/jquery-file-upload/package.json @@ -0,0 +1,56 @@ +{ + "name": "blueimp-file-upload-jquery-ui", + "version": "6.9.2", + "title": "jQuery File Upload - jQuery UI version", + "description": "File Upload widget with multiple file selection, drag&drop support, progress bars and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads and client-side image resizing. Works with any server-side platform (PHP, Python, Ruby on Rails, Java, Node.js, Go etc.) that supports standard HTML form file uploads.", + "keywords": [ + "jquery", + "file", + "upload", + "widget", + "multiple", + "selection", + "drag", + "drop", + "progress", + "preview", + "cross-domain", + "cross-site", + "chunk", + "resume", + "gae", + "go", + "python", + "php", + "ui" + ], + "homepage": "https://github.com/blueimp/jQuery-File-Upload", + "author": { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + }, + "maintainers": [ + { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + } + ], + "repository": { + "type": "git", + "url": "git://github.com/blueimp/jQuery-File-Upload.git" + }, + "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", + "licenses": [ + { + "type": "MIT", + "url": "http://www.opensource.org/licenses/MIT" + } + ], + "dependencies": { + "jquery": ">=1.6", + "jquery.ui": ">=1.8", + "blueimp-tmpl": ">=2.1.0", + "blueimp-load-image": ">=1.1.6", + "blueimp-canvas-to-blob": ">=2.0.0" + } +} diff --git a/vendors/jquery-file-upload/server/gae-go/app.yaml b/vendors/jquery-file-upload/server/gae-go/app.yaml new file mode 100644 index 000000000..2d09daa56 --- /dev/null +++ b/vendors/jquery-file-upload/server/gae-go/app.yaml @@ -0,0 +1,12 @@ +application: jquery-file-upload +version: 2 +runtime: go +api_version: go1 + +handlers: +- url: /(favicon\.ico|robots\.txt) + static_files: static/\1 + upload: static/(.*) + expiration: '1d' +- url: /.* + script: _go_app diff --git a/vendors/jquery-file-upload/server/gae-go/app/main.go b/vendors/jquery-file-upload/server/gae-go/app/main.go new file mode 100644 index 000000000..01dc2f204 --- /dev/null +++ b/vendors/jquery-file-upload/server/gae-go/app/main.go @@ -0,0 +1,361 @@ +/* + * jQuery File Upload Plugin GAE Go Example 2.0 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2011, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +package app + +import ( + "appengine" + "appengine/blobstore" + "appengine/memcache" + "appengine/taskqueue" + "bytes" + "encoding/base64" + "encoding/json" + "fmt" + "image" + "image/png" + "io" + "log" + "mime/multipart" + "net/http" + "net/url" + "regexp" + "resize" + "strings" + "time" +) + +import _ "image/gif" +import _ "image/jpeg" + +const ( + WEBSITE = "http://blueimp.github.com/jQuery-File-Upload/" + MIN_FILE_SIZE = 1 // bytes + MAX_FILE_SIZE = 5000000 // bytes + IMAGE_TYPES = "image/(gif|p?jpeg|(x-)?png)" + ACCEPT_FILE_TYPES = IMAGE_TYPES + EXPIRATION_TIME = 300 // seconds + THUMBNAIL_MAX_WIDTH = 80 + THUMBNAIL_MAX_HEIGHT = THUMBNAIL_MAX_WIDTH +) + +var ( + imageTypes = regexp.MustCompile(IMAGE_TYPES) + acceptFileTypes = regexp.MustCompile(ACCEPT_FILE_TYPES) +) + +type FileInfo struct { + Key appengine.BlobKey `json:"-"` + Url string `json:"url,omitempty"` + ThumbnailUrl string `json:"thumbnail_url,omitempty"` + Name string `json:"name"` + Type string `json:"type"` + Size int64 `json:"size"` + Error string `json:"error,omitempty"` + DeleteUrl string `json:"delete_url,omitempty"` + DeleteType string `json:"delete_type,omitempty"` +} + +func (fi *FileInfo) ValidateType() (valid bool) { + if acceptFileTypes.MatchString(fi.Type) { + return true + } + fi.Error = "acceptFileTypes" + return false +} + +func (fi *FileInfo) ValidateSize() (valid bool) { + if fi.Size < MIN_FILE_SIZE { + fi.Error = "minFileSize" + } else if fi.Size > MAX_FILE_SIZE { + fi.Error = "maxFileSize" + } else { + return true + } + return false +} + +func (fi *FileInfo) CreateUrls(r *http.Request, c appengine.Context) { + u := &url.URL{ + Scheme: r.URL.Scheme, + Host: appengine.DefaultVersionHostname(c), + Path: "/", + } + uString := u.String() + fi.Url = uString + escape(string(fi.Key)) + "/" + + escape(string(fi.Name)) + fi.DeleteUrl = fi.Url + fi.DeleteType = "DELETE" + if fi.ThumbnailUrl != "" && -1 == strings.Index( + r.Header.Get("Accept"), + "application/json", + ) { + fi.ThumbnailUrl = uString + "thumbnails/" + + escape(string(fi.Key)) + } +} + +func (fi *FileInfo) CreateThumbnail(r io.Reader, c appengine.Context) (data []byte, err error) { + defer func() { + if rec := recover(); rec != nil { + log.Println(rec) + // 1x1 pixel transparent GIf, bas64 encoded: + s := "R0lGODlhAQABAIAAAP///////yH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" + data, _ = base64.StdEncoding.DecodeString(s) + fi.ThumbnailUrl = "data:image/gif;base64," + s + } + memcache.Add(c, &memcache.Item{ + Key: string(fi.Key), + Value: data, + Expiration: EXPIRATION_TIME, + }) + }() + img, _, err := image.Decode(r) + check(err) + if bounds := img.Bounds(); bounds.Dx() > THUMBNAIL_MAX_WIDTH || + bounds.Dy() > THUMBNAIL_MAX_HEIGHT { + w, h := THUMBNAIL_MAX_WIDTH, THUMBNAIL_MAX_HEIGHT + if bounds.Dx() > bounds.Dy() { + h = bounds.Dy() * h / bounds.Dx() + } else { + w = bounds.Dx() * w / bounds.Dy() + } + img = resize.Resize(img, img.Bounds(), w, h) + } + var b bytes.Buffer + err = png.Encode(&b, img) + check(err) + data = b.Bytes() + fi.ThumbnailUrl = "data:image/png;base64," + + base64.StdEncoding.EncodeToString(data) + return +} + +func check(err error) { + if err != nil { + panic(err) + } +} + +func escape(s string) string { + return strings.Replace(url.QueryEscape(s), "+", "%20", -1) +} + +func delayedDelete(c appengine.Context, fi *FileInfo) { + if key := string(fi.Key); key != "" { + task := &taskqueue.Task{ + Path: "/" + escape(key) + "/-", + Method: "DELETE", + Delay: time.Duration(EXPIRATION_TIME) * time.Second, + } + taskqueue.Add(c, task, "") + } +} + +func handleUpload(r *http.Request, p *multipart.Part) (fi *FileInfo) { + fi = &FileInfo{ + Name: p.FileName(), + Type: p.Header.Get("Content-Type"), + } + if !fi.ValidateType() { + return + } + defer func() { + if rec := recover(); rec != nil { + log.Println(rec) + fi.Error = rec.(error).Error() + } + }() + var b bytes.Buffer + lr := &io.LimitedReader{R: p, N: MAX_FILE_SIZE + 1} + context := appengine.NewContext(r) + w, err := blobstore.Create(context, fi.Type) + defer func() { + w.Close() + fi.Size = MAX_FILE_SIZE + 1 - lr.N + fi.Key, err = w.Key() + check(err) + if !fi.ValidateSize() { + err := blobstore.Delete(context, fi.Key) + check(err) + return + } + delayedDelete(context, fi) + if b.Len() > 0 { + fi.CreateThumbnail(&b, context) + } + fi.CreateUrls(r, context) + }() + check(err) + var wr io.Writer = w + if imageTypes.MatchString(fi.Type) { + wr = io.MultiWriter(&b, w) + } + _, err = io.Copy(wr, lr) + return +} + +func getFormValue(p *multipart.Part) string { + var b bytes.Buffer + io.CopyN(&b, p, int64(1<<20)) // Copy max: 1 MiB + return b.String() +} + +func handleUploads(r *http.Request) (fileInfos []*FileInfo) { + fileInfos = make([]*FileInfo, 0) + mr, err := r.MultipartReader() + check(err) + r.Form, err = url.ParseQuery(r.URL.RawQuery) + check(err) + part, err := mr.NextPart() + for err == nil { + if name := part.FormName(); name != "" { + if part.FileName() != "" { + fileInfos = append(fileInfos, handleUpload(r, part)) + } else { + r.Form[name] = append(r.Form[name], getFormValue(part)) + } + } + part, err = mr.NextPart() + } + return +} + +func get(w http.ResponseWriter, r *http.Request) { + if r.URL.Path == "/" { + http.Redirect(w, r, WEBSITE, http.StatusFound) + return + } + parts := strings.Split(r.URL.Path, "/") + if len(parts) == 3 { + if key := parts[1]; key != "" { + blobKey := appengine.BlobKey(key) + bi, err := blobstore.Stat(appengine.NewContext(r), blobKey) + if err == nil { + w.Header().Add( + "Cache-Control", + fmt.Sprintf("public,max-age=%d", EXPIRATION_TIME), + ) + if imageTypes.MatchString(bi.ContentType) { + w.Header().Add("X-Content-Type-Options", "nosniff") + } else { + w.Header().Add("Content-Type", "application/octet-stream") + w.Header().Add( + "Content-Disposition:", + fmt.Sprintf("attachment; filename=%s;", parts[2]), + ) + } + blobstore.Send(w, appengine.BlobKey(key)) + return + } + } + } + http.Error(w, "404 Not Found", http.StatusNotFound) +} + +func post(w http.ResponseWriter, r *http.Request) { + b, err := json.Marshal(handleUploads(r)) + check(err) + if redirect := r.FormValue("redirect"); redirect != "" { + http.Redirect(w, r, fmt.Sprintf( + redirect, + escape(string(b)), + ), http.StatusFound) + return + } + jsonType := "application/json" + if strings.Index(r.Header.Get("Accept"), jsonType) != -1 { + w.Header().Set("Content-Type", jsonType) + } + fmt.Fprintln(w, string(b)) +} + +func delete(w http.ResponseWriter, r *http.Request) { + parts := strings.Split(r.URL.Path, "/") + if len(parts) != 3 { + return + } + if key := parts[1]; key != "" { + c := appengine.NewContext(r) + blobstore.Delete(c, appengine.BlobKey(key)) + memcache.Delete(c, key) + } +} + +func serveThumbnail(w http.ResponseWriter, r *http.Request) { + parts := strings.Split(r.URL.Path, "/") + if len(parts) == 3 { + if key := parts[2]; key != "" { + var data []byte + c := appengine.NewContext(r) + item, err := memcache.Get(c, key) + if err == nil { + data = item.Value + } else { + blobKey := appengine.BlobKey(key) + if _, err = blobstore.Stat(c, blobKey); err == nil { + fi := FileInfo{Key: blobKey} + data, _ = fi.CreateThumbnail( + blobstore.NewReader(c, blobKey), + c, + ) + } + } + if err == nil && len(data) > 3 { + w.Header().Add( + "Cache-Control", + fmt.Sprintf("public,max-age=%d", EXPIRATION_TIME), + ) + contentType := "image/png" + if string(data[:3]) == "GIF" { + contentType = "image/gif" + } else if string(data[1:4]) != "PNG" { + contentType = "image/jpeg" + } + w.Header().Set("Content-Type", contentType) + fmt.Fprintln(w, string(data)) + return + } + } + } + http.Error(w, "404 Not Found", http.StatusNotFound) +} + +func handle(w http.ResponseWriter, r *http.Request) { + params, err := url.ParseQuery(r.URL.RawQuery) + check(err) + w.Header().Add("Access-Control-Allow-Origin", "*") + w.Header().Add( + "Access-Control-Allow-Methods", + "OPTIONS, HEAD, GET, POST, PUT, DELETE", + ) + switch r.Method { + case "OPTIONS": + case "HEAD": + case "GET": + get(w, r) + case "POST": + if len(params["_method"]) > 0 && params["_method"][0] == "DELETE" { + delete(w, r) + } else { + post(w, r) + } + case "DELETE": + delete(w, r) + default: + http.Error(w, "501 Not Implemented", http.StatusNotImplemented) + } +} + +func init() { + http.HandleFunc("/", handle) + http.HandleFunc("/thumbnails/", serveThumbnail) +} diff --git a/vendors/jquery-file-upload/server/gae-go/resize/resize.go b/vendors/jquery-file-upload/server/gae-go/resize/resize.go new file mode 100644 index 000000000..dcb627870 --- /dev/null +++ b/vendors/jquery-file-upload/server/gae-go/resize/resize.go @@ -0,0 +1,247 @@ +// Copyright 2011 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package resize + +import ( + "image" + "image/color" +) + +// Resize returns a scaled copy of the image slice r of m. +// The returned image has width w and height h. +func Resize(m image.Image, r image.Rectangle, w, h int) image.Image { + if w < 0 || h < 0 { + return nil + } + if w == 0 || h == 0 || r.Dx() <= 0 || r.Dy() <= 0 { + return image.NewRGBA64(image.Rect(0, 0, w, h)) + } + switch m := m.(type) { + case *image.RGBA: + return resizeRGBA(m, r, w, h) + case *image.YCbCr: + if m, ok := resizeYCbCr(m, r, w, h); ok { + return m + } + } + ww, hh := uint64(w), uint64(h) + dx, dy := uint64(r.Dx()), uint64(r.Dy()) + // The scaling algorithm is to nearest-neighbor magnify the dx * dy source + // to a (ww*dx) * (hh*dy) intermediate image and then minify the intermediate + // image back down to a ww * hh destination with a simple box filter. + // The intermediate image is implied, we do not physically allocate a slice + // of length ww*dx*hh*dy. + // For example, consider a 4*3 source image. Label its pixels from a-l: + // abcd + // efgh + // ijkl + // To resize this to a 3*2 destination image, the intermediate is 12*6. + // Whitespace has been added to delineate the destination pixels: + // aaab bbcc cddd + // aaab bbcc cddd + // eeef ffgg ghhh + // + // eeef ffgg ghhh + // iiij jjkk klll + // iiij jjkk klll + // Thus, the 'b' source pixel contributes one third of its value to the + // (0, 0) destination pixel and two thirds to (1, 0). + // The implementation is a two-step process. First, the source pixels are + // iterated over and each source pixel's contribution to 1 or more + // destination pixels are summed. Second, the sums are divided by a scaling + // factor to yield the destination pixels. + // TODO: By interleaving the two steps, instead of doing all of + // step 1 first and all of step 2 second, we could allocate a smaller sum + // slice of length 4*w*2 instead of 4*w*h, although the resultant code + // would become more complicated. + n, sum := dx*dy, make([]uint64, 4*w*h) + for y := r.Min.Y; y < r.Max.Y; y++ { + for x := r.Min.X; x < r.Max.X; x++ { + // Get the source pixel. + r32, g32, b32, a32 := m.At(x, y).RGBA() + r64 := uint64(r32) + g64 := uint64(g32) + b64 := uint64(b32) + a64 := uint64(a32) + // Spread the source pixel over 1 or more destination rows. + py := uint64(y) * hh + for remy := hh; remy > 0; { + qy := dy - (py % dy) + if qy > remy { + qy = remy + } + // Spread the source pixel over 1 or more destination columns. + px := uint64(x) * ww + index := 4 * ((py/dy)*ww + (px / dx)) + for remx := ww; remx > 0; { + qx := dx - (px % dx) + if qx > remx { + qx = remx + } + sum[index+0] += r64 * qx * qy + sum[index+1] += g64 * qx * qy + sum[index+2] += b64 * qx * qy + sum[index+3] += a64 * qx * qy + index += 4 + px += qx + remx -= qx + } + py += qy + remy -= qy + } + } + } + return average(sum, w, h, n*0x0101) +} + +// average convert the sums to averages and returns the result. +func average(sum []uint64, w, h int, n uint64) image.Image { + ret := image.NewRGBA(image.Rect(0, 0, w, h)) + for y := 0; y < h; y++ { + for x := 0; x < w; x++ { + index := 4 * (y*w + x) + ret.SetRGBA(x, y, color.RGBA{ + uint8(sum[index+0] / n), + uint8(sum[index+1] / n), + uint8(sum[index+2] / n), + uint8(sum[index+3] / n), + }) + } + } + return ret +} + +// resizeYCbCr returns a scaled copy of the YCbCr image slice r of m. +// The returned image has width w and height h. +func resizeYCbCr(m *image.YCbCr, r image.Rectangle, w, h int) (image.Image, bool) { + var verticalRes int + switch m.SubsampleRatio { + case image.YCbCrSubsampleRatio420: + verticalRes = 2 + case image.YCbCrSubsampleRatio422: + verticalRes = 1 + default: + return nil, false + } + ww, hh := uint64(w), uint64(h) + dx, dy := uint64(r.Dx()), uint64(r.Dy()) + // See comment in Resize. + n, sum := dx*dy, make([]uint64, 4*w*h) + for y := r.Min.Y; y < r.Max.Y; y++ { + Y := m.Y[y*m.YStride:] + Cb := m.Cb[y/verticalRes*m.CStride:] + Cr := m.Cr[y/verticalRes*m.CStride:] + for x := r.Min.X; x < r.Max.X; x++ { + // Get the source pixel. + r8, g8, b8 := color.YCbCrToRGB(Y[x], Cb[x/2], Cr[x/2]) + r64 := uint64(r8) + g64 := uint64(g8) + b64 := uint64(b8) + // Spread the source pixel over 1 or more destination rows. + py := uint64(y) * hh + for remy := hh; remy > 0; { + qy := dy - (py % dy) + if qy > remy { + qy = remy + } + // Spread the source pixel over 1 or more destination columns. + px := uint64(x) * ww + index := 4 * ((py/dy)*ww + (px / dx)) + for remx := ww; remx > 0; { + qx := dx - (px % dx) + if qx > remx { + qx = remx + } + qxy := qx * qy + sum[index+0] += r64 * qxy + sum[index+1] += g64 * qxy + sum[index+2] += b64 * qxy + sum[index+3] += 0xFFFF * qxy + index += 4 + px += qx + remx -= qx + } + py += qy + remy -= qy + } + } + } + return average(sum, w, h, n), true +} + +// resizeRGBA returns a scaled copy of the RGBA image slice r of m. +// The returned image has width w and height h. +func resizeRGBA(m *image.RGBA, r image.Rectangle, w, h int) image.Image { + ww, hh := uint64(w), uint64(h) + dx, dy := uint64(r.Dx()), uint64(r.Dy()) + // See comment in Resize. + n, sum := dx*dy, make([]uint64, 4*w*h) + for y := r.Min.Y; y < r.Max.Y; y++ { + pixOffset := m.PixOffset(r.Min.X, y) + for x := r.Min.X; x < r.Max.X; x++ { + // Get the source pixel. + r64 := uint64(m.Pix[pixOffset+0]) + g64 := uint64(m.Pix[pixOffset+1]) + b64 := uint64(m.Pix[pixOffset+2]) + a64 := uint64(m.Pix[pixOffset+3]) + pixOffset += 4 + // Spread the source pixel over 1 or more destination rows. + py := uint64(y) * hh + for remy := hh; remy > 0; { + qy := dy - (py % dy) + if qy > remy { + qy = remy + } + // Spread the source pixel over 1 or more destination columns. + px := uint64(x) * ww + index := 4 * ((py/dy)*ww + (px / dx)) + for remx := ww; remx > 0; { + qx := dx - (px % dx) + if qx > remx { + qx = remx + } + qxy := qx * qy + sum[index+0] += r64 * qxy + sum[index+1] += g64 * qxy + sum[index+2] += b64 * qxy + sum[index+3] += a64 * qxy + index += 4 + px += qx + remx -= qx + } + py += qy + remy -= qy + } + } + } + return average(sum, w, h, n) +} + +// Resample returns a resampled copy of the image slice r of m. +// The returned image has width w and height h. +func Resample(m image.Image, r image.Rectangle, w, h int) image.Image { + if w < 0 || h < 0 { + return nil + } + if w == 0 || h == 0 || r.Dx() <= 0 || r.Dy() <= 0 { + return image.NewRGBA64(image.Rect(0, 0, w, h)) + } + curw, curh := r.Dx(), r.Dy() + img := image.NewRGBA(image.Rect(0, 0, w, h)) + for y := 0; y < h; y++ { + for x := 0; x < w; x++ { + // Get a source pixel. + subx := x * curw / w + suby := y * curh / h + r32, g32, b32, a32 := m.At(subx, suby).RGBA() + r := uint8(r32 >> 8) + g := uint8(g32 >> 8) + b := uint8(b32 >> 8) + a := uint8(a32 >> 8) + img.SetRGBA(x, y, color.RGBA{r, g, b, a}) + } + } + return img +} diff --git a/vendors/jquery-file-upload/server/gae-go/static/favicon.ico b/vendors/jquery-file-upload/server/gae-go/static/favicon.ico new file mode 100644 index 000000000..1a71ea772 Binary files /dev/null and b/vendors/jquery-file-upload/server/gae-go/static/favicon.ico differ diff --git a/vendors/jquery-file-upload/server/gae-go/static/robots.txt b/vendors/jquery-file-upload/server/gae-go/static/robots.txt new file mode 100644 index 000000000..eb0536286 --- /dev/null +++ b/vendors/jquery-file-upload/server/gae-go/static/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: diff --git a/vendors/jquery-file-upload/server/gae-python/app.yaml b/vendors/jquery-file-upload/server/gae-python/app.yaml new file mode 100644 index 000000000..5fe123f59 --- /dev/null +++ b/vendors/jquery-file-upload/server/gae-python/app.yaml @@ -0,0 +1,16 @@ +application: jquery-file-upload +version: 1 +runtime: python27 +api_version: 1 +threadsafe: true + +builtins: +- deferred: on + +handlers: +- url: /(favicon\.ico|robots\.txt) + static_files: static/\1 + upload: static/(.*) + expiration: '1d' +- url: /.* + script: main.app diff --git a/vendors/jquery-file-upload/server/gae-python/main.py b/vendors/jquery-file-upload/server/gae-python/main.py new file mode 100644 index 000000000..37218c827 --- /dev/null +++ b/vendors/jquery-file-upload/server/gae-python/main.py @@ -0,0 +1,149 @@ +# -*- coding: utf-8 -*- +# +# jQuery File Upload Plugin GAE Python Example 1.1.4 +# https://github.com/blueimp/jQuery-File-Upload +# +# Copyright 2011, Sebastian Tschan +# https://blueimp.net +# +# Licensed under the MIT license: +# http://www.opensource.org/licenses/MIT +# + +from __future__ import with_statement +from google.appengine.api import files, images +from google.appengine.ext import blobstore, deferred +from google.appengine.ext.webapp import blobstore_handlers +import json, re, urllib, webapp2 + +WEBSITE = 'http://blueimp.github.com/jQuery-File-Upload/' +MIN_FILE_SIZE = 1 # bytes +MAX_FILE_SIZE = 5000000 # bytes +IMAGE_TYPES = re.compile('image/(gif|p?jpeg|(x-)?png)') +ACCEPT_FILE_TYPES = IMAGE_TYPES +THUMBNAIL_MODIFICATOR = '=s80' # max width / height +EXPIRATION_TIME = 300 # seconds + +def cleanup(blob_keys): + blobstore.delete(blob_keys) + +class UploadHandler(webapp2.RequestHandler): + + def initialize(self, request, response): + super(UploadHandler, self).initialize(request, response) + self.response.headers['Access-Control-Allow-Origin'] = '*' + self.response.headers[ + 'Access-Control-Allow-Methods' + ] = 'OPTIONS, HEAD, GET, POST, PUT, DELETE' + + def validate(self, file): + if file['size'] < MIN_FILE_SIZE: + file['error'] = 'minFileSize' + elif file['size'] > MAX_FILE_SIZE: + file['error'] = 'maxFileSize' + elif not ACCEPT_FILE_TYPES.match(file['type']): + file['error'] = 'acceptFileTypes' + else: + return True + return False + + def get_file_size(self, file): + file.seek(0, 2) # Seek to the end of the file + size = file.tell() # Get the position of EOF + file.seek(0) # Reset the file position to the beginning + return size + + def write_blob(self, data, info): + blob = files.blobstore.create( + mime_type=info['type'], + _blobinfo_uploaded_filename=info['name'] + ) + with files.open(blob, 'a') as f: + f.write(data) + files.finalize(blob) + return files.blobstore.get_blob_key(blob) + + def handle_upload(self): + results = [] + blob_keys = [] + for name, fieldStorage in self.request.POST.items(): + if type(fieldStorage) is unicode: + continue + result = {} + result['name'] = re.sub(r'^.*\\', '', + fieldStorage.filename) + result['type'] = fieldStorage.type + result['size'] = self.get_file_size(fieldStorage.file) + if self.validate(result): + blob_key = str( + self.write_blob(fieldStorage.value, result) + ) + blob_keys.append(blob_key) + result['delete_type'] = 'DELETE' + result['delete_url'] = self.request.host_url +\ + '/?key=' + urllib.quote(blob_key, '') + if (IMAGE_TYPES.match(result['type'])): + try: + result['url'] = images.get_serving_url( + blob_key, + secure_url=self.request.host_url\ + .startswith('https') + ) + result['thumbnail_url'] = result['url'] +\ + THUMBNAIL_MODIFICATOR + except: # Could not get an image serving url + pass + if not 'url' in result: + result['url'] = self.request.host_url +\ + '/' + blob_key + '/' + urllib.quote( + result['name'].encode('utf-8'), '') + results.append(result) + deferred.defer( + cleanup, + blob_keys, + _countdown=EXPIRATION_TIME + ) + return results + + def options(self): + pass + + def head(self): + pass + + def get(self): + self.redirect(WEBSITE) + + def post(self): + if (self.request.get('_method') == 'DELETE'): + return self.delete() + s = json.dumps(self.handle_upload(), separators=(',',':')) + redirect = self.request.get('redirect') + if redirect: + return self.redirect(str( + redirect.replace('%s', urllib.quote(s, ''), 1) + )) + if 'application/json' in self.request.headers.get('Accept'): + self.response.headers['Content-Type'] = 'application/json' + self.response.write(s) + + def delete(self): + blobstore.delete(self.request.get('key') or '') + +class DownloadHandler(blobstore_handlers.BlobstoreDownloadHandler): + def get(self, key, filename): + if not blobstore.get(key): + self.error(404) + else: + # Cache for the expiration time: + self.response.headers['Cache-Control'] =\ + 'public,max-age=%d' % EXPIRATION_TIME + self.send_blob(key, save_as=filename) + +app = webapp2.WSGIApplication( + [ + ('/', UploadHandler), + ('/([^/]+)/([^/]+)', DownloadHandler) + ], + debug=True +) \ No newline at end of file diff --git a/vendors/jquery-file-upload/server/gae-python/static/favicon.ico b/vendors/jquery-file-upload/server/gae-python/static/favicon.ico new file mode 100644 index 000000000..1a71ea772 Binary files /dev/null and b/vendors/jquery-file-upload/server/gae-python/static/favicon.ico differ diff --git a/vendors/jquery-file-upload/server/gae-python/static/robots.txt b/vendors/jquery-file-upload/server/gae-python/static/robots.txt new file mode 100644 index 000000000..eb0536286 --- /dev/null +++ b/vendors/jquery-file-upload/server/gae-python/static/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: diff --git a/vendors/jquery-file-upload/server/node/.gitignore b/vendors/jquery-file-upload/server/node/.gitignore new file mode 100644 index 000000000..9daa8247d --- /dev/null +++ b/vendors/jquery-file-upload/server/node/.gitignore @@ -0,0 +1,2 @@ +.DS_Store +node_modules diff --git a/vendors/jquery-file-upload/server/node/package.json b/vendors/jquery-file-upload/server/node/package.json new file mode 100644 index 000000000..0e0c1aaae --- /dev/null +++ b/vendors/jquery-file-upload/server/node/package.json @@ -0,0 +1,41 @@ +{ + "name": "blueimp-file-upload-node", + "version": "1.0.2", + "title": "jQuery File Upload Node.js example", + "description": "Node.js implementation example of a file upload handler for jQuery File Upload.", + "keywords": [ + "file", + "upload", + "cross-domain", + "cross-site", + "node" + ], + "homepage": "https://github.com/blueimp/jQuery-File-Upload", + "author": { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + }, + "maintainers": [ + { + "name": "Sebastian Tschan", + "url": "https://blueimp.net" + } + ], + "repository": { + "type": "git", + "url": "git://github.com/blueimp/jQuery-File-Upload.git" + }, + "bugs": "https://github.com/blueimp/jQuery-File-Upload/issues", + "licenses": [ + { + "type": "MIT", + "url": "http://www.opensource.org/licenses/MIT" + } + ], + "dependencies": { + "formidable": ">=1.0.8", + "node-static": ">=0.5.9", + "imagemagick": ">=0.1.2" + }, + "main": "server.js" +} diff --git a/vendors/jquery-file-upload/server/node/public/files/thumbnail/.gitignore b/vendors/jquery-file-upload/server/node/public/files/thumbnail/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/vendors/jquery-file-upload/server/node/server.js b/vendors/jquery-file-upload/server/node/server.js new file mode 100755 index 000000000..f1bec542b --- /dev/null +++ b/vendors/jquery-file-upload/server/node/server.js @@ -0,0 +1,285 @@ +#!/usr/bin/env node +/* + * jQuery File Upload Plugin Node.js Example 1.0.2 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2012, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true, regexp: true, unparam: true */ +/*global require, __dirname, unescape */ + +(function (port) { + 'use strict'; + var path = require('path'), + fs = require('fs'), + // Since Node 0.8, .existsSync() moved from path to fs: + _existsSync = fs.existsSync || path.existsSync, + formidable = require('formidable'), + nodeStatic = require('node-static'), + imageMagick = require('imagemagick'), + options = { + tmpDir: __dirname + '/tmp', + publicDir: __dirname + '/public', + uploadDir: __dirname + '/public/files', + uploadUrl: '/files/', + maxPostSize: 500000000, // 500 MB + minFileSize: 1, + maxFileSize: 100000000, // 100 MB + acceptFileTypes: /.+/i, + // Files not matched by this regular expression force a download dialog, + // to prevent executing any scripts in the context of the service domain: + safeFileTypes: /\.(gif|jpe?g|png)$/i, + imageTypes: /\.(gif|jpe?g|png)$/i, + imageVersions: { + 'thumbnail': { + width: 80, + height: 80 + } + }, + accessControl: { + allowOrigin: '*', + allowMethods: 'OPTIONS, HEAD, GET, POST, PUT, DELETE' + }, + /* Uncomment and edit this section to provide the service via HTTPS: + ssl: { + key: fs.readFileSync('/Applications/XAMPP/etc/ssl.key/server.key'), + cert: fs.readFileSync('/Applications/XAMPP/etc/ssl.crt/server.crt') + }, + */ + nodeStatic: { + cache: 3600 // seconds to cache served files + } + }, + utf8encode = function (str) { + return unescape(encodeURIComponent(str)); + }, + fileServer = new nodeStatic.Server(options.publicDir, options.nodeStatic), + nameCountRegexp = /(?:(?: \(([\d]+)\))?(\.[^.]+))?$/, + nameCountFunc = function (s, index, ext) { + return ' (' + ((parseInt(index, 10) || 0) + 1) + ')' + (ext || ''); + }, + FileInfo = function (file) { + this.name = file.name; + this.size = file.size; + this.type = file.type; + this.delete_type = 'DELETE'; + }, + UploadHandler = function (req, res, callback) { + this.req = req; + this.res = res; + this.callback = callback; + }, + serve = function (req, res) { + res.setHeader( + 'Access-Control-Allow-Origin', + options.accessControl.allowOrigin + ); + res.setHeader( + 'Access-Control-Allow-Methods', + options.accessControl.allowMethods + ); + var handleResult = function (result, redirect) { + if (redirect) { + res.writeHead(302, { + 'Location': redirect.replace( + /%s/, + encodeURIComponent(JSON.stringify(result)) + ) + }); + res.end(); + } else { + res.writeHead(200, { + 'Content-Type': req.headers.accept + .indexOf('application/json') !== -1 ? + 'application/json' : 'text/plain' + }); + res.end(JSON.stringify(result)); + } + }, + setNoCacheHeaders = function () { + res.setHeader('Pragma', 'no-cache'); + res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate'); + res.setHeader('Content-Disposition', 'inline; filename="files.json"'); + }, + handler = new UploadHandler(req, res, handleResult); + switch (req.method) { + case 'OPTIONS': + res.end(); + break; + case 'HEAD': + case 'GET': + if (req.url === '/') { + setNoCacheHeaders(); + if (req.method === 'GET') { + handler.get(); + } else { + res.end(); + } + } else { + fileServer.serve(req, res); + } + break; + case 'POST': + setNoCacheHeaders(); + handler.post(); + break; + case 'DELETE': + handler.destroy(); + break; + default: + res.statusCode = 405; + res.end(); + } + }; + fileServer.respond = function (pathname, status, _headers, files, stat, req, res, finish) { + if (!options.safeFileTypes.test(files[0])) { + // Force a download dialog for unsafe file extensions: + res.setHeader( + 'Content-Disposition', + 'attachment; filename="' + utf8encode(path.basename(files[0])) + '"' + ); + } else { + // Prevent Internet Explorer from MIME-sniffing the content-type: + res.setHeader('X-Content-Type-Options', 'nosniff'); + } + nodeStatic.Server.prototype.respond + .call(this, pathname, status, _headers, files, stat, req, res, finish); + }; + FileInfo.prototype.validate = function () { + if (options.minFileSize && options.minFileSize > this.size) { + this.error = 'minFileSize'; + } else if (options.maxFileSize && options.maxFileSize < this.size) { + this.error = 'maxFileSize'; + } else if (!options.acceptFileTypes.test(this.name)) { + this.error = 'acceptFileTypes'; + } + return !this.error; + }; + FileInfo.prototype.safeName = function () { + // Prevent directory traversal and creating hidden system files: + this.name = path.basename(this.name).replace(/^\.+/, ''); + // Prevent overwriting existing files: + while (_existsSync(options.uploadDir + '/' + this.name)) { + this.name = this.name.replace(nameCountRegexp, nameCountFunc); + } + }; + FileInfo.prototype.initUrls = function (req) { + if (!this.error) { + var that = this, + baseUrl = (options.ssl ? 'https:' : 'http:') + + '//' + req.headers.host + options.uploadUrl; + this.url = this.delete_url = baseUrl + encodeURIComponent(this.name); + Object.keys(options.imageVersions).forEach(function (version) { + if (_existsSync( + options.uploadDir + '/' + version + '/' + that.name + )) { + that[version + '_url'] = baseUrl + version + '/' + + encodeURIComponent(that.name); + } + }); + } + }; + UploadHandler.prototype.get = function () { + var handler = this, + files = []; + fs.readdir(options.uploadDir, function (err, list) { + list.forEach(function (name) { + var stats = fs.statSync(options.uploadDir + '/' + name), + fileInfo; + if (stats.isFile()) { + fileInfo = new FileInfo({ + name: name, + size: stats.size + }); + fileInfo.initUrls(handler.req); + files.push(fileInfo); + } + }); + handler.callback(files); + }); + }; + UploadHandler.prototype.post = function () { + var handler = this, + form = new formidable.IncomingForm(), + tmpFiles = [], + files = [], + map = {}, + counter = 1, + redirect, + finish = function () { + counter -= 1; + if (!counter) { + files.forEach(function (fileInfo) { + fileInfo.initUrls(handler.req); + }); + handler.callback(files, redirect); + } + }; + form.uploadDir = options.tmpDir; + form.on('fileBegin', function (name, file) { + tmpFiles.push(file.path); + var fileInfo = new FileInfo(file, handler.req, true); + fileInfo.safeName(); + map[path.basename(file.path)] = fileInfo; + files.push(fileInfo); + }).on('field', function (name, value) { + if (name === 'redirect') { + redirect = value; + } + }).on('file', function (name, file) { + var fileInfo = map[path.basename(file.path)]; + fileInfo.size = file.size; + if (!fileInfo.validate()) { + fs.unlink(file.path); + return; + } + fs.renameSync(file.path, options.uploadDir + '/' + fileInfo.name); + if (options.imageTypes.test(fileInfo.name)) { + Object.keys(options.imageVersions).forEach(function (version) { + counter += 1; + var opts = options.imageVersions[version]; + imageMagick.resize({ + width: opts.width, + height: opts.height, + srcPath: options.uploadDir + '/' + fileInfo.name, + dstPath: options.uploadDir + '/' + version + '/' + + fileInfo.name + }, finish); + }); + } + }).on('aborted', function () { + tmpFiles.forEach(function (file) { + fs.unlink(file); + }); + }).on('progress', function (bytesReceived, bytesExpected) { + if (bytesReceived > options.maxPostSize) { + handler.req.connection.destroy(); + } + }).on('end', finish).parse(handler.req); + }; + UploadHandler.prototype.destroy = function () { + var handler = this, + fileName; + if (handler.req.url.slice(0, options.uploadUrl.length) === options.uploadUrl) { + fileName = path.basename(decodeURIComponent(handler.req.url)); + fs.unlink(options.uploadDir + '/' + fileName, function (ex) { + Object.keys(options.imageVersions).forEach(function (version) { + fs.unlink(options.uploadDir + '/' + version + '/' + fileName); + }); + handler.callback(!ex); + }); + } else { + handler.callback(false); + } + }; + if (options.ssl) { + require('https').createServer(options.ssl, serve).listen(port); + } else { + require('http').createServer(serve).listen(port); + } +}(8888)); diff --git a/vendors/jquery-file-upload/server/node/tmp/.gitignore b/vendors/jquery-file-upload/server/node/tmp/.gitignore new file mode 100644 index 000000000..e69de29bb diff --git a/vendors/jquery-file-upload/server/php/files/.htaccess b/vendors/jquery-file-upload/server/php/files/.htaccess new file mode 100644 index 000000000..a6a9f6a75 --- /dev/null +++ b/vendors/jquery-file-upload/server/php/files/.htaccess @@ -0,0 +1,4 @@ +ForceType application/octet-stream + + ForceType none + \ No newline at end of file diff --git a/vendors/jquery-file-upload/server/php/index.php b/vendors/jquery-file-upload/server/php/index.php new file mode 100644 index 000000000..1601c76f3 --- /dev/null +++ b/vendors/jquery-file-upload/server/php/index.php @@ -0,0 +1,46 @@ +get(); + break; + case 'POST': + if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') { + $upload_handler->delete(); + } else { + $upload_handler->post(); + } + break; + case 'DELETE': + $upload_handler->delete(); + break; + default: + header('HTTP/1.1 405 Method Not Allowed'); +} diff --git a/vendors/jquery-file-upload/server/php/thumbnails/.htaccess b/vendors/jquery-file-upload/server/php/thumbnails/.htaccess new file mode 100644 index 000000000..e69de29bb diff --git a/vendors/jquery-file-upload/server/php/upload.class.php b/vendors/jquery-file-upload/server/php/upload.class.php new file mode 100644 index 000000000..c4efacbdb --- /dev/null +++ b/vendors/jquery-file-upload/server/php/upload.class.php @@ -0,0 +1,436 @@ +options = array( + 'script_url' => $this->getFullUrl().'/', + 'upload_dir' => dirname($_SERVER['SCRIPT_FILENAME']).'/files/', + 'upload_url' => $this->getFullUrl().'/files/', + 'param_name' => 'files', + // Set the following option to 'POST', if your server does not support + // DELETE requests. This is a parameter sent to the client: + 'delete_type' => 'DELETE', + // The php.ini settings upload_max_filesize and post_max_size + // take precedence over the following max_file_size setting: + 'max_file_size' => null, + 'min_file_size' => 1, + 'accept_file_types' => '/.+$/i', + // The maximum number of files for the upload directory: + 'max_number_of_files' => null, + // Image resolution restrictions: + 'max_width' => null, + 'max_height' => null, + 'min_width' => 1, + 'min_height' => 1, + // Set the following option to false to enable resumable uploads: + 'discard_aborted_uploads' => true, + // Set to true to rotate images based on EXIF meta data, if available: + 'orient_image' => false, + 'image_versions' => array( + // Uncomment the following version to restrict the size of + // uploaded images. You can also add additional versions with + // their own upload directories: + /* + 'large' => array( + 'upload_dir' => dirname($_SERVER['SCRIPT_FILENAME']).'/files/', + 'upload_url' => $this->getFullUrl().'/files/', + 'max_width' => 1920, + 'max_height' => 1200, + 'jpeg_quality' => 95 + ), + */ + 'thumbnail' => array( + 'upload_dir' => dirname($_SERVER['SCRIPT_FILENAME']).'/thumbnails/', + 'upload_url' => $this->getFullUrl().'/thumbnails/', + 'max_width' => 80, + 'max_height' => 80 + ) + ) + ); + if ($options) { + $this->options = array_replace_recursive($this->options, $options); + } + } + + protected function getFullUrl() { + $https = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off'; + return + ($https ? 'https://' : 'http://'). + (!empty($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : ''). + (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME']. + ($https && $_SERVER['SERVER_PORT'] === 443 || + $_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))). + substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/')); + } + + protected function set_file_delete_url($file) { + $file->delete_url = $this->options['script_url'] + .'?file='.rawurlencode($file->name); + $file->delete_type = $this->options['delete_type']; + if ($file->delete_type !== 'DELETE') { + $file->delete_url .= '&_method=DELETE'; + } + } + + protected function get_file_object($file_name) { + $file_path = $this->options['upload_dir'].$file_name; + if (is_file($file_path) && $file_name[0] !== '.') { + $file = new stdClass(); + $file->name = $file_name; + $file->size = filesize($file_path); + $file->url = $this->options['upload_url'].rawurlencode($file->name); + foreach($this->options['image_versions'] as $version => $options) { + if (is_file($options['upload_dir'].$file_name)) { + $file->{$version.'_url'} = $options['upload_url'] + .rawurlencode($file->name); + } + } + $this->set_file_delete_url($file); + return $file; + } + return null; + } + + protected function get_file_objects() { + return array_values(array_filter(array_map( + array($this, 'get_file_object'), + scandir($this->options['upload_dir']) + ))); + } + + protected function create_scaled_image($file_name, $options) { + $file_path = $this->options['upload_dir'].$file_name; + $new_file_path = $options['upload_dir'].$file_name; + list($img_width, $img_height) = @getimagesize($file_path); + if (!$img_width || !$img_height) { + return false; + } + $scale = min( + $options['max_width'] / $img_width, + $options['max_height'] / $img_height + ); + if ($scale >= 1) { + if ($file_path !== $new_file_path) { + return copy($file_path, $new_file_path); + } + return true; + } + $new_width = $img_width * $scale; + $new_height = $img_height * $scale; + $new_img = @imagecreatetruecolor($new_width, $new_height); + switch (strtolower(substr(strrchr($file_name, '.'), 1))) { + case 'jpg': + case 'jpeg': + $src_img = @imagecreatefromjpeg($file_path); + $write_image = 'imagejpeg'; + $image_quality = isset($options['jpeg_quality']) ? + $options['jpeg_quality'] : 75; + break; + case 'gif': + @imagecolortransparent($new_img, @imagecolorallocate($new_img, 0, 0, 0)); + $src_img = @imagecreatefromgif($file_path); + $write_image = 'imagegif'; + $image_quality = null; + break; + case 'png': + @imagecolortransparent($new_img, @imagecolorallocate($new_img, 0, 0, 0)); + @imagealphablending($new_img, false); + @imagesavealpha($new_img, true); + $src_img = @imagecreatefrompng($file_path); + $write_image = 'imagepng'; + $image_quality = isset($options['png_quality']) ? + $options['png_quality'] : 9; + break; + default: + $src_img = null; + } + $success = $src_img && @imagecopyresampled( + $new_img, + $src_img, + 0, 0, 0, 0, + $new_width, + $new_height, + $img_width, + $img_height + ) && $write_image($new_img, $new_file_path, $image_quality); + // Free up memory (imagedestroy does not delete files): + @imagedestroy($src_img); + @imagedestroy($new_img); + return $success; + } + + protected function validate($uploaded_file, $file, $error, $index) { + if ($error) { + $file->error = $error; + return false; + } + if (!$file->name) { + $file->error = 'missingFileName'; + return false; + } + if (!preg_match($this->options['accept_file_types'], $file->name)) { + $file->error = 'acceptFileTypes'; + return false; + } + if ($uploaded_file && is_uploaded_file($uploaded_file)) { + $file_size = filesize($uploaded_file); + } else { + $file_size = $_SERVER['CONTENT_LENGTH']; + } + if ($this->options['max_file_size'] && ( + $file_size > $this->options['max_file_size'] || + $file->size > $this->options['max_file_size']) + ) { + $file->error = 'maxFileSize'; + return false; + } + if ($this->options['min_file_size'] && + $file_size < $this->options['min_file_size']) { + $file->error = 'minFileSize'; + return false; + } + if (is_int($this->options['max_number_of_files']) && ( + count($this->get_file_objects()) >= $this->options['max_number_of_files']) + ) { + $file->error = 'maxNumberOfFiles'; + return false; + } + list($img_width, $img_height) = @getimagesize($uploaded_file); + if (is_int($img_width)) { + if ($this->options['max_width'] && $img_width > $this->options['max_width'] || + $this->options['max_height'] && $img_height > $this->options['max_height']) { + $file->error = 'maxResolution'; + return false; + } + if ($this->options['min_width'] && $img_width < $this->options['min_width'] || + $this->options['min_height'] && $img_height < $this->options['min_height']) { + $file->error = 'minResolution'; + return false; + } + } + return true; + } + + protected function upcount_name_callback($matches) { + $index = isset($matches[1]) ? intval($matches[1]) + 1 : 1; + $ext = isset($matches[2]) ? $matches[2] : ''; + return ' ('.$index.')'.$ext; + } + + protected function upcount_name($name) { + return preg_replace_callback( + '/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/', + array($this, 'upcount_name_callback'), + $name, + 1 + ); + } + + protected function trim_file_name($name, $type, $index) { + // Remove path information and dots around the filename, to prevent uploading + // into different directories or replacing hidden system files. + // Also remove control characters and spaces (\x00..\x20) around the filename: + $file_name = trim(basename(stripslashes($name)), ".\x00..\x20"); + // Add missing file extension for known image types: + if (strpos($file_name, '.') === false && + preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) { + $file_name .= '.'.$matches[1]; + } + if ($this->options['discard_aborted_uploads']) { + while(is_file($this->options['upload_dir'].$file_name)) { + $file_name = $this->upcount_name($file_name); + } + } + return $file_name; + } + + protected function handle_form_data($file, $index) { + // Handle form data, e.g. $_REQUEST['description'][$index] + } + + protected function orient_image($file_path) { + $exif = @exif_read_data($file_path); + if ($exif === false) { + return false; + } + $orientation = intval(@$exif['Orientation']); + if (!in_array($orientation, array(3, 6, 8))) { + return false; + } + $image = @imagecreatefromjpeg($file_path); + switch ($orientation) { + case 3: + $image = @imagerotate($image, 180, 0); + break; + case 6: + $image = @imagerotate($image, 270, 0); + break; + case 8: + $image = @imagerotate($image, 90, 0); + break; + default: + return false; + } + $success = imagejpeg($image, $file_path); + // Free up memory (imagedestroy does not delete files): + @imagedestroy($image); + return $success; + } + + protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index = null) { + $file = new stdClass(); + $file->name = $this->trim_file_name($name, $type, $index); + $file->size = intval($size); + $file->type = $type; + if ($this->validate($uploaded_file, $file, $error, $index)) { + $this->handle_form_data($file, $index); + $file_path = $this->options['upload_dir'].$file->name; + $append_file = !$this->options['discard_aborted_uploads'] && + is_file($file_path) && $file->size > filesize($file_path); + clearstatcache(); + if ($uploaded_file && is_uploaded_file($uploaded_file)) { + // multipart/formdata uploads (POST method uploads) + if ($append_file) { + file_put_contents( + $file_path, + fopen($uploaded_file, 'r'), + FILE_APPEND + ); + } else { + move_uploaded_file($uploaded_file, $file_path); + } + } else { + // Non-multipart uploads (PUT method support) + file_put_contents( + $file_path, + fopen('php://input', 'r'), + $append_file ? FILE_APPEND : 0 + ); + } + $file_size = filesize($file_path); + if ($file_size === $file->size) { + if ($this->options['orient_image']) { + $this->orient_image($file_path); + } + $file->url = $this->options['upload_url'].rawurlencode($file->name); + foreach($this->options['image_versions'] as $version => $options) { + if ($this->create_scaled_image($file->name, $options)) { + if ($this->options['upload_dir'] !== $options['upload_dir']) { + $file->{$version.'_url'} = $options['upload_url'] + .rawurlencode($file->name); + } else { + clearstatcache(); + $file_size = filesize($file_path); + } + } + } + } else if ($this->options['discard_aborted_uploads']) { + unlink($file_path); + $file->error = 'abort'; + } + $file->size = $file_size; + $this->set_file_delete_url($file); + } + return $file; + } + + public function get() { + $file_name = isset($_REQUEST['file']) ? + basename(stripslashes($_REQUEST['file'])) : null; + if ($file_name) { + $info = $this->get_file_object($file_name); + } else { + $info = $this->get_file_objects(); + } + header('Content-type: application/json'); + echo json_encode($info); + } + + public function post() { + if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') { + return $this->delete(); + } + $upload = isset($_FILES[$this->options['param_name']]) ? + $_FILES[$this->options['param_name']] : null; + $info = array(); + if ($upload && is_array($upload['tmp_name'])) { + // param_name is an array identifier like "files[]", + // $_FILES is a multi-dimensional array: + foreach ($upload['tmp_name'] as $index => $value) { + $info[] = $this->handle_file_upload( + $upload['tmp_name'][$index], + isset($_SERVER['HTTP_X_FILE_NAME']) ? + $_SERVER['HTTP_X_FILE_NAME'] : $upload['name'][$index], + isset($_SERVER['HTTP_X_FILE_SIZE']) ? + $_SERVER['HTTP_X_FILE_SIZE'] : $upload['size'][$index], + isset($_SERVER['HTTP_X_FILE_TYPE']) ? + $_SERVER['HTTP_X_FILE_TYPE'] : $upload['type'][$index], + $upload['error'][$index], + $index + ); + } + } elseif ($upload || isset($_SERVER['HTTP_X_FILE_NAME'])) { + // param_name is a single object identifier like "file", + // $_FILES is a one-dimensional array: + $info[] = $this->handle_file_upload( + isset($upload['tmp_name']) ? $upload['tmp_name'] : null, + isset($_SERVER['HTTP_X_FILE_NAME']) ? + $_SERVER['HTTP_X_FILE_NAME'] : (isset($upload['name']) ? + $upload['name'] : null), + isset($_SERVER['HTTP_X_FILE_SIZE']) ? + $_SERVER['HTTP_X_FILE_SIZE'] : (isset($upload['size']) ? + $upload['size'] : null), + isset($_SERVER['HTTP_X_FILE_TYPE']) ? + $_SERVER['HTTP_X_FILE_TYPE'] : (isset($upload['type']) ? + $upload['type'] : null), + isset($upload['error']) ? $upload['error'] : null + ); + } + header('Vary: Accept'); + $json = json_encode($info); + $redirect = isset($_REQUEST['redirect']) ? + stripslashes($_REQUEST['redirect']) : null; + if ($redirect) { + header('Location: '.sprintf($redirect, rawurlencode($json))); + return; + } + if (isset($_SERVER['HTTP_ACCEPT']) && + (strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) { + header('Content-type: application/json'); + } else { + header('Content-type: text/plain'); + } + echo $json; + } + + public function delete() { + $file_name = isset($_REQUEST['file']) ? + basename(stripslashes($_REQUEST['file'])) : null; + $file_path = $this->options['upload_dir'].$file_name; + $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path); + if ($success) { + foreach($this->options['image_versions'] as $version => $options) { + $file = $options['upload_dir'].$file_name; + if (is_file($file)) { + unlink($file); + } + } + } + header('Content-type: application/json'); + echo json_encode($success); + } + +} diff --git a/vendors/jquery-file-upload/test/index.html b/vendors/jquery-file-upload/test/index.html new file mode 100644 index 000000000..8a8011d21 --- /dev/null +++ b/vendors/jquery-file-upload/test/index.html @@ -0,0 +1,146 @@ + + + + + + + +jQuery File Upload Plugin Test + + + + +

      jQuery File Upload Plugin Test

      +

      +
      +

      +
        +
        + +
        + +
        +
        + + + + Add files... + + + + + + +
        + +
        + +
        +
        +
        + +
         
        +
        +
        + +
        +
        + + +
        +
        + + + + + + + + + + + + + + + + + + + diff --git a/vendors/jquery-file-upload/test/test.js b/vendors/jquery-file-upload/test/test.js new file mode 100644 index 000000000..0f6d90afb --- /dev/null +++ b/vendors/jquery-file-upload/test/test.js @@ -0,0 +1,1279 @@ +/* + * jQuery File Upload Plugin Test 6.9.2 + * https://github.com/blueimp/jQuery-File-Upload + * + * Copyright 2010, Sebastian Tschan + * https://blueimp.net + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/MIT + */ + +/*jslint nomen: true, unparam: true */ +/*global $, QUnit, document, expect, module, test, asyncTest, start, ok, strictEqual, notStrictEqual */ + +$(function () { + 'use strict'; + + QUnit.done = function () { + // Delete all uploaded files: + var url = $('#fileupload').find('form').prop('action'); + $.getJSON(url, function (files) { + $.each(files, function (index, file) { + $.ajax({ + url: url + '?file=' + encodeURIComponent(file.name), + type: 'DELETE' + }); + }); + }); + }; + + var lifecycle = { + setup: function () { + // Set the .fileupload method to the basic widget method: + $.widget('blueimp.fileupload', $.blueimp.fileupload, {}); + }, + teardown: function () { + // De-initialize the file input plugin: + $('#fileupload:blueimp-fileupload').fileupload('destroy'); + // Remove all remaining event listeners: + $('#fileupload input').unbind(); + $(document).unbind(); + } + }, + lifecycleUI = { + setup: function () { + // Set the .fileupload method to the JUI widget method: + $.widget('blueimpJUI.fileupload', $.blueimpJUI.fileupload, {}); + }, + teardown: function () { + // De-initialize the file input plugin: + $('#fileupload:blueimpJUI-fileupload').fileupload('destroy'); + // Remove all remaining event listeners: + $('#fileupload input, #fileupload button').unbind(); + $(document).unbind(); + } + }; + + module('Initialization', lifecycle); + + test('Widget initialization', function () { + ok($('#fileupload').fileupload().data('fileupload')); + }); + + test('Data attribute options', function () { + $('#fileupload').attr('data-url', 'http://example.org'); + $('#fileupload').fileupload(); + strictEqual( + $('#fileupload').fileupload('option', 'url'), + 'http://example.org' + ); + }); + + test('File input initialization', function () { + var fu = $('#fileupload').fileupload(); + ok( + fu.fileupload('option', 'fileInput').length, + 'File input field inside of the widget' + ); + ok( + fu.fileupload('option', 'fileInput').length, + 'Widget element as file input field' + ); + }); + + test('Drop zone initialization', function () { + ok($('#fileupload').fileupload() + .fileupload('option', 'dropZone').length); + }); + + test('Event listeners initialization', function () { + var fu = $('#fileupload').fileupload(); + ok( + fu.fileupload('option', 'fileInput') + .data('events').change.length, + 'Listens to file input change events' + ); + if ($.support.xhrFormDataFileUpload) { + ok( + fu.fileupload('option', 'dropZone') + .data('events').drop.length, + 'Listens to drop zone drop events' + ); + ok( + fu.fileupload('option', 'dropZone') + .data('events').dragover.length, + 'Listens to drop zone dragover events' + ); + } + }); + + module('API', lifecycle); + + test('destroy', function () { + var fu = $('#fileupload').fileupload(), + fileInput = fu.fileupload('option', 'fileInput'), + dropZone = fu.fileupload('option', 'dropZone'); + fileInput.change($.noop); + dropZone.bind('drop', $.noop); + dropZone.bind('dragover', $.noop); + fu.fileupload('destroy'); + strictEqual( + fileInput.data('events').change.length, + 1, + 'Removes own file input change event listener' + ); + if ($.support.xhrFormDataFileUpload) { + strictEqual( + dropZone.data('events').drop.length, + 1, + 'Removes own drop zone drop event listener' + ); + strictEqual( + dropZone.data('events').dragover.length, + 1, + 'Removes own drop zone dragover event listener' + ); + } + }); + + test('disable', function () { + var fu = $('#fileupload').fileupload(), + fileInput = fu.fileupload('option', 'fileInput'), + dropZone = fu.fileupload('option', 'dropZone'), + param = {files: [{name: 'test'}]}; + fileInput.change($.noop); + dropZone.bind('drop', $.noop); + dropZone.bind('dragover', $.noop); + fu.fileupload('disable'); + strictEqual( + fileInput.data('events').change.length, + 1, + 'Removes own file input change event listener' + ); + if ($.support.xhrFormDataFileUpload) { + strictEqual( + dropZone.data('events').drop.length, + 1, + 'Removes own drop zone drop event listener' + ); + strictEqual( + dropZone.data('events').dragover.length, + 1, + 'Removes own drop zone dragover event listener' + ); + } + fu.fileupload({ + add: function (e, data) { + ok(false); + } + }).fileupload('add', param); + }); + + test('enable', function () { + var fu = $('#fileupload').fileupload(), + param = {files: [{name: 'test'}]}; + fu.fileupload('disable'); + fu.fileupload('enable'); + ok( + fu.fileupload('option', 'fileInput') + .data('events').change.length, + 'Listens to file input change events' + ); + if ($.support.xhrFormDataFileUpload) { + ok( + fu.fileupload('option', 'dropZone') + .data('events').drop.length, + 'Listens to drop zone drop events' + ); + ok( + fu.fileupload('option', 'dropZone') + .data('events').dragover.length, + 'Listens to drop zone dragover events' + ); + } + $('#fileupload').fileupload({ + send: function (e, data) { + strictEqual( + data.files[0].name, + 'test', + 'Triggers send callback' + ); + return false; + } + }).fileupload('send', param); + }); + + test('option', function () { + var fu = $('#fileupload').fileupload(), + fileInput = fu.fileupload('option', 'fileInput'), + dropZone = fu.fileupload('option', 'dropZone'); + fu.fileupload('option', 'fileInput', null); + fu.fileupload('option', 'dropZone', null); + ok( + !fileInput.data('events'), + 'Removes event listener after changing fileInput option' + ); + if ($.support.xhrFormDataFileUpload) { + ok( + !dropZone.data('events'), + 'Removes event listeners after changing dropZone option' + ); + } + fu.fileupload('option', 'fileInput', fileInput); + fu.fileupload('option', 'dropZone', dropZone); + ok( + fileInput.data('events').change.length, + 'Adds change event listener after setting fileInput option' + ); + if ($.support.xhrFormDataFileUpload) { + ok( + dropZone.data('events').drop.length, + 'Adds drop event listener after setting dropZone option' + ); + ok( + dropZone.data('events').dragover.length, + 'Adds dragover event listener after setting dropZone option' + ); + } + fu.fileupload('option', 'dropZone', 'body'); + strictEqual( + fu.fileupload('option', 'dropZone')[0], + document.body, + 'Allow a query string as parameter for the dropZone option' + ); + fu.fileupload('option', 'dropZone', document); + strictEqual( + fu.fileupload('option', 'dropZone')[0], + document, + 'Allow a document element as parameter for the dropZone option' + ); + fu.fileupload('option', 'fileInput', ':file'); + strictEqual( + fu.fileupload('option', 'fileInput')[0], + $(':file')[0], + 'Allow a query string as parameter for the fileInput option' + ); + fu.fileupload('option', 'fileInput', $(':file')[0]); + strictEqual( + fu.fileupload('option', 'fileInput')[0], + $(':file')[0], + 'Allow a document element as parameter for the fileInput option' + ); + }); + + asyncTest('add', function () { + expect(4); + var param = {files: [{name: 'test'}]}, + param2 = {files: [{fileName: 'test', fileSize: 123}]}; + $('#fileupload').fileupload({ + add: function (e, data) { + strictEqual( + data.files[0].name, + param.files[0].name, + 'Triggers add callback' + ); + } + }).fileupload('add', param).fileupload( + 'option', + 'add', + function (e, data) { + strictEqual( + data.files[0].name, + param2.files[0].fileName, + 'Normalizes fileName' + ); + strictEqual( + data.files[0].size, + param2.files[0].fileSize, + 'Normalizes fileSize' + ); + data.submit().complete(function () { + ok(true, 'data.submit() Returns a jqXHR object'); + start(); + }); + } + ).fileupload('add', param2); + }); + + asyncTest('send', function () { + expect(3); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + send: function (e, data) { + strictEqual( + data.files[0].name, + 'test', + 'Triggers send callback' + ); + } + }).fileupload('send', param).fail(function () { + ok(true, 'Allows to abort the request'); + }).complete(function () { + ok(true, 'Returns a jqXHR object'); + start(); + }).abort(); + }); + + module('Callbacks', lifecycle); + + asyncTest('add', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + add: function (e, data) { + ok(true, 'Triggers add callback'); + start(); + } + }).fileupload('add', param); + }); + + asyncTest('submit', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + submit: function (e, data) { + ok(true, 'Triggers submit callback'); + start(); + return false; + } + }).fileupload('add', param); + }); + + asyncTest('send', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + send: function (e, data) { + ok(true, 'Triggers send callback'); + start(); + return false; + } + }).fileupload('send', param); + }); + + asyncTest('done', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + done: function (e, data) { + ok(true, 'Triggers done callback'); + start(); + } + }).fileupload('send', param); + }); + + asyncTest('fail', function () { + expect(1); + var param = {files: [{name: 'test'}]}, + fu = $('#fileupload').fileupload({ + url: '404', + fail: function (e, data) { + ok(true, 'Triggers fail callback'); + start(); + } + }); + fu.data('fileupload')._isXHRUpload = function () { + return true; + }; + fu.fileupload('send', param); + }); + + asyncTest('always', function () { + expect(2); + var param = {files: [{name: 'test'}]}, + counter = 0, + fu = $('#fileupload').fileupload({ + always: function (e, data) { + ok(true, 'Triggers always callback'); + if (counter === 1) { + start(); + } else { + counter += 1; + } + } + }); + fu.data('fileupload')._isXHRUpload = function () { + return true; + }; + fu.fileupload('add', param).fileupload( + 'option', + 'url', + '404' + ).fileupload('add', param); + }); + + asyncTest('progress', function () { + expect(1); + var param = {files: [{name: 'test'}]}, + counter = 0; + $('#fileupload').fileupload({ + forceIframeTransport: true, + progress: function (e, data) { + ok(true, 'Triggers progress callback'); + if (counter === 0) { + start(); + } else { + counter += 1; + } + } + }).fileupload('send', param); + }); + + asyncTest('progressall', function () { + expect(1); + var param = {files: [{name: 'test'}]}, + counter = 0; + $('#fileupload').fileupload({ + forceIframeTransport: true, + progressall: function (e, data) { + ok(true, 'Triggers progressall callback'); + if (counter === 0) { + start(); + } else { + counter += 1; + } + } + }).fileupload('send', param); + }); + + asyncTest('start', function () { + expect(1); + var param = {files: [{name: '1'}, {name: '2'}]}, + active = 0; + $('#fileupload').fileupload({ + send: function (e, data) { + active += 1; + }, + start: function (e, data) { + ok(!active, 'Triggers start callback before uploads'); + start(); + } + }).fileupload('send', param); + }); + + asyncTest('stop', function () { + expect(1); + var param = {files: [{name: '1'}, {name: '2'}]}, + active = 0; + $('#fileupload').fileupload({ + send: function (e, data) { + active += 1; + }, + always: function (e, data) { + active -= 1; + }, + stop: function (e, data) { + ok(!active, 'Triggers stop callback after uploads'); + start(); + } + }).fileupload('send', param); + }); + + test('change', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('fileupload'), + fileInput = fu.fileupload('option', 'fileInput'); + expect(2); + fu.fileupload({ + change: function (e, data) { + ok(true, 'Triggers change callback'); + strictEqual( + data.files.length, + 0, + 'Returns empty files list' + ); + }, + add: $.noop + }); + fuo._onChange({ + data: {fileupload: fuo}, + target: fileInput[0] + }); + }); + + test('paste', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('fileupload'); + expect(1); + fu.fileupload({ + paste: function (e, data) { + ok(true, 'Triggers paste callback'); + }, + add: $.noop + }); + fuo._onPaste({ + data: {fileupload: fuo}, + originalEvent: {clipboardData: {}}, + preventDefault: $.noop + }); + }); + + test('drop', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('fileupload'); + expect(1); + fu.fileupload({ + drop: function (e, data) { + ok(true, 'Triggers drop callback'); + }, + add: $.noop + }); + fuo._onDrop({ + data: {fileupload: fuo}, + originalEvent: {dataTransfer: {}}, + preventDefault: $.noop + }); + }); + + test('dragover', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('fileupload'); + expect(1); + fu.fileupload({ + dragover: function (e, data) { + ok(true, 'Triggers dragover callback'); + }, + add: $.noop + }); + fuo._onDragOver({ + data: {fileupload: fuo}, + originalEvent: {dataTransfer: {}}, + preventDefault: $.noop + }); + }); + + module('Options', lifecycle); + + test('paramName', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + paramName: null, + send: function (e, data) { + strictEqual( + data.paramName[0], + data.fileInput.prop('name'), + 'Takes paramName from file input field if not set' + ); + return false; + } + }).fileupload('send', param); + }); + + test('url', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + url: null, + send: function (e, data) { + strictEqual( + data.url, + $(data.fileInput.prop('form')).prop('action'), + 'Takes url from form action if not set' + ); + return false; + } + }).fileupload('send', param); + }); + + test('type', function () { + expect(2); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + type: null, + send: function (e, data) { + strictEqual( + data.type, + 'POST', + 'Request type is "POST" if not set to "PUT"' + ); + return false; + } + }).fileupload('send', param); + $('#fileupload').fileupload({ + type: 'PUT', + send: function (e, data) { + strictEqual( + data.type, + 'PUT', + 'Request type is "PUT" if set to "PUT"' + ); + return false; + } + }).fileupload('send', param); + }); + + test('replaceFileInput', function () { + var fu = $('#fileupload').fileupload(), + fuo = fu.data('fileupload'), + fileInput = fu.fileupload('option', 'fileInput'), + fileInputElement = fileInput[0]; + expect(2); + fu.fileupload({ + replaceFileInput: false, + change: function (e, data) { + strictEqual( + fu.fileupload('option', 'fileInput')[0], + fileInputElement, + 'Keeps file input with replaceFileInput: false' + ); + }, + add: $.noop + }); + fuo._onChange({ + data: {fileupload: fuo}, + target: fileInput[0] + }); + fu.fileupload({ + replaceFileInput: true, + change: function (e, data) { + notStrictEqual( + fu.fileupload('option', 'fileInput')[0], + fileInputElement, + 'Replaces file input with replaceFileInput: true' + ); + }, + add: $.noop + }); + fuo._onChange({ + data: {fileupload: fuo}, + target: fileInput[0] + }); + }); + + asyncTest('forceIframeTransport', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + forceIframeTransport: true, + done: function (e, data) { + strictEqual( + data.dataType.substr(0, 6), + 'iframe', + 'Iframe Transport is used' + ); + start(); + } + }).fileupload('send', param); + }); + + test('singleFileUploads', function () { + expect(3); + var fu = $('#fileupload').fileupload(), + param = {files: [{name: '1'}, {name: '2'}]}, + index = 1; + fu.data('fileupload')._isXHRUpload = function () { + return true; + }; + $('#fileupload').fileupload({ + singleFileUploads: true, + add: function (e, data) { + ok(true, 'Triggers callback number ' + index.toString()); + index += 1; + } + }).fileupload('add', param).fileupload( + 'option', + 'singleFileUploads', + false + ).fileupload('add', param); + }); + + test('limitMultiFileUploads', function () { + expect(3); + var fu = $('#fileupload').fileupload(), + param = {files: [ + {name: '1'}, + {name: '2'}, + {name: '3'}, + {name: '4'}, + {name: '5'} + ]}, + index = 1; + fu.data('fileupload')._isXHRUpload = function () { + return true; + }; + $('#fileupload').fileupload({ + singleFileUploads: false, + limitMultiFileUploads: 2, + add: function (e, data) { + ok(true, 'Triggers callback number ' + index.toString()); + index += 1; + } + }).fileupload('add', param); + }); + + asyncTest('sequentialUploads', function () { + expect(6); + var param = {files: [ + {name: '1'}, + {name: '2'}, + {name: '3'}, + {name: '4'}, + {name: '5'}, + {name: '6'} + ]}, + addIndex = 0, + sendIndex = 0, + loadIndex = 0, + fu = $('#fileupload').fileupload({ + sequentialUploads: true, + add: function (e, data) { + addIndex += 1; + if (addIndex === 4) { + data.submit().abort(); + } else { + data.submit(); + } + }, + send: function (e, data) { + sendIndex += 1; + }, + done: function (e, data) { + loadIndex += 1; + strictEqual(sendIndex, loadIndex, 'upload in order'); + }, + fail: function (e, data) { + strictEqual(data.errorThrown, 'abort', 'upload aborted'); + }, + stop: function (e) { + start(); + } + }); + fu.data('fileupload')._isXHRUpload = function () { + return true; + }; + fu.fileupload('add', param); + }); + + asyncTest('limitConcurrentUploads', function () { + expect(12); + var param = {files: [ + {name: '1'}, + {name: '2'}, + {name: '3'}, + {name: '4'}, + {name: '5'}, + {name: '6'}, + {name: '7'}, + {name: '8'}, + {name: '9'}, + {name: '10'}, + {name: '11'}, + {name: '12'} + ]}, + addIndex = 0, + sendIndex = 0, + loadIndex = 0, + fu = $('#fileupload').fileupload({ + limitConcurrentUploads: 3, + add: function (e, data) { + addIndex += 1; + if (addIndex === 4) { + data.submit().abort(); + } else { + data.submit(); + } + }, + send: function (e, data) { + sendIndex += 1; + }, + done: function (e, data) { + loadIndex += 1; + ok(sendIndex - loadIndex < 3); + }, + fail: function (e, data) { + strictEqual(data.errorThrown, 'abort', 'upload aborted'); + }, + stop: function (e) { + start(); + } + }); + fu.data('fileupload')._isXHRUpload = function () { + return true; + }; + fu.fileupload('add', param); + }); + + if ($.support.xhrFileUpload) { + asyncTest('multipart', function () { + expect(4); + var param = {files: [{ + name: 'test.png', + size: 123, + type: 'image/png' + }]}, + fu = $('#fileupload').fileupload({ + multipart: false, + always: function (e, data) { + strictEqual( + data.contentType, + param.files[0].type, + 'non-multipart upload sets file type as contentType' + ); + strictEqual( + data.headers['X-File-Name'], + param.files[0].name, + 'non-multipart upload sets X-File-Name header' + ); + strictEqual( + data.headers['X-File-Type'], + param.files[0].type, + 'non-multipart upload sets X-File-Type header' + ); + strictEqual( + data.headers['X-File-Size'], + param.files[0].size, + 'non-multipart upload sets X-File-Size header' + ); + start(); + } + }); + fu.fileupload('send', param); + }); + } + + module('UI Initialization', lifecycleUI); + + test('Widget initialization', function () { + ok($('#fileupload').fileupload().data('fileupload')); + ok( + $('#fileupload').fileupload('option', 'uploadTemplate').length, + 'Initialized upload template' + ); + ok( + $('#fileupload').fileupload('option', 'downloadTemplate').length, + 'Initialized download template' + ); + }); + + test('Buttonbar event listeners', function () { + var buttonbar = $('#fileupload .fileupload-buttonbar'), + files = [{name: 'test'}]; + expect(7); + $('#fileupload').fileupload({ + send: function (e, data) { + ok(true, 'Started file upload via global start button'); + }, + fail: function (e, data) { + ok(true, 'Canceled file upload via global cancel button'); + data.context.remove(); + }, + destroy: function (e, data) { + ok(true, 'Delete action called via global delete button'); + } + }); + ok( + buttonbar.find('.start') + .data('events').click.length, + 'Listens to start button click events' + ); + ok( + buttonbar.find('.cancel') + .data('events').click.length, + 'Listens to cancel button click events' + ); + ok( + buttonbar.find('.delete') + .data('events').click.length, + 'Listens to delete button click events' + ); + $('#fileupload').fileupload('add', {files: files}); + buttonbar.find('.cancel').click(); + $('#fileupload').fileupload('add', {files: files}); + buttonbar.find('.start').click(); + buttonbar.find('.cancel').click(); + $('#fileupload').data('fileupload')._renderDownload(files) + .appendTo($('#fileupload .files')).show() + .find('.delete input').click(); + buttonbar.find('.delete').click(); + }); + + module('UI API', lifecycleUI); + + test('destroy', function () { + var buttonbar = $('#fileupload .fileupload-buttonbar'); + $('#fileupload').fileupload(); + buttonbar.find('button').click($.noop); + $('#fileupload').fileupload('destroy'); + strictEqual( + buttonbar.find('.start').data('events').click.length, + 1, + 'Removes own start button click event listener' + ); + strictEqual( + buttonbar.find('.cancel').data('events').click.length, + 1, + 'Removes own cancel button click event listener' + ); + strictEqual( + buttonbar.find('.delete').data('events').click.length, + 1, + 'Removes own delete button click event listener' + ); + }); + + test('disable', function () { + var buttonbar = $('#fileupload .fileupload-buttonbar'); + $('#fileupload').fileupload(); + $('#fileupload').fileupload('disable'); + strictEqual( + buttonbar.find('input[type=file], button').not(':disabled').length, + 0, + 'Disables the buttonbar buttons' + ); + }); + + test('enable', function () { + var buttonbar = $('#fileupload .fileupload-buttonbar'); + $('#fileupload') + .fileupload() + .fileupload('disable') + .fileupload('enable'); + strictEqual( + buttonbar.find('input[type=file], button').not(':disabled').length, + 4, + 'Enables the buttonbar buttons' + ); + }); + + module('UI Callbacks', lifecycleUI); + + test('destroy', function () { + expect(3); + $('#fileupload').fileupload({ + destroy: function (e, data) { + ok(true, 'Triggers destroy callback'); + strictEqual( + data.url, + 'test', + 'Passes over deletion url parameter' + ); + strictEqual( + data.type, + 'DELETE', + 'Passes over deletion request type parameter' + ); + } + }); + $('#fileupload').data('fileupload')._renderDownload([{ + name: 'test', + delete_url: 'test', + delete_type: 'DELETE' + }]).appendTo($('#fileupload .files')).show() + .find('.delete input').click(); + $('#fileupload .fileupload-buttonbar .delete').click(); + }); + + asyncTest('added', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + added: function (e, data) { + start(); + strictEqual( + data.files[0].name, + param.files[0].name, + 'Triggers added callback' + ); + }, + send: function () { + return false; + } + }).fileupload('add', param); + }); + + asyncTest('started', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + started: function (e) { + start(); + ok('Triggers started callback'); + return false; + }, + sent: function (e, data) { + return false; + } + }).fileupload('send', param); + }); + + asyncTest('sent', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + sent: function (e, data) { + start(); + strictEqual( + data.files[0].name, + param.files[0].name, + 'Triggers sent callback' + ); + return false; + } + }).fileupload('send', param); + }); + + asyncTest('completed', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + completed: function (e, data) { + start(); + ok('Triggers completed callback'); + return false; + } + }).fileupload('send', param); + }); + + asyncTest('failed', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + failed: function (e, data) { + start(); + ok('Triggers failed callback'); + return false; + } + }).fileupload('send', param).abort(); + }); + + asyncTest('stopped', function () { + expect(1); + var param = {files: [{name: 'test'}]}; + $('#fileupload').fileupload({ + stopped: function (e, data) { + start(); + ok('Triggers stopped callback'); + return false; + } + }).fileupload('send', param); + }); + + asyncTest('destroyed', function () { + expect(1); + $('#fileupload').fileupload({ + destroyed: function (e, data) { + start(); + ok(true, 'Triggers destroyed callback'); + } + }); + $('#fileupload').data('fileupload')._renderDownload([{ + name: 'test', + delete_url: 'test', + delete_type: 'DELETE' + }]).appendTo($('#fileupload .files')).show() + .find('.delete input').click(); + $('#fileupload .fileupload-buttonbar .delete').click(); + }); + + module('UI Options', lifecycleUI); + + test('autoUpload', function () { + expect(1); + $('#fileupload') + .fileupload({ + autoUpload: true, + send: function (e, data) { + ok(true, 'Started file upload automatically'); + return false; + } + }) + .fileupload('add', {files: [{name: 'test'}]}) + .fileupload('option', 'autoUpload', false) + .fileupload('add', {files: [{name: 'test'}]}); + }); + + test('maxNumberOfFiles', function () { + expect(4); + var addIndex = 0, + sendIndex = 0; + $('#fileupload') + .fileupload({ + autoUpload: true, + maxNumberOfFiles: 1, + singleFileUploads: false, + send: function (e, data) { + strictEqual( + sendIndex += 1, + addIndex + ); + }, + progress: $.noop, + progressall: $.noop, + done: $.noop, + stop: $.noop + }) + .fileupload('add', {files: [{name: (addIndex += 1)}]}) + .fileupload('add', {files: [{name: 'test'}]}) + .fileupload('option', 'maxNumberOfFiles', 1) + .fileupload('add', {files: [{name: 1}, {name: 2}]}) + .fileupload({ + maxNumberOfFiles: 1, + send: function (e, data) { + strictEqual( + sendIndex += 1, + addIndex + ); + return false; + } + }) + .fileupload('add', {files: [{name: (addIndex += 1)}]}) + .fileupload('add', {files: [{name: (addIndex += 1)}]}) + .fileupload({ + maxNumberOfFiles: 0, + send: function (e, data) { + ok( + !$.blueimpUI.fileupload.prototype.options + .send.call(this, e, data) + ); + return false; + } + }) + .fileupload('send', {files: [{name: 'test'}]}); + }); + + test('maxFileSize', function () { + expect(3); + var addIndex = 0, + sendIndex = 0; + $('#fileupload') + .fileupload({ + autoUpload: true, + maxFileSize: 1000, + send: function (e, data) { + strictEqual( + sendIndex += 1, + addIndex + ); + return false; + } + }) + .fileupload('add', {files: [{ + name: (addIndex += 1) + }]}) + .fileupload('add', {files: [{ + name: (addIndex += 1), + size: 999 + }]}) + .fileupload('add', {files: [{ + name: 'test', + size: 1001 + }]}) + .fileupload({ + send: function (e, data) { + ok( + !$.blueimpUI.fileupload.prototype.options + .send.call(this, e, data) + ); + return false; + } + }) + .fileupload('send', {files: [{ + name: 'test', + size: 1001 + }]}); + }); + + test('minFileSize', function () { + expect(3); + var addIndex = 0, + sendIndex = 0; + $('#fileupload') + .fileupload({ + autoUpload: true, + minFileSize: 1000, + send: function (e, data) { + strictEqual( + sendIndex += 1, + addIndex + ); + return false; + } + }) + .fileupload('add', {files: [{ + name: (addIndex += 1) + }]}) + .fileupload('add', {files: [{ + name: (addIndex += 1), + size: 1001 + }]}) + .fileupload('add', {files: [{ + name: 'test', + size: 999 + }]}) + .fileupload({ + send: function (e, data) { + ok( + !$.blueimpUI.fileupload.prototype.options + .send.call(this, e, data) + ); + return false; + } + }) + .fileupload('send', {files: [{ + name: 'test', + size: 999 + }]}); + }); + + test('acceptFileTypes', function () { + expect(3); + var addIndex = 0, + sendIndex = 0; + $('#fileupload') + .fileupload({ + autoUpload: true, + acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i, + previewFileTypes: /none/, + send: function (e, data) { + strictEqual( + sendIndex += 1, + addIndex + ); + return false; + } + }) + .fileupload('add', {files: [{ + name: (addIndex += 1) + '.jpg' + }]}) + .fileupload('add', {files: [{ + name: (addIndex += 1), + type: 'image/jpeg' + }]}) + .fileupload('add', {files: [{ + name: 'test.txt', + type: 'text/plain' + }]}) + .fileupload({ + send: function (e, data) { + ok( + !$.blueimpUI.fileupload.prototype.options + .send.call(this, e, data) + ); + return false; + } + }) + .fileupload('send', {files: [{ + name: 'test.txt', + type: 'text/plain' + }]}); + }); + + test('acceptFileTypes as HTML5 data attribute', function () { + expect(2); + var regExp = /(\.|\/)(gif|jpe?g|png)$/i; + $('#fileupload') + .attr('data-accept-file-types', regExp.toString()) + .fileupload(); + strictEqual( + $.type($('#fileupload').fileupload('option', 'acceptFileTypes')), + $.type(regExp) + ); + strictEqual( + $('#fileupload').fileupload('option', 'acceptFileTypes').toString(), + regExp.toString() + ); + }); + +}); -- cgit v1.2.3 From e0879bc60015ab6be470b6828da0e50a7399bb9b Mon Sep 17 00:00:00 2001 From: Sem Date: Tue, 31 Jul 2012 09:28:14 +0200 Subject: Added some depenences. --- vendors/jquery-file-upload/js/vendor/canvas-to-blob.min.js | 1 + vendors/jquery-file-upload/js/vendor/load-image.min.js | 1 + vendors/jquery-file-upload/js/vendor/tmpl.min.js | 1 + 3 files changed, 3 insertions(+) create mode 100644 vendors/jquery-file-upload/js/vendor/canvas-to-blob.min.js create mode 100644 vendors/jquery-file-upload/js/vendor/load-image.min.js create mode 100644 vendors/jquery-file-upload/js/vendor/tmpl.min.js diff --git a/vendors/jquery-file-upload/js/vendor/canvas-to-blob.min.js b/vendors/jquery-file-upload/js/vendor/canvas-to-blob.min.js new file mode 100644 index 000000000..9328aae30 --- /dev/null +++ b/vendors/jquery-file-upload/js/vendor/canvas-to-blob.min.js @@ -0,0 +1 @@ +(function(a){"use strict";var b=a.HTMLCanvasElement&&a.HTMLCanvasElement.prototype,c=a.BlobBuilder||a.WebKitBlobBuilder||a.MozBlobBuilder||a.MSBlobBuilder,d=c&&a.atob&&a.ArrayBuffer&&a.Uint8Array&&function(a){var b,d,e,f,g,h;a.split(",")[0].indexOf("base64")>=0?b=atob(a.split(",")[1]):b=decodeURIComponent(a.split(",")[1]),d=new ArrayBuffer(b.length),e=new Uint8Array(d);for(f=0;f1&&(d=parseInt(d*f,10),e=parseInt(e*f,10)),f=Math.min((b.maxWidth||d)/d,(b.maxHeight||e)/e),f<1&&(d=parseInt(d*f,10),e=parseInt(e*f,10)),a.getContext||b.canvas&&c.getContext?(c.width=d,c.height=e,c.getContext("2d").drawImage(a,0,0,d,e),c):(a.width=d,a.height=e,a)},b.createObjectURL=function(a){return c?c.createObjectURL(a):!1},b.revokeObjectURL=function(a){return c?c.revokeObjectURL(a):!1},b.readFile=function(a,b){if(window.FileReader&&FileReader.prototype.readAsDataURL){var c=new FileReader;return c.onload=function(a){b(a.target.result)},c.readAsDataURL(a),c}return!1},typeof define!="undefined"&&define.amd?define(function(){return b}):a.loadImage=b})(this); \ No newline at end of file diff --git a/vendors/jquery-file-upload/js/vendor/tmpl.min.js b/vendors/jquery-file-upload/js/vendor/tmpl.min.js new file mode 100644 index 000000000..065532e7c --- /dev/null +++ b/vendors/jquery-file-upload/js/vendor/tmpl.min.js @@ -0,0 +1 @@ +(function(a){"use strict";var b=function(a,c){var d=/[^\w\-\.:]/.test(a)?new Function(b.arg+",tmpl","var _e=tmpl.encode"+b.helper+",_s='"+a.replace(b.regexp,b.func)+"';return _s;"):b.cache[a]=b.cache[a]||b(b.load(a));return c?d(c,b):function(a){return d(a,b)}};b.cache={},b.load=function(a){return document.getElementById(a).innerHTML},b.regexp=/([\s'\\])(?![^%]*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g,b.func=function(a,b,c,d,e,f){if(b)return{"\n":"\\n","\r":"\\r","\t":"\\t"," ":" "}[a]||"\\"+a;if(c)return c==="="?"'+_e("+d+")+'":"'+("+d+"||'')+'";if(e)return"';";if(f)return"_s+='"},b.encReg=/[<>&"'\x00]/g,b.encMap={"<":"<",">":">","&":"&",'"':""","'":"'"},b.encode=function(a){return String(a||"").replace(b.encReg,function(a){return b.encMap[a]||""})},b.arg="o",b.helper=",print=function(s,e){_s+=e&&(s||'')||_e(s);},include=function(s,d){_s+=tmpl(s,d);}",typeof define=="function"&&define.amd?define(function(){return b}):a.tmpl=b})(this); \ No newline at end of file -- cgit v1.2.3 From 28b1669c4b1afaed7429da2cc9580340dcb13b6e Mon Sep 17 00:00:00 2001 From: Sem Date: Tue, 31 Jul 2012 10:09:51 +0200 Subject: New uploader based on javascript for Tidypics --- languages/en.php | 10 +++- pages/photos/image/upload.php | 16 +++++- start.php | 16 ++++++ views/default/forms/photos/basic_upload.php | 75 +++++++++++++++++------------ views/default/photos/css.php | 64 +++++++++++++++++++----- 5 files changed, 135 insertions(+), 46 deletions(-) diff --git a/languages/en.php b/languages/en.php index 1c40e5e0a..9d8773efd 100644 --- a/languages/en.php +++ b/languages/en.php @@ -57,6 +57,13 @@ $english = array( 'tidypics:sort' => 'Sorting the %s album', 'tidypics:none' => 'No photo albums', + //upload + 'tidypics:upload:error' => 'Error:', + 'tidypics:upload:maxfilesize' => 'File is too big', + 'tidypics:upload:minfilesize' => 'File is too small', + 'tidypics:upload:acceptfiletypes' => 'Filetype not allowed', + 'tidypics:upload:maxnumberoffiles' => 'Max number of files exceeded', + //settings 'tidypics:settings' => 'Settings', 'tidypics:settings:main' => 'Primary settings', @@ -157,8 +164,7 @@ $english = array( 'tidypics:uploader:upload' => "Upload photos", 'tidypics:uploader:describe' => "Describe photos", 'tidypics:uploader:filedesc' => 'Image files (jpeg, png, gif)', - 'tidypics:uploader:instructs' => 'There are three easy steps for adding photos to your album using this uploader: choosing, uploading, and describing them. There is a %s MB maximum per photo. If you do not have Flash, there is also a basic uploader available.', - 'tidypics:uploader:basic' => 'You can upload up to 10 photos at a time (%s MB maximum per photo)', + 'tidypics:uploader:help' => 'Tip: use Ctrl or Shift keys to select more than one file. You also can drag&drop photos from desktop.', 'tidypics:sort:instruct' => 'Sort the album photos by dragging and dropping the images. Then click the save button.', 'tidypics:sort:no_images' => 'No images found to sort. Upload images using the link above.', diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php index 61be8523b..c8e57038c 100644 --- a/pages/photos/image/upload.php +++ b/pages/photos/image/upload.php @@ -38,7 +38,21 @@ elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); elgg_push_breadcrumb($album->getTitle(), $album->getURL()); elgg_push_breadcrumb(elgg_echo('album:addpix')); -$content = elgg_view('forms/photos/basic_upload', array('entity' => $album)); +// load javascript dependences +elgg_load_js('jquery-tmpl'); +elgg_load_js('jquery-load-image'); +elgg_load_js('jquery-canvas-to-blob'); +elgg_load_js('jquery-fileupload'); +elgg_load_js('jquery-fileupload-ui'); +elgg_load_js('tidypics:upload'); + +$form_vars = array( + 'id' => 'fileupload', + 'action' => 'action/photos/image/upload', + 'enctype' => 'multipart/form-data', +); + +$content = elgg_view_form('photos/basic_upload', $form_vars, array('entity' => $album)); $body = elgg_view_layout('content', array( 'content' => $content, diff --git a/start.php b/start.php index 45e9257f5..376c7985d 100644 --- a/start.php +++ b/start.php @@ -38,12 +38,28 @@ function tidypics_init() { $js = elgg_get_simplecache_url('js', 'photos/tidypics'); elgg_register_simplecache_view('js/photos/tidypics'); elgg_register_js('tidypics', $js, 'footer'); + $js = elgg_get_simplecache_url('js', 'photos/upload'); + elgg_register_simplecache_view('js/photos/upload'); + elgg_register_js('tidypics:upload', $js, 'footer'); $js = elgg_get_simplecache_url('js', 'photos/tagging'); elgg_register_simplecache_view('js/photos/tagging'); elgg_register_js('tidypics:tagging', $js, 'footer'); elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.js', 'footer'); + $js_base = 'mod/tidypics/vendors/jquery-file-upload/js'; + + elgg_register_js('jquery-tmpl', "http://blueimp.github.com/JavaScript-Templates/tmpl.js", 'footer'); + elgg_register_js('jquery-load-image', "$js_base/vendor/load-image.min.js", 'footer'); + elgg_register_js('jquery-canvas-to-blob', "$js_base/vendor/canvas-to-blob.min.js", 'footer'); + elgg_register_js('jquery-image-gallery', "$js_base/vendor/jquery.image-gallery.min.js", 'footer'); + elgg_register_js('jquery-iframe-transport', "$js_base/jquery.iframe-transport.js", 'footer'); + + elgg_register_js('jquery-fileupload', "$js_base/jquery.fileupload.js", 'footer'); + elgg_register_js('jquery-fileupload-fp', "$js_base/jquery.fileupload-fp.js", 'footer'); + elgg_register_js('jquery-fileupload-ui', "$js_base/jquery.fileupload-ui.js", 'footer'); + elgg_register_js('jquery-fileupload-jui', "$js_base/jquery.fileupload-jui.js", 'footer'); + // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); diff --git a/views/default/forms/photos/basic_upload.php b/views/default/forms/photos/basic_upload.php index ba849d1b4..9e71cf59e 100644 --- a/views/default/forms/photos/basic_upload.php +++ b/views/default/forms/photos/basic_upload.php @@ -1,48 +1,63 @@ access_id; +$help = elgg_echo('tidypics:uploader:help'); -$maxfilesize = (float) elgg_get_plugin_setting('maxfilesize', 'tidypics'); +$input = elgg_view('input/file', array( + 'name' => 'images[]', + 'multiple' => 'multiple', + 'class' => 'hidden-js', +)); -$instructions = elgg_echo("tidypics:uploader:upload"); -$max = elgg_echo('tidypics:uploader:basic', array($maxfilesize)); +$button = elgg_view('output/url', array( + 'text' => elgg_echo('tidypics:uploader:upload') . $input, + 'class' => 'elgg-button elgg-button-action fileinput-button', +)); -$list = ''; -for ($x = 0; $x < 10; $x++) { - $list .= '
      1. ' . elgg_view('input/file', array('name' => 'images[]')) . '
        2. '; -} +$reset = elgg_view('input/reset', array( + 'value' => elgg_echo('cancel'), + 'class' => 'hidden', +)); $foot = elgg_view('input/hidden', array('name' => 'guid', 'value' => $album->getGUID())); $foot .= elgg_view('input/submit', array('value' => elgg_echo("save"))); -$form_body = << $max -
        -
          - $list -
        +
        + $button + $reset +

        $help

        +
        +
        + + +
        $foot
        HTML; -echo elgg_view('input/form', array( - 'body' => $form_body, - 'action' => 'action/photos/image/upload', - 'enctype' => 'multipart/form-data', -)); +?> + + + + + + +