Merge branch 'master' of git://github.com/gallery/gallery3

8 files changed, 369 insertions, 89 deletions

diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 39df9f06..96e0b758 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -23,13 +23,18 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
   public function no_trailing_closing_php_tag_test() {
     $dir = new GalleryCodeFilterIterator(
       new RecursiveIteratorIterator(new RecursiveDirectoryIterator(DOCROOT)));
+    $count = 0;
     foreach ($dir as $file) {
+      $count++;
       if (!preg_match("|\.html\.php$|", $file->getPathname())) {
         $this->assert_false(
           preg_match('/\?\>\s*$/', file_get_contents($file)),
           "{$file->getPathname()} ends in ?>");
       }
     }
+
+    $this->assert_true($count > 500, "We should have analyzed at least this 500 files");
+    $this->assert_true($count < 1000, "We shouldn't be shipping 1000 files!");
   }
 
   public function view_files_correct_suffix_test() {
@@ -42,8 +47,8 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
 
       if (strpos($file, "views")) {
         $this->assert_true(
-          preg_match("#/views/.*?(\.html|mrss|txt)\.php$#", $file->getPathname()),
-          "{$file->getPathname()} should end in .{html,mrss,txt}.php");
+          preg_match("#/views/.*?\.(html|mrss|txt|json)\.php$#", $file->getPathname()),
+          "{$file->getPathname()} should end in .{html,mrss,txt,json}.php");
       }
     }
   }
diff --git a/modules/gallery/tests/Gallery_Filters.php b/modules/gallery/tests/Gallery_Filters.php
index 4e32553b..052990d5 100644
--- a/modules/gallery/tests/Gallery_Filters.php
+++ b/modules/gallery/tests/Gallery_Filters.php
@@ -28,8 +28,11 @@ class GalleryCodeFilterIterator extends FilterIterator {
   public function accept() {
     // Skip anything that we didn"t write
     $path_name = $this->getInnerIterator()->getPathName();
+    $file_name = $this->getInnerIterator()->getFileName();
     return !(
-      strpos($path_name, ".svn") ||
+      $file_name == "." ||
+      $file_name == ".." ||
+      strpos($path_name, DOCROOT . ".git") !== false ||
       strpos($path_name, DOCROOT . "test") !== false ||
       strpos($path_name, DOCROOT . "var") !== false ||
       strpos($path_name, MODPATH . "forge") !== false ||
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index 4771b11a..eb2458cb 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -41,6 +41,11 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
       ORM::factory("item")->viewable()->where("id", "=", $item->id)->count_all());
   }
 
+  public function convert_filename_to_title_test() {
+    $this->assert_equal("foo", item::convert_filename_to_title("foo.jpg"));
+    $this->assert_equal("foo.bar", item::convert_filename_to_title("foo.bar.jpg"));
+  }
+
   public function convert_filename_to_slug_test() {
     $this->assert_equal("foo", item::convert_filename_to_slug("{[foo]}"));
     $this->assert_equal("foo-bar", item::convert_filename_to_slug("{[foo!@#!$@#^$@($!(@bar]}"));
@@ -106,15 +111,18 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
     $this->assert_not_same($rand, $photo2->slug);
   }
 
-  public function delete_cover_photo_picks_new_album_cover() {
-    $album = test::random_album();
+  public function delete_cover_photo_picks_new_album_cover_test() {
+    $parent = test::random_album();
+    $album = test::random_album($parent);
     $photo1 = test::random_photo($album);
     // At this point, $photo1 is the album cover.  We verify this in
     // Item_Model_Test::first_photo_becomes_album_cover
     $photo2 = test::random_photo($album);
     $photo1->delete();
     $album->reload();
+    $parent->reload();
 
     $this->assert_same($photo2->id, $album->album_cover_item_id);
+    $this->assert_same($photo2->id, $parent->album_cover_item_id);
   }
 }
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 15aa2d8c..907cfe24 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -18,6 +18,10 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Item_Model_Test extends Gallery_Unit_Test_Case {
+  public function teardown() {
+    identity::set_active_user(identity::admin_user());
+  }
+
   public function saving_sets_created_and_updated_dates_test() {
     $item = test::random_photo();
     $this->assert_true(!empty($item->created));
@@ -364,6 +368,15 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
     $this->assert_true(!array_key_exists("album_cover_item_id", $result));
   }
 
+  public function as_restful_array_with_edit_bit_test() {
+    $response = item::root()->as_restful_array(true);
+    $this->assert_true($response["can_edit"]);
+
+    identity::set_active_user(identity::guest());
+    $response = item::root()->as_restful_array(true);
+    $this->assert_false($response["can_edit"]);
+  }
+
   public function first_photo_becomes_album_cover() {
     $album = test::random_album();
     $photo = test::random_photo($album);
diff --git a/modules/gallery/tests/Item_Rest_Helper_Test.php b/modules/gallery/tests/Item_Rest_Helper_Test.php
index 0b5e0471..a2ab534b 100644
--- a/modules/gallery/tests/Item_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Item_Rest_Helper_Test.php
@@ -43,6 +43,8 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
       array("url" => rest::url("item", $album1),
             "entity" => $album1->as_restful_array(),
             "relationships" => array(
+              "comments" => array(
+                "url" => rest::url("item_comments", $album1)),
               "tags" => array(
                 "url" => rest::url("item_tags", $album1),
                 "members" => array())),
@@ -58,6 +60,8 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
       array("url" => rest::url("item", $album1),
             "entity" => $album1->as_restful_array(),
             "relationships" => array(
+              "comments" => array(
+                "url" => rest::url("item_comments", $album1)),
               "tags" => array(
                 "url" => rest::url("item_tags", $album1),
                 "members" => array())),
@@ -73,6 +77,8 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
       array("url" => rest::url("item", $album1),
             "entity" => $album1->as_restful_array(),
             "relationships" => array(
+              "comments" => array(
+                "url" => rest::url("item_comments", $album1)),
               "tags" => array(
                 "url" => rest::url("item_tags", $album1),
                 "members" => array())),
@@ -100,6 +106,8 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
       array("url" => rest::url("item", $album1),
             "entity" => $album1->as_restful_array(),
             "relationships" => array(
+              "comments" => array(
+                "url" => rest::url("item_comments", $album1)),
               "tags" => array(
                 "url" => rest::url("item_tags", $album1),
                 "members" => array())),
@@ -123,6 +131,8 @@ class Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
       array("url" => rest::url("item", $album1),
             "entity" => $album1->as_restful_array(),
             "relationships" => array(
+              "comments" => array(
+                "url" => rest::url("item_comments", $album1)),
               "tags" => array(
                 "url" => rest::url("item_tags", $album1),
                 "members" => array())),
diff --git a/modules/gallery/tests/Items_Rest_Helper_Test.php b/modules/gallery/tests/Items_Rest_Helper_Test.php
new file mode 100644
index 00000000..8e53110a
--- /dev/null
+++ b/modules/gallery/tests/Items_Rest_Helper_Test.php
@@ -0,0 +1,206 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Items_Rest_Helper_Test extends Gallery_Unit_Test_Case {
+  public function get_url_test() {
+    $album1 = test::random_album();
+    $photo1 = test::random_photo($album1);
+    $album2 = test::random_album($album1);
+    $photo2 = test::random_photo($album2);
+    $album1->reload();
+    $album2->reload();
+
+    $request = new stdClass();
+    $request->params = new stdClass();
+    $request->params->urls = json_encode(array(
+      rest::url("item", $photo1),
+      rest::url("item", $album2)));
+    $this->assert_equal_array(
+      array(
+        array("url" => rest::url("item", $photo1),
+              "entity" => $photo1->as_restful_array(),
+              "relationships" => array(
+                "comments" => array(
+                  "url" => rest::url("item_comments", $photo1)),
+                "tags" => array(
+                  "url" => rest::url("item_tags", $photo1),
+                  "members" => array()))),
+         array("url" => rest::url("item", $album2),
+               "entity" => $album2->as_restful_array(),
+               "relationships" => array(
+                 "comments" => array(
+                   "url" => rest::url("item_comments", $album2)),
+                 "tags" => array(
+                   "url" => rest::url("item_tags", $album2),
+                   "members" => array())),
+               "members" => array(
+                 rest::url("item", $photo2)))),
+      items_rest::get($request));
+  }
+
+  public function get_url_filter_album_test() {
+    $album1 = test::random_album();
+    $photo1 = test::random_photo($album1);
+    $album2 = test::random_album($album1);
+    $photo2 = test::random_photo($album2);
+    $album1->reload();
+    $album2->reload();
+
+    $request = new stdClass();
+    $request->params = new stdClass();
+    $request->params->urls = json_encode(array(
+      rest::url("item", $photo1),
+      rest::url("item", $album2)));
+    $request->params->type = "album";
+    $this->assert_equal_array(
+      array(
+         array("url" => rest::url("item", $album2),
+               "entity" => $album2->as_restful_array(),
+               "relationships" => array(
+                 "comments" => array(
+                   "url" => rest::url("item_comments", $album2)),
+                 "tags" => array(
+                   "url" => rest::url("item_tags", $album2),
+                   "members" => array())),
+               "members" => array(
+                 rest::url("item", $photo2)))),
+      items_rest::get($request));
+  }
+
+  public function get_url_filter_photo_test() {
+    $album1 = test::random_album();
+    $photo1 = test::random_photo($album1);
+    $album2 = test::random_album($album1);
+    $photo2 = test::random_photo($album2);
+    $album1->reload();
+    $album2->reload();
+
+    $request = new stdClass();
+    $request->params = new stdClass();
+    $request->params->urls = json_encode(array(
+      rest::url("item", $photo1),
+      rest::url("item", $album2)));
+    $request->params->type = "photo";
+    $this->assert_equal_array(
+      array(
+        array("url" => rest::url("item", $photo1),
+              "entity" => $photo1->as_restful_array(),
+              "relationships" => array(
+                "comments" => array(
+                  "url" => rest::url("item_comments", $photo1)),
+                "tags" => array(
+                  "url" => rest::url("item_tags", $photo1),
+                  "members" => array())))),
+      items_rest::get($request));
+  }
+
+  public function get_url_filter_albums_photos_test() {
+    $album1 = test::random_album();
+    $photo1 = test::random_photo($album1);
+    $album2 = test::random_album($album1);
+    $photo2 = test::random_photo($album2);
+    $album1->reload();
+    $album2->reload();
+
+    $request = new stdClass();
+    $request->params = new stdClass();
+    $request->params->urls = json_encode(array(
+      rest::url("item", $photo1),
+      rest::url("item", $album2)));
+    $request->params->type = "photo,album";
+    $this->assert_equal_array(
+      array(
+        array("url" => rest::url("item", $photo1),
+              "entity" => $photo1->as_restful_array(),
+              "relationships" => array(
+                "comments" => array(
+                  "url" => rest::url("item_comments", $photo1)),
+                "tags" => array(
+                  "url" => rest::url("item_tags", $photo1),
+                  "members" => array()))),
+         array("url" => rest::url("item", $album2),
+               "entity" => $album2->as_restful_array(),
+               "relationships" => array(
+                 "comments" => array(
+                   "url" => rest::url("item_comments", $album2)),
+                 "tags" => array(
+                   "url" => rest::url("item_tags", $album2),
+                   "members" => array())),
+               "members" => array(
+                 rest::url("item", $photo2)))),
+      items_rest::get($request));
+  }
+
+  public function get_ancestors_test() {
+    $album1 = test::random_album();
+    $photo1 = test::random_photo($album1);
+    $album2 = test::random_album($album1);
+    $photo2 = test::random_photo($album2);
+    $album1->reload();
+    $album2->reload();
+
+    $root = ORM::factory("item", 1);
+    $restful_root = array(
+      "url" => rest::url("item", $root),
+      "entity" => $root->as_restful_array(),
+      "relationships" => rest::relationships("item", $root));
+    $restful_root["members"] = array();
+    foreach ($root->children() as $child) {
+      $restful_root["members"][] = rest::url("item", $child);
+    }
+
+    $request = new stdClass();
+    $request->params = new stdClass();
+    $request->params->ancestors_for = rest::url("item", $photo2);
+    $this->assert_equal_array(
+      array(
+        $restful_root,
+        array("url" => rest::url("item", $album1),
+              "entity" => $album1->as_restful_array(),
+              "relationships" => array(
+                "comments" => array(
+                  "url" => rest::url("item_comments", $album1)),
+                "tags" => array(
+                  "url" => rest::url("item_tags", $album1),
+                  "members" => array())),
+              "members" => array(
+                rest::url("item", $photo1),
+                rest::url("item", $album2)),
+            ),
+        array("url" => rest::url("item", $album2),
+              "entity" => $album2->as_restful_array(),
+              "relationships" => array(
+                "comments" => array(
+                  "url" => rest::url("item_comments", $album2)),
+                "tags" => array(
+                  "url" => rest::url("item_tags", $album2),
+                  "members" => array())),
+              "members" => array(
+                rest::url("item", $photo2))),
+        array("url" => rest::url("item", $photo2),
+              "entity" => $photo2->as_restful_array(),
+              "relationships" => array(
+                "comments" => array(
+                  "url" => rest::url("item_comments", $photo2)),
+                "tags" => array(
+                  "url" => rest::url("item_tags", $photo2),
+                  "members" => array())))),
+      items_rest::get($request));
+  }
+}
diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 0aa26057..f7ceed90 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -1,4 +1,4 @@
-modules/comment/controllers/admin_comments.php               queue                DIRTY_CSRF
+modules/comment/controllers/admin_manage_comments.php        queue                DIRTY_CSRF
 modules/comment/helpers/comment_rss.php                      feed                 DIRTY_AUTH
 modules/digibug/controllers/digibug.php                      print_proxy          DIRTY_CSRF|DIRTY_AUTH
 modules/digibug/controllers/digibug.php                      close_window         DIRTY_AUTH
@@ -9,6 +9,8 @@ modules/gallery/controllers/albums.php                       show
 modules/gallery/controllers/combined.php                     javascript           DIRTY_AUTH
 modules/gallery/controllers/combined.php                     css                  DIRTY_AUTH
 modules/gallery/controllers/file_proxy.php                   __call               DIRTY_CSRF|DIRTY_AUTH
+modules/gallery/controllers/flash_uploader.php               start                DIRTY_AUTH
+modules/gallery/controllers/flash_uploader.php               finish               DIRTY_AUTH
 modules/gallery/controllers/login.php                        ajax                 DIRTY_AUTH
 modules/gallery/controllers/login.php                        auth_ajax            DIRTY_AUTH
 modules/gallery/controllers/login.php                        html                 DIRTY_AUTH
@@ -16,13 +18,13 @@ modules/gallery/controllers/login.php                        auth_html
 modules/gallery/controllers/logout.php                       index                DIRTY_AUTH
 modules/gallery/controllers/maintenance.php                  index                DIRTY_AUTH
 modules/gallery/controllers/quick.php                        form_edit            DIRTY_CSRF
-modules/gallery/controllers/simple_uploader.php              start                DIRTY_AUTH
-modules/gallery/controllers/simple_uploader.php              finish               DIRTY_AUTH
 modules/gallery/controllers/upgrader.php                     index                DIRTY_AUTH
 modules/gallery/controllers/user_profile.php                 show                 DIRTY_AUTH
 modules/gallery/controllers/user_profile.php                 contact              DIRTY_AUTH
 modules/gallery/controllers/user_profile.php                 send                 DIRTY_AUTH
 modules/gallery/controllers/welcome_message.php              index                DIRTY_AUTH
+modules/organize/controllers/organize.php                    dialog               DIRTY_CSRF
+modules/organize/controllers/organize.php                    add_album_fields     DIRTY_AUTH
 modules/rest/controllers/rest.php                            index                DIRTY_CSRF|DIRTY_AUTH
 modules/rest/controllers/rest.php                            __call               DIRTY_CSRF|DIRTY_AUTH
 modules/rss/controllers/rss.php                              feed                 DIRTY_CSRF|DIRTY_AUTH
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index afad9e13..26edaebc 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -4,21 +4,22 @@ modules/akismet/views/admin_akismet_stats.html.php           9   DIRTY_ATTR urle
 modules/comment/views/admin_block_recent_comments.html.php   4   DIRTY_ATTR text::alternate("g-even","g-odd")
 modules/comment/views/admin_block_recent_comments.html.php   5   DIRTY_ATTR $comment->author()->avatar_url(32,$theme->url(,true))
 modules/comment/views/admin_block_recent_comments.html.php   10  DIRTY    gallery::date_time($comment->created)
-modules/comment/views/admin_comments.html.php                43  DIRTY    $menu->render()
-modules/comment/views/admin_comments.html.php                107 DIRTY_ATTR $comment->id
-modules/comment/views/admin_comments.html.php                107 DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/comment/views/admin_comments.html.php                110 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
-modules/comment/views/admin_comments.html.php                123 DIRTY_JS $item->url()
-modules/comment/views/admin_comments.html.php                125 DIRTY_ATTR $item->thumb_url()
-modules/comment/views/admin_comments.html.php                127 DIRTY    photo::img_dimensions($item->thumb_width,$item->thumb_height,75)
-modules/comment/views/admin_comments.html.php                135 DIRTY    gallery::date($comment->created)
-modules/comment/views/admin_comments.html.php                142 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php                151 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php                160 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php                169 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php                176 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php                184 DIRTY_JS $comment->id
-modules/comment/views/admin_comments.html.php                197 DIRTY    $pager
+modules/comment/views/admin_comments.html.php                5   DIRTY    $form
+modules/comment/views/admin_manage_comments.html.php         43  DIRTY    $menu->render()
+modules/comment/views/admin_manage_comments.html.php         107 DIRTY_ATTR $comment->id
+modules/comment/views/admin_manage_comments.html.php         107 DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/comment/views/admin_manage_comments.html.php         110 DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
+modules/comment/views/admin_manage_comments.html.php         123 DIRTY_JS $item->url()
+modules/comment/views/admin_manage_comments.html.php         125 DIRTY_ATTR $item->thumb_url()
+modules/comment/views/admin_manage_comments.html.php         127 DIRTY    photo::img_dimensions($item->thumb_width,$item->thumb_height,75)
+modules/comment/views/admin_manage_comments.html.php         135 DIRTY    gallery::date($comment->created)
+modules/comment/views/admin_manage_comments.html.php         142 DIRTY_JS $comment->id
+modules/comment/views/admin_manage_comments.html.php         151 DIRTY_JS $comment->id
+modules/comment/views/admin_manage_comments.html.php         160 DIRTY_JS $comment->id
+modules/comment/views/admin_manage_comments.html.php         169 DIRTY_JS $comment->id
+modules/comment/views/admin_manage_comments.html.php         176 DIRTY_JS $comment->id
+modules/comment/views/admin_manage_comments.html.php         184 DIRTY_JS $comment->id
+modules/comment/views/admin_manage_comments.html.php         197 DIRTY    $pager
 modules/comment/views/comment.html.php                       2   DIRTY_ATTR $comment->id;
 modules/comment/views/comment.html.php                       5   DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
 modules/comment/views/comment.mrss.php                       10  DIRTY    $feed->uri
@@ -27,13 +28,13 @@ modules/comment/views/comment.mrss.php                       16  DIRTY_JS $feed-
 modules/comment/views/comment.mrss.php                       19  DIRTY_JS $feed->next_page_uri
 modules/comment/views/comment.mrss.php                       21  DIRTY    $pub_date
 modules/comment/views/comment.mrss.php                       22  DIRTY    $pub_date
-modules/comment/views/comment.mrss.php                       28  DIRTY    $child->item_uri
-modules/comment/views/comment.mrss.php                       29  DIRTY    $child->pub_date
-modules/comment/views/comment.mrss.php                       34  DIRTY_ATTR $child->thumb_url
-modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $child->thumb_height
-modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $child->thumb_width
-modules/comment/views/comments.html.php                      18  DIRTY_ATTR $comment->id
-modules/comment/views/comments.html.php                      21  DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
+modules/comment/views/comment.mrss.php                       28  DIRTY    $comment->item_uri
+modules/comment/views/comment.mrss.php                       29  DIRTY    $comment->pub_date
+modules/comment/views/comment.mrss.php                       34  DIRTY_ATTR $comment->thumb_url
+modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $comment->thumb_height
+modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $comment->thumb_width
+modules/comment/views/comments.html.php                      28  DIRTY_ATTR $comment->id
+modules/comment/views/comments.html.php                      31  DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
 modules/comment/views/user_profile_comments.html.php         5   DIRTY_ATTR $comment->id
 modules/comment/views/user_profile_comments.html.php         10  DIRTY_JS $comment->item()->url()
 modules/comment/views/user_profile_comments.html.php         11  DIRTY    $comment->item()->thumb_img(array(),50)
@@ -108,7 +109,7 @@ modules/gallery/views/admin_sidebar.html.php                 50  DIRTY    $avail
 modules/gallery/views/admin_sidebar.html.php                 58  DIRTY    $active
 modules/gallery/views/admin_sidebar_blocks.html.php          4   DIRTY_ATTR $ref
 modules/gallery/views/admin_sidebar_blocks.html.php          4   DIRTY    $text
-modules/gallery/views/admin_theme_options.html.php           6   DIRTY    $form
+modules/gallery/views/admin_theme_options.html.php           36  DIRTY    $form
 modules/gallery/views/admin_themes.html.php                  3   DIRTY_JS url::site("admin/themes/choose")
 modules/gallery/views/admin_themes.html.php                  5   DIRTY_JS $csrf
 modules/gallery/views/admin_themes.html.php                  22  DIRTY    $themes[$site]->name
@@ -119,10 +120,54 @@ modules/gallery/views/admin_themes.html.php                  60  DIRTY    $theme
 modules/gallery/views/admin_themes.html.php                  62  DIRTY    $themes[$admin]->description
 modules/gallery/views/admin_themes.html.php                  76  DIRTY    $info->name
 modules/gallery/views/admin_themes.html.php                  78  DIRTY    $info->description
-modules/gallery/views/admin_themes_preview.html.php          7   DIRTY_ATTR $url
+modules/gallery/views/admin_themes_preview.html.php          8   DIRTY_ATTR $url
 modules/gallery/views/error_404.html.php                     14  DIRTY    $login_form
+modules/gallery/views/error_admin.html.php                   150 DIRTY    $type
+modules/gallery/views/error_admin.html.php                   150 DIRTY    $code
+modules/gallery/views/error_admin.html.php                   153 DIRTY    $message
+modules/gallery/views/error_admin.html.php                   156 DIRTY_ATTR $error_id
+modules/gallery/views/error_admin.html.php                   161 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   161 DIRTY    $line
+modules/gallery/views/error_admin.html.php                   166 DIRTY_ATTR ($num==$line)?"highlight":""
+modules/gallery/views/error_admin.html.php                   166 DIRTY    $num
+modules/gallery/views/error_admin.html.php                   166 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
+modules/gallery/views/error_admin.html.php                   178 DIRTY_ATTR $source_id
+modules/gallery/views/error_admin.html.php                   178 DIRTY_JS $source_id
+modules/gallery/views/error_admin.html.php                   178 DIRTY    Kohana_Exception::debug_path($step["file"])
+modules/gallery/views/error_admin.html.php                   178 DIRTY    $step["line"]
+modules/gallery/views/error_admin.html.php                   180 DIRTY    Kohana_Exception::debug_path($step["file"])
+modules/gallery/views/error_admin.html.php                   180 DIRTY    $step["line"]
+modules/gallery/views/error_admin.html.php                   187 DIRTY    $step["function"]
+modules/gallery/views/error_admin.html.php                   188 DIRTY_ATTR $args_id
+modules/gallery/views/error_admin.html.php                   188 DIRTY_JS $args_id
+modules/gallery/views/error_admin.html.php                   192 DIRTY_ATTR $args_id
+modules/gallery/views/error_admin.html.php                   197 DIRTY    $name
+modules/gallery/views/error_admin.html.php                   200 DIRTY    Kohana_Exception::safe_dump($arg,$name)
+modules/gallery/views/error_admin.html.php                   208 DIRTY_ATTR $source_id
+modules/gallery/views/error_admin.html.php                   208 DIRTY_ATTR ($num==$step["line"])?"highlight":""
+modules/gallery/views/error_admin.html.php                   208 DIRTY    $num
+modules/gallery/views/error_admin.html.php                   208 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
+modules/gallery/views/error_admin.html.php                   218 DIRTY_ATTR $env_id=$error_id."environment"
+modules/gallery/views/error_admin.html.php                   218 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   220 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   222 DIRTY_ATTR $env_id=$error_id."environment_included"
+modules/gallery/views/error_admin.html.php                   222 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   222 DIRTY    count($included)
+modules/gallery/views/error_admin.html.php                   223 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   228 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   235 DIRTY_ATTR $env_id=$error_id."environment_loaded"
+modules/gallery/views/error_admin.html.php                   235 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   235 DIRTY    count($included)
+modules/gallery/views/error_admin.html.php                   236 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   241 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   249 DIRTY_ATTR $env_id="$error_id.environment".strtolower($var)
+modules/gallery/views/error_admin.html.php                   250 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   250 DIRTY    $var
+modules/gallery/views/error_admin.html.php                   251 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   257 DIRTY    $key
+modules/gallery/views/error_admin.html.php                   261 DIRTY    Kohana_Exception::safe_dump($value,$key)
 modules/gallery/views/form_uploadify.html.php                9   DIRTY_JS url::file("lib/uploadify/uploadify.swf")
-modules/gallery/views/form_uploadify.html.php                10  DIRTY_JS url::site("simple_uploader/add_photo/{$album->id}")
+modules/gallery/views/form_uploadify.html.php                10  DIRTY_JS url::site("flash_uploader/add_photo/{$album->id}")
 modules/gallery/views/form_uploadify.html.php                14  DIRTY_JS url::file("lib/uploadify/cancel.png")
 modules/gallery/views/form_uploadify.html.php                15  DIRTY_JS $simultaneous_upload_limit
 modules/gallery/views/in_place_edit.html.php                 2   DIRTY    form::open($action,array("method"=>"post","id"=>"g-in-place-edit-form","class"=>"g-short-form"))
@@ -145,7 +190,7 @@ modules/gallery/views/l10n_client.html.php                   58  DIRTY    form::
 modules/gallery/views/l10n_client.html.php                   62  DIRTY    form::textarea("l10n-edit-plural-translation-many","",' rows="2"')
 modules/gallery/views/l10n_client.html.php                   67  DIRTY    form::textarea("l10n-edit-plural-translation-other","",' rows="2"')
 modules/gallery/views/login_ajax.html.php                    6   DIRTY_JS url::site("password/reset")
-modules/gallery/views/login_ajax.html.php                    37  DIRTY    $form
+modules/gallery/views/login_ajax.html.php                    44  DIRTY    $form
 modules/gallery/views/maintenance.html.php                   46  DIRTY    auth::get_login_form("login/auth_html")
 modules/gallery/views/menu.html.php                          4   DIRTY    $menu->css_id?"id='$menu->css_id'":""
 modules/gallery/views/menu.html.php                          4   DIRTY_ATTR $menu->css_class
@@ -175,7 +220,7 @@ modules/gallery/views/move_tree.html.php                     15  DIRTY_JS $child
 modules/gallery/views/movieplayer.html.php                   2   DIRTY    html::anchor($item->file_url(true),"",$attrs)
 modules/gallery/views/movieplayer.html.php                   5   DIRTY_JS $attrs["id"]
 modules/gallery/views/movieplayer.html.php                   7   DIRTY_JS url::abs_file("lib/flowplayer.swf")
-modules/gallery/views/movieplayer.html.php                   13  DIRTY_JS url::abs_file("lib/flowplayer.h264streaming.swf")
+modules/gallery/views/movieplayer.html.php                   14  DIRTY_JS url::abs_file("lib/flowplayer.pseudostreaming.swf")
 modules/gallery/views/permissions_browse.html.php            3   DIRTY_JS url::site("permissions/form/__ITEM__")
 modules/gallery/views/permissions_browse.html.php            16  DIRTY_JS url::site("permissions/change/__CMD__/__GROUP__/__PERM__/__ITEM__?csrf=$csrf")
 modules/gallery/views/permissions_browse.html.php            43  DIRTY_ATTR $parent->id
@@ -234,27 +279,16 @@ modules/notification/views/item_updated.html.php             20  DIRTY_JS $item-
 modules/notification/views/item_updated.html.php             20  DIRTY    $item->abs_url()
 modules/notification/views/user_profile_notification.html.php 5   DIRTY_ATTR $subscription->id
 modules/notification/views/user_profile_notification.html.php 6   DIRTY_JS $subscription->url
-modules/organize/views/organize_dialog.html.php              3   DIRTY_JS url::site("organize/move_to/__ALBUM_ID__?csrf=$csrf")
-modules/organize/views/organize_dialog.html.php              4   DIRTY_JS url::site("organize/rearrange/__TARGET_ID__/__BEFORE__?csrf=$csrf")
-modules/organize/views/organize_dialog.html.php              5   DIRTY_JS url::site("organize/sort_order/__ALBUM_ID__/__COL__/__DIR__?csrf=$csrf")
-modules/organize/views/organize_dialog.html.php              6   DIRTY_JS url::site("organize/tree/__ALBUM_ID__")
-modules/organize/views/organize_dialog.html.php              14  DIRTY    $album_tree
-modules/organize/views/organize_dialog.html.php              23  DIRTY    $micro_thumb_grid
-modules/organize/views/organize_dialog.html.php              32  DIRTY    form::dropdown(array("id"=>"g-organize-sort-column"),album::get_sort_order_options(),$album->sort_column)
-modules/organize/views/organize_thumb_grid.html.php          3   DIRTY_ATTR $child->is_album()?"g-album":"g-photo"
-modules/organize/views/organize_thumb_grid.html.php          4   DIRTY_ATTR $child->id
-modules/organize/views/organize_thumb_grid.html.php          5   DIRTY    $child->thumb_img(array("class"=>"g-thumbnail","ref"=>$child->id),90,true)
-modules/organize/views/organize_thumb_grid.html.php          6   DIRTY    $child->is_album()?" class=\"ui-icon ui-icon-note\"":""
-modules/organize/views/organize_thumb_grid.html.php          13  DIRTY_JS url::site("organize/album/$album->id/".($offset+25))
-modules/organize/views/organize_tree.html.php                2   DIRTY_ATTR access::can("edit",$album)?"":"g-view-only"
-modules/organize/views/organize_tree.html.php                3   DIRTY_ATTR $album->id
-modules/organize/views/organize_tree.html.php                6   DIRTY_ATTR $selected&&$album->id==$selected->id?"ui-state-focus":""
-modules/organize/views/organize_tree.html.php                7   DIRTY_ATTR $album->id
-modules/organize/views/organize_tree.html.php                15  DIRTY    View::factory("organize_tree.html",array("selected"=>$selected,"album"=>$child));
-modules/organize/views/organize_tree.html.php                17  DIRTY_ATTR access::can("edit",$child)?"":"g-view-only"
-modules/organize/views/organize_tree.html.php                18  DIRTY_ATTR $child->id
-modules/organize/views/organize_tree.html.php                20  DIRTY_ATTR $selected&&$child->id==$selected->id?"ui-state-focus":""
-modules/organize/views/organize_tree.html.php                20  DIRTY_ATTR $child->id
+modules/organize/views/organize_dialog.html.php              90  DIRTY_JS $domain
+modules/organize/views/organize_dialog.html.php              91  DIRTY_JS $access_key
+modules/organize/views/organize_dialog.html.php              92  DIRTY_JS request::protocol()
+modules/organize/views/organize_dialog.html.php              93  DIRTY_JS $file_filter
+modules/organize/views/organize_dialog.html.php              94  DIRTY_JS $sort_order
+modules/organize/views/organize_dialog.html.php              95  DIRTY_JS $sort_fields
+modules/organize/views/organize_dialog.html.php              96  DIRTY_JS $album->id
+modules/organize/views/organize_dialog.html.php              97  DIRTY_JS $rest_uri
+modules/organize/views/organize_dialog.html.php              98  DIRTY_JS $controller_uri
+modules/organize/views/organize_dialog.html.php              122 DIRTY_JS $swf_uri
 modules/recaptcha/views/admin_recaptcha.html.php             11  DIRTY    $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY_JS $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY_JS $public_key
@@ -264,26 +298,26 @@ modules/rss/views/feed.mrss.php                              16  DIRTY_JS $feed-
 modules/rss/views/feed.mrss.php                              19  DIRTY_JS $feed->next_page_uri
 modules/rss/views/feed.mrss.php                              21  DIRTY    $pub_date
 modules/rss/views/feed.mrss.php                              22  DIRTY    $pub_date
-modules/rss/views/feed.mrss.php                              28  DIRTY    date("D, d M Y H:i:s T",$child->created);
-modules/rss/views/feed.mrss.php                              35  DIRTY_ATTR $child->resize_url(true)
-modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $child->resize_height
-modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $child->resize_width
-modules/rss/views/feed.mrss.php                              40  DIRTY_ATTR $child->thumb_url(true)
-modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $child->thumb_height
-modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $child->thumb_width
-modules/rss/views/feed.mrss.php                              48  DIRTY_ATTR $child->thumb_url(true)
-modules/rss/views/feed.mrss.php                              49  DIRTY_ATTR $child->thumb_height
-modules/rss/views/feed.mrss.php                              50  DIRTY_ATTR $child->thumb_width
-modules/rss/views/feed.mrss.php                              57  DIRTY_ATTR $child->resize_url(true)
-modules/rss/views/feed.mrss.php                              58  DIRTY_ATTR @filesize($child->resize_path())
-modules/rss/views/feed.mrss.php                              59  DIRTY_ATTR $child->mime_type
-modules/rss/views/feed.mrss.php                              60  DIRTY_ATTR $child->resize_height
-modules/rss/views/feed.mrss.php                              61  DIRTY_ATTR $child->resize_width
-modules/rss/views/feed.mrss.php                              65  DIRTY_ATTR $child->file_url(true)
-modules/rss/views/feed.mrss.php                              66  DIRTY_ATTR @filesize($child->file_path())
-modules/rss/views/feed.mrss.php                              67  DIRTY_ATTR $child->mime_type
-modules/rss/views/feed.mrss.php                              68  DIRTY_ATTR $child->height
-modules/rss/views/feed.mrss.php                              69  DIRTY_ATTR $child->width
+modules/rss/views/feed.mrss.php                              28  DIRTY    date("D, d M Y H:i:s T",$item->created);
+modules/rss/views/feed.mrss.php                              35  DIRTY_ATTR $item->resize_url(true)
+modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $item->resize_height
+modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $item->resize_width
+modules/rss/views/feed.mrss.php                              40  DIRTY_ATTR $item->thumb_url(true)
+modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $item->thumb_height
+modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $item->thumb_width
+modules/rss/views/feed.mrss.php                              48  DIRTY_ATTR $item->thumb_url(true)
+modules/rss/views/feed.mrss.php                              49  DIRTY_ATTR $item->thumb_height
+modules/rss/views/feed.mrss.php                              50  DIRTY_ATTR $item->thumb_width
+modules/rss/views/feed.mrss.php                              57  DIRTY_ATTR $item->resize_url(true)
+modules/rss/views/feed.mrss.php                              58  DIRTY_ATTR @filesize($item->resize_path())
+modules/rss/views/feed.mrss.php                              59  DIRTY_ATTR $item->mime_type
+modules/rss/views/feed.mrss.php                              60  DIRTY_ATTR $item->resize_height
+modules/rss/views/feed.mrss.php                              61  DIRTY_ATTR $item->resize_width
+modules/rss/views/feed.mrss.php                              65  DIRTY_ATTR $item->file_url(true)
+modules/rss/views/feed.mrss.php                              66  DIRTY_ATTR @filesize($item->file_path())
+modules/rss/views/feed.mrss.php                              67  DIRTY_ATTR $item->mime_type
+modules/rss/views/feed.mrss.php                              68  DIRTY_ATTR $item->height
+modules/rss/views/feed.mrss.php                              69  DIRTY_ATTR $item->width
 modules/rss/views/rss_block.html.php                         6   DIRTY_JS rss::url($url)
 modules/search/views/search.html.php                         27  DIRTY_ATTR $item_class
 modules/search/views/search.html.php                         28  DIRTY_JS $item->url()
@@ -320,20 +354,19 @@ modules/user/views/admin_users_group.html.php                24  DIRTY_JS $group
 modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $width
 modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $height
 modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $url
-themes/admin_wind/views/admin.html.php                       9   DIRTY    $page_title
 themes/admin_wind/views/admin.html.php                       22  DIRTY_JS $theme->url()
 themes/admin_wind/views/admin.html.php                       39  DIRTY    $theme->admin_head()
 themes/admin_wind/views/admin.html.php                       43  DIRTY    $theme->admin_page_top()
 themes/admin_wind/views/admin.html.php                       51  DIRTY    $theme->admin_header_top()
 themes/admin_wind/views/admin.html.php                       52  DIRTY_JS item::root()->url()
 themes/admin_wind/views/admin.html.php                       55  DIRTY    $theme->user_menu()
-themes/admin_wind/views/admin.html.php                       57  DIRTY    $theme->admin_menu()
-themes/admin_wind/views/admin.html.php                       59  DIRTY    $theme->admin_header_bottom()
-themes/admin_wind/views/admin.html.php                       66  DIRTY    $content
-themes/admin_wind/views/admin.html.php                       72  DIRTY    $sidebar
-themes/admin_wind/views/admin.html.php                       77  DIRTY    $theme->admin_footer()
-themes/admin_wind/views/admin.html.php                       79  DIRTY    $theme->admin_credits()
-themes/admin_wind/views/admin.html.php                       83  DIRTY    $theme->admin_page_bottom()
+themes/admin_wind/views/admin.html.php                       58  DIRTY    $theme->admin_menu()
+themes/admin_wind/views/admin.html.php                       61  DIRTY    $theme->admin_header_bottom()
+themes/admin_wind/views/admin.html.php                       68  DIRTY    $content
+themes/admin_wind/views/admin.html.php                       74  DIRTY    $sidebar
+themes/admin_wind/views/admin.html.php                       79  DIRTY    $theme->admin_footer()
+themes/admin_wind/views/admin.html.php                       81  DIRTY    $theme->admin_credits()
+themes/admin_wind/views/admin.html.php                       85  DIRTY    $theme->admin_page_bottom()
 themes/admin_wind/views/block.html.php                       3   DIRTY_ATTR $anchor
 themes/admin_wind/views/block.html.php                       5   DIRTY    $id
 themes/admin_wind/views/block.html.php                       5   DIRTY_ATTR $css_id
@@ -363,7 +396,7 @@ themes/wind/views/dynamic.html.php                           16  DIRTY_ATTR $chi
 themes/wind/views/dynamic.html.php                           17  DIRTY_ATTR $child->thumb_height
 themes/wind/views/dynamic.html.php                           29  DIRTY    $theme->paginator()
 themes/wind/views/movie.html.php                             5   DIRTY    $theme->paginator()
-themes/wind/views/movie.html.php                             8   DIRTY    $item->movie_img(array("class"=>"g-movie","id"=>"g-movie-id-{$item->id}"))
+themes/wind/views/movie.html.php                             9   DIRTY    $item->movie_img(array("class"=>"g-movie","id"=>"g-item-id-{$item->id}"))
 themes/wind/views/page.html.php                              9   DIRTY    $page_title
 themes/wind/views/page.html.php                              33  DIRTY_JS $theme->url()
 themes/wind/views/page.html.php                              42  DIRTY    $new_width
@@ -373,9 +406,9 @@ themes/wind/views/page.html.php                              81  DIRTY    $heade
 themes/wind/views/page.html.php                              83  DIRTY_JS item::root()->url()
 themes/wind/views/page.html.php                              87  DIRTY    $theme->user_menu()
 themes/wind/views/page.html.php                              108 DIRTY_JS $parent->url($parent==$theme->item()->parent()?"show={$theme->item()->id}":null)
-themes/wind/views/page.html.php                              124 DIRTY    $content
-themes/wind/views/page.html.php                              130 DIRTY    newView("sidebar.html")
-themes/wind/views/page.html.php                              137 DIRTY    $footer_text
+themes/wind/views/page.html.php                              126 DIRTY    $content
+themes/wind/views/page.html.php                              132 DIRTY    newView("sidebar.html")
+themes/wind/views/page.html.php                              139 DIRTY    $footer_text
 themes/wind/views/paginator.html.php                         33  DIRTY_JS $first_page_url
 themes/wind/views/paginator.html.php                         42  DIRTY_JS $previous_page_url
 themes/wind/views/paginator.html.php                         70  DIRTY_JS $next_page_url
@@ -384,4 +417,4 @@ themes/wind/views/photo.html.php                             8   DIRTY_JS $theme
 themes/wind/views/photo.html.php                             8   DIRTY_JS $theme->item()->height
 themes/wind/views/photo.html.php                             18  DIRTY    $theme->paginator()
 themes/wind/views/photo.html.php                             23  DIRTY_JS $item->file_url()
-themes/wind/views/photo.html.php                             25  DIRTY    $item->resize_img(array("id"=>"g-photo-id-{$item->id}","class"=>"g-resize"))
+themes/wind/views/photo.html.php                             25  DIRTY    $item->resize_img(array("id"=>"g-item-id-{$item->id}","class"=>"g-resize"))