From 9364f0d931883bb5f17f22c4003ee59256f9efb6 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Wed, 5 Jan 2011 23:31:50 +0100
Subject: Allow '..' segment in photo/album paths through file_proxy (as is not
 forbidden in other places like add album/item) and explitely look for /../
 instead Note: directory path can't end in '.' forcibly so this shall be fine
 Fixes Ticket #1518

---
 modules/gallery/controllers/file_proxy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 22854fbd..5ce9b458 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -45,7 +45,7 @@ class File_Proxy_Controller extends Controller {
     $file_uri = substr($request_uri, strlen($var_uri));
 
     // Make sure that we don't leave the var dir
-    if (strpos($file_uri, "..") !== false) {
+    if (strpos($file_uri, "/../") !== false) {
       throw new Kohana_404_Exception();
     }
 
-- 
cgit v1.2.3


From 3ec0ba956dced01a97f2ee7bd943d326c42350e3 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sat, 8 Jan 2011 19:39:23 +0100
Subject: Refactored graphics::detect_toolkits() so ImageMagick and
 GraphicsMagick shares the same loop. Just as premarked as todo. Will make
 https://sourceforge.net/apps/trac/gallery/ticket/1555#comment:3 an even
 quicker task

---
 modules/gallery/helpers/graphics.php | 76 ++++++++++++++----------------------
 1 file changed, 29 insertions(+), 47 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index edba6b76..cb48ce82 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -318,55 +318,37 @@ class graphics_Core {
               getenv("PATH"),
               module::get_var("gallery", "extra_binary_paths")));
 
-      // @todo: consider refactoring the two segments below into a loop since they are so
-      // similar.
-
-      // ImageMagick
-      $path = exec("which convert");
-      $toolkits->imagemagick->name = "ImageMagick";
-      if ($path) {
-        if (@is_file($path)) {
-          preg_match('/Version: \S+ (\S+)/', `convert -v`, $matches);
-          $version = $matches[1];
-
-          $toolkits->imagemagick->installed = true;
-          $toolkits->imagemagick->version = $version;
-          $toolkits->imagemagick->binary = $path;
-          $toolkits->imagemagick->dir = dirname($path);
-          $toolkits->imagemagick->rotate = true;
-          $toolkits->imagemagick->sharpen = true;
-        } else {
-          $toolkits->imagemagick->installed = false;
-          $toolkits->imagemagick->error =
-            t("ImageMagick is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
-        }
-      } else {
-        $toolkits->imagemagick->installed = false;
-        $toolkits->imagemagick->error = t("We could not locate ImageMagick on your system.");
-      }
-
-      // GraphicsMagick
-      $path = exec("which gm");
-      $toolkits->graphicsmagick->name = "GraphicsMagick";
-      if ($path) {
-        if (@is_file($path)) {
-          preg_match('/\S+ (\S+)/', `gm version`, $matches);
-          $version = $matches[1];
-
-          $toolkits->graphicsmagick->installed = true;
-          $toolkits->graphicsmagick->version = $version;
-          $toolkits->graphicsmagick->binary = $path;
-          $toolkits->graphicsmagick->dir = dirname($path);
-          $toolkits->graphicsmagick->rotate = true;
-          $toolkits->graphicsmagick->sharpen = true;
+      // ImageMagick & GraphicsMagick
+      $magick_kits = array(
+          "imagemagick" => array(
+              "name" => "ImageMagick", "binary" => "convert", "version" => "convert -v"),
+          "graphicsmagick" => array(
+              "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version"));
+      // Loop through the kits
+      foreach ( $magick_kits as $index => $settings ) {
+        $path = exec("which " . $settings["binary"]);
+        $toolkits->$index->name = $settings["name"];
+        if ($path) {
+          if (@is_file($path)) {
+            preg_match('/Version: \S+ (\S+)/', shell_exec($settings["version"]), $matches);
+            $version = $matches[1];
+
+            $toolkits->$index->installed = true;
+            $toolkits->$index->version = $version;
+            $toolkits->$index->binary = $path;
+            $toolkits->$index->dir = dirname($path);
+            $toolkits->$index->rotate = true;
+            $toolkits->$index->sharpen = true;
+          } else {
+            $toolkits->$index->installed = false;
+            $toolkits->$index->error =
+              t($settings["name"] . " is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
+          }
         } else {
-          $toolkits->graphicsmagick->installed = false;
-          $toolkits->graphicsmagick->error =
-            t("GraphicsMagick is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
+          $toolkits->$index->installed = false;
+          $toolkits->$index->error =
+            t("We could not locate " . $settings["name"] . " on your system.");
         }
-      } else {
-        $toolkits->graphicsmagick->installed = false;
-        $toolkits->graphicsmagick->error = t("We could not locate GraphicsMagick on your system.");
       }
     }
 
-- 
cgit v1.2.3


From 7dd63630d8f7fc46847388c307ecf160a729aafb Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sat, 8 Jan 2011 19:44:46 +0100
Subject: Minor coding style fix

---
 modules/gallery/helpers/graphics.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index cb48ce82..96a6ceba 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -325,7 +325,7 @@ class graphics_Core {
           "graphicsmagick" => array(
               "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version"));
       // Loop through the kits
-      foreach ( $magick_kits as $index => $settings ) {
+      foreach ($magick_kits as $index => $settings) {
         $path = exec("which " . $settings["binary"]);
         $toolkits->$index->name = $settings["name"];
         if ($path) {
-- 
cgit v1.2.3


From eecb24429115b5f1883971befe0de18ac718fc2a Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sun, 9 Jan 2011 02:06:35 +0100
Subject: Made t() calls parsable by localization scanner

---
 modules/gallery/helpers/graphics.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 96a6ceba..a30699e8 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -342,12 +342,14 @@ class graphics_Core {
           } else {
             $toolkits->$index->installed = false;
             $toolkits->$index->error =
-              t($settings["name"] . " is installed, but PHP's open_basedir restriction prevents Gallery from using it.");
+              t("%toolkit_name is installed, but PHP's open_basedir restriction prevents Gallery from using it.",
+                array("toolkit_name" => $settings["name"]));
           }
         } else {
           $toolkits->$index->installed = false;
           $toolkits->$index->error =
-            t("We could not locate " . $settings["name"] . " on your system.");
+            t("We could not locate %toolkit_name on your system.",
+              array("toolkit_name" => $settings["name"]));
         }
       }
     }
-- 
cgit v1.2.3


From 0d7e951aa5f7329edb25e821de95051668789bcd Mon Sep 17 00:00:00 2001
From: Jérémy Subtil <bigmadwolf@gmail.com>
Date: Sat, 8 Jan 2011 22:57:09 +0100
Subject: Moved item_Model::get_position() method to the Item helper.  It now
 calls the viewable() method on every query.

---
 modules/gallery/helpers/item.php | 85 ++++++++++++++++++++++++++++++++++++++++
 modules/gallery/models/item.php  | 79 ++-----------------------------------
 2 files changed, 89 insertions(+), 75 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 29dd8603..a2d5f74d 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -304,4 +304,89 @@ class item_Core {
       ->where("rand_key", "<", random::percent())
       ->order_by("rand_key", "DESC");
   }
+
+  /**
+   * Find the position of the given item in its parent album.  The resulting
+   * value is 1-indexed, so the first child in the album is at position 1.
+   */
+  static function get_position($item, $where=array()) {
+    $album = $item->parent();
+
+    if (!strcasecmp($album->sort_order, "DESC")) {
+      $comp = ">";
+    } else {
+      $comp = "<";
+    }
+    $query_model = ORM::factory("item");
+
+    // If the comparison column has NULLs in it, we can't use comparators on it
+    // and will have to deal with it the hard way.
+    $count = $query_model->viewable()
+      ->where("parent_id", "=", $album->id)
+      ->where($album->sort_column, "IS", null)
+      ->merge_where($where)
+      ->count_all();
+
+    if (empty($count)) {
+      // There are no NULLs in the sort column, so we can just use it directly.
+      $sort_column = $album->sort_column;
+
+      $position = $query_model->viewable()
+        ->where("parent_id", "=", $album->id)
+        ->where($sort_column, $comp, $item->$sort_column)
+        ->merge_where($where)
+        ->count_all();
+
+      // We stopped short of our target value in the sort (notice that we're
+      // using a < comparator above) because it's possible that we have
+      // duplicate values in the sort column.  An equality check would just
+      // arbitrarily pick one of those multiple possible equivalent columns,
+      // which would mean that if you choose a sort order that has duplicates,
+      // it'd pick any one of them as the child's "position".
+      //
+      // Fix this by doing a 2nd query where we iterate over the equivalent
+      // columns and add them to our base value.
+      foreach ($query_model->viewable()
+               ->select("id")
+               ->where("parent_id", "=", $album->id)
+               ->where($sort_column, "=", $item->$sort_column)
+               ->merge_where($where)
+               ->order_by(array("id" => "ASC"))
+               ->find_all() as $row) {
+        $position++;
+        if ($row->id == $item->id) {
+          break;
+        }
+      }
+    } else {
+      // There are NULLs in the sort column, so we can't use MySQL comparators.
+      // Fall back to iterating over every child row to get to the current one.
+      // This can be wildly inefficient for really large albums, but it should
+      // be a rare case that the user is sorting an album with null values in
+      // the sort column.
+      //
+      // Reproduce the children() functionality here using Database directly to
+      // avoid loading the whole ORM for each row.
+      $order_by = array($album->sort_column => $album->sort_order);
+      // Use id as a tie breaker
+      if ($album->sort_column != "id") {
+        $order_by["id"] = "ASC";
+      }
+
+      $position = 0;
+      foreach ($query_model->viewable()
+               ->select("id")
+               ->where("parent_id", "=", $album->id)
+               ->merge_where($where)
+               ->order_by($order_by)
+               ->find_all() as $row) {
+        $position++;
+        if ($row->id == $item->id) {
+          break;
+        }
+      }
+    }
+
+    return $position;
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 88a444b4..47b062b8 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -546,83 +546,12 @@ class Item_Model_Core extends ORM_MPTT {
   /**
    * Find the position of the given child id in this album.  The resulting value is 1-indexed, so
    * the first child in the album is at position 1.
+   *
+   * This method stands as a backward compatibility for gallery 3.0, and will
+   * be deprecated in version 3.1.
    */
   public function get_position($child, $where=array()) {
-    if (!strcasecmp($this->sort_order, "DESC")) {
-      $comp = ">";
-    } else {
-      $comp = "<";
-    }
-    $db = db::build();
-
-    // If the comparison column has NULLs in it, we can't use comparators on it and will have to
-    // deal with it the hard way.
-    $count = $db->from("items")
-      ->where("parent_id", "=", $this->id)
-      ->where($this->sort_column, "IS", null)
-      ->merge_where($where)
-      ->count_records();
-
-    if (empty($count)) {
-      // There are no NULLs in the sort column, so we can just use it directly.
-      $sort_column = $this->sort_column;
-
-      $position = $db->from("items")
-        ->where("parent_id", "=", $this->id)
-        ->where($sort_column, $comp, $child->$sort_column)
-        ->merge_where($where)
-        ->count_records();
-
-      // We stopped short of our target value in the sort (notice that we're using a < comparator
-      // above) because it's possible that we have duplicate values in the sort column.  An
-      // equality check would just arbitrarily pick one of those multiple possible equivalent
-      // columns, which would mean that if you choose a sort order that has duplicates, it'd pick
-      // any one of them as the child's "position".
-      //
-      // Fix this by doing a 2nd query where we iterate over the equivalent columns and add them to
-      // our base value.
-      foreach ($db
-               ->select("id")
-               ->from("items")
-               ->where("parent_id", "=", $this->id)
-               ->where($sort_column, "=", $child->$sort_column)
-               ->merge_where($where)
-               ->order_by(array("id" => "ASC"))
-               ->execute() as $row) {
-        $position++;
-        if ($row->id == $child->id) {
-          break;
-        }
-      }
-    } else {
-      // There are NULLs in the sort column, so we can't use MySQL comparators.  Fall back to
-      // iterating over every child row to get to the current one.  This can be wildly inefficient
-      // for really large albums, but it should be a rare case that the user is sorting an album
-      // with null values in the sort column.
-      //
-      // Reproduce the children() functionality here using Database directly to avoid loading the
-      // whole ORM for each row.
-      $order_by = array($this->sort_column => $this->sort_order);
-      // Use id as a tie breaker
-      if ($this->sort_column != "id") {
-        $order_by["id"] = "ASC";
-      }
-
-      $position = 0;
-      foreach ($db->select("id")
-               ->from("items")
-               ->where("parent_id", "=", $this->id)
-               ->merge_where($where)
-               ->order_by($order_by)
-               ->execute() as $row) {
-        $position++;
-        if ($row->id == $child->id) {
-          break;
-        }
-      }
-    }
-
-    return $position;
+    return item::get_position($child, $where);
   }
 
   /**
-- 
cgit v1.2.3


From 24c0b69847d4144c29e557fa654c30247e628a9c Mon Sep 17 00:00:00 2001
From: Jérémy Subtil <bigmadwolf@gmail.com>
Date: Sun, 9 Jan 2011 00:22:46 +0100
Subject: Fixed item controllers so that any item position is computed
 correctly, when some other items belonging to the same parent album are not
 viewable. Changed depracated calls to item_Model::get_position() to
 item::get_position().

---
 modules/gallery/controllers/albums.php | 2 +-
 modules/gallery/controllers/movies.php | 4 ++--
 modules/gallery/controllers/photos.php | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 25df0da7..3435465c 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -37,7 +37,7 @@ class Albums_Controller extends Items_Controller {
 
     if ($show) {
       $child = ORM::factory("item", $show);
-      $index = $album->get_position($child);
+      $index = item::get_position($child);
       if ($index) {
         $page = ceil($index / $page_size);
         if ($page == 1) {
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index bf50abd5..7c85dd98 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -28,10 +28,10 @@ class Movies_Controller extends Items_Controller {
     access::required("view", $movie);
 
     $where = array(array("type", "!=", "album"));
-    $position = $movie->parent()->get_position($movie, $where);
+    $position = item::get_position($movie, $where);
     if ($position > 1) {
       list ($previous_item, $ignore, $next_item) =
-        $movie->parent()->children(3, $position - 2, $where);
+        $movie->parent()->viewable()->children(3, $position - 2, $where);
     } else {
       $previous_item = null;
       list ($next_item) = $movie->parent()->viewable()->children(1, $position, $where);
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index d500a92e..4578747d 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -28,10 +28,10 @@ class Photos_Controller extends Items_Controller {
     access::required("view", $photo);
 
     $where = array(array("type", "!=", "album"));
-    $position = $photo->parent()->get_position($photo, $where);
+    $position = item::get_position($photo, $where);
     if ($position > 1) {
       list ($previous_item, $ignore, $next_item) =
-        $photo->parent()->children(3, $position - 2, $where);
+        $photo->parent()->viewable()->children(3, $position - 2, $where);
     } else {
       $previous_item = null;
       list ($next_item) = $photo->parent()->viewable()->children(1, $position, $where);
-- 
cgit v1.2.3


From 89737c09d572efe35014e668cdd06407c2c19d62 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sun, 9 Jan 2011 20:52:31 +0100
Subject: Paginator for user manager admin view Closes ticket #1557 Note: also
 optimizes the way item count is retrieved for users, saving <user_count>-1
 queries when displaying this page

---
 modules/gallery/libraries/MY_Controller.php | 26 ++++++++++++++++++++++
 modules/user/controllers/admin_users.php    | 34 ++++++++++++++++++++++++++++-
 modules/user/views/admin_users.html.php     | 31 +++++++++++++++++++++++++-
 3 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 modules/gallery/libraries/MY_Controller.php

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_Controller.php b/modules/gallery/libraries/MY_Controller.php
new file mode 100644
index 00000000..ea2a7502
--- /dev/null
+++ b/modules/gallery/libraries/MY_Controller.php
@@ -0,0 +1,26 @@
+<?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 Controller extends Controller_Core {
+  public function get_pager_params($page, $item_count, $items_per_page) {
+    $offset = ($page - 1) * $items_per_page;
+    $max_pages = max(ceil($item_count / $items_per_page), 1);
+    return array($offset, $max_pages);
+  }
+}
\ No newline at end of file
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 23032ab3..6850f8af 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -22,8 +22,40 @@ class Admin_Users_Controller extends Admin_Controller {
     $view = new Admin_View("admin.html");
     $view->page_title = t("Users and groups");
     $view->content = new View("admin_users.html");
-    $view->content->users = ORM::factory("user")->order_by("name", "ASC")->find_all();
+
+    // @todo: add this as a config option
+    $page_size = module::get_var("user", "page_size", 10);
+    $page = Input::instance()->get("page", "1");
+    $builder = db::build();
+    $user_count = $builder->from("users")->count_records();
+    list($offset, $max_pages) = Controller::get_pager_params($page, $user_count, $page_size);
+
+    // Make sure that the page references a valid offset
+    if ($page < 1) {
+      url::redirect(url::merge(array("page" => 1)));
+    } else if ($page > $max_pages) {
+      url::redirect(url::merge(array("page" => $max_pages)));
+    }
+    $view->content->users = ORM::factory("user")
+        ->select(array("users.id", "users.admin", "users.name", "users.email", "users.full_name",
+                       "users.last_login", "users.guest", db::expr("COUNT(items.id) as item_count")))
+        ->join("items", "items.owner_id", "users.id", "LEFT")
+        ->group_by("users.id")
+        ->order_by("users.name", "ASC")
+        ->find_all($page_size, $offset);
+
     $view->content->groups = ORM::factory("group")->order_by("name", "ASC")->find_all();
+    $view->content->page = $page;
+    $view->content->max_pages = $max_pages;
+
+    if ($page < $max_pages) {
+      $view->content->next_page_url = url::site(url::merge(array("page" => $page + 1)));
+    }
+    if ( $page > 1 )
+    {
+      $view->content->previous_page_url = url::site(url::merge(array("page" => $page - 1)));
+    }
+
     print $view;
   }
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index f067cae8..028d44eb 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -88,7 +88,7 @@
               <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
             </td>
             <td>
-              <?= db::build()->from("items")->where("owner_id", "=", $user->id)->count_records() ?>
+              <?= $user->item_count ?>
             </td>
             <td>
               <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
@@ -108,6 +108,35 @@
           </tr>
           <? endforeach ?>
         </table>
+
+        <div class="g-right">
+          <? if (isset($previous_page_url)): ?>
+            <a href="<?= $previous_page_url ?>"
+                class="g-button ui-icon-left ui-state-default ui-corner-all"
+                title="<?= t("Previous page")->for_html_attr() ?>">
+          <? else: ?>
+            <a class="g-button ui-icon-left ui-state-disabled ui-corner-all"
+                title="<?= t("Previous page")->for_html_attr() ?>">
+          <? endif ?>
+            <span class="ui-icon ui-icon-circle-plus"></span>
+            <?= t("Previous") ?>
+          </a>
+
+          <?= t("Page %current of %total", array("current"=>$page, "total"=>$max_pages)) ?>
+
+          <? if (isset($next_page_url)): ?>
+            <a href="<?= $next_page_url ?>"
+                class="g-button ui-icon-left ui-state-default ui-corner-all"
+                title="<?= t("Next page")->for_html_attr() ?>">
+          <? else: ?>
+            <a class="g-button ui-icon-left ui-state-disabled ui-corner-all"
+                title="<?= t("Next page")->for_html_attr() ?>">
+          <? endif ?>
+            <span class="ui-icon ui-icon-circle-plus"></span>
+            <?= t("Next") ?>
+          </a>
+        </div>
+
       </div>
     </div>
 
-- 
cgit v1.2.3


From 97fc535411478f939b303c75a067b7dad9123112 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sun, 9 Jan 2011 21:19:55 +0100
Subject: Minor css mod to make it obvious paging belongs to user block

---
 modules/user/css/user.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 084eac31..93e3d02e 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -12,6 +12,7 @@
 
 #g-user-admin {
   width: auto;
+  margin-bottom: 4em;
 }
 
 #g-group-admin {
-- 
cgit v1.2.3


From b7ffb0501e09878b7d95f46a2b678678e0e60fa6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 9 Jan 2011 18:38:09 -0800
Subject: Replace preg_quote with a more targeted regex to fix the problem
 where directories get skipped.  Fixes #1460, I think.

---
 modules/server_add/controllers/server_add.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index e4c3e69c..757481d0 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -156,7 +156,7 @@ class Server_Add_Controller extends Admin_Controller {
           $entry_id = null;
         }
 
-        $file = preg_quote($file);
+        $file = preg_replace("/(\*|\?|\[)/", "[$1]", $file);
         foreach (glob("$file/*") as $child) {
           if (is_dir($child)) {
             $queue[] = array($child, $entry_id);
-- 
cgit v1.2.3


From fca6d1254a2aeb95bee15fea4c503e4588fc9f1b Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sun, 9 Jan 2011 14:20:30 +0100
Subject: Fixed offset sanitizing code - Fixes Ticket#1593

---
 modules/tag/controllers/tag.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/tag/controllers/tag.php b/modules/tag/controllers/tag.php
index 7bfa7d58..47110540 100644
--- a/modules/tag/controllers/tag.php
+++ b/modules/tag/controllers/tag.php
@@ -29,9 +29,9 @@ class Tag_Controller extends Controller {
 
     // Make sure that the page references a valid offset
     if ($page < 1) {
-      url::redirect($album->abs_url());
+      url::redirect(url::merge(array("page" => 1)));
     } else if ($page > $max_pages) {
-      url::redirect($album->abs_url("page=$max_pages"));
+      url::redirect(url::merge(array("page" => $max_pages)));
     }
 
     $template = new Theme_View("page.html", "collection", "tag");
-- 
cgit v1.2.3


From 65448548637f462ad17c12b149cdb2a169d07026 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 9 Jan 2011 22:29:26 -0800
Subject: Move the directory queue into the database as well, otherwise if you
 have too many directories it blows out the task queue and the whole thing
 falls over.  Fixes #1547.

---
 modules/server_add/controllers/server_add.php      | 126 ++++++++++++---------
 .../server_add/helpers/server_add_installer.php    |  23 +++-
 modules/server_add/models/server_add_entry.php     |  21 ++++
 modules/server_add/models/server_add_file.php      |  21 ----
 modules/server_add/module.info                     |   2 +-
 5 files changed, 113 insertions(+), 80 deletions(-)
 create mode 100644 modules/server_add/models/server_add_entry.php
 delete mode 100644 modules/server_add/models/server_add_file.php

(limited to 'modules')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 757481d0..15b92cc0 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -24,6 +24,12 @@ class Server_Add_Controller extends Admin_Controller {
       $files[] = $path;
     }
 
+    // Clean leftover task rows.  There really should be support for this in the task framework
+    db::build()
+      ->where("task_id", "NOT IN", db::build()->select("id")->from("tasks"))
+      ->delete("server_add_entries")
+      ->execute();
+
     $item = ORM::factory("item", $id);
     $view = new View("server_add_tree_dialog.html");
     $view->item = $item;
@@ -79,17 +85,22 @@ class Server_Add_Controller extends Admin_Controller {
     access::verify_csrf();
     $item = ORM::factory("item", Input::instance()->get("item_id"));
 
-    foreach (Input::instance()->post("paths") as $path) {
-      if (server_add::is_valid_path($path)) {
-        $paths[] = array($path, null);
-      }
-    }
-
     $task_def = Task_Definition::factory()
       ->callback("Server_Add_Controller::add")
       ->description(t("Add photos or movies from the local server"))
       ->name(t("Add from server"));
-    $task = task::create($task_def, array("item_id" => $item->id, "queue" => $paths));
+    $task = task::create($task_def, array("item_id" => $item->id));
+
+    foreach (Input::instance()->post("paths") as $path) {
+      if (server_add::is_valid_path($path)) {
+        $entry = ORM::factory("server_add_entry");
+        $entry->path = $path;
+        $entry->is_directory = 1;
+        $entry->parent_id = null;
+        $entry->task_id = $task->id;
+        $entry->save();
+      }
+    }
 
     json::reply(
       array("result" => "started",
@@ -118,7 +129,7 @@ class Server_Add_Controller extends Admin_Controller {
 
   /**
    * This is the task code that adds photos and albums.  It first examines all the target files
-   * and creates a set of Server_Add_File_Models, then runs through the list of models and adds
+   * and creates a set of Server_Add_Entry_Models, then runs through the list of models and adds
    * them one at a time.
    */
   static function add($task) {
@@ -128,6 +139,7 @@ class Server_Add_Controller extends Admin_Controller {
     switch ($mode) {
     case "init":
       $task->set("mode", "build-file-list");
+      $task->set("dirs_scanned", 0);
       $task->percent_complete = 0;
       $task->status = t("Starting up");
       batch::start();
@@ -136,58 +148,63 @@ class Server_Add_Controller extends Admin_Controller {
     case "build-file-list":  // 0% to 10%
       // We can't fit an arbitrary number of paths in a task, so store them in a separate table.
       // Don't use an iterator here because we can't get enough control over it when we're dealing
-      // with a deep hierarchy and we don't want to go over our time quota.  The queue is in the
-      // form [path, parent_id] where the parent_id refers to another Server_Add_File_Model.  We
-      // have this extra level of abstraction because we don't know its Item_Model id yet.
-      $queue = $task->get("queue");
+      // with a deep hierarchy and we don't want to go over our time quota.
       $paths = unserialize(module::get_var("server_add", "authorized_paths"));
+      $dirs_scanned = $task->get("dirs_scanned");
+      while (microtime(true) - $start < 0.5) {
+        // Process every directory that doesn't yet have a parent id, these are the
+        // paths that we're importing.
+        $entry = ORM::factory("server_add_entry")
+          ->where("task_id", "=", $task->id)
+          ->where("is_directory", "=", 1)
+          ->where("checked", "=", 0)
+          ->order_by("id", "ASC")
+          ->find();
 
-      while ($queue && microtime(true) - $start < 0.5) {
-        list($file, $parent_entry_id) = array_shift($queue);
-        // Ignore the staging directories as directories to be imported.
-        if (empty($paths[$file])) {
-          $entry = ORM::factory("server_add_file");
-          $entry->task_id = $task->id;
-          $entry->file = $file;
-          $entry->parent_id = $parent_entry_id;
-          $entry->save();
-          $entry_id = $entry->id;
-        } else {
-          $entry_id = null;
-        }
+        if ($entry->loaded()) {
+          // Ignore the staging directories as directories to be imported.
+          if (!empty($paths[$entry->path])) {
+            $entry->delete();
+          }
 
-        $file = preg_replace("/(\*|\?|\[)/", "[$1]", $file);
-        foreach (glob("$file/*") as $child) {
-          if (is_dir($child)) {
-            $queue[] = array($child, $entry_id);
-          } else {
-            $ext = strtolower(pathinfo($child, PATHINFO_EXTENSION));
-            if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4", "m4v")) &&
-                filesize($child) > 0) {
-              $child_entry = ORM::factory("server_add_file");
-              $child_entry->task_id = $task->id;
-              $child_entry->file = $child;
-              $child_entry->parent_id = $entry_id;
-              $child_entry->save();
+          $path = preg_replace("/(\*|\?|\[)/", "[$1]", $entry->path);
+          foreach (glob("$path/*") as $child_path) {
+            if (!is_dir($child_path)) {
+              $ext = strtolower(pathinfo($child_path, PATHINFO_EXTENSION));
+              if (!in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4", "m4v")) ||
+                  !filesize($child_path)) {
+                // Not importable, skip it.
+                continue;
+              }
             }
+
+            $child_entry = ORM::factory("server_add_entry");
+            $child_entry->task_id = $task->id;
+            $child_entry->path = $child_path;
+            $child_entry->parent_id = $entry->id;  // null if the parent was a staging dir
+            $child_entry->is_directory = is_dir($child_path);
+            $child_entry->save();
           }
+
+          // We've processed this entry, mark it as done.
+          $entry->checked = 1;
+          $entry->save();
         }
+        $dirs_scanned++;
       }
 
       // We have no idea how long this can take because we have no idea how deep the tree
       // hierarchy rabbit hole goes.  Leave ourselves room here for 100 iterations and don't go
       // over 10% in percent_complete.
-      $task->set("queue", $queue);
+      $task->set("dirs_scanned", $dirs_scanned);
       $task->percent_complete = min($task->percent_complete + 0.1, 10);
-      $task->status = t2(
-        "Found one file", "Found %count files",
-        ORM::factory("server_add_file")->where("task_id", "=", $task->id)->count_all());
+      $task->status = t2("Scanned one directory", "Scanned %count directories", $dirs_scanned);
 
-      if (!$queue) {
+      if (!$entry->loaded()) {
         $task->set("mode", "add-files");
         $task->set(
           "total_files",
-          ORM::factory("server_add_file")->where("task_id", "=", $task->id)->count_all());
+          ORM::factory("server_add_entry")->where("task_id", "=", $task->id)->count_all());
         $task->percent_complete = 10;
       }
       break;
@@ -199,7 +216,7 @@ class Server_Add_Controller extends Admin_Controller {
       // Ordering by id ensures that we add them in the order that we created the entries, which
       // will create albums first.  Ignore entries which already have an Item_Model attached,
       // they're done.
-      $entries = ORM::factory("server_add_file")
+      $entries = ORM::factory("server_add_entry")
         ->where("task_id", "=", $task->id)
         ->where("item_id", "IS", null)
         ->order_by("id", "ASC")
@@ -218,16 +235,16 @@ class Server_Add_Controller extends Admin_Controller {
 
         // Look up the parent item for this entry.  By now it should exist, but if none was
         // specified, then this belongs as a child of the current item.
-        $parent_entry = ORM::factory("server_add_file", $entry->parent_id);
+        $parent_entry = ORM::factory("server_add_entry", $entry->parent_id);
         if (!$parent_entry->loaded()) {
           $parent = ORM::factory("item", $task->get("item_id"));
         } else {
           $parent = ORM::factory("item", $parent_entry->item_id);
         }
 
-        $name = basename($entry->file);
+        $name = basename($entry->path);
         $title = item::convert_filename_to_title($name);
-        if (is_dir($entry->file)) {
+        if ($entry->is_directory) {
           $album = ORM::factory("item");
           $album->type = "album";
           $album->parent_id = $parent->id;
@@ -243,7 +260,7 @@ class Server_Add_Controller extends Admin_Controller {
               $photo = ORM::factory("item");
               $photo->type = "photo";
               $photo->parent_id = $parent->id;
-              $photo->set_data_file($entry->file);
+              $photo->set_data_file($entry->path);
               $photo->name = $name;
               $photo->title = $title;
               $photo->owner_id = $owner_id;
@@ -253,7 +270,7 @@ class Server_Add_Controller extends Admin_Controller {
               $movie = ORM::factory("item");
               $movie->type = "movie";
               $movie->parent_id = $parent->id;
-              $movie->set_data_file($entry->file);
+              $movie->set_data_file($entry->path);
               $movie->name = $name;
               $movie->title = $title;
               $movie->owner_id = $owner_id;
@@ -264,12 +281,12 @@ class Server_Add_Controller extends Admin_Controller {
               // process.  But just in, case.. set this to a non-null value so that we skip this
               // entry.
               $entry->item_id = 0;
-              $task->log("Skipping unknown file type: $entry->file");
+              $task->log("Skipping unknown file type: {$entry->path}");
             }
           } catch (Exception $e) {
             // This can happen if a photo file is invalid, like a BMP masquerading as a .jpg
             $entry->item_id = 0;
-            $task->log("Skipping invalid file: $entry->file");
+            $task->log("Skipping invalid file: {$entry->file}");
           }
         }
 
@@ -288,10 +305,9 @@ class Server_Add_Controller extends Admin_Controller {
       $task->done = true;
       $task->state = "success";
       $task->percent_complete = 100;
-      db::build()
-        ->delete("server_add_files")
+      ORM::factory("server_add_entry")
         ->where("task_id", "=", $task->id)
-        ->execute();
+        ->delete_all();
       message::info(t2("Successfully added one photo / album",
                        "Successfully added %count photos / albums",
                        $task->get("completed_files")));
diff --git a/modules/server_add/helpers/server_add_installer.php b/modules/server_add/helpers/server_add_installer.php
index 676bc3cf..320e205e 100644
--- a/modules/server_add/helpers/server_add_installer.php
+++ b/modules/server_add/helpers/server_add_installer.php
@@ -20,15 +20,17 @@
 class server_add_installer {
   static function install() {
     $db = Database::instance();
-    $db->query("CREATE TABLE {server_add_files} (
+    $db->query("CREATE TABLE {server_add_entries} (
                   `id` int(9) NOT NULL auto_increment,
-                  `file` varchar(255) NOT NULL,
+                  `checked` boolean default 0,
+                  `is_directory` boolean default 0,
                   `item_id` int(9),
                   `parent_id` int(9),
+                  `path` varchar(255) NOT NULL,
                   `task_id` int(9) NOT NULL,
                   PRIMARY KEY (`id`))
                 DEFAULT CHARSET=utf8;");
-    module::set_version("server_add", 3);
+    module::set_version("server_add", 4);
     server_add::check_config();
   }
 
@@ -49,6 +51,21 @@ class server_add_installer {
       $db->query("ALTER TABLE {server_add_files} ADD COLUMN `parent_id` int(9)");
       module::set_version("server_add", $version = 3);
     }
+
+    if ($version == 3) {
+      $db->query("DROP TABLE {server_add_files}");
+      $db->query("CREATE TABLE {server_add_entries} (
+                    `id` int(9) NOT NULL auto_increment,
+                    `checked` boolean default 0,
+                    `is_directory` boolean default 0,
+                    `item_id` int(9),
+                    `parent_id` int(9),
+                    `path` varchar(255) NOT NULL,
+                    `task_id` int(9) NOT NULL,
+                    PRIMARY KEY (`id`))
+                  DEFAULT CHARSET=utf8;");
+      module::set_version("server_add", $version = 4);
+    }
   }
 
   static function deactivate() {
diff --git a/modules/server_add/models/server_add_entry.php b/modules/server_add/models/server_add_entry.php
new file mode 100644
index 00000000..dfeb05a2
--- /dev/null
+++ b/modules/server_add/models/server_add_entry.php
@@ -0,0 +1,21 @@
+<?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 Server_Add_Entry_Model_Core extends ORM {
+}
diff --git a/modules/server_add/models/server_add_file.php b/modules/server_add/models/server_add_file.php
deleted file mode 100644
index 92b9f6de..00000000
--- a/modules/server_add/models/server_add_file.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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 Server_Add_File_Model_Core extends ORM {
-}
diff --git a/modules/server_add/module.info b/modules/server_add/module.info
index 23acab94..87b317b1 100644
--- a/modules/server_add/module.info
+++ b/modules/server_add/module.info
@@ -1,3 +1,3 @@
 name = "Server Add"
 description = "Allows authorized users to load images directly from your web server"
-version = 3
+version = 4
-- 
cgit v1.2.3


From 65ff2470a505fbc18211093ac131c29b1e820c3e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 9 Jan 2011 22:34:44 -0800
Subject: Use eeldivad's fallback code from
 http://gallery.menalto.com/node/96806#comment-358404 instead of relying
 solely on preg_quote.  Fixes #1460.

---
 modules/server_add/controllers/server_add.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 15b92cc0..05543a68 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -167,8 +167,11 @@ class Server_Add_Controller extends Admin_Controller {
             $entry->delete();
           }
 
-          $path = preg_replace("/(\*|\?|\[)/", "[$1]", $entry->path);
-          foreach (glob("$path/*") as $child_path) {
+          $child_paths = glob(preg_quote($entry->path) . "/*");
+          if (!$child_paths) {
+            $child_paths = glob("$path/*");
+          }
+          foreach ($child_paths as $child_path) {
             if (!is_dir($child_path)) {
               $ext = strtolower(pathinfo($child_path, PATHINFO_EXTENSION));
               if (!in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4", "m4v")) ||
@@ -189,8 +192,8 @@ class Server_Add_Controller extends Admin_Controller {
           // We've processed this entry, mark it as done.
           $entry->checked = 1;
           $entry->save();
+          $dirs_scanned++;
         }
-        $dirs_scanned++;
       }
 
       // We have no idea how long this can take because we have no idea how deep the tree
-- 
cgit v1.2.3


From bd6bd029a7c2e0247d4da931c49f3731498cd303 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Jan 2011 14:04:15 -0800
Subject: Fix up the version detecting regex for GraphicsMagick and don't crash
 if the regex doesn't return properly.  Follow on to
 3ec0ba956dced01a97f2ee7bd943d326c42350e3 for ticket #1595.

---
 modules/gallery/helpers/graphics.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index a30699e8..29527705 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -321,16 +321,18 @@ class graphics_Core {
       // ImageMagick & GraphicsMagick
       $magick_kits = array(
           "imagemagick" => array(
-              "name" => "ImageMagick", "binary" => "convert", "version" => "convert -v"),
+            "name" => "ImageMagick", "binary" => "convert", "version" => "convert -v",
+            "version_regex" => "/Version: \S+ (\S+)/"),
           "graphicsmagick" => array(
-              "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version"));
+            "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version",
+            "version_regex" => "/\S+ (\S+)/"));
       // Loop through the kits
       foreach ($magick_kits as $index => $settings) {
         $path = exec("which " . $settings["binary"]);
         $toolkits->$index->name = $settings["name"];
         if ($path) {
-          if (@is_file($path)) {
-            preg_match('/Version: \S+ (\S+)/', shell_exec($settings["version"]), $matches);
+          if (@is_file($path) &&
+              preg_match($settings["version_regex"], shell_exec($settings["version"]), $matches)) {
             $version = $matches[1];
 
             $toolkits->$index->installed = true;
-- 
cgit v1.2.3


From d557b2a63e2ea424965fb53be9f6b76ad3f18015 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Jan 2011 14:50:30 -0800
Subject: Allow File_Proxy_Controller to run in private gallery mode since it
 does all the right permission checks.  This prevents a hotlink to a private
 photo in a private gallery from kicking the user out to a login page.  Fixes
 #1594.

---
 modules/gallery/controllers/file_proxy.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 22854fbd..c6051dfd 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -27,6 +27,7 @@
  * input is sanitized against the database before we perform any file I/O.
  */
 class File_Proxy_Controller extends Controller {
+  const ALLOW_PRIVATE_GALLERY = true;
   public function __call($function, $args) {
     // request_uri: gallery3/var/trunk/albums/foo/bar.jpg
     $request_uri = rawurldecode(Input::instance()->server("REQUEST_URI"));
-- 
cgit v1.2.3


From 23eaec7063b81d4dae04ec3f5c311a0a2f228a05 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Jan 2011 15:49:15 -0800
Subject: Stop using "which" to find binaries.  Create system::find_binary()
 which traverses the $PATH and returns any executable binary of the
 appropriate name that it can find.  Fixes #1555.

---
 modules/gallery/helpers/graphics.php |  8 ++-----
 modules/gallery/helpers/movie.php    | 14 +++++-------
 modules/gallery/helpers/system.php   | 43 ++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 15 deletions(-)
 create mode 100644 modules/gallery/helpers/system.php

(limited to 'modules')

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 29527705..18820ed7 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -313,11 +313,6 @@ class graphics_Core {
       $toolkits->graphicsmagick->installed = false;
       $toolkits->graphicsmagick->error = t("GraphicsMagick requires the <b>exec</b> function");
     } else {
-      gallery::set_path_env(
-        array(module::get_var("gallery", "graphics_toolkit_path"),
-              getenv("PATH"),
-              module::get_var("gallery", "extra_binary_paths")));
-
       // ImageMagick & GraphicsMagick
       $magick_kits = array(
           "imagemagick" => array(
@@ -328,7 +323,8 @@ class graphics_Core {
             "version_regex" => "/\S+ (\S+)/"));
       // Loop through the kits
       foreach ($magick_kits as $index => $settings) {
-        $path = exec("which " . $settings["binary"]);
+        $path = system::find_binary(
+          $settings["binary"], module::get_var("gallery", "graphics_toolkit_path"));
         $toolkits->$index->name = $settings["name"];
         if ($path) {
           if (@is_file($path) &&
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 0895c5f4..dd0b437e 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -83,22 +83,18 @@ class movie_Core {
     }
   }
 
+  /**
+   * Return the path to the ffmpeg binary if one exists and is executable, or null.
+   */
   static function find_ffmpeg() {
     if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || !file_exists($ffmpeg_path)) {
-      gallery::set_path_env(
-        array(module::get_var("gallery", "graphics_toolkit_path"),
-              getenv("PATH"),
-              module::get_var("gallery", "extra_binary_paths")));
-      if (function_exists("exec")) {
-        $ffmpeg_path = exec("which ffmpeg");
-      }
-
+      $ffmpeg_path = system::find_binary(
+        "ffmpeg", module::get_var("gallery", "graphics_toolkit_path"));
       module::set_var("gallery", "ffmpeg_path", $ffmpeg_path);
     }
     return $ffmpeg_path;
   }
 
-
   /**
    * Return the width, height, mime_type and extension of the given movie file.
    */
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
new file mode 100644
index 00000000..4a6a3c0f
--- /dev/null
+++ b/modules/gallery/helpers/system.php
@@ -0,0 +1,43 @@
+<?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 system_Core {
+  /**
+   * Return the path to an executable version of the named binary, or null.
+   * Traverse the PATH environment variable looking for the given file.  If
+   * the $priority_path variable is set, check that path first.
+   */
+  static function find_binary($binary, $priority_path=null) {
+    $paths = array_merge(
+      explode(":", getenv("PATH")),
+      explode(":", module::get_var("gallery", "extra_binary_paths")));
+    if ($priority_path) {
+      array_unshift($paths, $priority_path);
+    }
+
+    foreach ($paths as $path) {
+      $candidate = "$path/$binary";
+      // @suppress errors below to avoid open_basedir issues
+      if (@file_exists($candidate) && @is_executable($candidate)) {
+        return $candidate;
+      }
+    }
+    return null;
+  }
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 9dfb733ad7d5e7e5aa002833d52d1b8642609161 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Jan 2011 19:24:38 -0800
Subject: New albums should take the sort order from their parent.  Fixes
 #1599.

---
 modules/server_add/controllers/server_add.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'modules')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 05543a68..71688605 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -254,6 +254,8 @@ class Server_Add_Controller extends Admin_Controller {
           $album->name = $name;
           $album->title = $title;
           $album->owner_id = $owner_id;
+          $album->sort_order = $parent->sort_order;
+          $album->sort_column = $parent->sort_column;
           $album->save();
           $entry->item_id = $album->id;
         } else {
-- 
cgit v1.2.3


From 5ac49d497f51a3828c1254b5024a4aa898f86530 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Jan 2011 22:20:12 -0800
Subject: Create new APIs for allowing themers to control what CSS/JS get
 combined and when.  Backwards compatible in that old themes will work, but
 their CSS/JS will no longer be combined unless they make some changes.  Fixes
 #1600.

---
 modules/gallery/libraries/Admin_View.php   |  5 ---
 modules/gallery/libraries/Gallery_View.php | 61 +++++++++++++++++++++---------
 modules/gallery/libraries/Theme_View.php   | 14 -------
 themes/admin_wind/views/admin.html.php     | 38 ++++++++++++-------
 themes/wind/views/page.html.php            | 49 +++++++++++++++---------
 5 files changed, 99 insertions(+), 68 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 28a003cc..1a633a34 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -96,11 +96,6 @@ class Admin_View_Core extends Gallery_View {
         }
       }
 
-      if ($function == "admin_head") {
-        array_unshift($blocks, $this->combine_files($this->scripts, "javascript"));
-        array_unshift($blocks, $this->combine_files($this->css, "css"));
-      }
-
       if (Session::instance()->get("debug")) {
         if ($function != "admin_head") {
           array_unshift(
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index b45bb94a..8befda95 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -19,18 +19,35 @@
  */
 class Gallery_View_Core extends View {
   protected $theme_name = null;
-  protected $scripts = array();
-  protected $css = array();
+  protected $combine_queue = array();
 
   /**
-   * Add a script to the combined scripts list.
+   * Begin gather up scripts or css files so that they can be combined into a single request.
+   *
+   * @param $types  a comma separated list of types to combine, eg "script,css"
+   */
+  public function start_combining($types) {
+    foreach (explode(",", $types) as $type) {
+      $this->combine_queue[$type] = array();
+    }
+  }
+
+  /**
+   * If script combining is enabled, add this script to the list of scripts that will be
+   * combined into a single script element.  When combined, the order of scripts is preserved.
+   *
    * @param $file  the file name or path of the script to include. If a path is specified then
    *               it needs to be relative to DOCROOT. Just specifying a file name will result
    *               in searching Kohana's cascading file system.
+   * @param $group the group of scripts to combine this with.  defaults to "core"
    */
-  public function script($file) {
+  public function script($file, $group="core") {
     if (($path = gallery::find_file("js", $file, false))) {
-      $this->scripts[$path] = 1;
+      if (isset($this->combine_queue["script"])) {
+        $this->combine_queue["script"][$group][$path] = 1;
+      } else {
+        return html::script($path);
+      }
     } else {
       Kohana_Log::add("error", "Can't find script file: $file");
     }
@@ -46,14 +63,22 @@ class Gallery_View_Core extends View {
   }
 
   /**
-   * Add a css file to the combined css list.
-   * @param $file  the file name or path of the script to include. If a path is specified then
+   * If css combining is enabled, add this css to the list of css that will be
+   * combined into a single style element.  When combined, the order of style elements
+   * is preserved.
+   *
+   * @param $file  the file name or path of the css to include. If a path is specified then
    *               it needs to be relative to DOCROOT. Just specifying a file name will result
    *               in searching Kohana's cascading file system.
+   * @param $group the group of css to combine this with.  defaults to "core"
    */
-  public function css($file) {
+  public function css($file, $group="core") {
     if (($path = gallery::find_file("css", $file, false))) {
-      $this->css[$path] = 1;
+      if (isset($this->combine_queue["css"])) {
+        $this->combine_queue["css"][$group][$path] = 1;
+      } else {
+        return html::stylesheet($path);
+      }
     } else {
       Kohana_Log::add("error", "Can't find css file: $file");
     }
@@ -61,11 +86,13 @@ class Gallery_View_Core extends View {
 
   /**
    * Combine a series of files into a single one and cache it in the database.
+   * @param $type  the data type (script or css)
+   * @param $group the group of scripts or css we want
    */
-  protected function combine_files($paths, $type) {
+  public function get_combined($type, $group="core") {
     $links = array();
 
-    if (empty($paths)) {
+    if (empty($this->combine_queue[$type][$group])) {
       return;
     }
 
@@ -73,7 +100,7 @@ class Gallery_View_Core extends View {
     // entries.
     $key = array(url::abs_file(""));
 
-    foreach (array_keys($paths) as $path) {
+    foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
       $stats = stat($path);
       // 7 == size, 9 == mtime, see http://php.net/stat
       $key[] = "$path $stats[7] $stats[9]";
@@ -85,7 +112,7 @@ class Gallery_View_Core extends View {
 
     if (empty($contents)) {
       $contents = "";
-      foreach (array_keys($paths) as $path) {
+      foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
         if ($type == "css") {
           $contents .= "/* $path */\n" . $this->process_css($path) . "\n";
         } else {
@@ -103,12 +130,12 @@ class Gallery_View_Core extends View {
       }
     }
 
+    unset($this->combine_queue[$type][$group]);
+
     if ($type == "css") {
-      return "<!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->\n" .
-        html::stylesheet("combined/css/$key", "screen,print,projection", true);
+      return html::stylesheet("combined/css/$key", "screen,print,projection", true);
     } else {
-      return "<!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->\n" .
-        html::script("combined/javascript/$key", true);
+      return html::script("combined/javascript/$key", true);
     }
   }
 
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index ba1862c0..04784ca1 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -236,13 +236,6 @@ class Theme_View_Core extends Gallery_View {
     case "thumb_bottom":
     case "thumb_info":
     case "thumb_top":
-      if ($function == "head") {
-        // Stash any CSS we have already; that came from the theme and we want theme CSS to
-        // override module CSs
-        $save_css = $this->css;
-        $this->css = array();
-      }
-
       $blocks = array();
       if (method_exists("gallery_theme", $function)) {
         switch (count($args)) {
@@ -281,13 +274,6 @@ class Theme_View_Core extends Gallery_View {
           array_merge(array($this), $args));
       }
 
-      if ($function == "head") {
-        // Merge the theme CSS/JS at the end
-        $this->css = array_merge($this->css, $save_css);
-        array_unshift($blocks, $this->combine_files($this->scripts, "javascript"));
-        array_unshift($blocks, $this->combine_files($this->css, "css"));
-      }
-
       if (Session::instance()->get("debug")) {
         if ($function != "head" && $function != "body_attributes") {
           array_unshift(
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index c8041069..54b30c6f 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -4,6 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <? $theme->start_combining("script,css") ?>
     <title>
       <? if ($page_title): ?>
         <?= t("Gallery Admin: %page_title", array("page_title" => $page_title)) ?>
@@ -11,8 +12,26 @@
         <?= t("Admin dashboard") ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
+    <link rel="shortcut icon"
+          href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
+          type="image/x-icon" />
 
+    <?= $theme->script("jquery.js") ?>
+    <?= $theme->script("jquery.form.js") ?>
+    <?= $theme->script("jquery-ui.js") ?>
+    <?= $theme->script("gallery.common.js") ?>
+    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
+    <script type="text/javascript">
+    var MSG_CANCEL = <?= t("Cancel")->for_js() ?>;
+    </script>
+    <?= $theme->script("gallery.ajax.js") ?>
+    <?= $theme->script("gallery.dialog.js") ?>
+    <?= $theme->script("superfish/js/superfish.js") ?>
+
+    <?= $theme->admin_head() ?>
+
+    <? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
+    <?= $theme->script("ui.init.js") ?>
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
@@ -22,20 +41,11 @@
           media="screen,print,projection" />
     <![endif]-->
 
-   <?= $theme->script("jquery.js") ?>
-   <?= $theme->script("jquery.form.js") ?>
-   <?= $theme->script("jquery-ui.js") ?>
-   <?= $theme->script("gallery.common.js") ?>
-   <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
-   <script type="text/javascript">
-   var MSG_CANCEL = <?= t("Cancel")->for_js() ?>;
-   </script>
-   <?= $theme->script("gallery.ajax.js") ?>
-   <?= $theme->script("gallery.dialog.js") ?>
-   <?= $theme->script("superfish/js/superfish.js") ?>
-   <?= $theme->script("ui.init.js") ?>
+    <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
+    <?= $theme->get_combined("script") ?>
 
-   <?= $theme->admin_head() ?>
+    <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
+    <?= $theme->get_combined("css") ?>
   </head>
 
   <body <?= $theme->body_attributes() ?>>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 90f76bb5..441866d5 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -4,6 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <? $theme->start_combining("script,css") ?>
     <title>
       <? if ($page_title): ?>
         <?= $page_title ?>
@@ -17,28 +18,24 @@
         <? endif ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
-    <?= $theme->css("yui/reset-fonts-grids.css") ?>
-    <?= $theme->css("superfish/css/superfish.css") ?>
-    <?= $theme->css("themeroller/ui.base.css") ?>
-    <?= $theme->css("screen.css") ?>
-    <!--[if lte IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
-          media="screen,print,projection" />
-    <![endif]-->
+    <link rel="shortcut icon"
+          href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
+          type="image/x-icon" />
+
     <? if ($theme->page_type == "collection"): ?>
       <? if ($thumb_proportion != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
         <? $new_height = round($thumb_proportion * 240) ?>
-    <style type="text/css">
-    .g-view #g-content #g-album-grid .g-item {
-      width: <?= $new_width ?>px;
-      height: <?= $new_height ?>px;
-      /* <?= $thumb_proportion ?> */
-    }
-    </style>
+        <style type="text/css">
+        .g-view #g-content #g-album-grid .g-item {
+          width: <?= $new_width ?>px;
+          height: <?= $new_height ?>px;
+          /* <?= $thumb_proportion ?> */
+        }
+        </style>
       <? endif ?>
     <? endif ?>
+
     <?= $theme->script("json2-min.js") ?>
     <?= $theme->script("jquery.js") ?>
     <?= $theme->script("jquery.form.js") ?>
@@ -52,9 +49,8 @@
     <?= $theme->script("gallery.dialog.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
     <?= $theme->script("jquery.localscroll.js") ?>
-    <?= $theme->script("ui.init.js") ?>
 
-    <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
+    <? /* These are page specific but they get combined */ ?>
     <? if ($theme->page_subtype == "photo"): ?>
     <?= $theme->script("jquery.scrollTo.js") ?>
     <?= $theme->script("gallery.show_full_size.js") ?>
@@ -63,6 +59,23 @@
     <? endif ?>
 
     <?= $theme->head() ?>
+
+    <? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
+    <?= $theme->script("ui.init.js") ?>
+    <?= $theme->css("yui/reset-fonts-grids.css") ?>
+    <?= $theme->css("superfish/css/superfish.css") ?>
+    <?= $theme->css("themeroller/ui.base.css") ?>
+    <?= $theme->css("screen.css") ?>
+    <!--[if lte IE 8]>
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+          media="screen,print,projection" />
+    <![endif]-->
+
+    <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
+    <?= $theme->get_combined("script") ?>
+
+    <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
+    <?= $theme->get_combined("css") ?>
   </head>
 
   <body <?= $theme->body_attributes() ?>>
-- 
cgit v1.2.3


From 84e08a62838b0299a5daa7c9cac4be3eca6d0cb1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 11 Jan 2011 01:04:10 -0800
Subject: Don't resize if the target size is the same as the original. Fixes
 #1602.

---
 modules/gallery/helpers/gallery_graphics.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_graphics.php b/modules/gallery/helpers/gallery_graphics.php
index fca18076..4cd7143e 100644
--- a/modules/gallery/helpers/gallery_graphics.php
+++ b/modules/gallery/helpers/gallery_graphics.php
@@ -56,7 +56,7 @@ class gallery_graphics_Core {
     }
 
     $dims = getimagesize($input_file);
-    if (max($dims[0], $dims[1]) < min($options["width"], $options["height"])) {
+    if (max($dims[0], $dims[1]) <= min($options["width"], $options["height"])) {
       // Image would get upscaled; do nothing
       copy($input_file, $output_file);
     } else {
-- 
cgit v1.2.3


From 00b520fffd867389b5a030ddefee9f468cad044c Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Tue, 11 Jan 2011 20:53:48 +0100
Subject: coding style

---
 modules/user/controllers/admin_users.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 6850f8af..2ae9788e 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -51,8 +51,7 @@ class Admin_Users_Controller extends Admin_Controller {
     if ($page < $max_pages) {
       $view->content->next_page_url = url::site(url::merge(array("page" => $page + 1)));
     }
-    if ( $page > 1 )
-    {
+    if ($page > 1) {
       $view->content->previous_page_url = url::site(url::merge(array("page" => $page - 1)));
     }
 
-- 
cgit v1.2.3


From df802de6ae3cc0c294a1a3dc76db29ff21949b9f Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Tue, 11 Jan 2011 21:28:25 +0100
Subject: Making good use of Pagination class to reduce code (removed
 MY_Controller which duplicated some functionality available in Pagination as
 well)

---
 modules/gallery/libraries/MY_Controller.php | 26 --------------------------
 modules/user/controllers/admin_users.php    | 24 +++++++++++-------------
 modules/user/views/admin_users.html.php     | 28 ++--------------------------
 3 files changed, 13 insertions(+), 65 deletions(-)
 delete mode 100644 modules/gallery/libraries/MY_Controller.php

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_Controller.php b/modules/gallery/libraries/MY_Controller.php
deleted file mode 100644
index ea2a7502..00000000
--- a/modules/gallery/libraries/MY_Controller.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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 Controller extends Controller_Core {
-  public function get_pager_params($page, $item_count, $items_per_page) {
-    $offset = ($page - 1) * $items_per_page;
-    $max_pages = max(ceil($item_count / $items_per_page), 1);
-    return array($offset, $max_pages);
-  }
-}
\ No newline at end of file
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 2ae9788e..e11145de 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -28,32 +28,30 @@ class Admin_Users_Controller extends Admin_Controller {
     $page = Input::instance()->get("page", "1");
     $builder = db::build();
     $user_count = $builder->from("users")->count_records();
-    list($offset, $max_pages) = Controller::get_pager_params($page, $user_count, $page_size);
+
+    $view->content->pager = new Pagination();
+    $view->content->pager->initialize(
+      array("query_string" => "page",
+            "total_items" => $user_count,
+            "items_per_page" => $page_size,
+            "style" => "classic"));
 
     // Make sure that the page references a valid offset
     if ($page < 1) {
       url::redirect(url::merge(array("page" => 1)));
-    } else if ($page > $max_pages) {
-      url::redirect(url::merge(array("page" => $max_pages)));
+    } else if ($page > $view->content->pager->total_pages) {
+      url::redirect(url::merge(array("page" => $view->content->pager->total_pages)));
     }
+
     $view->content->users = ORM::factory("user")
         ->select(array("users.id", "users.admin", "users.name", "users.email", "users.full_name",
                        "users.last_login", "users.guest", db::expr("COUNT(items.id) as item_count")))
         ->join("items", "items.owner_id", "users.id", "LEFT")
         ->group_by("users.id")
         ->order_by("users.name", "ASC")
-        ->find_all($page_size, $offset);
+        ->find_all($page_size, $view->content->pager->sql_offset);
 
     $view->content->groups = ORM::factory("group")->order_by("name", "ASC")->find_all();
-    $view->content->page = $page;
-    $view->content->max_pages = $max_pages;
-
-    if ($page < $max_pages) {
-      $view->content->next_page_url = url::site(url::merge(array("page" => $page + 1)));
-    }
-    if ($page > 1) {
-      $view->content->previous_page_url = url::site(url::merge(array("page" => $page - 1)));
-    }
 
     print $view;
   }
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 028d44eb..74b13ec5 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -109,32 +109,8 @@
           <? endforeach ?>
         </table>
 
-        <div class="g-right">
-          <? if (isset($previous_page_url)): ?>
-            <a href="<?= $previous_page_url ?>"
-                class="g-button ui-icon-left ui-state-default ui-corner-all"
-                title="<?= t("Previous page")->for_html_attr() ?>">
-          <? else: ?>
-            <a class="g-button ui-icon-left ui-state-disabled ui-corner-all"
-                title="<?= t("Previous page")->for_html_attr() ?>">
-          <? endif ?>
-            <span class="ui-icon ui-icon-circle-plus"></span>
-            <?= t("Previous") ?>
-          </a>
-
-          <?= t("Page %current of %total", array("current"=>$page, "total"=>$max_pages)) ?>
-
-          <? if (isset($next_page_url)): ?>
-            <a href="<?= $next_page_url ?>"
-                class="g-button ui-icon-left ui-state-default ui-corner-all"
-                title="<?= t("Next page")->for_html_attr() ?>">
-          <? else: ?>
-            <a class="g-button ui-icon-left ui-state-disabled ui-corner-all"
-                title="<?= t("Next page")->for_html_attr() ?>">
-          <? endif ?>
-            <span class="ui-icon ui-icon-circle-plus"></span>
-            <?= t("Next") ?>
-          </a>
+        <div class="g-paginator">
+          <?= $pager ?>
         </div>
 
       </div>
-- 
cgit v1.2.3


From 7f6d87166df138073d85dd5201de8b9d19bc6cd2 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Tue, 11 Jan 2011 23:16:05 +0100
Subject: Removed check as input value is compared against dataset of validated
 values, and request is only processed further in case of a match. => this is
 unnecessary

---
 modules/gallery/controllers/file_proxy.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 5ce9b458..47e1e483 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -44,11 +44,6 @@ class File_Proxy_Controller extends Controller {
 
     $file_uri = substr($request_uri, strlen($var_uri));
 
-    // Make sure that we don't leave the var dir
-    if (strpos($file_uri, "/../") !== false) {
-      throw new Kohana_404_Exception();
-    }
-
     list ($type, $path) = explode("/", $file_uri, 2);
     if ($type != "resizes" && $type != "albums" && $type != "thumbs") {
       throw new Kohana_404_Exception();
-- 
cgit v1.2.3


From 049f2af1c982bb12fee6e5512e4830f63d06d343 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Wed, 12 Jan 2011 00:05:11 +0100
Subject: Returning 2 flags from l10n_client::validate_api_key(), 1 to reflect
 if connection was built up properly (just a boolean, not distuingishing
 between reasons in case of a failure), the other to reflect API validating
 success status. Using this presenting a slightly more meaningfull error msg
 to user in case the connection would fail. Fixes Ticket #1504

---
 modules/gallery/controllers/admin_languages.php | 11 +++++++----
 modules/gallery/helpers/l10n_client.php         |  8 ++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 573ededf..e9be2a88 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -74,9 +74,11 @@ class Admin_Languages_Controller extends Admin_Controller {
 
   private function _save_api_key($form) {
     $new_key = $form->sharing->api_key->value;
-    if ($new_key && !l10n_client::validate_api_key($new_key)) {
-      $form->sharing->api_key->add_error("invalid", 1);
-      $valid = false;
+    if ($new_key) {
+      list($connected, $valid) = l10n_client::validate_api_key($new_key);
+      if (!$valid) {
+        $form->sharing->api_key->add_error($connected ? "invalid" : "noconn", 1);
+      }
     } else {
       $valid = true;
     }
@@ -119,7 +121,8 @@ class Admin_Languages_Controller extends Admin_Controller {
                   array("server-link" => html::mark_clean(html::anchor($server_link))))
               : t("API key"))
       ->value($api_key)
-      ->error_messages("invalid", t("The API key you provided is invalid."));
+      ->error_messages("invalid", t("The API key you provided is invalid."))
+      ->error_messages("noconn", t("Could not connect to remote server to validate the API key."));
     $group->submit("save")->value(t("Save settings"));
     if ($api_key && $this->_outgoing_translations_count()) {
       // TODO: UI improvement: hide API key / save button when API key is set.
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 8c2685a8..2af5c8d0 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -60,10 +60,14 @@ class l10n_client_Core {
                   "client_token" => l10n_client::client_token(),
                   "signature" => $signature,
                   "uid" => l10n_client::server_uid($api_key)));
+    if (!isset($response_data) && !isset($response_status)) {
+      return array(false, false);
+    }
+
     if (!remote::success($response_status)) {
-      return false;
+      return array(true, false);
     }
-    return true;
+    return array(true, true);
   }
 
   /**
-- 
cgit v1.2.3


From 92db7f42181f6582763e7b5c56b18b989b061e21 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 11 Jan 2011 15:23:20 -0800
Subject: Update some comments.

---
 modules/gallery/helpers/item.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index a2d5f74d..8aa14934 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -308,6 +308,9 @@ class item_Core {
   /**
    * Find the position of the given item in its parent album.  The resulting
    * value is 1-indexed, so the first child in the album is at position 1.
+   *
+   * @param Item_Model $item
+   * @param array      $where an array of arrays, each compatible with ORM::where()
    */
   static function get_position($item, $where=array()) {
     $album = $item->parent();
@@ -338,14 +341,14 @@ class item_Core {
         ->count_all();
 
       // We stopped short of our target value in the sort (notice that we're
-      // using a < comparator above) because it's possible that we have
+      // using a inequality comparator above) because it's possible that we have
       // duplicate values in the sort column.  An equality check would just
       // arbitrarily pick one of those multiple possible equivalent columns,
       // which would mean that if you choose a sort order that has duplicates,
       // it'd pick any one of them as the child's "position".
       //
       // Fix this by doing a 2nd query where we iterate over the equivalent
-      // columns and add them to our base value.
+      // columns and add them to our position count.
       foreach ($query_model->viewable()
                ->select("id")
                ->where("parent_id", "=", $album->id)
-- 
cgit v1.2.3


From ee53744aa73b06f262122b6236014618fe6d742c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 11 Jan 2011 16:59:57 -0800
Subject: Two improvements to Joe's fix for #1504: 1) Trap all exceptions, eg
 dns or connectivity issues and    report back in the form (but put the stack
 trace in the logs) 2) Rename "noconn" to "no_connection"

---
 modules/gallery/controllers/admin_languages.php |  5 +++--
 modules/gallery/helpers/l10n_client.php         | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index e9be2a88..f96a0eb7 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -77,7 +77,7 @@ class Admin_Languages_Controller extends Admin_Controller {
     if ($new_key) {
       list($connected, $valid) = l10n_client::validate_api_key($new_key);
       if (!$valid) {
-        $form->sharing->api_key->add_error($connected ? "invalid" : "noconn", 1);
+        $form->sharing->api_key->add_error($connected ? "invalid" : "no_connection", 1);
       }
     } else {
       $valid = true;
@@ -122,7 +122,8 @@ class Admin_Languages_Controller extends Admin_Controller {
               : t("API key"))
       ->value($api_key)
       ->error_messages("invalid", t("The API key you provided is invalid."))
-      ->error_messages("noconn", t("Could not connect to remote server to validate the API key."));
+      ->error_messages(
+        "no_connection", t("Could not connect to remote server to validate the API key."));
     $group->submit("save")->value(t("Save settings"));
     if ($api_key && $this->_outgoing_translations_count()) {
       // TODO: UI improvement: hide API key / save button when API key is set.
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 2af5c8d0..8fc66b68 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -55,11 +55,16 @@ class l10n_client_Core {
     $url = self::_server_url("status");
     $signature = self::_sign($version, $api_key);
 
-    list ($response_data, $response_status) = remote::post(
-      $url, array("version" => $version,
-                  "client_token" => l10n_client::client_token(),
-                  "signature" => $signature,
-                  "uid" => l10n_client::server_uid($api_key)));
+    try {
+      list ($response_data, $response_status) = remote::post(
+        $url, array("version" => $version,
+                    "client_token" => l10n_client::client_token(),
+                    "signature" => $signature,
+                    "uid" => l10n_client::server_uid($api_key)));
+    } catch (ErrorException $e) {
+      // Log the error, but then return a "can't make connection" error
+      Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
+    }
     if (!isset($response_data) && !isset($response_status)) {
       return array(false, false);
     }
-- 
cgit v1.2.3


From 09d34696a12ae15f6c7378a64b2359465b2d7277 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 11 Jan 2011 17:54:33 -0800
Subject: Update comments to annotate what data is where during the process.
 Follow-on for #1518.

---
 modules/gallery/controllers/file_proxy.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 0400d7c4..98f4e839 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -29,9 +29,11 @@
 class File_Proxy_Controller extends Controller {
   const ALLOW_PRIVATE_GALLERY = true;
   public function __call($function, $args) {
-    // request_uri: gallery3/var/trunk/albums/foo/bar.jpg
+    // request_uri: gallery3/var/albums/foo/bar.jpg?m=1234
     $request_uri = rawurldecode(Input::instance()->server("REQUEST_URI"));
 
+    // get rid of query parameters
+    // request_uri: gallery3/var/albums/foo/bar.jpg
     $request_uri = preg_replace("/\?.*/", "", $request_uri);
 
     // var_uri: gallery3/var/
@@ -43,8 +45,11 @@ class File_Proxy_Controller extends Controller {
       throw new Kohana_404_Exception();
     }
 
+    // file_uri: albums/foo/bar.jpg
     $file_uri = substr($request_uri, strlen($var_uri));
 
+    // type: albums
+    // path: foo/bar.jpg
     list ($type, $path) = explode("/", $file_uri, 2);
     if ($type != "resizes" && $type != "albums" && $type != "thumbs") {
       throw new Kohana_404_Exception();
-- 
cgit v1.2.3


From d511fc77adfa628b04968d153e397425e3a93358 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 15 Jan 2011 12:33:51 -0800
Subject: Tweake Joe's change to admin_users to revert the code that joins
 against the items table; it's not clear that this is going to be efficient
 for large data sets.

---
 modules/user/controllers/admin_users.php | 7 ++-----
 modules/user/views/admin_users.html.php  | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index e11145de..8dbc4cbb 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -43,14 +43,11 @@ class Admin_Users_Controller extends Admin_Controller {
       url::redirect(url::merge(array("page" => $view->content->pager->total_pages)));
     }
 
+    // Join our users against the items table so that we can get a count of their items
+    // in the same query.
     $view->content->users = ORM::factory("user")
-        ->select(array("users.id", "users.admin", "users.name", "users.email", "users.full_name",
-                       "users.last_login", "users.guest", db::expr("COUNT(items.id) as item_count")))
-        ->join("items", "items.owner_id", "users.id", "LEFT")
-        ->group_by("users.id")
         ->order_by("users.name", "ASC")
         ->find_all($page_size, $view->content->pager->sql_offset);
-
     $view->content->groups = ORM::factory("group")->order_by("name", "ASC")->find_all();
 
     print $view;
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 74b13ec5..a7bd6b27 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -88,7 +88,7 @@
               <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
             </td>
             <td>
-              <?= $user->item_count ?>
+              <?= db::build()->from("items")->where("owner_id", "=", $user->id)->count_records() ?>
             </td>
             <td>
               <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
-- 
cgit v1.2.3


From 376f09c4e171e03a5b3764e51e0d28f1f57a233b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 15 Jan 2011 12:47:15 -0800
Subject: Reorganize the url() function out from in the middle of the
 script/css combining functions.

---
 modules/gallery/libraries/Gallery_View.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 8befda95..e27dc41a 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -21,6 +21,15 @@ class Gallery_View_Core extends View {
   protected $theme_name = null;
   protected $combine_queue = array();
 
+  /**
+   * Provide a url to a resource within the current theme.  This allows us to refer to theme
+   * resources without naming the theme itself which makes themes easier to copy.
+   */
+  public function url($path, $absolute_url=false) {
+    $arg = "themes/{$this->theme_name}/$path";
+    return $absolute_url ? url::abs_file($arg) : url::file($arg);
+  }
+
   /**
    * Begin gather up scripts or css files so that they can be combined into a single request.
    *
@@ -53,15 +62,6 @@ class Gallery_View_Core extends View {
     }
   }
 
-  /**
-   * Provide a url to a resource within the current theme.  This allows us to refer to theme
-   * resources without naming the theme itself which makes themes easier to copy.
-   */
-  public function url($path, $absolute_url=false) {
-    $arg = "themes/{$this->theme_name}/$path";
-    return $absolute_url ? url::abs_file($arg) : url::file($arg);
-  }
-
   /**
    * If css combining is enabled, add this css to the list of css that will be
    * combined into a single style element.  When combined, the order of style elements
-- 
cgit v1.2.3


From 38b74932878e8e0c7eb071552568bbb014355996 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 15 Jan 2011 13:07:14 -0800
Subject: whitespace fix.

---
 modules/search/helpers/search_theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/search/helpers/search_theme.php b/modules/search/helpers/search_theme.php
index 07066caa..45a88dc2 100644
--- a/modules/search/helpers/search_theme.php
+++ b/modules/search/helpers/search_theme.php
@@ -22,7 +22,7 @@ class search_theme_Core {
     if ($theme->page_subtype() != "login") {
       $view = new View("search_link.html");
       return $view->render();
-    }else {
+    } else {
       return "";
     }
   }
-- 
cgit v1.2.3


From ee13b934f46d67982e5eeea21f81ac58f166741c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 15 Jan 2011 13:14:43 -0800
Subject: Fix all the head() and admin_head() theme callbacks to return the
 results of the $theme->css() and $theme->script() calls.  This handles the
 case where combining scripts/css returns HTML instead of putting it in the
 queue for combination.  Fixes #1611.

---
 modules/comment/helpers/comment_theme.php       |  8 +++-----
 modules/digibug/helpers/digibug_theme.php       |  2 +-
 modules/gallery/helpers/gallery_theme.php       | 27 +++++++++++++------------
 modules/recaptcha/helpers/recaptcha_theme.php   |  4 ++--
 modules/server_add/helpers/server_add_theme.php | 18 ++++++++---------
 modules/tag/helpers/tag_theme.php               | 10 ++++-----
 modules/user/helpers/user_theme.php             |  8 ++++----
 7 files changed, 38 insertions(+), 39 deletions(-)

(limited to 'modules')

diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index b993cdae..9cc93fa1 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -19,14 +19,12 @@
  */
 class comment_theme_Core {
   static function head($theme) {
-    $theme->css("comment.css");
-    $theme->script("comment.js");
-    return "";
+    return $theme->css("comment.css")
+      . $theme->script("comment.js");
   }
 
   static function admin_head($theme) {
-    $theme->css("comment.css");
-    return "";
+    return $theme->css("comment.css");
   }
 
   static function photo_bottom($theme) {
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index d146e17d..1106910e 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -19,6 +19,6 @@
  */
 class digibug_theme_Core {
   static function head($theme) {
-    $theme->script("digibug.js");
+    return $theme->script("digibug.js");
   }
 }
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 978c69a6..ebf8f38e 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,9 +21,9 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
-    $theme->css("gallery.css");
+    $buf .= $theme->css("gallery.css");
     if ($session->get("debug")) {
-      $theme->css("debug.css");
+      $buf .= $theme->css("debug.css");
     }
 
     if (module::is_active("rss")) {
@@ -40,32 +40,33 @@ class gallery_theme_Core {
 
     if (count(locales::installed())) {
       // Needed by the languages block
-      $theme->script("jquery.cookie.js");
+      $buf .= $theme->script("jquery.cookie.js");
     }
 
     if ($session->get("l10n_mode", false)) {
-      $theme->css("l10n_client.css");
-      $theme->script("jquery.cookie.js");
-      $theme->script("l10n_client.js");
+      $buf .= $theme->css("l10n_client.css")
+        . $theme->script("jquery.cookie.js")
+        . $theme->script("l10n_client.js");
     }
 
-    $theme->css("uploadify/uploadify.css");
+    $buf .= $theme->css("uploadify/uploadify.css");
     return $buf;
   }
 
   static function admin_head($theme) {
-    $theme->css("gallery.css");
-    $theme->script("gallery.panel.js");
+    $buf = $theme->css("gallery.css");
+    $buf .= $theme->script("gallery.panel.js");
     $session = Session::instance();
     if ($session->get("debug")) {
-      $theme->css("debug.css");
+      $buf .= $theme->css("debug.css");
     }
 
     if ($session->get("l10n_mode", false)) {
-      $theme->css("l10n_client.css");
-      $theme->script("jquery.cookie.js");
-      $theme->script("l10n_client.js");
+      $buf .= $theme->css("l10n_client.css");
+      $buf .= $theme->script("jquery.cookie.js");
+      $buf .=$theme->script("l10n_client.js");
     }
+    return $buf;
   }
 
   static function page_bottom($theme) {
diff --git a/modules/recaptcha/helpers/recaptcha_theme.php b/modules/recaptcha/helpers/recaptcha_theme.php
index ee880986..3677a7c7 100644
--- a/modules/recaptcha/helpers/recaptcha_theme.php
+++ b/modules/recaptcha/helpers/recaptcha_theme.php
@@ -19,10 +19,10 @@
  */
 class recaptcha_theme_Core {
   static function head($theme) {
-    $theme->css("recaptcha.css");
+    return $theme->css("recaptcha.css");
   }
 
   static function admin_head($theme) {
-    $theme->css("recaptcha.css");
+    return $theme->css("recaptcha.css");
   }
 }
\ No newline at end of file
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 53f78772..6395c2f0 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -20,24 +20,24 @@
 class server_add_theme_Core {
   static function head($theme) {
     if (identity::active_user()->admin) {
-      $theme->css("server_add.css");
-      $theme->script("server_add.js");
+      return $theme->css("server_add.css")
+        . $theme->script("server_add.js");
     }
   }
 
   static function admin_head($theme) {
-    $head = array();
+    $buf = "";
     if (strpos(Router::$current_uri, "admin/server_add") !== false) {
-      $theme->css("server_add.css");
-      $theme->css("jquery.autocomplete.css");
+      $buf .= $theme->css("server_add.css")
+        . $theme->css("jquery.autocomplete.css");
       $base = url::site("__ARGS__");
       $csrf = access::csrf_token();
-      $head[] = "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
+      $buf .= "<script type=\"text/javascript\"> var base_url = \"$base\"; var csrf = \"$csrf\";</script>";
 
-      $theme->script("jquery.autocomplete.js");
-      $theme->script("admin.js");
+      $buf .= $theme->script("jquery.autocomplete.js")
+        . $theme->script("admin.js");
     }
 
-    return implode("\n", $head);
+    return $buf;
   }
 }
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index f731dbb7..3325a832 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -19,13 +19,13 @@
  */
 class tag_theme_Core {
   static function head($theme) {
-    $theme->css("jquery.autocomplete.css");
-    $theme->script("jquery.autocomplete.js");
-    $theme->css("tag.css");
+    return $theme->css("jquery.autocomplete.css")
+      . $theme->script("jquery.autocomplete.js")
+      . $theme->css("tag.css");
   }
 
   static function admin_head($theme) {
-    $theme->css("tag.css");
-    $theme->script("gallery.in_place_edit.js");
+    return $theme->css("tag.css")
+      . $theme->script("gallery.in_place_edit.js");
   }
 }
\ No newline at end of file
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 5a7161ed..70e96f70 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -19,12 +19,12 @@
  */
 class user_theme_Core {
   static function head($theme) {
-    $theme->css("user.css");
-    $theme->script("password_strength.js");
+    return $theme->css("user.css")
+      . $theme->script("password_strength.js");
   }
 
   static function admin_head($theme) {
-    $theme->css("user.css");
-    $theme->script("password_strength.js");
+    return $theme->css("user.css")
+      . $theme->script("password_strength.js");
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 02f30b91bf8f68118a578de2194e66a7a16a291a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 15 Jan 2011 14:20:26 -0800
Subject: Follow on to 966dee8628293f78fbf9431281709ceba011d3c2 for #1586 --
 don't try to update the tag item count if we didn't change any items with
 this change (ie: a tag rename).  In that case, we haven't loaded the related
 items so we don't have any idea what the count is going to be.

---
 modules/tag/models/tag.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index 25df87e0..2b73b5be 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -78,12 +78,14 @@ class Tag_Model_Core extends ORM {
       $related_item_ids[$row->item_id] = 1;
     }
 
-    $added = array_diff($this->changed_relations["items"], $this->object_relations["items"]);
-    $removed = array_diff($this->object_relations["items"], $this->changed_relations["items"]);
-    if (isset($this->changed_relations["items"])) {
-      $changed = array_merge($added, $removed);
+    if (isset($this->object_relations["items"])) {
+      $added = array_diff($this->changed_relations["items"], $this->object_relations["items"]);
+      $removed = array_diff($this->object_relations["items"], $this->changed_relations["items"]);
+      if (isset($this->changed_relations["items"])) {
+        $changed = array_merge($added, $removed);
+      }
+      $this->count = count($this->object_relations["items"]) + count($added) - count($removed);
     }
-    $this->count = count($this->object_relations["items"]) + count($added) - count($removed);
 
     $result = parent::save();
 
-- 
cgit v1.2.3


From f0dd16efc428d372cca6ec90ca31251e3ce24382 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 15 Jan 2011 14:59:25 -0800
Subject: Revive the code from Cache_Driver::exists and put it into a helper
 function in the test so that we can keep our tests functioning. Follow on to
 66fd8c7518ab71466aca72d20fb7bcd5f374af26 for #1559.

---
 modules/gallery/tests/Cache_Test.php | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/Cache_Test.php b/modules/gallery/tests/Cache_Test.php
index b95ef0a2..5e14051a 100644
--- a/modules/gallery/tests/Cache_Test.php
+++ b/modules/gallery/tests/Cache_Test.php
@@ -24,8 +24,16 @@ class Cache_Test extends Gallery_Unit_Test_Case {
     $this->_driver = new Cache_Database_Driver();
   }
 
-  public function cache_exists_test() {
-    $this->assert_false($this->_driver->exists("test_key"), "test_key should not be defined");
+  private function _exists($id) {
+    return db::build()
+      ->where("key", "=", $id)
+      ->where("expiration", ">=", time())
+      ->limit("1")
+      ->count_records("caches") > 0;
+  }
+
+  public function cache_exists_test_helper_function_test() {
+    $this->assert_false($this->_exists("test_key"), "test_key should not be defined");
 
     $id = random::hash();
     db::build()
@@ -34,7 +42,7 @@ class Cache_Test extends Gallery_Unit_Test_Case {
       ->values($id, "<tag1>, <tag2>", 84600 + time(), serialize("some test data"))
       ->execute();
 
-    $this->assert_true($this->_driver->exists($id), "test_key should be defined");
+    $this->assert_true($this->_exists($id), "test_key should be defined");
   }
 
   public function cache_get_test() {
@@ -100,9 +108,9 @@ class Cache_Test extends Gallery_Unit_Test_Case {
 
     $this->_driver->delete(array($id1));
 
-    $this->assert_false($this->_driver->exists($id1), "$id1 should have been deleted");
-    $this->assert_true($this->_driver->exists($id2), "$id2 should not have been deleted");
-    $this->assert_true($this->_driver->exists($id3), "$id3 should not have been deleted");
+    $this->assert_false($this->_exists($id1), "$id1 should have been deleted");
+    $this->assert_true($this->_exists($id2), "$id2 should not have been deleted");
+    $this->assert_true($this->_exists($id3), "$id3 should not have been deleted");
   }
 
   public function cache_delete_tag_test() {
@@ -120,9 +128,9 @@ class Cache_Test extends Gallery_Unit_Test_Case {
 
     $data = $this->_driver->delete_tag(array("tag3"));
 
-    $this->assert_true($this->_driver->exists($id1), "$id1 should not have been deleted");
-    $this->assert_false($this->_driver->exists($id2), "$id2 should have been deleted");
-    $this->assert_false($this->_driver->exists($id3), "$id3 should have been deleted");
+    $this->assert_true($this->_exists($id1), "$id1 should not have been deleted");
+    $this->assert_false($this->_exists($id2), "$id2 should have been deleted");
+    $this->assert_false($this->_exists($id3), "$id3 should have been deleted");
   }
 
   public function cache_delete_all_test() {
@@ -140,8 +148,8 @@ class Cache_Test extends Gallery_Unit_Test_Case {
 
     $data = $this->_driver->delete(true);
 
-    $this->assert_false($this->_driver->exists($id1), "$id1 should have been deleted");
-    $this->assert_false($this->_driver->exists($id2), "$id2 should have been deleted");
-    $this->assert_false($this->_driver->exists($id3), "$id3 should have been deleted");
+    $this->assert_false($this->_exists($id1), "$id1 should have been deleted");
+    $this->assert_false($this->_exists($id2), "$id2 should have been deleted");
+    $this->assert_false($this->_exists($id3), "$id3 should have been deleted");
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 8583c1d259e33ab8c85ade70ee521bb21452cff5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 15 Jan 2011 15:10:27 -0800
Subject: Style fixes.

---
 modules/user/controllers/admin_users.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 8dbc4cbb..9ef6f8c1 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -46,8 +46,8 @@ class Admin_Users_Controller extends Admin_Controller {
     // Join our users against the items table so that we can get a count of their items
     // in the same query.
     $view->content->users = ORM::factory("user")
-        ->order_by("users.name", "ASC")
-        ->find_all($page_size, $view->content->pager->sql_offset);
+      ->order_by("users.name", "ASC")
+      ->find_all($page_size, $view->content->pager->sql_offset);
     $view->content->groups = ORM::factory("group")->order_by("name", "ASC")->find_all();
 
     print $view;
-- 
cgit v1.2.3


From 44da46abd4aa2e210300d1d54c1d6896988fd71b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 15 Jan 2011 15:11:37 -0800
Subject: Golden file updates for xss and controller authentication.

---
 modules/gallery/tests/controller_auth_data.txt |   5 +-
 modules/gallery/tests/xss_data.txt             | 106 ++++++++++++++-----------
 2 files changed, 62 insertions(+), 49 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 24170092..f1192071 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -22,8 +22,8 @@ modules/gallery/controllers/user_profile.php                 show
 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/organize/controllers/organize.php                    tree                 DIRTY_CSRF
+modules/organize/controllers/organize.php                    delete               DIRTY_AUTH
 modules/rest/controllers/rest.php                            index                DIRTY_CSRF|DIRTY_AUTH
 modules/rest/controllers/rest.php                            reset_api_key_confirm DIRTY_AUTH
 modules/rest/controllers/rest.php                            reset_api_key        DIRTY_AUTH
@@ -35,5 +35,6 @@ modules/server_add/controllers/server_add.php                children
 modules/tag/controllers/admin_tags.php                       index                DIRTY_CSRF
 modules/tag/controllers/tag.php                              __call               DIRTY_CSRF|DIRTY_AUTH
 modules/tag/controllers/tags.php                             autocomplete         DIRTY_CSRF|DIRTY_AUTH
+modules/user/controllers/admin_users.php                     index                DIRTY_CSRF
 modules/user/controllers/password.php                        reset                DIRTY_AUTH
 modules/user/controllers/password.php                        do_reset             DIRTY_CSRF|DIRTY_AUTH
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 366391cf..609f786a 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -213,7 +213,7 @@ modules/gallery/views/menu_link.html.php                     5   DIRTY_JS $menu-
 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                   14  DIRTY_JS url::abs_file("lib/flowplayer.pseudostreaming.swf")
+modules/gallery/views/movieplayer.html.php                   17  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
@@ -262,8 +262,8 @@ modules/gallery/views/user_profile.html.php                  34  DIRTY_ATTR $use
 modules/gallery/views/user_profile.html.php                  43  DIRTY    $info->view
 modules/image_block/views/image_block_block.html.php         4   DIRTY_JS $item->url()
 modules/image_block/views/image_block_block.html.php         5   DIRTY    $item->thumb_img(array("class"=>"g-thumbnail"))
-modules/info/views/info_block.html.php                       22  DIRTY    gallery::date_time($item->captured)
-modules/info/views/info_block.html.php                       29  DIRTY_JS $item->owner->url
+modules/info/views/info_block.html.php                       5   DIRTY    $info["label"]
+modules/info/views/info_block.html.php                       5   DIRTY    $info["value"]
 modules/notification/views/comment_published.html.php        28  DIRTY_JS $comment->item()->abs_url()
 modules/notification/views/comment_published.html.php        29  DIRTY    $comment->item()->abs_url()
 modules/notification/views/item_added.html.php               16  DIRTY_JS $item->abs_url()
@@ -274,22 +274,29 @@ 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              94  DIRTY_JS $domain
-modules/organize/views/organize_dialog.html.php              95  DIRTY_JS $access_key
-modules/organize/views/organize_dialog.html.php              96  DIRTY_JS request::protocol()
-modules/organize/views/organize_dialog.html.php              97  DIRTY_JS $file_filter
-modules/organize/views/organize_dialog.html.php              98  DIRTY_JS $sort_order
-modules/organize/views/organize_dialog.html.php              99  DIRTY_JS $sort_fields
-modules/organize/views/organize_dialog.html.php              100 DIRTY_JS $album->id
-modules/organize/views/organize_dialog.html.php              101 DIRTY_JS $selected_id
-modules/organize/views/organize_dialog.html.php              102 DIRTY_JS $rest_uri
-modules/organize/views/organize_dialog.html.php              103 DIRTY_JS $controller_uri
-modules/organize/views/organize_dialog.html.php              109 DIRTY_JS $flash_minimum_version="10.0.0"
-modules/organize/views/organize_dialog.html.php              127 DIRTY_JS $swf_uri
-modules/organize/views/organize_dialog.html.php              140 DIRTY_ATTR request::protocol()
+modules/organize/views/organize_dialog.html.php              8   DIRTY_JS url::site("items/__ID__")
+modules/organize/views/organize_dialog.html.php              14  DIRTY_JS $album->title
+modules/organize/views/organize_frame.html.php               12  DIRTY_JS url::file("modules/organize/vendor/ext/images/default/s.gif")
+modules/organize/views/organize_frame.html.php               56  DIRTY_JS url::site("organize/album_info/__ID__")
+modules/organize/views/organize_frame.html.php               94  DIRTY_JS access::csrf_token()
+modules/organize/views/organize_frame.html.php               96  DIRTY_JS url::site("organize/set_sort/__ID__")
+modules/organize/views/organize_frame.html.php               116 DIRTY_JS url::site("organize/delete")
+modules/organize/views/organize_frame.html.php               125 DIRTY_JS access::csrf_token()
+modules/organize/views/organize_frame.html.php               226 DIRTY_JS url::site("organize/rearrange")
+modules/organize/views/organize_frame.html.php               237 DIRTY_JS access::csrf_token()
+modules/organize/views/organize_frame.html.php               275 DIRTY_JS $key
+modules/organize/views/organize_frame.html.php               398 DIRTY_JS url::site("organize/tree/{$album->id}")
+modules/organize/views/organize_frame.html.php               456 DIRTY_JS url::site("organize/reparent")
+modules/organize/views/organize_frame.html.php               479 DIRTY_JS access::csrf_token()
+modules/organize/views/organize_frame.html.php               495 DIRTY_JS access::can("edit",item::root())
+modules/organize/views/organize_frame.html.php               497 DIRTY_JS item::root()->title
+modules/organize/views/organize_frame.html.php               499 DIRTY_JS item::root()->id
+modules/organize/views/organize_frame.html.php               507 DIRTY_JS $album->id
+modules/organize/views/organize_frame.html.php               508 DIRTY_JS $album->id
 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
+modules/recaptcha/views/form_recaptcha.html.php              3   DIRTY_ATTR request::protocol()
+modules/recaptcha/views/form_recaptcha.html.php              8   DIRTY_JS $public_key
 modules/rest/views/reset_api_key_confirm.html.php            6   DIRTY    $form
 modules/rss/views/feed.mrss.php                              10  DIRTY    $feed->uri
 modules/rss/views/feed.mrss.php                              13  DIRTY_JS $feed->uri
@@ -346,28 +353,31 @@ modules/user/views/admin_users.html.php                      73  DIRTY_ATTR $use
 modules/user/views/admin_users.html.php                      74  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
 modules/user/views/admin_users.html.php                      88  DIRTY    ($user->last_login==0)?"":gallery::date($user->last_login)
 modules/user/views/admin_users.html.php                      91  DIRTY    db::build()->from("items")->where("owner_id","=",$user->id)->count_records()
-modules/user/views/admin_users.html.php                      127 DIRTY_ATTR $group->id
-modules/user/views/admin_users.html.php                      127 DIRTY_ATTR ($group->special?"g-default-group":"")
-modules/user/views/admin_users.html.php                      129 DIRTY    $v
+modules/user/views/admin_users.html.php                      113 DIRTY    $pager
+modules/user/views/admin_users.html.php                      132 DIRTY_ATTR $group->id
+modules/user/views/admin_users.html.php                      132 DIRTY_ATTR ($group->special?"g-default-group":"")
+modules/user/views/admin_users.html.php                      134 DIRTY    $v
 modules/user/views/admin_users_delete_user.html.php          6   DIRTY    $form
 modules/user/views/admin_users_group.html.php                24  DIRTY_JS $user->id
 modules/user/views/admin_users_group.html.php                24  DIRTY_JS $group->id
 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                       21  DIRTY_JS $theme->url()
-themes/admin_wind/views/admin.html.php                       38  DIRTY    $theme->admin_head()
-themes/admin_wind/views/admin.html.php                       42  DIRTY    $theme->admin_page_top()
-themes/admin_wind/views/admin.html.php                       50  DIRTY    $theme->admin_header_top()
-themes/admin_wind/views/admin.html.php                       51  DIRTY_JS item::root()->url()
-themes/admin_wind/views/admin.html.php                       54  DIRTY    $theme->user_menu()
-themes/admin_wind/views/admin.html.php                       57  DIRTY    $theme->admin_menu()
-themes/admin_wind/views/admin.html.php                       60  DIRTY    $theme->admin_header_bottom()
-themes/admin_wind/views/admin.html.php                       67  DIRTY    $content
-themes/admin_wind/views/admin.html.php                       73  DIRTY    $sidebar
-themes/admin_wind/views/admin.html.php                       78  DIRTY    $theme->admin_footer()
-themes/admin_wind/views/admin.html.php                       81  DIRTY    $theme->admin_credits()
-themes/admin_wind/views/admin.html.php                       86  DIRTY    $theme->admin_page_bottom()
+themes/admin_wind/views/admin.html.php                       31  DIRTY    $theme->admin_head()
+themes/admin_wind/views/admin.html.php                       40  DIRTY_JS $theme->url()
+themes/admin_wind/views/admin.html.php                       45  DIRTY    $theme->get_combined("script")
+themes/admin_wind/views/admin.html.php                       48  DIRTY    $theme->get_combined("css")
+themes/admin_wind/views/admin.html.php                       52  DIRTY    $theme->admin_page_top()
+themes/admin_wind/views/admin.html.php                       60  DIRTY    $theme->admin_header_top()
+themes/admin_wind/views/admin.html.php                       61  DIRTY_JS item::root()->url()
+themes/admin_wind/views/admin.html.php                       64  DIRTY    $theme->user_menu()
+themes/admin_wind/views/admin.html.php                       67  DIRTY    $theme->admin_menu()
+themes/admin_wind/views/admin.html.php                       70  DIRTY    $theme->admin_header_bottom()
+themes/admin_wind/views/admin.html.php                       77  DIRTY    $content
+themes/admin_wind/views/admin.html.php                       83  DIRTY    $sidebar
+themes/admin_wind/views/admin.html.php                       88  DIRTY    $theme->admin_footer()
+themes/admin_wind/views/admin.html.php                       91  DIRTY    $theme->admin_credits()
+themes/admin_wind/views/admin.html.php                       96  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
@@ -398,20 +408,22 @@ themes/wind/views/dynamic.html.php                           17  DIRTY_ATTR $chi
 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                             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                              12  DIRTY    $theme->item()->title
-themes/wind/views/page.html.php                              16  DIRTY    item::root()->title
-themes/wind/views/page.html.php                              26  DIRTY_JS $theme->url()
-themes/wind/views/page.html.php                              35  DIRTY    $new_width
-themes/wind/views/page.html.php                              36  DIRTY    $new_height
-themes/wind/views/page.html.php                              37  DIRTY    $thumb_proportion
-themes/wind/views/page.html.php                              74  DIRTY    $header_text
-themes/wind/views/page.html.php                              76  DIRTY_JS item::root()->url()
-themes/wind/views/page.html.php                              80  DIRTY    $theme->user_menu()
-themes/wind/views/page.html.php                              101 DIRTY_JS $parent->url($parent->id==$theme->item()->parent_id?"show={$theme->item()->id}":null)
-themes/wind/views/page.html.php                              122 DIRTY    $content
-themes/wind/views/page.html.php                              128 DIRTY    newView("sidebar.html")
-themes/wind/views/page.html.php                              135 DIRTY    $footer_text
+themes/wind/views/page.html.php                              10  DIRTY    $page_title
+themes/wind/views/page.html.php                              13  DIRTY    $theme->item()->title
+themes/wind/views/page.html.php                              17  DIRTY    item::root()->title
+themes/wind/views/page.html.php                              31  DIRTY    $new_width
+themes/wind/views/page.html.php                              32  DIRTY    $new_height
+themes/wind/views/page.html.php                              33  DIRTY    $thumb_proportion
+themes/wind/views/page.html.php                              70  DIRTY_JS $theme->url()
+themes/wind/views/page.html.php                              75  DIRTY    $theme->get_combined("script")
+themes/wind/views/page.html.php                              78  DIRTY    $theme->get_combined("css")
+themes/wind/views/page.html.php                              88  DIRTY    $header_text
+themes/wind/views/page.html.php                              90  DIRTY_JS item::root()->url()
+themes/wind/views/page.html.php                              94  DIRTY    $theme->user_menu()
+themes/wind/views/page.html.php                              115 DIRTY_JS $parent->url($parent->id==$theme->item()->parent_id?"show={$theme->item()->id}":null)
+themes/wind/views/page.html.php                              136 DIRTY    $content
+themes/wind/views/page.html.php                              142 DIRTY    newView("sidebar.html")
+themes/wind/views/page.html.php                              149 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
-- 
cgit v1.2.3


From 0020f87d6a23ce00200074b678a9293d055e27a3 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sat, 15 Jan 2011 21:49:22 +0100
Subject: Fixed paging for albums ordered by random. MySql has problems when
 comparing float values against -seemingly same- float input, see
 http://dev.mysql.com/doc/refman/5.0/en/problems-with-float.html for details.
 Fixes #1610

---
 installer/install.sql                         | 4 ++--
 modules/gallery/helpers/gallery_installer.php | 9 +++++++--
 modules/gallery/module.info                   | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/installer/install.sql b/installer/install.sql
index 0ed7f2f3..07aae36d 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -160,7 +160,7 @@ CREATE TABLE {items} (
   `name` varchar(255) DEFAULT NULL,
   `owner_id` int(9) DEFAULT NULL,
   `parent_id` int(9) NOT NULL,
-  `rand_key` float DEFAULT NULL,
+  `rand_key` decimal(11,10) DEFAULT NULL,
   `relative_path_cache` varchar(255) DEFAULT NULL,
   `relative_url_cache` varchar(255) DEFAULT NULL,
   `resize_dirty` tinyint(1) DEFAULT '1',
@@ -244,7 +244,7 @@ CREATE TABLE {modules} (
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO {modules} VALUES (1,1,'gallery',43,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',44,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
 INSERT INTO {modules} VALUES (4,1,'organize',3,4);
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index f7b8da5f..3c7b1c84 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -92,7 +92,7 @@ class gallery_installer {
                  `name` varchar(255) default NULL,
                  `owner_id` int(9) default NULL,
                  `parent_id` int(9) NOT NULL,
-                 `rand_key` float default NULL,
+                 `rand_key` decimal(11,10) default NULL,
                  `relative_path_cache` varchar(255) default NULL,
                  `relative_url_cache` varchar(255) default NULL,
                  `resize_dirty` boolean default 1,
@@ -309,7 +309,7 @@ class gallery_installer {
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
     module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
 
-    module::set_version("gallery", 43);
+    module::set_version("gallery", 44);
   }
 
   static function upgrade($version) {
@@ -653,6 +653,11 @@ class gallery_installer {
       $db->query("ALTER TABLE {items} CHANGE `description` `description` text DEFAULT NULL");
       module::set_version("gallery", $version = 43);
     }
+
+    if ($version == 43) {
+      $db->query("ALTER TABLE {items} CHANGE `rand_key` `rand_key` DECIMAL(11, 10)");
+      module::set_version("gallery", $version = 44);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index eb579ab6..4c4e63a1 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 43
+version = 44
-- 
cgit v1.2.3


From ac44e9c930ec83545b37e1e31381919fbd849d26 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 Jan 2011 15:49:34 -0800
Subject: First step in setting up version checking.

We now have two types of packages (release, git).  Instead of using
constants, we now have gallery::version_string() which returns the
current version string.  If you're on a release package, then the
version string looks like:

  3.0 (Santa Fe)

If you're on a git package, then the version string looks like this:

  3.0.1 (branch 3.0.x build 3)

We track the build number in a new file in the gallery3 root called
BUILD_NUMBER which we will update periodically with the latest
build number for each branch.
---
 BUILD_NUMBER                                     |  1 +
 modules/gallery/helpers/gallery.php              | 25 +++++++++++++++++++++++-
 modules/gallery/helpers/gallery_theme.php        |  2 +-
 modules/gallery/views/admin_block_stats.html.php |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 BUILD_NUMBER

(limited to 'modules')

diff --git a/BUILD_NUMBER b/BUILD_NUMBER
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/BUILD_NUMBER
@@ -0,0 +1 @@
+1
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 282289b5..c4a6286c 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -18,7 +18,10 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class gallery_Core {
-  const VERSION = "3.0+ (git)";
+  const VERSION = "3.0+";
+  const CODE_NAME = "";
+  const RELEASE_CHANNEL = "git";
+  const RELEASE_BRANCH = "master";
 
   /**
    * If Gallery is in maintenance mode, then force all non-admins to get routed to a "This site is
@@ -184,4 +187,24 @@ class gallery_Core {
     }
     putenv("PATH=" .  implode(":", $path_env));
   }
+
+  /**
+   * Return a string describing this version of Gallery and the type of release.
+   */
+  static function version_string() {
+    if (gallery::RELEASE_CHANNEL == "git") {
+      return sprintf(
+        "%s (branch %s build %s)", gallery::VERSION, gallery::RELEASE_BRANCH, gallery::build_number());
+    } else {
+      return sprintf("%s (%s)", gallery::VERSION, gallery::CODE_NAME);
+    }
+  }
+
+  /**
+   * Return the contents of the BUILD_NUMBER file, which should be a single integer.
+   */
+  static function build_number() {
+    $lines = file(DOCROOT . "BUILD_NUMBER", FILE_IGNORE_NEW_LINES);
+    return $lines[0];
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index ebf8f38e..d75c6fc6 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -115,7 +115,7 @@ class gallery_theme_Core {
 
   static function credits() {
     $version_string = SafeString::of_safe_html(
-        '<bdo dir="ltr">Gallery ' . gallery::VERSION . '</bdo>');
+      '<bdo dir="ltr">Gallery ' . gallery::version_string() . '</bdo>');
     return "<li class=\"g-first\">" .
       t(module::get_var("gallery", "credits"),
         array("url" => "http://gallery.menalto.com",
diff --git a/modules/gallery/views/admin_block_stats.html.php b/modules/gallery/views/admin_block_stats.html.php
index 1dec8ccd..c8c54765 100644
--- a/modules/gallery/views/admin_block_stats.html.php
+++ b/modules/gallery/views/admin_block_stats.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <ul>
   <li>
-    <?= t("Version: %version", array("version" => gallery::VERSION)) ?>
+    <?= t("Version: %version", array("version" => gallery::version_string())) ?>
   </li>
   <li>
     <?= t("Albums: %count", array("count" => $album_count)) ?>
-- 
cgit v1.2.3


From b78b1090184dd863c984e54652935963cc502eb8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 Jan 2011 17:10:30 -0800
Subject: Fix indentation.

---
 modules/gallery/helpers/gallery.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index c4a6286c..31b342db 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -194,7 +194,8 @@ class gallery_Core {
   static function version_string() {
     if (gallery::RELEASE_CHANNEL == "git") {
       return sprintf(
-        "%s (branch %s build %s)", gallery::VERSION, gallery::RELEASE_BRANCH, gallery::build_number());
+        "%s (branch %s build %s)", gallery::VERSION, gallery::RELEASE_BRANCH,
+        gallery::build_number());
     } else {
       return sprintf("%s (%s)", gallery::VERSION, gallery::CODE_NAME);
     }
-- 
cgit v1.2.3


From 84d576606d709dcccef2549fdb926d47494a876c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 Jan 2011 21:46:03 -0800
Subject: Change the value column of the messages table from a varchar(255) to
 a text.  Fixes #1612.

---
 modules/gallery/helpers/gallery_installer.php | 9 +++++++--
 modules/gallery/module.info                   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 3c7b1c84..92e5b7b8 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -136,7 +136,7 @@ class gallery_installer {
                  `id` int(9) NOT NULL auto_increment,
                  `key` varchar(255) default NULL,
                  `severity` varchar(32) default NULL,
-                 `value` varchar(255) default NULL,
+                 `value` text default NULL,
                  PRIMARY KEY (`id`),
                  UNIQUE KEY(`key`))
                DEFAULT CHARSET=utf8;");
@@ -309,7 +309,7 @@ class gallery_installer {
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
     module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
 
-    module::set_version("gallery", 44);
+    module::set_version("gallery", 45);
   }
 
   static function upgrade($version) {
@@ -658,6 +658,11 @@ class gallery_installer {
       $db->query("ALTER TABLE {items} CHANGE `rand_key` `rand_key` DECIMAL(11, 10)");
       module::set_version("gallery", $version = 44);
     }
+
+    if ($version == 44) {
+      $db->query("ALTER TABLE {messages} CHANGE `value` `value` text default NULL");
+      module::set_version("gallery", $version = 45);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 4c4e63a1..b79df7be 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 44
+version = 45
-- 
cgit v1.2.3


From 70abfb2a20734802c922c0e9917d2a1778aef3f2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 Jan 2011 22:16:09 -0800
Subject: Upgrade checking code is now here, along with a bump of the Gallery
 module to v46.  There's a new block in the admin dashboard which controls
 whether automatic checking happens, and lets you check immediately.  If a
 newer version is detected, a site status message appears for admins providing
 upgrade instructions.

Automatic checking is not yet implemented (even though the UI claims
that it exists).  This is all for #1605.
---
 .../gallery/controllers/admin_upgrade_checker.php  | 49 ++++++++++++
 modules/gallery/helpers/gallery_block.php          | 12 ++-
 modules/gallery/helpers/gallery_installer.php      | 16 +++-
 modules/gallery/helpers/upgrade_checker.php        | 91 ++++++++++++++++++++++
 modules/gallery/module.info                        |  2 +-
 .../gallery/views/upgrade_checker_block.html.php   | 45 +++++++++++
 6 files changed, 212 insertions(+), 3 deletions(-)
 create mode 100644 modules/gallery/controllers/admin_upgrade_checker.php
 create mode 100644 modules/gallery/helpers/upgrade_checker.php
 create mode 100644 modules/gallery/views/upgrade_checker_block.html.php

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_upgrade_checker.php b/modules/gallery/controllers/admin_upgrade_checker.php
new file mode 100644
index 00000000..4b1467cd
--- /dev/null
+++ b/modules/gallery/controllers/admin_upgrade_checker.php
@@ -0,0 +1,49 @@
+<?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 Admin_Upgrade_Checker_Controller extends Admin_Controller {
+  function check_now() {
+    access::verify_csrf();
+    upgrade_checker::fetch_version_info();
+    upgrade_checker::check_for_upgrade();
+    url::redirect("admin/dashboard");
+  }
+
+  function remind_me_later() {
+    access::verify_csrf();
+    site_status::clear("upgrade_checker");
+    if ($referer = Input::instance()->server("HTTP_REFERER")) {
+      url::redirect($referer);
+    } else {
+      url::redirect(item::root()->abs_url());
+    }
+  }
+
+  function set_auto($val) {
+    access::verify_csrf();
+    module::set_var("gallery", "upgrade_checker_auto_enabled", (bool)$val);
+
+    if ((bool)$val) {
+      message::success(t("Automatic upgrade checking is enabled."));
+    } else {
+      message::success(t("Automatic upgrade checking is disabled."));
+    }
+    url::redirect("admin/dashboard");
+  }
+}
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 1d92d66d..2189a710 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -25,7 +25,9 @@ class gallery_block_Core {
       "log_entries" => t("Log entries"),
       "stats" => t("Gallery stats"),
       "platform_info" => t("Platform information"),
-      "project_news" => t("Gallery project news"));
+      "project_news" => t("Gallery project news"),
+      "upgrade_checker" => t("Check for Gallery upgrades")
+    );
   }
 
   static function get_site_list() {
@@ -101,6 +103,14 @@ class gallery_block_Core {
         $block = "";
       }
       break;
+
+    case "upgrade_checker":
+      $block = new Block();
+      $block->css_id = "g-upgrade-available-block";
+      $block->title = t("Check for Gallery upgrades");
+      $block->content = new View("upgrade_checker_block.html");
+      $block->content->version_info = upgrade_checker::version_info();
+      $block->content->auto_check_enabled = upgrade_checker::auto_check_enabled();
     }
     return $block;
   }
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 92e5b7b8..1ffe9bae 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -259,6 +259,7 @@ class gallery_installer {
     module::set_var("gallery", "default_locale", "en_US");
     module::set_var("gallery", "image_quality", 75);
     module::set_var("gallery", "image_sharpen", 15);
+    module::set_var("gallery", "upgrade_checker_auto_enabled", true);
 
     // Add rules for generating our thumbnails and resizes
     graphics::add_rule(
@@ -285,6 +286,7 @@ class gallery_installer {
     block_manager::add("dashboard_sidebar", "gallery", "platform_info");
     block_manager::add("dashboard_sidebar", "gallery", "project_news");
     block_manager::add("dashboard_center", "gallery", "welcome");
+    block_manager::add("dashboard_center", "gallery", "upgrade_checker");
     block_manager::add("dashboard_center", "gallery", "photo_stream");
     block_manager::add("dashboard_center", "gallery", "log_entries");
 
@@ -309,7 +311,7 @@ class gallery_installer {
     module::set_var("gallery", "show_user_profiles_to", "registered_users");
     module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
 
-    module::set_version("gallery", 45);
+    module::set_version("gallery", 46);
   }
 
   static function upgrade($version) {
@@ -663,6 +665,18 @@ class gallery_installer {
       $db->query("ALTER TABLE {messages} CHANGE `value` `value` text default NULL");
       module::set_version("gallery", $version = 45);
     }
+
+    if ($version == 45) {
+      // Splice the upgrade_checker block into the admin dashboard at the top
+      // of the page, but under the welcome block if it's in the first position.
+      $blocks = block_manager::get_active("dashboard_center");
+      $index = count($blocks) && current($blocks) == array("gallery", "welcome") ? 1 : 0;
+      array_splice($blocks, $index, 0, array(random::int() => array("gallery", "upgrade_checker")));
+      block_manager::set_active("dashboard_center", $blocks);
+
+      module::set_var("gallery", "upgrade_checker_auto_enabled", true);
+      module::set_version("gallery", $version = 46);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/upgrade_checker.php b/modules/gallery/helpers/upgrade_checker.php
new file mode 100644
index 00000000..9311cf4a
--- /dev/null
+++ b/modules/gallery/helpers/upgrade_checker.php
@@ -0,0 +1,91 @@
+<?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 upgrade_checker_Core {
+  const CHECK_URL = "http://gallery.menalto.com/versioncheck/gallery3";
+
+  static function version_info() {
+    return unserialize(Cache::instance()->get("upgrade_checker_version_info"));
+  }
+
+  static function auto_check_enabled() {
+    return (bool)module::get_var("gallery", "upgrade_checker_auto_enabled");
+  }
+
+  static function fetch_version_info() {
+    $result = new stdClass();
+    try {
+      list ($status, $headers, $body) = remote::do_request(upgrade_checker::CHECK_URL);
+      if ($status == "HTTP/1.1 200 OK") {
+        $result->status = "success";
+        foreach (explode("\n", $body) as $line) {
+          if ($line) {
+            list($key, $val) = explode("=", $line, 2);
+            $result->data[$key] = $val;
+          }
+        }
+      } else {
+        $result->status = "error";
+      }
+    } catch (Exception $e) {
+      Kohana_Log::add("error",
+                      sprintf("%s in %s at line %s:\n%s", $e->getMessage(), $e->getFile(),
+                              $e->getLine(), $e->getTraceAsString()));
+    }
+    $result->timestamp = time();
+    Cache::instance()->set("upgrade_checker_version_info", serialize($result), null, 86400 * 365);
+  }
+
+  static function check_for_upgrade() {
+    $version_info = upgrade_checker::version_info();
+    $upgrade_available = false;
+    if ($version_info) {
+      if (gallery::RELEASE_CHANNEL == "release") {
+        if (version_compare($version_info->data["release_version"], gallery::VERSION, ">")) {
+          site_status::warning(
+            t("A newer version of Gallery is available! <a href=\"%upgrade-url\">Upgrade now</a> to version %version or <a href=\"%hide-url\">wait until later</a>.",
+              array("version" => $version_info->data["release_version"],
+                    "upgrade-url" => $version_info->data["release_upgrade_url"],
+                    "hide-url" => url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__"))),
+            "upgrade_checker");
+          $upgrade_available = true;
+        }
+      } else {
+        $branch = gallery::RELEASE_BRANCH;
+        if (isset($version_info->data["{$branch}_build_number"]) &&
+            version_compare($version_info->data["{$branch}_build_number"],
+                            gallery::build_number(), ">")) {
+          site_status::warning(
+            t("A newer version of Gallery is available! <a href=\"%upgrade-url\">Upgrade now</a> to version %version (build %build on branch %branch) or <a href=\"%hide-url\">wait until later</a>.",
+              array("version" => $version_info->data["{$branch}_version"],
+                    "upgrade-url" => $version_info->data["{$branch}_upgrade_url"],
+                    "build" => $version_info->data["{$branch}_build_number"],
+                    "branch" => $branch,
+                    "hide-url" => url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__"))),
+            "upgrade_checker");
+          $upgrade_available = true;
+        }
+      }
+    }
+
+    if (!$upgrade_available) {
+      site_status::clear("upgrade_checker");
+    }
+  }
+}
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index b79df7be..4c0c8866 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 45
+version = 46
diff --git a/modules/gallery/views/upgrade_checker_block.html.php b/modules/gallery/views/upgrade_checker_block.html.php
new file mode 100644
index 00000000..30e18305
--- /dev/null
+++ b/modules/gallery/views/upgrade_checker_block.html.php
@@ -0,0 +1,45 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<p>
+  <?= t("Gallery can check to see if there is a new version available for you to use.  It is a good idea to upgrade your Gallery to get the latest features and security fixes.  Your privacy is important so no information about your Gallery is shared during this process.  You can disable this feature below.") ?>
+</p>
+
+<p>
+  <? if (gallery::RELEASE_CHANNEL == "release"): ?>
+  <?= t("You are using the official Gallery %version release, code named <i>%code_name</i>.", array("version" => gallery::VERSION, "code_name" => gallery::CODE_NAME)) ?>
+  <? else: ?>
+  <?= t("You are using an experimental snapshot of Gallery %version (build %build_number on branch %branch).", array("version" => gallery::VERSION, "branch" => gallery::RELEASE_BRANCH, "build_number" => gallery::build_number())) ?>
+  <? endif ?>
+</p>
+
+<p>
+  <a class="g-button ui-state-default ui-corner-all"
+     href="<?= url::site("admin/upgrade_checker/check_now?csrf=$csrf") ?>">
+    <?= t("Check now") ?>
+  </a>
+  <? if ($auto_check_enabled): ?>
+  <a class="g-button ui-state-default ui-corner-all"
+     href="<?= url::site("admin/upgrade_checker/set_auto/0?csrf=$csrf") ?>">
+    <?= t("Disable automatic checking") ?>
+  </a>
+  <? else: ?>
+  <a class="g-button ui-state-default ui-corner-all"
+     href="<?= url::site("admin/upgrade_checker/set_auto/1?csrf=$csrf") ?>">
+    <?= t("Enable automatic checking") ?>
+  </a>
+  <? endif ?>
+</p>
+
+<p class="g-text-small">
+  <? if ($auto_check_enabled): ?>
+  <?= t("Automatic upgrade checking is enabled.") ?>
+  <? else: ?>
+  <?= t("Automatic upgrade checking is disabled.") ?>
+  <? endif ?>
+  <? if (!$version_info): ?>
+  <?= t("No upgrade checks have been made yet.") ?>
+  <? else: ?>
+  <?= t("The last upgrade check was made on %date.",
+        array("date" => gallery::date_time($version_info->timestamp))) ?>
+  <? endif ?>
+</p>
+
-- 
cgit v1.2.3


From 167f635a6ce5a71b35450844f9b5c647aa14bcc1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 Jan 2011 23:06:19 -0800
Subject: Add arguments to random::int() to match mt_rand().  Follow on to
 cd48b89f3166e7fa732b5cb06d33fba018af9127 for #1527.

---
 modules/gallery/helpers/random.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/random.php b/modules/gallery/helpers/random.php
index a26762bd..dfc7558c 100644
--- a/modules/gallery/helpers/random.php
+++ b/modules/gallery/helpers/random.php
@@ -42,9 +42,13 @@ class random_Core {
   }
 
   /**
-   * Return a random number between 0 and mt_getrandmax()
+   * Return a random number between $min and $max.  If $min and $max are not specified,
+   * return a random number between 0 and mt_getrandmax()
    */
-  static function int() {
+  static function int($min=null, $max=null) {
+    if ($min || $max) {
+      return mt_rand($min, $max);
+    }
     return mt_rand();
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 66bb496b6c2ad9c5341644b2e303e694078374d1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 Jan 2011 23:14:57 -0800
Subject: If the logged in user is an admin and it's been more than 7 days
 since the last check and auto upgrade checking is enabled, fire off an XHR to
 check for a possible upgrade.  Finishes off #1605.

---
 modules/gallery/helpers/gallery_installer.php |  3 +++
 modules/gallery/helpers/gallery_theme.php     | 20 ++++++++++++++++++--
 modules/gallery/helpers/upgrade_checker.php   | 25 +++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 1ffe9bae..41ed1c6e 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -677,6 +677,9 @@ class gallery_installer {
       module::set_var("gallery", "upgrade_checker_auto_enabled", true);
       module::set_version("gallery", $version = 46);
     }
+
+    // Clear any upgrade check strings, we are probably up to date.
+    site_status::clear("upgrade_check");
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index d75c6fc6..a6ca5eb7 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -76,13 +76,22 @@ class gallery_theme_Core {
       $profiler = new Profiler();
       $profiler->render();
     }
+    $content = "";
     if ($session->get("l10n_mode", false)) {
-      return L10n_Client_Controller::l10n_form();
+      $content .= L10n_Client_Controller::l10n_form();
     }
 
     if ($session->get_once("after_install")) {
-      return new View("welcome_message_loader.html");
+      $content .= new View("welcome_message_loader.html");
     }
+
+    if (identity::active_user()->admin && upgrade_checker::should_auto_check()) {
+      $content .= '<script type="text/javascript">
+        $.ajax({url: "' . url::site("admin/upgrade_checker/check_now?csrf=" .
+                                    access::csrf_token()) . '"});
+        </script>';
+    }
+    return $content;
   }
 
   static function admin_page_bottom($theme) {
@@ -107,6 +116,13 @@ class gallery_theme_Core {
       setInterval("adminReauthCheck();", 60 * 1000);
       </script>';
 
+    if (upgrade_checker::should_auto_check()) {
+      $content .= '<script type="text/javascript">
+        $.ajax({url: "' . url::site("admin/upgrade_checker/check_now?csrf=" .
+                                    access::csrf_token()) . '"});
+        </script>';
+    }
+
     if ($session->get("l10n_mode", false)) {
       $content .= "\n" . L10n_Client_Controller::l10n_form();
     }
diff --git a/modules/gallery/helpers/upgrade_checker.php b/modules/gallery/helpers/upgrade_checker.php
index 9311cf4a..ef1308d7 100644
--- a/modules/gallery/helpers/upgrade_checker.php
+++ b/modules/gallery/helpers/upgrade_checker.php
@@ -19,15 +19,37 @@
  */
 class upgrade_checker_Core {
   const CHECK_URL = "http://gallery.menalto.com/versioncheck/gallery3";
+  const AUTO_CHECK_INTERVAL = 604800;  // 7 days in seconds
 
+  /**
+   * Return the last version info blob retrieved from the Gallery website or
+   * null if no checks have been performed.
+   */
   static function version_info() {
     return unserialize(Cache::instance()->get("upgrade_checker_version_info"));
   }
 
+  /**
+   * Return true if auto checking is enabled.
+   */
   static function auto_check_enabled() {
     return (bool)module::get_var("gallery", "upgrade_checker_auto_enabled");
   }
 
+  /**
+   * Return true if it's time to auto check.
+   */
+  static function should_auto_check() {
+    if (upgrade_checker::auto_check_enabled() && random::int(1, 100) == 1) {
+      $version_info = upgrade_checker::version_info();
+      return (!$version_info || (time() - $version_info->timestamp) > AUTO_CHECK_INTERVAL);
+    }
+    return false;
+  }
+
+  /**
+   * Fech version info from the Gallery website.
+   */
   static function fetch_version_info() {
     $result = new stdClass();
     try {
@@ -52,6 +74,9 @@ class upgrade_checker_Core {
     Cache::instance()->set("upgrade_checker_version_info", serialize($result), null, 86400 * 365);
   }
 
+  /**
+   * Check the latest version info blob to see if it's time for an upgrade.
+   */
   static function check_for_upgrade() {
     $version_info = upgrade_checker::version_info();
     $upgrade_available = false;
-- 
cgit v1.2.3


From 14ae5d854400d632b63a331f541f180b8d1f3ea1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 17 Jan 2011 17:07:32 -0800
Subject: Update version checking code to expect "branch_" as the prefix for
 all branch related lines.  For #1605.

---
 modules/gallery/helpers/upgrade_checker.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/upgrade_checker.php b/modules/gallery/helpers/upgrade_checker.php
index ef1308d7..0e72bb94 100644
--- a/modules/gallery/helpers/upgrade_checker.php
+++ b/modules/gallery/helpers/upgrade_checker.php
@@ -93,14 +93,14 @@ class upgrade_checker_Core {
         }
       } else {
         $branch = gallery::RELEASE_BRANCH;
-        if (isset($version_info->data["{$branch}_build_number"]) &&
-            version_compare($version_info->data["{$branch}_build_number"],
+        if (isset($version_info->data["branch_{$branch}_build_number"]) &&
+            version_compare($version_info->data["branch_{$branch}_build_number"],
                             gallery::build_number(), ">")) {
           site_status::warning(
             t("A newer version of Gallery is available! <a href=\"%upgrade-url\">Upgrade now</a> to version %version (build %build on branch %branch) or <a href=\"%hide-url\">wait until later</a>.",
-              array("version" => $version_info->data["{$branch}_version"],
-                    "upgrade-url" => $version_info->data["{$branch}_upgrade_url"],
-                    "build" => $version_info->data["{$branch}_build_number"],
+              array("version" => $version_info->data["branch_{$branch}_version"],
+                    "upgrade-url" => $version_info->data["branch_{$branch}_upgrade_url"],
+                    "build" => $version_info->data["branch_{$branch}_build_number"],
                     "branch" => $branch,
                     "hide-url" => url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__"))),
             "upgrade_checker");
-- 
cgit v1.2.3


From 29be21bb0deaf70558b1aa02a115e67daefea0bd Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 17 Jan 2011 17:27:16 -0800
Subject: Add BUILD_NUMBER to the security check in .htaccess Change
 BUILD_NUMBER to be .ini format and add a big "do not edit" comment.

---
 .htaccess                           | 2 +-
 BUILD_NUMBER                        | 7 ++++++-
 modules/gallery/helpers/gallery.php | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/.htaccess b/.htaccess
index 5a329520..771a8df0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -29,7 +29,7 @@
 # in your Apache2 config file before you uncomment this block or
 # you'll get an "Internal Server Error".
 #
-# <FilesMatch "(\.(class|fla|gitignore|inc|ini|sql|txt)|(README|LICENSE))$">
+# <FilesMatch "(\.(class|fla|gitignore|inc|ini|sql|txt)|(README|LICENSE|BUILD_NUMBER))$">
 #   Order deny,allow
 #   Deny from all
 # </FilesMatch>
diff --git a/BUILD_NUMBER b/BUILD_NUMBER
index 0691f67b..d32d51e9 100644
--- a/BUILD_NUMBER
+++ b/BUILD_NUMBER
@@ -1 +1,6 @@
-52
+; This file keeps track of the build number for the "master"
+; branch of gallery3.  It's kept up to date by an automated
+; process.  You don't need to edit it.  In fact..
+;
+;     DO NOT EDIT THIS FILE BY HAND!
+build_number=52
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 31b342db..7a60f56a 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -205,7 +205,7 @@ class gallery_Core {
    * Return the contents of the BUILD_NUMBER file, which should be a single integer.
    */
   static function build_number() {
-    $lines = file(DOCROOT . "BUILD_NUMBER", FILE_IGNORE_NEW_LINES);
-    return $lines[0];
+    $result = parse_ini_file(DOCROOT . "BUILD_NUMBER");
+    return $result["build_number"];
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 76411d7d6d481bc2ab51e24ec2dbf003f43ce40b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 17 Jan 2011 17:33:10 -0800
Subject: Rename BUILD_NUMBER to .build_number so it's not so loud.

---
 .build_number                       | 6 ++++++
 .gitattributes                      | 2 +-
 BUILD_NUMBER                        | 6 ------
 modules/gallery/helpers/gallery.php | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 .build_number
 delete mode 100644 BUILD_NUMBER

(limited to 'modules')

diff --git a/.build_number b/.build_number
new file mode 100644
index 00000000..d32d51e9
--- /dev/null
+++ b/.build_number
@@ -0,0 +1,6 @@
+; This file keeps track of the build number for the "master"
+; branch of gallery3.  It's kept up to date by an automated
+; process.  You don't need to edit it.  In fact..
+;
+;     DO NOT EDIT THIS FILE BY HAND!
+build_number=52
diff --git a/.gitattributes b/.gitattributes
index 9122eeb1..fdf9d072 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-BUILD_NUMBER	merge=merge-keep-ours
+.build_number	merge=merge-keep-ours
 
diff --git a/BUILD_NUMBER b/BUILD_NUMBER
deleted file mode 100644
index d32d51e9..00000000
--- a/BUILD_NUMBER
+++ /dev/null
@@ -1,6 +0,0 @@
-; This file keeps track of the build number for the "master"
-; branch of gallery3.  It's kept up to date by an automated
-; process.  You don't need to edit it.  In fact..
-;
-;     DO NOT EDIT THIS FILE BY HAND!
-build_number=52
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 7a60f56a..ad9f40e8 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -202,10 +202,10 @@ class gallery_Core {
   }
 
   /**
-   * Return the contents of the BUILD_NUMBER file, which should be a single integer.
+   * Return the contents of the .build_number file, which should be a single integer.
    */
   static function build_number() {
-    $result = parse_ini_file(DOCROOT . "BUILD_NUMBER");
+    $result = parse_ini_file(DOCROOT . ".build_number");
     return $result["build_number"];
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 45caba09f81e53dfa4264bc74c4e6ed7935bd5f9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 17 Jan 2011 20:03:11 -0800
Subject: Move the code that clears the upgrade_check site status message to
 the upgrader so that it's cleared any time we run an upgrade.  Part of

---
 modules/gallery/controllers/upgrader.php      | 3 +++
 modules/gallery/helpers/gallery_installer.php | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index 66c71648..0932090f 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -94,6 +94,9 @@ class Upgrader_Controller extends Controller {
     // If the upgrade failed, this will get recreated
     site_status::clear("upgrade_now");
 
+    // Clear any upgrade check strings, we are probably up to date.
+    site_status::clear("upgrade_check");
+
     if (php_sapi_name() == "cli") {
       if ($failed) {
         print "Upgrade completed ** WITH FAILURES **\n";
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 41ed1c6e..1ffe9bae 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -677,9 +677,6 @@ class gallery_installer {
       module::set_var("gallery", "upgrade_checker_auto_enabled", true);
       module::set_version("gallery", $version = 46);
     }
-
-    // Clear any upgrade check strings, we are probably up to date.
-    site_status::clear("upgrade_check");
   }
 
   static function uninstall() {
-- 
cgit v1.2.3


From 20ae106c22b9528d34fb85d09a7ab542e6c6c880 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 17 Jan 2011 21:15:33 -0800
Subject: Display a message in the "Check for Gallery upgrades" block when
 there's a newer version available, even if the user has dismissed the site
 status message.  #1605.

---
 .../gallery/controllers/admin_upgrade_checker.php  |  9 ++++++-
 modules/gallery/helpers/gallery_block.php          |  1 +
 modules/gallery/helpers/upgrade_checker.php        | 31 +++++++---------------
 .../gallery/views/upgrade_checker_block.html.php   |  8 ++++++
 themes/admin_wind/css/screen.css                   |  2 +-
 5 files changed, 27 insertions(+), 24 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_upgrade_checker.php b/modules/gallery/controllers/admin_upgrade_checker.php
index 4b1467cd..456a982c 100644
--- a/modules/gallery/controllers/admin_upgrade_checker.php
+++ b/modules/gallery/controllers/admin_upgrade_checker.php
@@ -21,7 +21,14 @@ class Admin_Upgrade_Checker_Controller extends Admin_Controller {
   function check_now() {
     access::verify_csrf();
     upgrade_checker::fetch_version_info();
-    upgrade_checker::check_for_upgrade();
+    $message = upgrade_checker::get_upgrade_message();
+    if ($message) {
+      $message .= " <a href=" . url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__")
+        . ">[x]</a>";
+      site_status::info($message, "upgrade_checker");
+    } else {
+      site_status::clear("upgrade_checker");
+    }
     url::redirect("admin/dashboard");
   }
 
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index 2189a710..fed786cc 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -111,6 +111,7 @@ class gallery_block_Core {
       $block->content = new View("upgrade_checker_block.html");
       $block->content->version_info = upgrade_checker::version_info();
       $block->content->auto_check_enabled = upgrade_checker::auto_check_enabled();
+      $block->content->new_version = upgrade_checker::get_upgrade_message();
     }
     return $block;
   }
diff --git a/modules/gallery/helpers/upgrade_checker.php b/modules/gallery/helpers/upgrade_checker.php
index 0e72bb94..f92203c8 100644
--- a/modules/gallery/helpers/upgrade_checker.php
+++ b/modules/gallery/helpers/upgrade_checker.php
@@ -77,40 +77,27 @@ class upgrade_checker_Core {
   /**
    * Check the latest version info blob to see if it's time for an upgrade.
    */
-  static function check_for_upgrade() {
+  static function get_upgrade_message() {
     $version_info = upgrade_checker::version_info();
-    $upgrade_available = false;
     if ($version_info) {
       if (gallery::RELEASE_CHANNEL == "release") {
         if (version_compare($version_info->data["release_version"], gallery::VERSION, ">")) {
-          site_status::warning(
-            t("A newer version of Gallery is available! <a href=\"%upgrade-url\">Upgrade now</a> to version %version or <a href=\"%hide-url\">wait until later</a>.",
-              array("version" => $version_info->data["release_version"],
-                    "upgrade-url" => $version_info->data["release_upgrade_url"],
-                    "hide-url" => url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__"))),
-            "upgrade_checker");
-          $upgrade_available = true;
+          return t("A newer version of Gallery is available! <a href=\"%upgrade-url\">Upgrade now</a> to version %version",
+                   array("version" => $version_info->data["release_version"],
+                         "upgrade-url" => $version_info->data["release_upgrade_url"]));
         }
       } else {
         $branch = gallery::RELEASE_BRANCH;
         if (isset($version_info->data["branch_{$branch}_build_number"]) &&
             version_compare($version_info->data["branch_{$branch}_build_number"],
                             gallery::build_number(), ">")) {
-          site_status::warning(
-            t("A newer version of Gallery is available! <a href=\"%upgrade-url\">Upgrade now</a> to version %version (build %build on branch %branch) or <a href=\"%hide-url\">wait until later</a>.",
-              array("version" => $version_info->data["branch_{$branch}_version"],
-                    "upgrade-url" => $version_info->data["branch_{$branch}_upgrade_url"],
-                    "build" => $version_info->data["branch_{$branch}_build_number"],
-                    "branch" => $branch,
-                    "hide-url" => url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__"))),
-            "upgrade_checker");
-          $upgrade_available = true;
+          return t("A newer version of Gallery is available! <a href=\"%upgrade-url\">Upgrade now</a> to version %version (build %build on branch %branch)",
+                   array("version" => $version_info->data["branch_{$branch}_version"],
+                         "upgrade-url" => $version_info->data["branch_{$branch}_upgrade_url"],
+                         "build" => $version_info->data["branch_{$branch}_build_number"],
+                         "branch" => $branch));
         }
       }
     }
-
-    if (!$upgrade_available) {
-      site_status::clear("upgrade_checker");
-    }
   }
 }
diff --git a/modules/gallery/views/upgrade_checker_block.html.php b/modules/gallery/views/upgrade_checker_block.html.php
index 30e18305..b04887b2 100644
--- a/modules/gallery/views/upgrade_checker_block.html.php
+++ b/modules/gallery/views/upgrade_checker_block.html.php
@@ -11,6 +11,14 @@
   <? endif ?>
 </p>
 
+<? if ($new_version): ?>
+<ul class="g-message-block">
+  <li class="g-message g-info">
+    <?= $new_version ?>
+  </li>
+</ul>
+<? endif ?>
+
 <p>
   <a class="g-button ui-state-default ui-corner-all"
      href="<?= url::site("admin/upgrade_checker/check_now?csrf=$csrf") ?>">
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 7d491cb7..a5376ff6 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -888,10 +888,10 @@ button {
   background-position: .4em .3em;
   border: 1px solid #ccc;
   padding: 0;
+  margin-bottom: 1em;
 }
 
 #g-action-status {
-  margin-bottom: 1em;
 }
 
 #g-action-status li,
-- 
cgit v1.2.3


From 83bf1d767b9dac33ca1c2f01141358cd0b657523 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 17 Jan 2011 21:18:24 -0800
Subject: Fix typo: upgrade_check -> upgrade_checker #1605.

---
 modules/gallery/controllers/upgrader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index 0932090f..6a34f19f 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -95,7 +95,7 @@ class Upgrader_Controller extends Controller {
     site_status::clear("upgrade_now");
 
     // Clear any upgrade check strings, we are probably up to date.
-    site_status::clear("upgrade_check");
+    site_status::clear("upgrade_checker");
 
     if (php_sapi_name() == "cli") {
       if ($failed) {
-- 
cgit v1.2.3


From 56e6cb998f9b2f55af88fef426f8a69cc0058cb2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 17 Jan 2011 21:37:51 -0800
Subject: Change the [x] close box to "(remind me later)".  #1605.

---
 modules/gallery/controllers/admin_upgrade_checker.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_upgrade_checker.php b/modules/gallery/controllers/admin_upgrade_checker.php
index 456a982c..366bd64e 100644
--- a/modules/gallery/controllers/admin_upgrade_checker.php
+++ b/modules/gallery/controllers/admin_upgrade_checker.php
@@ -23,8 +23,9 @@ class Admin_Upgrade_Checker_Controller extends Admin_Controller {
     upgrade_checker::fetch_version_info();
     $message = upgrade_checker::get_upgrade_message();
     if ($message) {
-      $message .= " <a href=" . url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__")
-        . ">[x]</a>";
+      $message .= t(
+        " <a href=\"%hide-url\"><i>(remind me later)</i></a>",
+        array("url" => url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__")));
       site_status::info($message, "upgrade_checker");
     } else {
       site_status::clear("upgrade_checker");
-- 
cgit v1.2.3


From f657a05d7ed21423afb925755bacbb07a1384044 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 18 Jan 2011 10:06:29 -0800
Subject: Get rid of the "organize needs rest" message when upgrading to the
 new organize; it may be hanging around from a prior version.  Reinstate the
 installer for this.  Bump organize module to v4.  Follow-on for #1584.

---
 installer/install.sql                           |  2 +-
 modules/organize/helpers/organize_installer.php | 28 +++++++++++++++++++++++++
 modules/organize/module.info                    |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 modules/organize/helpers/organize_installer.php

(limited to 'modules')

diff --git a/installer/install.sql b/installer/install.sql
index 1d2e6720..865cb2a4 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -247,7 +247,7 @@ CREATE TABLE {modules} (
 INSERT INTO {modules} VALUES (1,1,'gallery',46,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
-INSERT INTO {modules} VALUES (4,1,'organize',3,4);
+INSERT INTO {modules} VALUES (4,1,'organize',4,4);
 INSERT INTO {modules} VALUES (5,1,'info',2,5);
 INSERT INTO {modules} VALUES (6,1,'rss',1,6);
 INSERT INTO {modules} VALUES (7,1,'search',1,7);
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
new file mode 100644
index 00000000..d68bc3b6
--- /dev/null
+++ b/modules/organize/helpers/organize_installer.php
@@ -0,0 +1,28 @@
+<?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 organize_installer {
+  static function upgrade($version) {
+    if ($version < 4) {
+      // No longer necessary, make sure that it's cleared.
+      site_status::clear("organize_needs_rest");
+      module::set_version("organize", $version = 4);
+    }
+  }
+}
diff --git a/modules/organize/module.info b/modules/organize/module.info
index be0bc86d..0d16144d 100644
--- a/modules/organize/module.info
+++ b/modules/organize/module.info
@@ -1,3 +1,3 @@
 name = "Organize"
 description = "Visually rearrange and move photos in your gallery"
-version = 3
+version = 4
-- 
cgit v1.2.3


From c06017991636c21582926c0977896c63bbefd85f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 18 Jan 2011 21:22:24 -0800
Subject: Revert "Temporarily removed ref tag to get the page validated. (Was
 also pointing at a rather semi-finished looking page)"

This was breaking the tag autocomplete code, which depends on this value.

This reverts commit 5e8d92552b1384d99d5fef56333deb7eb67a8f92.
---
 modules/tag/views/tag_block.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index a6536361..813f24b5 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -22,7 +22,7 @@
     });
   });
 </script>
-<div id="g-tag-cloud">
+<div id="g-tag-cloud" ref="<?= url::site("tags") ?>">
   <?= $cloud ?>
 </div>
 <?= $form ?>
-- 
cgit v1.2.3


From b78fd8eeff0c952d48a886698153c42209eb52b9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 18 Jan 2011 21:25:58 -0800
Subject: Create a hidden anchor containing the tag cloud autocomplete url. 
 This way validates.  Fix for #1577.

---
 modules/tag/views/tag_block.html.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index 813f24b5..98fa0d4f 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $("#g-add-tag-form").ready(function() {
-    var url = $("#g-tag-cloud").attr("ref") + "/autocomplete";
+    var url = $("#g-tag-cloud-autocomplete-url").attr("href");
     $("#g-add-tag-form input:text").autocomplete(
       url, {
         max: 30,
@@ -22,7 +22,9 @@
     });
   });
 </script>
-<div id="g-tag-cloud" ref="<?= url::site("tags") ?>">
+<div id="g-tag-cloud">
+   <a id="g-tag-cloud-autocomplete-url" style="display: none"
+      href="<?= url::site("tags/autocomplete") ?>"></a>
   <?= $cloud ?>
 </div>
 <?= $form ?>
-- 
cgit v1.2.3


From 0126a0385d5a763b4920bc9ffe63ed9ec03d64f0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 19 Jan 2011 19:50:50 -0800
Subject: Fix a bug introduced in 65ff2470a505fbc18211093ac131c29b1e820c3e,
 clearly I didn't test this enough.  Further fix for #1460.

---
 modules/server_add/controllers/server_add.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 71688605..11d4cb0a 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -169,7 +169,7 @@ class Server_Add_Controller extends Admin_Controller {
 
           $child_paths = glob(preg_quote($entry->path) . "/*");
           if (!$child_paths) {
-            $child_paths = glob("$path/*");
+            $child_paths = glob("{$entry->path}/*");
           }
           foreach ($child_paths as $child_path) {
             if (!is_dir($child_path)) {
-- 
cgit v1.2.3


From 029fa606be07c6fab0c1de6326a26f0ee442523a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 20 Jan 2011 23:42:36 -0800
Subject: Fix a bug introduced in the refactor in
 65448548637f462ad17c12b149cdb2a169d07026 for #1547.  By skipping the staging
 dirs, we wind up scanning the entire filesystem because the first model is
 blank so there's no leading path before the /*.

---
 modules/server_add/controllers/server_add.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'modules')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 11d4cb0a..6639fbae 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -162,11 +162,6 @@ class Server_Add_Controller extends Admin_Controller {
           ->find();
 
         if ($entry->loaded()) {
-          // Ignore the staging directories as directories to be imported.
-          if (!empty($paths[$entry->path])) {
-            $entry->delete();
-          }
-
           $child_paths = glob(preg_quote($entry->path) . "/*");
           if (!$child_paths) {
             $child_paths = glob("{$entry->path}/*");
-- 
cgit v1.2.3


From 08c41f2976cb49b85ec896b11735edb008d53881 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 21 Jan 2011 00:07:00 -0800
Subject: Add "html_attributes" theme callback to allow modules to inject
 attributes into the <html> element, including things like namespaces.   Fixes
 #1615.

---
 modules/gallery/libraries/Admin_View.php | 1 +
 modules/gallery/libraries/Theme_View.php | 1 +
 themes/admin_wind/views/admin.html.php   | 2 +-
 themes/wind/views/page.html.php          | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 1a633a34..b5d3871e 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -86,6 +86,7 @@ class Admin_View_Core extends Gallery_View {
     case "admin_page_top":
     case "admin_head":
     case "body_attributes":
+    case "html_attributes":
       $blocks = array();
       foreach (module::active() as $module) {
         $helper_class = "{$module->name}_theme";
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 04784ca1..cdc7a7cd 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -224,6 +224,7 @@ class Theme_View_Core extends Gallery_View {
     case "head":
     case "header_bottom":
     case "header_top":
+    case "html_attributes":
     case "page_bottom":
     case "page_top":
     case "photo_blocks":
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 54b30c6f..9e011c69 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> xml:lang="en" lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <? $theme->start_combining("script,css") ?>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 441866d5..0e5bdf6b 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" <?= $theme->html_attributes() ?> xml:lang="en" lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
     <? $theme->start_combining("script,css") ?>
-- 
cgit v1.2.3


From 6b4ccc56ceabd5721c7ff996e01be719880564f9 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Fri, 21 Jan 2011 15:39:38 +0100
Subject: Fix: photos get added as albums in case only some photos are selected
 via server ad Fixes #1619

---
 modules/server_add/controllers/server_add.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 6639fbae..89a36cbe 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -95,7 +95,7 @@ class Server_Add_Controller extends Admin_Controller {
       if (server_add::is_valid_path($path)) {
         $entry = ORM::factory("server_add_entry");
         $entry->path = $path;
-        $entry->is_directory = 1;
+        $entry->is_directory = intval(is_dir($path));
         $entry->parent_id = null;
         $entry->task_id = $task->id;
         $entry->save();
-- 
cgit v1.2.3


From 423daa52d55a5298b461384baedc995eee09a0d1 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 21 Jan 2011 23:01:06 -0800
Subject: Update copyright to 2011.

---
 application/Bootstrap.php                                      | 2 +-
 application/config/config.php                                  | 2 +-
 index.php                                                      | 2 +-
 installer/cli.php                                              | 2 +-
 installer/index.php                                            | 2 +-
 installer/installer.php                                        | 2 +-
 installer/web.php                                              | 2 +-
 modules/akismet/controllers/admin_akismet.php                  | 2 +-
 modules/akismet/helpers/akismet.php                            | 2 +-
 modules/akismet/helpers/akismet_event.php                      | 2 +-
 modules/akismet/helpers/akismet_installer.php                  | 2 +-
 modules/akismet/tests/Akismet_Helper_Test.php                  | 2 +-
 modules/comment/controllers/admin_comments.php                 | 2 +-
 modules/comment/controllers/admin_manage_comments.php          | 2 +-
 modules/comment/controllers/comments.php                       | 2 +-
 modules/comment/helpers/comment.php                            | 2 +-
 modules/comment/helpers/comment_block.php                      | 2 +-
 modules/comment/helpers/comment_event.php                      | 2 +-
 modules/comment/helpers/comment_installer.php                  | 2 +-
 modules/comment/helpers/comment_rest.php                       | 2 +-
 modules/comment/helpers/comment_rss.php                        | 2 +-
 modules/comment/helpers/comment_theme.php                      | 2 +-
 modules/comment/helpers/comments_rest.php                      | 2 +-
 modules/comment/helpers/item_comments_rest.php                 | 2 +-
 modules/comment/models/comment.php                             | 2 +-
 modules/comment/tests/Comment_Event_Test.php                   | 2 +-
 modules/comment/tests/Comment_Helper_Test.php                  | 2 +-
 modules/comment/tests/Comment_Model_Test.php                   | 2 +-
 modules/digibug/config/digibug.php                             | 2 +-
 modules/digibug/controllers/admin_digibug.php                  | 2 +-
 modules/digibug/controllers/digibug.php                        | 2 +-
 modules/digibug/helpers/digibug_event.php                      | 2 +-
 modules/digibug/helpers/digibug_installer.php                  | 2 +-
 modules/digibug/helpers/digibug_theme.php                      | 2 +-
 modules/digibug/models/digibug_proxy.php                       | 2 +-
 modules/digibug/tests/Digibug_Controller_Test.php              | 2 +-
 modules/exif/controllers/exif.php                              | 2 +-
 modules/exif/helpers/exif.php                                  | 2 +-
 modules/exif/helpers/exif_event.php                            | 2 +-
 modules/exif/helpers/exif_installer.php                        | 2 +-
 modules/exif/helpers/exif_task.php                             | 2 +-
 modules/exif/helpers/exif_theme.php                            | 2 +-
 modules/exif/models/exif_key.php                               | 2 +-
 modules/exif/models/exif_record.php                            | 2 +-
 modules/exif/tests/Exif_Test.php                               | 2 +-
 modules/g2_import/controllers/admin_g2_import.php              | 2 +-
 modules/g2_import/controllers/g2.php                           | 2 +-
 modules/g2_import/helpers/g2_import.php                        | 2 +-
 modules/g2_import/helpers/g2_import_event.php                  | 2 +-
 modules/g2_import/helpers/g2_import_installer.php              | 2 +-
 modules/g2_import/helpers/g2_import_task.php                   | 2 +-
 modules/g2_import/libraries/G2_Import_Exception.php            | 2 +-
 modules/g2_import/models/g2_map.php                            | 2 +-
 modules/gallery/config/cache.php                               | 2 +-
 modules/gallery/config/cookie.php                              | 2 +-
 modules/gallery/config/database.php                            | 2 +-
 modules/gallery/config/locale.php                              | 2 +-
 modules/gallery/config/log_file.php                            | 2 +-
 modules/gallery/config/routes.php                              | 2 +-
 modules/gallery/config/session.php                             | 2 +-
 modules/gallery/config/upload.php                              | 2 +-
 modules/gallery/config/user_agents.php                         | 2 +-
 modules/gallery/controllers/admin.php                          | 2 +-
 modules/gallery/controllers/admin_advanced_settings.php        | 2 +-
 modules/gallery/controllers/admin_dashboard.php                | 2 +-
 modules/gallery/controllers/admin_graphics.php                 | 2 +-
 modules/gallery/controllers/admin_languages.php                | 2 +-
 modules/gallery/controllers/admin_maintenance.php              | 2 +-
 modules/gallery/controllers/admin_modules.php                  | 2 +-
 modules/gallery/controllers/admin_sidebar.php                  | 2 +-
 modules/gallery/controllers/admin_theme_options.php            | 2 +-
 modules/gallery/controllers/admin_themes.php                   | 2 +-
 modules/gallery/controllers/admin_upgrade_checker.php          | 2 +-
 modules/gallery/controllers/albums.php                         | 2 +-
 modules/gallery/controllers/combined.php                       | 2 +-
 modules/gallery/controllers/file_proxy.php                     | 2 +-
 modules/gallery/controllers/items.php                          | 2 +-
 modules/gallery/controllers/l10n_client.php                    | 2 +-
 modules/gallery/controllers/login.php                          | 2 +-
 modules/gallery/controllers/logout.php                         | 2 +-
 modules/gallery/controllers/movies.php                         | 2 +-
 modules/gallery/controllers/packager.php                       | 2 +-
 modules/gallery/controllers/permissions.php                    | 2 +-
 modules/gallery/controllers/photos.php                         | 2 +-
 modules/gallery/controllers/quick.php                          | 2 +-
 modules/gallery/controllers/reauthenticate.php                 | 2 +-
 modules/gallery/controllers/upgrader.php                       | 2 +-
 modules/gallery/controllers/uploader.php                       | 2 +-
 modules/gallery/controllers/user_profile.php                   | 2 +-
 modules/gallery/controllers/welcome_message.php                | 2 +-
 modules/gallery/helpers/MY_html.php                            | 2 +-
 modules/gallery/helpers/MY_num.php                             | 2 +-
 modules/gallery/helpers/MY_remote.php                          | 2 +-
 modules/gallery/helpers/MY_url.php                             | 2 +-
 modules/gallery/helpers/access.php                             | 2 +-
 modules/gallery/helpers/album.php                              | 2 +-
 modules/gallery/helpers/auth.php                               | 2 +-
 modules/gallery/helpers/batch.php                              | 2 +-
 modules/gallery/helpers/block_manager.php                      | 2 +-
 modules/gallery/helpers/data_rest.php                          | 2 +-
 modules/gallery/helpers/dir.php                                | 2 +-
 modules/gallery/helpers/gallery.php                            | 2 +-
 modules/gallery/helpers/gallery_block.php                      | 2 +-
 modules/gallery/helpers/gallery_error.php                      | 2 +-
 modules/gallery/helpers/gallery_event.php                      | 2 +-
 modules/gallery/helpers/gallery_graphics.php                   | 2 +-
 modules/gallery/helpers/gallery_installer.php                  | 2 +-
 modules/gallery/helpers/gallery_rss.php                        | 2 +-
 modules/gallery/helpers/gallery_task.php                       | 2 +-
 modules/gallery/helpers/gallery_theme.php                      | 2 +-
 modules/gallery/helpers/graphics.php                           | 2 +-
 modules/gallery/helpers/identity.php                           | 2 +-
 modules/gallery/helpers/item.php                               | 2 +-
 modules/gallery/helpers/item_rest.php                          | 2 +-
 modules/gallery/helpers/items_rest.php                         | 2 +-
 modules/gallery/helpers/json.php                               | 2 +-
 modules/gallery/helpers/l10n_client.php                        | 2 +-
 modules/gallery/helpers/l10n_scanner.php                       | 2 +-
 modules/gallery/helpers/locales.php                            | 2 +-
 modules/gallery/helpers/log.php                                | 2 +-
 modules/gallery/helpers/message.php                            | 2 +-
 modules/gallery/helpers/model_cache.php                        | 2 +-
 modules/gallery/helpers/module.php                             | 2 +-
 modules/gallery/helpers/movie.php                              | 2 +-
 modules/gallery/helpers/photo.php                              | 2 +-
 modules/gallery/helpers/random.php                             | 2 +-
 modules/gallery/helpers/site_status.php                        | 2 +-
 modules/gallery/helpers/system.php                             | 2 +-
 modules/gallery/helpers/task.php                               | 2 +-
 modules/gallery/helpers/theme.php                              | 2 +-
 modules/gallery/helpers/tree_rest.php                          | 2 +-
 modules/gallery/helpers/upgrade_checker.php                    | 2 +-
 modules/gallery/helpers/user_profile.php                       | 2 +-
 modules/gallery/helpers/xml.php                                | 2 +-
 modules/gallery/hooks/init_gallery.php                         | 2 +-
 modules/gallery/libraries/Admin_View.php                       | 2 +-
 modules/gallery/libraries/Block.php                            | 2 +-
 modules/gallery/libraries/Form_Script.php                      | 2 +-
 modules/gallery/libraries/Form_Uploadify.php                   | 2 +-
 modules/gallery/libraries/Form_Uploadify_buttons.php           | 2 +-
 modules/gallery/libraries/Gallery_I18n.php                     | 2 +-
 modules/gallery/libraries/Gallery_View.php                     | 2 +-
 modules/gallery/libraries/IdentityProvider.php                 | 2 +-
 modules/gallery/libraries/InPlaceEdit.php                      | 2 +-
 modules/gallery/libraries/MY_Database.php                      | 2 +-
 modules/gallery/libraries/MY_Forge.php                         | 2 +-
 modules/gallery/libraries/MY_Input.php                         | 2 +-
 modules/gallery/libraries/MY_Kohana_Exception.php              | 2 +-
 modules/gallery/libraries/MY_ORM.php                           | 2 +-
 modules/gallery/libraries/MY_Pagination.php                    | 2 +-
 modules/gallery/libraries/MY_View.php                          | 2 +-
 modules/gallery/libraries/Menu.php                             | 2 +-
 modules/gallery/libraries/ORM_MPTT.php                         | 2 +-
 modules/gallery/libraries/SafeString.php                       | 2 +-
 modules/gallery/libraries/Sendmail.php                         | 2 +-
 modules/gallery/libraries/Task_Definition.php                  | 2 +-
 modules/gallery/libraries/Theme_View.php                       | 2 +-
 modules/gallery/libraries/drivers/Cache/Database.php           | 2 +-
 modules/gallery/libraries/drivers/IdentityProvider.php         | 2 +-
 modules/gallery/models/access_cache.php                        | 2 +-
 modules/gallery/models/access_intent.php                       | 2 +-
 modules/gallery/models/cache.php                               | 2 +-
 modules/gallery/models/failed_auth.php                         | 2 +-
 modules/gallery/models/graphics_rule.php                       | 2 +-
 modules/gallery/models/incoming_translation.php                | 2 +-
 modules/gallery/models/item.php                                | 2 +-
 modules/gallery/models/log.php                                 | 2 +-
 modules/gallery/models/message.php                             | 2 +-
 modules/gallery/models/module.php                              | 2 +-
 modules/gallery/models/outgoing_translation.php                | 2 +-
 modules/gallery/models/permission.php                          | 2 +-
 modules/gallery/models/task.php                                | 2 +-
 modules/gallery/models/theme.php                               | 2 +-
 modules/gallery/models/var.php                                 | 2 +-
 modules/gallery/tests/Access_Helper_Test.php                   | 2 +-
 modules/gallery/tests/Albums_Controller_Test.php               | 2 +-
 modules/gallery/tests/Cache_Test.php                           | 2 +-
 modules/gallery/tests/Controller_Auth_Test.php                 | 2 +-
 modules/gallery/tests/Database_Test.php                        | 2 +-
 modules/gallery/tests/Dir_Helper_Test.php                      | 2 +-
 modules/gallery/tests/DrawForm_Test.php                        | 2 +-
 modules/gallery/tests/File_Structure_Test.php                  | 4 ++--
 modules/gallery/tests/Gallery_Filters.php                      | 2 +-
 modules/gallery/tests/Gallery_I18n_Test.php                    | 2 +-
 modules/gallery/tests/Gallery_Installer_Test.php               | 2 +-
 modules/gallery/tests/Html_Helper_Test.php                     | 2 +-
 modules/gallery/tests/Input_Library_Test.php                   | 2 +-
 modules/gallery/tests/Item_Helper_Test.php                     | 2 +-
 modules/gallery/tests/Item_Model_Test.php                      | 2 +-
 modules/gallery/tests/Item_Rest_Helper_Test.php                | 2 +-
 modules/gallery/tests/Items_Rest_Helper_Test.php               | 2 +-
 modules/gallery/tests/Kohana_Exception_Test.php                | 2 +-
 modules/gallery/tests/Locales_Helper_Test.php                  | 2 +-
 modules/gallery/tests/Menu_Test.php                            | 2 +-
 modules/gallery/tests/ORM_MPTT_Test.php                        | 2 +-
 modules/gallery/tests/Photos_Controller_Test.php               | 2 +-
 modules/gallery/tests/SafeString_Test.php                      | 2 +-
 modules/gallery/tests/Sendmail_Test.php                        | 2 +-
 modules/gallery/tests/Url_Security_Test.php                    | 2 +-
 modules/gallery/tests/Var_Test.php                             | 2 +-
 modules/gallery/tests/Xss_Security_Test.php                    | 2 +-
 modules/gallery_unit_test/controllers/gallery_unit_test.php    | 2 +-
 modules/gallery_unit_test/helpers/MY_request.php               | 2 +-
 modules/gallery_unit_test/helpers/test.php                     | 2 +-
 modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php | 2 +-
 modules/image_block/helpers/image_block_block.php              | 2 +-
 modules/image_block/helpers/image_block_installer.php          | 2 +-
 modules/info/helpers/info_block.php                            | 2 +-
 modules/info/helpers/info_installer.php                        | 2 +-
 modules/info/helpers/info_theme.php                            | 2 +-
 modules/kohana23_compat/config/pagination.php                  | 2 +-
 modules/kohana23_compat/libraries/MY_Database_Builder.php      | 2 +-
 modules/kohana23_compat/libraries/Pagination.php               | 2 +-
 modules/notification/controllers/notification.php              | 2 +-
 modules/notification/helpers/notification.php                  | 2 +-
 modules/notification/helpers/notification_event.php            | 2 +-
 modules/notification/helpers/notification_installer.php        | 2 +-
 modules/notification/models/pending_notification.php           | 2 +-
 modules/notification/models/subscription.php                   | 2 +-
 modules/organize/controllers/organize.php                      | 2 +-
 modules/organize/helpers/organize_event.php                    | 2 +-
 modules/organize/helpers/organize_installer.php                | 2 +-
 modules/recaptcha/controllers/admin_recaptcha.php              | 2 +-
 modules/recaptcha/helpers/recaptcha.php                        | 2 +-
 modules/recaptcha/helpers/recaptcha_event.php                  | 2 +-
 modules/recaptcha/helpers/recaptcha_installer.php              | 2 +-
 modules/recaptcha/helpers/recaptcha_theme.php                  | 2 +-
 modules/recaptcha/libraries/Form_Recaptcha.php                 | 2 +-
 modules/rest/controllers/rest.php                              | 2 +-
 modules/rest/helpers/registry_rest.php                         | 2 +-
 modules/rest/helpers/rest.php                                  | 2 +-
 modules/rest/helpers/rest_event.php                            | 2 +-
 modules/rest/helpers/rest_installer.php                        | 2 +-
 modules/rest/libraries/Rest_Exception.php                      | 2 +-
 modules/rest/models/user_access_key.php                        | 2 +-
 modules/rest/tests/Rest_Controller_Test.php                    | 2 +-
 modules/rss/controllers/rss.php                                | 2 +-
 modules/rss/helpers/rss.php                                    | 2 +-
 modules/rss/helpers/rss_block.php                              | 2 +-
 modules/search/controllers/search.php                          | 2 +-
 modules/search/helpers/search.php                              | 2 +-
 modules/search/helpers/search_event.php                        | 2 +-
 modules/search/helpers/search_installer.php                    | 2 +-
 modules/search/helpers/search_task.php                         | 2 +-
 modules/search/helpers/search_theme.php                        | 2 +-
 modules/search/models/search_record.php                        | 2 +-
 modules/server_add/controllers/admin_server_add.php            | 2 +-
 modules/server_add/controllers/server_add.php                  | 2 +-
 modules/server_add/helpers/server_add.php                      | 2 +-
 modules/server_add/helpers/server_add_event.php                | 2 +-
 modules/server_add/helpers/server_add_installer.php            | 2 +-
 modules/server_add/helpers/server_add_theme.php                | 2 +-
 modules/server_add/models/server_add_entry.php                 | 2 +-
 modules/slideshow/helpers/slideshow_event.php                  | 2 +-
 modules/slideshow/helpers/slideshow_installer.php              | 2 +-
 modules/slideshow/helpers/slideshow_theme.php                  | 2 +-
 modules/tag/controllers/admin_tags.php                         | 2 +-
 modules/tag/controllers/tag.php                                | 2 +-
 modules/tag/controllers/tags.php                               | 2 +-
 modules/tag/helpers/item_tags_rest.php                         | 2 +-
 modules/tag/helpers/tag.php                                    | 2 +-
 modules/tag/helpers/tag_block.php                              | 2 +-
 modules/tag/helpers/tag_event.php                              | 2 +-
 modules/tag/helpers/tag_installer.php                          | 2 +-
 modules/tag/helpers/tag_item_rest.php                          | 2 +-
 modules/tag/helpers/tag_items_rest.php                         | 2 +-
 modules/tag/helpers/tag_rest.php                               | 2 +-
 modules/tag/helpers/tag_rss.php                                | 2 +-
 modules/tag/helpers/tag_task.php                               | 2 +-
 modules/tag/helpers/tag_theme.php                              | 2 +-
 modules/tag/helpers/tags_rest.php                              | 2 +-
 modules/tag/models/tag.php                                     | 2 +-
 modules/tag/tests/Tag_Item_Rest_Helper_Test.php                | 2 +-
 modules/tag/tests/Tag_Rest_Helper_Test.php                     | 2 +-
 modules/tag/tests/Tag_Test.php                                 | 2 +-
 modules/tag/tests/Tags_Rest_Helper_Test.php                    | 2 +-
 modules/user/config/identity.php                               | 2 +-
 modules/user/controllers/admin_users.php                       | 2 +-
 modules/user/controllers/password.php                          | 2 +-
 modules/user/controllers/users.php                             | 2 +-
 modules/user/helpers/group.php                                 | 2 +-
 modules/user/helpers/user.php                                  | 2 +-
 modules/user/helpers/user_event.php                            | 2 +-
 modules/user/helpers/user_installer.php                        | 2 +-
 modules/user/helpers/user_theme.php                            | 2 +-
 modules/user/libraries/drivers/IdentityProvider/Gallery.php    | 2 +-
 modules/user/models/group.php                                  | 2 +-
 modules/user/models/user.php                                   | 2 +-
 modules/user/tests/No_Direct_ORM_Access_Test.php               | 2 +-
 modules/user/tests/User_Groups_Test.php                        | 2 +-
 modules/user/tests/User_Installer_Test.php                     | 2 +-
 modules/watermark/controllers/admin_watermarks.php             | 2 +-
 modules/watermark/helpers/watermark.php                        | 2 +-
 modules/watermark/helpers/watermark_event.php                  | 2 +-
 modules/watermark/helpers/watermark_installer.php              | 2 +-
 295 files changed, 296 insertions(+), 296 deletions(-)

(limited to 'modules')

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index fbd83ce1..ff021fd5 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/application/config/config.php b/application/config/config.php
index 3b92ac73..e595231f 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/index.php b/index.php
index 8115ac13..ea7d28a5 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/installer/cli.php b/installer/cli.php
index fe82395a..e02c8658 100644
--- a/installer/cli.php
+++ b/installer/cli.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/installer/index.php b/installer/index.php
index fea9527a..5ac23cfb 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/installer/installer.php b/installer/installer.php
index 1771e3aa..c23d918f 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/installer/web.php b/installer/web.php
index 51f0f8aa..0df9b69c 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/akismet/controllers/admin_akismet.php b/modules/akismet/controllers/admin_akismet.php
index af98536a..e2e1d91b 100644
--- a/modules/akismet/controllers/admin_akismet.php
+++ b/modules/akismet/controllers/admin_akismet.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/akismet/helpers/akismet.php b/modules/akismet/helpers/akismet.php
index 3a7fc105..f3a015dc 100644
--- a/modules/akismet/helpers/akismet.php
+++ b/modules/akismet/helpers/akismet.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/akismet/helpers/akismet_event.php b/modules/akismet/helpers/akismet_event.php
index 4bfb0b8b..ae76aeb5 100644
--- a/modules/akismet/helpers/akismet_event.php
+++ b/modules/akismet/helpers/akismet_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/akismet/helpers/akismet_installer.php b/modules/akismet/helpers/akismet_installer.php
index 63205d5a..74022995 100644
--- a/modules/akismet/helpers/akismet_installer.php
+++ b/modules/akismet/helpers/akismet_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/akismet/tests/Akismet_Helper_Test.php b/modules/akismet/tests/Akismet_Helper_Test.php
index 5181fec4..9f68e3a4 100644
--- a/modules/akismet/tests/Akismet_Helper_Test.php
+++ b/modules/akismet/tests/Akismet_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index fda3873c..1e24ac9b 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/controllers/admin_manage_comments.php b/modules/comment/controllers/admin_manage_comments.php
index ec876fc4..9bd1d7f6 100644
--- a/modules/comment/controllers/admin_manage_comments.php
+++ b/modules/comment/controllers/admin_manage_comments.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index ded9743e..04660ec0 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 958f2f3d..428b11d6 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php
index 641395e1..dee57b2b 100644
--- a/modules/comment/helpers/comment_block.php
+++ b/modules/comment/helpers/comment_block.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 33d4cd05..22550c75 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/helpers/comment_installer.php b/modules/comment/helpers/comment_installer.php
index 18d51758..48b6ee21 100644
--- a/modules/comment/helpers/comment_installer.php
+++ b/modules/comment/helpers/comment_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/helpers/comment_rest.php b/modules/comment/helpers/comment_rest.php
index bd3011cc..c2c582c7 100644
--- a/modules/comment/helpers/comment_rest.php
+++ b/modules/comment/helpers/comment_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index cc4180bf..d04e74cf 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index 9cc93fa1..398f84b4 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/helpers/comments_rest.php b/modules/comment/helpers/comments_rest.php
index 1cedb80b..28a675ee 100644
--- a/modules/comment/helpers/comments_rest.php
+++ b/modules/comment/helpers/comments_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/helpers/item_comments_rest.php b/modules/comment/helpers/item_comments_rest.php
index 1fe5c35f..3c6dacab 100644
--- a/modules/comment/helpers/item_comments_rest.php
+++ b/modules/comment/helpers/item_comments_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/models/comment.php b/modules/comment/models/comment.php
index 8f860a7b..d5e952eb 100644
--- a/modules/comment/models/comment.php
+++ b/modules/comment/models/comment.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/tests/Comment_Event_Test.php b/modules/comment/tests/Comment_Event_Test.php
index 7cae9297..3745ba3b 100644
--- a/modules/comment/tests/Comment_Event_Test.php
+++ b/modules/comment/tests/Comment_Event_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/tests/Comment_Helper_Test.php b/modules/comment/tests/Comment_Helper_Test.php
index 313764a8..2a5c29c4 100644
--- a/modules/comment/tests/Comment_Helper_Test.php
+++ b/modules/comment/tests/Comment_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/comment/tests/Comment_Model_Test.php b/modules/comment/tests/Comment_Model_Test.php
index ee4d3d3c..15451e0e 100644
--- a/modules/comment/tests/Comment_Model_Test.php
+++ b/modules/comment/tests/Comment_Model_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/digibug/config/digibug.php b/modules/digibug/config/digibug.php
index 01aa1e00..4033b1f2 100644
--- a/modules/digibug/config/digibug.php
+++ b/modules/digibug/config/digibug.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/digibug/controllers/admin_digibug.php b/modules/digibug/controllers/admin_digibug.php
index f3a0f8f0..6caeec38 100644
--- a/modules/digibug/controllers/admin_digibug.php
+++ b/modules/digibug/controllers/admin_digibug.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index c48e3e87..4acb6513 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/digibug/helpers/digibug_event.php b/modules/digibug/helpers/digibug_event.php
index 413bf586..20ba6951 100644
--- a/modules/digibug/helpers/digibug_event.php
+++ b/modules/digibug/helpers/digibug_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/digibug/helpers/digibug_installer.php b/modules/digibug/helpers/digibug_installer.php
index a72e9ff3..85c03855 100644
--- a/modules/digibug/helpers/digibug_installer.php
+++ b/modules/digibug/helpers/digibug_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/digibug/helpers/digibug_theme.php b/modules/digibug/helpers/digibug_theme.php
index 1106910e..f2944500 100644
--- a/modules/digibug/helpers/digibug_theme.php
+++ b/modules/digibug/helpers/digibug_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/digibug/models/digibug_proxy.php b/modules/digibug/models/digibug_proxy.php
index 2bff6ddb..73c633b3 100644
--- a/modules/digibug/models/digibug_proxy.php
+++ b/modules/digibug/models/digibug_proxy.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/digibug/tests/Digibug_Controller_Test.php b/modules/digibug/tests/Digibug_Controller_Test.php
index d331b0ae..6021564a 100644
--- a/modules/digibug/tests/Digibug_Controller_Test.php
+++ b/modules/digibug/tests/Digibug_Controller_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/exif/controllers/exif.php b/modules/exif/controllers/exif.php
index 2fe875e3..2336a36d 100644
--- a/modules/exif/controllers/exif.php
+++ b/modules/exif/controllers/exif.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index aa77b42e..1cdf7d34 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/exif/helpers/exif_event.php b/modules/exif/helpers/exif_event.php
index e85aa5bd..e594c765 100644
--- a/modules/exif/helpers/exif_event.php
+++ b/modules/exif/helpers/exif_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/exif/helpers/exif_installer.php b/modules/exif/helpers/exif_installer.php
index 6567600e..76aa473f 100644
--- a/modules/exif/helpers/exif_installer.php
+++ b/modules/exif/helpers/exif_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/exif/helpers/exif_task.php b/modules/exif/helpers/exif_task.php
index 5963d03f..528e1aa2 100644
--- a/modules/exif/helpers/exif_task.php
+++ b/modules/exif/helpers/exif_task.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/exif/helpers/exif_theme.php b/modules/exif/helpers/exif_theme.php
index dc891fd3..acbbe496 100644
--- a/modules/exif/helpers/exif_theme.php
+++ b/modules/exif/helpers/exif_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/exif/models/exif_key.php b/modules/exif/models/exif_key.php
index 8ca63ada..5a0d688f 100644
--- a/modules/exif/models/exif_key.php
+++ b/modules/exif/models/exif_key.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/exif/models/exif_record.php b/modules/exif/models/exif_record.php
index 03b8c982..53441920 100644
--- a/modules/exif/models/exif_record.php
+++ b/modules/exif/models/exif_record.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/exif/tests/Exif_Test.php b/modules/exif/tests/Exif_Test.php
index 404b6cde..1a1cd847 100644
--- a/modules/exif/tests/Exif_Test.php
+++ b/modules/exif/tests/Exif_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php
index b9427f79..33186fb5 100644
--- a/modules/g2_import/controllers/admin_g2_import.php
+++ b/modules/g2_import/controllers/admin_g2_import.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 0f51173a..6e60bed0 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 162aa67b..5fd92972 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/g2_import/helpers/g2_import_event.php b/modules/g2_import/helpers/g2_import_event.php
index d3eb001a..0e078d08 100644
--- a/modules/g2_import/helpers/g2_import_event.php
+++ b/modules/g2_import/helpers/g2_import_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/g2_import/helpers/g2_import_installer.php b/modules/g2_import/helpers/g2_import_installer.php
index 8ada4fcb..a422ed30 100644
--- a/modules/g2_import/helpers/g2_import_installer.php
+++ b/modules/g2_import/helpers/g2_import_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php
index a90b1fc3..6bda8f17 100644
--- a/modules/g2_import/helpers/g2_import_task.php
+++ b/modules/g2_import/helpers/g2_import_task.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/g2_import/libraries/G2_Import_Exception.php b/modules/g2_import/libraries/G2_Import_Exception.php
index 591f51cd..f5814ccb 100644
--- a/modules/g2_import/libraries/G2_Import_Exception.php
+++ b/modules/g2_import/libraries/G2_Import_Exception.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/g2_import/models/g2_map.php b/modules/g2_import/models/g2_map.php
index 8b96050d..7795ba6a 100644
--- a/modules/g2_import/models/g2_map.php
+++ b/modules/g2_import/models/g2_map.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/config/cache.php b/modules/gallery/config/cache.php
index a817a5da..7460d95b 100644
--- a/modules/gallery/config/cache.php
+++ b/modules/gallery/config/cache.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/config/cookie.php b/modules/gallery/config/cookie.php
index 7f6ea265..a865231c 100644
--- a/modules/gallery/config/cookie.php
+++ b/modules/gallery/config/cookie.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/config/database.php b/modules/gallery/config/database.php
index 0defd853..b9911b47 100644
--- a/modules/gallery/config/database.php
+++ b/modules/gallery/config/database.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/config/locale.php b/modules/gallery/config/locale.php
index 2047159d..0509e45f 100644
--- a/modules/gallery/config/locale.php
+++ b/modules/gallery/config/locale.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/config/log_file.php b/modules/gallery/config/log_file.php
index d154d6d4..82377f99 100644
--- a/modules/gallery/config/log_file.php
+++ b/modules/gallery/config/log_file.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/config/routes.php b/modules/gallery/config/routes.php
index 55d3cf6c..ed827f60 100644
--- a/modules/gallery/config/routes.php
+++ b/modules/gallery/config/routes.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/config/session.php b/modules/gallery/config/session.php
index a94166d3..b114a2fe 100644
--- a/modules/gallery/config/session.php
+++ b/modules/gallery/config/session.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/config/upload.php b/modules/gallery/config/upload.php
index e065ab68..70781dc0 100644
--- a/modules/gallery/config/upload.php
+++ b/modules/gallery/config/upload.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/config/user_agents.php b/modules/gallery/config/user_agents.php
index 4e82e7d4..23877c66 100644
--- a/modules/gallery/config/user_agents.php
+++ b/modules/gallery/config/user_agents.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin.php b/modules/gallery/controllers/admin.php
index 8fc5432d..b70f9634 100644
--- a/modules/gallery/controllers/admin.php
+++ b/modules/gallery/controllers/admin.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index cf197743..fd652988 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_dashboard.php b/modules/gallery/controllers/admin_dashboard.php
index 76c42612..8dfb6615 100644
--- a/modules/gallery/controllers/admin_dashboard.php
+++ b/modules/gallery/controllers/admin_dashboard.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_graphics.php b/modules/gallery/controllers/admin_graphics.php
index de98035d..a2d19d4a 100644
--- a/modules/gallery/controllers/admin_graphics.php
+++ b/modules/gallery/controllers/admin_graphics.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index f96a0eb7..2e2651fc 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 80247a0f..ce828a75 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_modules.php b/modules/gallery/controllers/admin_modules.php
index 650b7e9e..787785ea 100644
--- a/modules/gallery/controllers/admin_modules.php
+++ b/modules/gallery/controllers/admin_modules.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_sidebar.php b/modules/gallery/controllers/admin_sidebar.php
index 2e49097a..42c4bb18 100644
--- a/modules/gallery/controllers/admin_sidebar.php
+++ b/modules/gallery/controllers/admin_sidebar.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 57f32f96..055e063c 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index a88e1e89..cd8a5530 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/admin_upgrade_checker.php b/modules/gallery/controllers/admin_upgrade_checker.php
index 366bd64e..a5cfcfc8 100644
--- a/modules/gallery/controllers/admin_upgrade_checker.php
+++ b/modules/gallery/controllers/admin_upgrade_checker.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 3435465c..ccf6c1cb 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/combined.php b/modules/gallery/controllers/combined.php
index 64f8d22b..ef640bd9 100644
--- a/modules/gallery/controllers/combined.php
+++ b/modules/gallery/controllers/combined.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 98f4e839..d1e42106 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/items.php b/modules/gallery/controllers/items.php
index 39b0f638..9dd49547 100644
--- a/modules/gallery/controllers/items.php
+++ b/modules/gallery/controllers/items.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 6833a9ae..05b88829 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/login.php b/modules/gallery/controllers/login.php
index adb2e50b..b203b7d3 100644
--- a/modules/gallery/controllers/login.php
+++ b/modules/gallery/controllers/login.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/logout.php b/modules/gallery/controllers/logout.php
index 20fa8074..dd0f7ddc 100644
--- a/modules/gallery/controllers/logout.php
+++ b/modules/gallery/controllers/logout.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 7c85dd98..8e81c594 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/packager.php b/modules/gallery/controllers/packager.php
index 9da34f9c..c5335c72 100644
--- a/modules/gallery/controllers/packager.php
+++ b/modules/gallery/controllers/packager.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index fc06cb44..023610c1 100644
--- a/modules/gallery/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 4578747d..054300a1 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 3db4f5df..17abc39f 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/reauthenticate.php b/modules/gallery/controllers/reauthenticate.php
index 53a96374..ef0e4632 100644
--- a/modules/gallery/controllers/reauthenticate.php
+++ b/modules/gallery/controllers/reauthenticate.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index 6a34f19f..365ba28e 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 168e8b2d..6b1455e4 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
index 4922416c..f30fe78a 100644
--- a/modules/gallery/controllers/user_profile.php
+++ b/modules/gallery/controllers/user_profile.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/controllers/welcome_message.php b/modules/gallery/controllers/welcome_message.php
index b20f0a94..f2a5aeb1 100644
--- a/modules/gallery/controllers/welcome_message.php
+++ b/modules/gallery/controllers/welcome_message.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/MY_html.php b/modules/gallery/helpers/MY_html.php
index d15bd816..f5d36ad4 100644
--- a/modules/gallery/helpers/MY_html.php
+++ b/modules/gallery/helpers/MY_html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/MY_num.php b/modules/gallery/helpers/MY_num.php
index e784b1ac..9787044c 100644
--- a/modules/gallery/helpers/MY_num.php
+++ b/modules/gallery/helpers/MY_num.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/MY_remote.php b/modules/gallery/helpers/MY_remote.php
index a1d2a3d1..67de36ff 100644
--- a/modules/gallery/helpers/MY_remote.php
+++ b/modules/gallery/helpers/MY_remote.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 8ac26602..47898687 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 4148049a..545e544f 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 89185e50..d8e918e0 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/auth.php b/modules/gallery/helpers/auth.php
index fa6242b9..3b2318c3 100644
--- a/modules/gallery/helpers/auth.php
+++ b/modules/gallery/helpers/auth.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/batch.php b/modules/gallery/helpers/batch.php
index 72d24400..461d5b2c 100644
--- a/modules/gallery/helpers/batch.php
+++ b/modules/gallery/helpers/batch.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/block_manager.php b/modules/gallery/helpers/block_manager.php
index 4bd649c2..c385a987 100644
--- a/modules/gallery/helpers/block_manager.php
+++ b/modules/gallery/helpers/block_manager.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/data_rest.php b/modules/gallery/helpers/data_rest.php
index 791de9c0..552df34e 100644
--- a/modules/gallery/helpers/data_rest.php
+++ b/modules/gallery/helpers/data_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/dir.php b/modules/gallery/helpers/dir.php
index f66f443e..e1d11a14 100644
--- a/modules/gallery/helpers/dir.php
+++ b/modules/gallery/helpers/dir.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index ad9f40e8..1fafdef7 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index fed786cc..b9ccf25b 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/gallery_error.php b/modules/gallery/helpers/gallery_error.php
index f9bbedfc..16699f84 100644
--- a/modules/gallery/helpers/gallery_error.php
+++ b/modules/gallery/helpers/gallery_error.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 13a0bdb4..07817187 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/gallery_graphics.php b/modules/gallery/helpers/gallery_graphics.php
index 4cd7143e..e63b9336 100644
--- a/modules/gallery/helpers/gallery_graphics.php
+++ b/modules/gallery/helpers/gallery_graphics.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 1ffe9bae..01c59eaa 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index fb617934..612872e6 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 9ccff152..4a97d865 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index a6ca5eb7..c4a82390 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 18820ed7..72c563b7 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index f45f72c3..ae888d6a 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 8aa14934..1a5c631e 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/item_rest.php b/modules/gallery/helpers/item_rest.php
index a8bc36ad..2cc1b75d 100644
--- a/modules/gallery/helpers/item_rest.php
+++ b/modules/gallery/helpers/item_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/items_rest.php b/modules/gallery/helpers/items_rest.php
index 3c09faa8..80db25b8 100644
--- a/modules/gallery/helpers/items_rest.php
+++ b/modules/gallery/helpers/items_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/json.php b/modules/gallery/helpers/json.php
index a88608aa..c89b9f30 100644
--- a/modules/gallery/helpers/json.php
+++ b/modules/gallery/helpers/json.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 8fc66b68..6d580249 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/l10n_scanner.php b/modules/gallery/helpers/l10n_scanner.php
index 843c74f7..572099ea 100644
--- a/modules/gallery/helpers/l10n_scanner.php
+++ b/modules/gallery/helpers/l10n_scanner.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/locales.php b/modules/gallery/helpers/locales.php
index d06bb319..47c2f76a 100644
--- a/modules/gallery/helpers/locales.php
+++ b/modules/gallery/helpers/locales.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/log.php b/modules/gallery/helpers/log.php
index 37154522..fe491ab1 100644
--- a/modules/gallery/helpers/log.php
+++ b/modules/gallery/helpers/log.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/message.php b/modules/gallery/helpers/message.php
index 64dd703c..f5a5eede 100644
--- a/modules/gallery/helpers/message.php
+++ b/modules/gallery/helpers/message.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/model_cache.php b/modules/gallery/helpers/model_cache.php
index b39d599e..10d85f3b 100644
--- a/modules/gallery/helpers/model_cache.php
+++ b/modules/gallery/helpers/model_cache.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 6efe6162..37f7f68a 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index dd0b437e..ddced0d2 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index a38b4fb2..8913f567 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/random.php b/modules/gallery/helpers/random.php
index dfc7558c..6016df7b 100644
--- a/modules/gallery/helpers/random.php
+++ b/modules/gallery/helpers/random.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/site_status.php b/modules/gallery/helpers/site_status.php
index 85f30dba..2ba7fca5 100644
--- a/modules/gallery/helpers/site_status.php
+++ b/modules/gallery/helpers/site_status.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index 4a6a3c0f..c39c7227 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index 4dda568f..0421035f 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index 1dc1f3b6..f285834c 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/tree_rest.php b/modules/gallery/helpers/tree_rest.php
index 21928cbe..d9468ed8 100644
--- a/modules/gallery/helpers/tree_rest.php
+++ b/modules/gallery/helpers/tree_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/upgrade_checker.php b/modules/gallery/helpers/upgrade_checker.php
index f92203c8..ff65608b 100644
--- a/modules/gallery/helpers/upgrade_checker.php
+++ b/modules/gallery/helpers/upgrade_checker.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/user_profile.php b/modules/gallery/helpers/user_profile.php
index d9cc8ace..d2a7441d 100644
--- a/modules/gallery/helpers/user_profile.php
+++ b/modules/gallery/helpers/user_profile.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/helpers/xml.php b/modules/gallery/helpers/xml.php
index 2d3a2545..569ba5b2 100644
--- a/modules/gallery/helpers/xml.php
+++ b/modules/gallery/helpers/xml.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/hooks/init_gallery.php b/modules/gallery/hooks/init_gallery.php
index 10a74733..fed0ad3d 100644
--- a/modules/gallery/hooks/init_gallery.php
+++ b/modules/gallery/hooks/init_gallery.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index b5d3871e..af6c2a69 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Block.php b/modules/gallery/libraries/Block.php
index f0a1b9c6..dd650b53 100644
--- a/modules/gallery/libraries/Block.php
+++ b/modules/gallery/libraries/Block.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Form_Script.php b/modules/gallery/libraries/Form_Script.php
index a2465169..c91256fe 100644
--- a/modules/gallery/libraries/Form_Script.php
+++ b/modules/gallery/libraries/Form_Script.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Form_Uploadify.php b/modules/gallery/libraries/Form_Uploadify.php
index 79477763..27ab9684 100644
--- a/modules/gallery/libraries/Form_Uploadify.php
+++ b/modules/gallery/libraries/Form_Uploadify.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Form_Uploadify_buttons.php b/modules/gallery/libraries/Form_Uploadify_buttons.php
index eab0a700..663e989b 100644
--- a/modules/gallery/libraries/Form_Uploadify_buttons.php
+++ b/modules/gallery/libraries/Form_Uploadify_buttons.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Gallery_I18n.php b/modules/gallery/libraries/Gallery_I18n.php
index 6cb36f07..1defd123 100644
--- a/modules/gallery/libraries/Gallery_I18n.php
+++ b/modules/gallery/libraries/Gallery_I18n.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index e27dc41a..562f7929 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index 4ef07e1a..153446e6 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/InPlaceEdit.php b/modules/gallery/libraries/InPlaceEdit.php
index 42eb2ffe..88c30494 100644
--- a/modules/gallery/libraries/InPlaceEdit.php
+++ b/modules/gallery/libraries/InPlaceEdit.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index 10dd8f3c..6afe48eb 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/MY_Forge.php b/modules/gallery/libraries/MY_Forge.php
index 0e264335..57ee2f42 100644
--- a/modules/gallery/libraries/MY_Forge.php
+++ b/modules/gallery/libraries/MY_Forge.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/MY_Input.php b/modules/gallery/libraries/MY_Input.php
index 1d5949e8..6ab597cf 100644
--- a/modules/gallery/libraries/MY_Input.php
+++ b/modules/gallery/libraries/MY_Input.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/MY_Kohana_Exception.php b/modules/gallery/libraries/MY_Kohana_Exception.php
index 82899d7e..c63e8621 100644
--- a/modules/gallery/libraries/MY_Kohana_Exception.php
+++ b/modules/gallery/libraries/MY_Kohana_Exception.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 4a66cf63..d39aa4aa 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/MY_Pagination.php b/modules/gallery/libraries/MY_Pagination.php
index 4c0df1fb..e697c0bd 100644
--- a/modules/gallery/libraries/MY_Pagination.php
+++ b/modules/gallery/libraries/MY_Pagination.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index 2230203a..9eeeca0c 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 78b60196..a29a9905 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 4556273c..2a43471f 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/SafeString.php b/modules/gallery/libraries/SafeString.php
index 81a51f08..cea9f8ce 100644
--- a/modules/gallery/libraries/SafeString.php
+++ b/modules/gallery/libraries/SafeString.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Sendmail.php b/modules/gallery/libraries/Sendmail.php
index a93be736..6d4329a1 100644
--- a/modules/gallery/libraries/Sendmail.php
+++ b/modules/gallery/libraries/Sendmail.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Task_Definition.php b/modules/gallery/libraries/Task_Definition.php
index 2a78308e..5185d102 100644
--- a/modules/gallery/libraries/Task_Definition.php
+++ b/modules/gallery/libraries/Task_Definition.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index cdc7a7cd..a507e9c8 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index 2e773ca4..b61dbc17 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/libraries/drivers/IdentityProvider.php b/modules/gallery/libraries/drivers/IdentityProvider.php
index ac2473f5..98bc025c 100644
--- a/modules/gallery/libraries/drivers/IdentityProvider.php
+++ b/modules/gallery/libraries/drivers/IdentityProvider.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/access_cache.php b/modules/gallery/models/access_cache.php
index e730f25c..217dd147 100644
--- a/modules/gallery/models/access_cache.php
+++ b/modules/gallery/models/access_cache.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/access_intent.php b/modules/gallery/models/access_intent.php
index 31711014..43c46d0c 100644
--- a/modules/gallery/models/access_intent.php
+++ b/modules/gallery/models/access_intent.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/cache.php b/modules/gallery/models/cache.php
index 1c464d51..9d02a44c 100644
--- a/modules/gallery/models/cache.php
+++ b/modules/gallery/models/cache.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/failed_auth.php b/modules/gallery/models/failed_auth.php
index 649e4bc9..a418681d 100644
--- a/modules/gallery/models/failed_auth.php
+++ b/modules/gallery/models/failed_auth.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/graphics_rule.php b/modules/gallery/models/graphics_rule.php
index 09410af0..feaae3c6 100644
--- a/modules/gallery/models/graphics_rule.php
+++ b/modules/gallery/models/graphics_rule.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/incoming_translation.php b/modules/gallery/models/incoming_translation.php
index ff6a7160..07df9d2f 100644
--- a/modules/gallery/models/incoming_translation.php
+++ b/modules/gallery/models/incoming_translation.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 47b062b8..8f4bc5e4 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/log.php b/modules/gallery/models/log.php
index 5d065313..a57649ff 100644
--- a/modules/gallery/models/log.php
+++ b/modules/gallery/models/log.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/message.php b/modules/gallery/models/message.php
index 3f84efd0..9a0b99f7 100644
--- a/modules/gallery/models/message.php
+++ b/modules/gallery/models/message.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/module.php b/modules/gallery/models/module.php
index e54613d1..ca251ff5 100644
--- a/modules/gallery/models/module.php
+++ b/modules/gallery/models/module.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/outgoing_translation.php b/modules/gallery/models/outgoing_translation.php
index cd580bed..7f90a2b0 100644
--- a/modules/gallery/models/outgoing_translation.php
+++ b/modules/gallery/models/outgoing_translation.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/permission.php b/modules/gallery/models/permission.php
index 51bd95e7..52e3131e 100644
--- a/modules/gallery/models/permission.php
+++ b/modules/gallery/models/permission.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/task.php b/modules/gallery/models/task.php
index 4d435101..2ee9075a 100644
--- a/modules/gallery/models/task.php
+++ b/modules/gallery/models/task.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/theme.php b/modules/gallery/models/theme.php
index 50fd04fd..ab2ba57f 100644
--- a/modules/gallery/models/theme.php
+++ b/modules/gallery/models/theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/models/var.php b/modules/gallery/models/var.php
index f21486ee..6e406ac7 100644
--- a/modules/gallery/models/var.php
+++ b/modules/gallery/models/var.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 32b3020f..35e3f76a 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Albums_Controller_Test.php b/modules/gallery/tests/Albums_Controller_Test.php
index 35a3bdbb..d9983cc2 100644
--- a/modules/gallery/tests/Albums_Controller_Test.php
+++ b/modules/gallery/tests/Albums_Controller_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Cache_Test.php b/modules/gallery/tests/Cache_Test.php
index 5e14051a..7dce6297 100644
--- a/modules/gallery/tests/Cache_Test.php
+++ b/modules/gallery/tests/Cache_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Controller_Auth_Test.php b/modules/gallery/tests/Controller_Auth_Test.php
index e83f9a29..d3da60e5 100644
--- a/modules/gallery/tests/Controller_Auth_Test.php
+++ b/modules/gallery/tests/Controller_Auth_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index f1a83d9c..64794b36 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Dir_Helper_Test.php b/modules/gallery/tests/Dir_Helper_Test.php
index 597963d7..2a0efdb0 100644
--- a/modules/gallery/tests/Dir_Helper_Test.php
+++ b/modules/gallery/tests/Dir_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/DrawForm_Test.php b/modules/gallery/tests/DrawForm_Test.php
index 4cbc7cb7..146fe1a4 100644
--- a/modules/gallery/tests/DrawForm_Test.php
+++ b/modules/gallery/tests/DrawForm_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 96e0b758..69c4bbf9 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
@@ -130,7 +130,7 @@ class File_Structure_Test extends Gallery_Unit_Test_Case {
         "<?php defined(\"SYSPATH\") or die(\"No direct script access.\");",
         "/**",
         " * Gallery - a web based photo album viewer and editor",
-        " * Copyright (C) 2000-2010 Bharat Mediratta",
+        " * Copyright (C) 2000-2011 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",
diff --git a/modules/gallery/tests/Gallery_Filters.php b/modules/gallery/tests/Gallery_Filters.php
index 1c07f93e..e0208ed3 100644
--- a/modules/gallery/tests/Gallery_Filters.php
+++ b/modules/gallery/tests/Gallery_Filters.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Gallery_I18n_Test.php b/modules/gallery/tests/Gallery_I18n_Test.php
index 3643e2ed..171f4c3a 100644
--- a/modules/gallery/tests/Gallery_I18n_Test.php
+++ b/modules/gallery/tests/Gallery_I18n_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index d34c3b0e..10a67465 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Html_Helper_Test.php b/modules/gallery/tests/Html_Helper_Test.php
index 520f9b01..fcd7c685 100644
--- a/modules/gallery/tests/Html_Helper_Test.php
+++ b/modules/gallery/tests/Html_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Input_Library_Test.php b/modules/gallery/tests/Input_Library_Test.php
index 06641323..a27f85b0 100644
--- a/modules/gallery/tests/Input_Library_Test.php
+++ b/modules/gallery/tests/Input_Library_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index 42acfb18..4d5aed41 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index 0554c0e2..968d7510 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Item_Rest_Helper_Test.php b/modules/gallery/tests/Item_Rest_Helper_Test.php
index a2ab534b..51943f73 100644
--- a/modules/gallery/tests/Item_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Item_Rest_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Items_Rest_Helper_Test.php b/modules/gallery/tests/Items_Rest_Helper_Test.php
index 49e77876..ebbeda20 100644
--- a/modules/gallery/tests/Items_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Items_Rest_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Kohana_Exception_Test.php b/modules/gallery/tests/Kohana_Exception_Test.php
index df7cf9ff..be91017d 100644
--- a/modules/gallery/tests/Kohana_Exception_Test.php
+++ b/modules/gallery/tests/Kohana_Exception_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Locales_Helper_Test.php b/modules/gallery/tests/Locales_Helper_Test.php
index a0ffd91c..7fc926cc 100644
--- a/modules/gallery/tests/Locales_Helper_Test.php
+++ b/modules/gallery/tests/Locales_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Menu_Test.php b/modules/gallery/tests/Menu_Test.php
index 58e37d5b..a6e6bd72 100644
--- a/modules/gallery/tests/Menu_Test.php
+++ b/modules/gallery/tests/Menu_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/ORM_MPTT_Test.php b/modules/gallery/tests/ORM_MPTT_Test.php
index 71f553d5..6e19ec90 100644
--- a/modules/gallery/tests/ORM_MPTT_Test.php
+++ b/modules/gallery/tests/ORM_MPTT_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Photos_Controller_Test.php b/modules/gallery/tests/Photos_Controller_Test.php
index dc50db94..401b1808 100644
--- a/modules/gallery/tests/Photos_Controller_Test.php
+++ b/modules/gallery/tests/Photos_Controller_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/SafeString_Test.php b/modules/gallery/tests/SafeString_Test.php
index 64772c12..5dfdb064 100644
--- a/modules/gallery/tests/SafeString_Test.php
+++ b/modules/gallery/tests/SafeString_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Sendmail_Test.php b/modules/gallery/tests/Sendmail_Test.php
index aee6abf5..979ebaab 100644
--- a/modules/gallery/tests/Sendmail_Test.php
+++ b/modules/gallery/tests/Sendmail_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Url_Security_Test.php b/modules/gallery/tests/Url_Security_Test.php
index dd395f78..900c7f32 100644
--- a/modules/gallery/tests/Url_Security_Test.php
+++ b/modules/gallery/tests/Url_Security_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Var_Test.php b/modules/gallery/tests/Var_Test.php
index 292fe2f1..c99c97bd 100644
--- a/modules/gallery/tests/Var_Test.php
+++ b/modules/gallery/tests/Var_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery/tests/Xss_Security_Test.php b/modules/gallery/tests/Xss_Security_Test.php
index f7806c07..2fbd72f1 100644
--- a/modules/gallery/tests/Xss_Security_Test.php
+++ b/modules/gallery/tests/Xss_Security_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index e241e1dd..8d7d97df 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery_unit_test/helpers/MY_request.php b/modules/gallery_unit_test/helpers/MY_request.php
index c169be05..d6ea9e5a 100644
--- a/modules/gallery_unit_test/helpers/MY_request.php
+++ b/modules/gallery_unit_test/helpers/MY_request.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery_unit_test/helpers/test.php b/modules/gallery_unit_test/helpers/test.php
index 65c7f6b4..b6b0055a 100644
--- a/modules/gallery_unit_test/helpers/test.php
+++ b/modules/gallery_unit_test/helpers/test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php b/modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php
index fa04667d..fd920603 100644
--- a/modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php
+++ b/modules/gallery_unit_test/libraries/Gallery_Unit_Test_Case.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/image_block/helpers/image_block_block.php b/modules/image_block/helpers/image_block_block.php
index 43ce4af9..44e63a29 100644
--- a/modules/image_block/helpers/image_block_block.php
+++ b/modules/image_block/helpers/image_block_block.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php
index 27097216..1b41bc0e 100644
--- a/modules/image_block/helpers/image_block_installer.php
+++ b/modules/image_block/helpers/image_block_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
index 74c92510..49923deb 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_block.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/info/helpers/info_installer.php b/modules/info/helpers/info_installer.php
index 51962173..d9053e46 100644
--- a/modules/info/helpers/info_installer.php
+++ b/modules/info/helpers/info_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php
index 05a19cf5..7599ad06 100644
--- a/modules/info/helpers/info_theme.php
+++ b/modules/info/helpers/info_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/kohana23_compat/config/pagination.php b/modules/kohana23_compat/config/pagination.php
index 91ecc308..2f4cdff4 100644
--- a/modules/kohana23_compat/config/pagination.php
+++ b/modules/kohana23_compat/config/pagination.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/kohana23_compat/libraries/MY_Database_Builder.php b/modules/kohana23_compat/libraries/MY_Database_Builder.php
index 014efe0e..aab80820 100644
--- a/modules/kohana23_compat/libraries/MY_Database_Builder.php
+++ b/modules/kohana23_compat/libraries/MY_Database_Builder.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/kohana23_compat/libraries/Pagination.php b/modules/kohana23_compat/libraries/Pagination.php
index ee268051..38f39607 100644
--- a/modules/kohana23_compat/libraries/Pagination.php
+++ b/modules/kohana23_compat/libraries/Pagination.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/notification/controllers/notification.php b/modules/notification/controllers/notification.php
index 6458c2fb..437bc15a 100644
--- a/modules/notification/controllers/notification.php
+++ b/modules/notification/controllers/notification.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index 2ff8ff48..32e0f48c 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index 5cd10de8..c2ed3b03 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/notification/helpers/notification_installer.php b/modules/notification/helpers/notification_installer.php
index 2ba25298..2ac975fa 100644
--- a/modules/notification/helpers/notification_installer.php
+++ b/modules/notification/helpers/notification_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/notification/models/pending_notification.php b/modules/notification/models/pending_notification.php
index 5857ce8c..ca79fb9d 100644
--- a/modules/notification/models/pending_notification.php
+++ b/modules/notification/models/pending_notification.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/notification/models/subscription.php b/modules/notification/models/subscription.php
index 273b6ad9..16cb8adf 100644
--- a/modules/notification/models/subscription.php
+++ b/modules/notification/models/subscription.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index df3130be..9ce518ac 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 58daf180..fb755c01 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
index d68bc3b6..3f5c740b 100644
--- a/modules/organize/helpers/organize_installer.php
+++ b/modules/organize/helpers/organize_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/recaptcha/controllers/admin_recaptcha.php b/modules/recaptcha/controllers/admin_recaptcha.php
index 264d3177..464a6cfb 100644
--- a/modules/recaptcha/controllers/admin_recaptcha.php
+++ b/modules/recaptcha/controllers/admin_recaptcha.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/recaptcha/helpers/recaptcha.php b/modules/recaptcha/helpers/recaptcha.php
index 68905bd8..e695cd4f 100644
--- a/modules/recaptcha/helpers/recaptcha.php
+++ b/modules/recaptcha/helpers/recaptcha.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/recaptcha/helpers/recaptcha_event.php b/modules/recaptcha/helpers/recaptcha_event.php
index f185f92b..494da1e9 100644
--- a/modules/recaptcha/helpers/recaptcha_event.php
+++ b/modules/recaptcha/helpers/recaptcha_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/recaptcha/helpers/recaptcha_installer.php b/modules/recaptcha/helpers/recaptcha_installer.php
index b970d0ab..5c3c425d 100644
--- a/modules/recaptcha/helpers/recaptcha_installer.php
+++ b/modules/recaptcha/helpers/recaptcha_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/recaptcha/helpers/recaptcha_theme.php b/modules/recaptcha/helpers/recaptcha_theme.php
index 3677a7c7..e2899725 100644
--- a/modules/recaptcha/helpers/recaptcha_theme.php
+++ b/modules/recaptcha/helpers/recaptcha_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/recaptcha/libraries/Form_Recaptcha.php b/modules/recaptcha/libraries/Form_Recaptcha.php
index 736e0d95..9e9d866c 100644
--- a/modules/recaptcha/libraries/Form_Recaptcha.php
+++ b/modules/recaptcha/libraries/Form_Recaptcha.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 00c7cda2..52d9925b 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rest/helpers/registry_rest.php b/modules/rest/helpers/registry_rest.php
index e9c8b955..b8be26f1 100644
--- a/modules/rest/helpers/registry_rest.php
+++ b/modules/rest/helpers/registry_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 676c10c3..1954f46e 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rest/helpers/rest_event.php b/modules/rest/helpers/rest_event.php
index 9e241bd0..1fdd49e2 100644
--- a/modules/rest/helpers/rest_event.php
+++ b/modules/rest/helpers/rest_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rest/helpers/rest_installer.php b/modules/rest/helpers/rest_installer.php
index 3c7fea4b..7a63e371 100644
--- a/modules/rest/helpers/rest_installer.php
+++ b/modules/rest/helpers/rest_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rest/libraries/Rest_Exception.php b/modules/rest/libraries/Rest_Exception.php
index 087da939..be8515fd 100644
--- a/modules/rest/libraries/Rest_Exception.php
+++ b/modules/rest/libraries/Rest_Exception.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rest/models/user_access_key.php b/modules/rest/models/user_access_key.php
index 93c3cf7f..dda110f7 100644
--- a/modules/rest/models/user_access_key.php
+++ b/modules/rest/models/user_access_key.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rest/tests/Rest_Controller_Test.php b/modules/rest/tests/Rest_Controller_Test.php
index 43139d29..5e113030 100644
--- a/modules/rest/tests/Rest_Controller_Test.php
+++ b/modules/rest/tests/Rest_Controller_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 407220da..84858cc9 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rss/helpers/rss.php b/modules/rss/helpers/rss.php
index 684dad08..bc868e54 100644
--- a/modules/rss/helpers/rss.php
+++ b/modules/rss/helpers/rss.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/rss/helpers/rss_block.php b/modules/rss/helpers/rss_block.php
index 5e53e492..b60f8208 100644
--- a/modules/rss/helpers/rss_block.php
+++ b/modules/rss/helpers/rss_block.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index 733bc9f7..eef009a0 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 24c4ed2b..09e5e83f 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/search/helpers/search_event.php b/modules/search/helpers/search_event.php
index 45f7da4c..458135bf 100644
--- a/modules/search/helpers/search_event.php
+++ b/modules/search/helpers/search_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/search/helpers/search_installer.php b/modules/search/helpers/search_installer.php
index 929cc1a8..7b6ed37b 100644
--- a/modules/search/helpers/search_installer.php
+++ b/modules/search/helpers/search_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/search/helpers/search_task.php b/modules/search/helpers/search_task.php
index 48a6688b..5489ed93 100644
--- a/modules/search/helpers/search_task.php
+++ b/modules/search/helpers/search_task.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/search/helpers/search_theme.php b/modules/search/helpers/search_theme.php
index 45a88dc2..ffbfac8f 100644
--- a/modules/search/helpers/search_theme.php
+++ b/modules/search/helpers/search_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/search/models/search_record.php b/modules/search/models/search_record.php
index 77290903..35541b4c 100644
--- a/modules/search/models/search_record.php
+++ b/modules/search/models/search_record.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index 2e743c81..90a60c73 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 89a36cbe..2afa93a7 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/server_add/helpers/server_add.php b/modules/server_add/helpers/server_add.php
index 03869f2d..a412cb38 100644
--- a/modules/server_add/helpers/server_add.php
+++ b/modules/server_add/helpers/server_add.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/server_add/helpers/server_add_event.php b/modules/server_add/helpers/server_add_event.php
index fd4ade71..c12ac288 100644
--- a/modules/server_add/helpers/server_add_event.php
+++ b/modules/server_add/helpers/server_add_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/server_add/helpers/server_add_installer.php b/modules/server_add/helpers/server_add_installer.php
index 320e205e..4d8b66cd 100644
--- a/modules/server_add/helpers/server_add_installer.php
+++ b/modules/server_add/helpers/server_add_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/server_add/helpers/server_add_theme.php b/modules/server_add/helpers/server_add_theme.php
index 6395c2f0..50c050a8 100644
--- a/modules/server_add/helpers/server_add_theme.php
+++ b/modules/server_add/helpers/server_add_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/server_add/models/server_add_entry.php b/modules/server_add/models/server_add_entry.php
index dfeb05a2..6e64031a 100644
--- a/modules/server_add/models/server_add_entry.php
+++ b/modules/server_add/models/server_add_entry.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/slideshow/helpers/slideshow_event.php b/modules/slideshow/helpers/slideshow_event.php
index 167fa7ff..d5b063c1 100644
--- a/modules/slideshow/helpers/slideshow_event.php
+++ b/modules/slideshow/helpers/slideshow_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/slideshow/helpers/slideshow_installer.php b/modules/slideshow/helpers/slideshow_installer.php
index cabbf7a8..2557a018 100644
--- a/modules/slideshow/helpers/slideshow_installer.php
+++ b/modules/slideshow/helpers/slideshow_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/slideshow/helpers/slideshow_theme.php b/modules/slideshow/helpers/slideshow_theme.php
index a3d6ef37..bbb68821 100644
--- a/modules/slideshow/helpers/slideshow_theme.php
+++ b/modules/slideshow/helpers/slideshow_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 99743a8e..73042a55 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/controllers/tag.php b/modules/tag/controllers/tag.php
index 47110540..7aa038c6 100644
--- a/modules/tag/controllers/tag.php
+++ b/modules/tag/controllers/tag.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index aa39b6cd..fe6d747b 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/item_tags_rest.php b/modules/tag/helpers/item_tags_rest.php
index 02c79e5d..74505cf7 100644
--- a/modules/tag/helpers/item_tags_rest.php
+++ b/modules/tag/helpers/item_tags_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index 7d5c643a..733215b3 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php
index 0473e4b2..8df58a6e 100644
--- a/modules/tag/helpers/tag_block.php
+++ b/modules/tag/helpers/tag_block.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index baf8b1ae..cd79f734 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag_installer.php b/modules/tag/helpers/tag_installer.php
index df6f0c65..16ad1239 100644
--- a/modules/tag/helpers/tag_installer.php
+++ b/modules/tag/helpers/tag_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag_item_rest.php b/modules/tag/helpers/tag_item_rest.php
index 17cb726e..a8d3d0bc 100644
--- a/modules/tag/helpers/tag_item_rest.php
+++ b/modules/tag/helpers/tag_item_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag_items_rest.php b/modules/tag/helpers/tag_items_rest.php
index 848c2cd3..535ab513 100644
--- a/modules/tag/helpers/tag_items_rest.php
+++ b/modules/tag/helpers/tag_items_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag_rest.php b/modules/tag/helpers/tag_rest.php
index e0b7bd87..7f744a9e 100644
--- a/modules/tag/helpers/tag_rest.php
+++ b/modules/tag/helpers/tag_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag_rss.php b/modules/tag/helpers/tag_rss.php
index f60bd908..a8947c84 100644
--- a/modules/tag/helpers/tag_rss.php
+++ b/modules/tag/helpers/tag_rss.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag_task.php b/modules/tag/helpers/tag_task.php
index 7bf50546..39df6c21 100644
--- a/modules/tag/helpers/tag_task.php
+++ b/modules/tag/helpers/tag_task.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index 3325a832..c532e708 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/helpers/tags_rest.php b/modules/tag/helpers/tags_rest.php
index 4f40e7f4..8785ad79 100644
--- a/modules/tag/helpers/tags_rest.php
+++ b/modules/tag/helpers/tags_rest.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index 2b73b5be..53ccc856 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/tests/Tag_Item_Rest_Helper_Test.php b/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
index 533f832d..1c5caf35 100644
--- a/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index a8aa89d4..48ee7872 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/tests/Tag_Test.php b/modules/tag/tests/Tag_Test.php
index 38c32e47..f5ccb3a2 100644
--- a/modules/tag/tests/Tag_Test.php
+++ b/modules/tag/tests/Tag_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/tag/tests/Tags_Rest_Helper_Test.php b/modules/tag/tests/Tags_Rest_Helper_Test.php
index 1b909e50..1b0c83a7 100644
--- a/modules/tag/tests/Tags_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tags_Rest_Helper_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/config/identity.php b/modules/user/config/identity.php
index 36ebc038..718c0300 100644
--- a/modules/user/config/identity.php
+++ b/modules/user/config/identity.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 9ef6f8c1..a3633b52 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php
index 567e56dc..4e93d5ce 100644
--- a/modules/user/controllers/password.php
+++ b/modules/user/controllers/password.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 6bb4967f..3e0e0e54 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index 88bfac35..801387d8 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index be50d6d1..49eec360 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 3b6ddc66..9913e52d 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index afa0bd16..b889af49 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 70e96f70..e2479bc3 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index 73ac9bd0..8cba3c82 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 8f8e218d..4409dcb8 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 585f4b96..145738ca 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/tests/No_Direct_ORM_Access_Test.php b/modules/user/tests/No_Direct_ORM_Access_Test.php
index 0e5aa263..f696d194 100644
--- a/modules/user/tests/No_Direct_ORM_Access_Test.php
+++ b/modules/user/tests/No_Direct_ORM_Access_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/tests/User_Groups_Test.php b/modules/user/tests/User_Groups_Test.php
index c3e90718..e58df209 100644
--- a/modules/user/tests/User_Groups_Test.php
+++ b/modules/user/tests/User_Groups_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/user/tests/User_Installer_Test.php b/modules/user/tests/User_Installer_Test.php
index 98e5edff..de86f8ea 100644
--- a/modules/user/tests/User_Installer_Test.php
+++ b/modules/user/tests/User_Installer_Test.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index a2cafee0..a436cfe9 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/watermark/helpers/watermark.php b/modules/watermark/helpers/watermark.php
index 515f8abb..3fecb6bb 100644
--- a/modules/watermark/helpers/watermark.php
+++ b/modules/watermark/helpers/watermark.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/watermark/helpers/watermark_event.php b/modules/watermark/helpers/watermark_event.php
index 8254e6ff..d0b14955 100644
--- a/modules/watermark/helpers/watermark_event.php
+++ b/modules/watermark/helpers/watermark_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index 23d1c3ee..547daf6e 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 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
-- 
cgit v1.2.3


From bc496809389c6d6d2842155aa2c177f037772fa6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 21 Jan 2011 23:09:27 -0800
Subject: Update XSS golden file

---
 modules/gallery/tests/xss_data.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 609f786a..0c812fb4 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -248,6 +248,7 @@ modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $permi
 modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $item->id
 modules/gallery/views/quick_delete_confirm.html.php          11  DIRTY    $form
 modules/gallery/views/reauthenticate.html.php                9   DIRTY    $form
+modules/gallery/views/upgrade_checker_block.html.php         17  DIRTY    $new_version
 modules/gallery/views/upgrader.html.php                      76  DIRTY_ATTR $done?"muted":""
 modules/gallery/views/upgrader.html.php                      94  DIRTY_ATTR $done?"muted":""
 modules/gallery/views/upgrader.html.php                      102 DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
@@ -338,8 +339,8 @@ modules/server_add/views/server_add_tree_dialog.html.php     4   DIRTY_JS url::s
 modules/server_add/views/server_add_tree_dialog.html.php     21  DIRTY    $tree
 modules/tag/views/admin_tags.html.php                        45  DIRTY_ATTR $tag->id
 modules/tag/views/admin_tags.html.php                        46  DIRTY    $tag->count
-modules/tag/views/tag_block.html.php                         26  DIRTY    $cloud
-modules/tag/views/tag_block.html.php                         28  DIRTY    $form
+modules/tag/views/tag_block.html.php                         28  DIRTY    $cloud
+modules/tag/views/tag_block.html.php                         30  DIRTY    $form
 modules/tag/views/tag_cloud.html.php                         4   DIRTY_ATTR (int)(($tag->count/$max_count)*7)
 modules/tag/views/tag_cloud.html.php                         5   DIRTY    $tag->count
 modules/tag/views/tag_cloud.html.php                         6   DIRTY_JS $tag->url()
@@ -363,6 +364,7 @@ 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                       4   DIRTY    $theme->html_attributes()
 themes/admin_wind/views/admin.html.php                       31  DIRTY    $theme->admin_head()
 themes/admin_wind/views/admin.html.php                       40  DIRTY_JS $theme->url()
 themes/admin_wind/views/admin.html.php                       45  DIRTY    $theme->get_combined("script")
@@ -408,6 +410,7 @@ themes/wind/views/dynamic.html.php                           17  DIRTY_ATTR $chi
 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                             9   DIRTY    $item->movie_img(array("class"=>"g-movie","id"=>"g-item-id-{$item->id}"))
+themes/wind/views/page.html.php                              4   DIRTY    $theme->html_attributes()
 themes/wind/views/page.html.php                              10  DIRTY    $page_title
 themes/wind/views/page.html.php                              13  DIRTY    $theme->item()->title
 themes/wind/views/page.html.php                              17  DIRTY    item::root()->title
-- 
cgit v1.2.3