From e6768a4e9771f5f751d74001ce3a0d33f6775216 Mon Sep 17 00:00:00 2001
From: unostar <unostar@danalan.info>
Date: Mon, 8 Jun 2009 17:51:56 +0800
Subject: Add string to localizer

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 modules/gallery/views/simple_uploader.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 79919d50..f10d764c 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -93,7 +93,7 @@
     button_width: "202",
     button_height: "45",
     button_placeholder_id: "gChooseFilesButtonPlaceholder",
-    button_text: '<span class="swfUploadFont">Select photos...</span>',
+    button_text: '<span class="swfUploadFont"><?= t("Select photos...") ?></span>',
     button_text_style: ".swfUploadFont { color: #2E6E9E; font-size: 16px; font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-weight: bold; }",
     button_text_left_padding: 30,
     button_text_top_padding: 10,
-- 
cgit v1.2.3


From d2b8ca241d6b2a1c1a512c731721b738e719d613 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 9 Jun 2009 00:25:49 -0600
Subject: Show status message when album cover is set (#257)

---
 modules/gallery/controllers/quick.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 6efcb9de..d6f5213f 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -87,9 +87,12 @@ class Quick_Controller extends Controller {
     access::required("view", $item->parent());
     access::required("edit", $item->parent());
 
+    $msg = t("Made <b>%title</b> this album's cover", array("title" => $item->title));
+
     item::make_album_cover($item);
+    message::success($msg);
 
-    print json_encode(array("result" => "success"));
+    print json_encode(array("result" => "success", "reload" => 1));
   }
 
   public function delete($id) {
-- 
cgit v1.2.3


From f0ea6d532cbbfd5a95e5b992bc62bb7ecb2c1c3b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 9 Jun 2009 21:35:35 +0800
Subject: Create a new method in MY_url.php "get_item_from_uri" which loads the
 item based on the uri.  Then use this helper method in logout.php to insure
 that the guest user has access to the "continue" uri.  If they don't redirect
 to the root album and let it deal with access issues.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/helpers/MY_url.php  | 21 ++++++++++++++-------
 modules/user/controllers/logout.php |  7 ++++++-
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index c8645c4d..e9a5f860 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -46,7 +46,19 @@ class url extends url_Core {
       return;
     }
 
-    $current_uri = html_entity_decode(Router::$current_uri, ENT_QUOTES);
+    $item = self:: get_item_from_uri(Router::$current_uri);
+    if ($item && $item->loaded) {
+      Router::$controller = "{$item->type}s";
+      Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
+      Router::$method = $item->id;
+    }
+  }
+
+  /**
+   * Return the item that the uri is referencing
+   */
+  static function get_item_from_uri($uri) {
+    $current_uri = html_entity_decode($uri);
     $item = ORM::factory("item")->where("relative_path_cache", $current_uri)->find();
     if (!$item->loaded) {
       // It's possible that the relative path cache for the item we're looking for is out of date,
@@ -61,12 +73,7 @@ class url extends url_Core {
         }
       }
     }
-
-    if ($item && $item->loaded) {
-      Router::$controller = "{$item->type}s";
-      Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
-      Router::$method = $item->id;
-    }
+    return $item;
   }
 
   /**
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
index 6ceb7192..a541ed9b 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/user/controllers/logout.php
@@ -26,7 +26,12 @@ class Logout_Controller extends Controller {
     log::info("user", t("User %name logged out", array("name" => $user->name)),
               html::anchor("user/$user->id", $user->name));
     if ($this->input->get("continue")) {
-      url::redirect($this->input->get("continue"));
+      $item = url::get_item_from_uri($this->input->get("continue"));
+      if (access::can("view", $item)) {
+        url::redirect($this->input->get("continue"));
+      } else {
+        url::redirect("");
+      }
     }
   }
 }
\ No newline at end of file
-- 
cgit v1.2.3


From 8189c1fc6b655907990c7f005936a4758ab7e315 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 9 Jun 2009 21:44:08 +0800
Subject: Removed extra whitespace

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/helpers/MY_url.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index e9a5f860..7bee70ca 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -46,7 +46,7 @@ class url extends url_Core {
       return;
     }
 
-    $item = self:: get_item_from_uri(Router::$current_uri);
+    $item = self::get_item_from_uri(Router::$current_uri);
     if ($item && $item->loaded) {
       Router::$controller = "{$item->type}s";
       Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
-- 
cgit v1.2.3


From 3c3a65b5a76c2cb53fe143f2b89d767b36dcafa2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 9 Jun 2009 22:18:41 +0800
Subject: Rather than just displaying the "unformatted" login screen when the
 root album is not viewable by a guest, display the root album as if it was
 empty. When the page finishes loading force the login dialog to be displayed.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/controllers/albums.php | 12 ++++++++++--
 themes/default/views/page.html.php     |  7 +++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index efde4f09..0fd89f05 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -23,16 +23,24 @@ class Albums_Controller extends Items_Controller {
    *  @see REST_Controller::_show($resource)
    */
   public function _show($album) {
+    $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
-        print new Theme_View("login_page.html", "album");
+        $template = new Theme_View("page.html", "album");
+        $template->set_global("page_size", $page_size);
+        $template->set_global("item", $album);
+        $template->set_global("children", array());
+        $template->set_global("children_count", 0);
+        $template->set_global("parents", $album->parents());
+        $template->unauthorized = true;
+        $template->content = new View("album.html");
+        print $template;
         return;
       } else {
         access::forbidden();
       }
     }
 
-    $page_size = module::get_var("gallery", "page_size", 9);
     $show = $this->input->get("show");
 
     if ($show) {
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index 6c77fb72..a17b643d 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -52,6 +52,13 @@
     <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
     <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
     <?= $theme->head() ?>
+    <? if (!empty($unauthorized)): ?>
+    <script type="text/javascript">
+       $(document).ready(function() {
+         $("#gLoginLink").click();
+       });
+    </script>
+    <? endif ?>
   </head>
 
     <body <?= $theme->main_element_attributes() ?>>
-- 
cgit v1.2.3


From b11ec14f2442cd92c4001e14afaadff80bff4ffb Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 10 Jun 2009 07:18:47 +0800
Subject: Changed how directories are processed when the parent directory is
 selected and the branch was never opened on the client.  This should fix some
 of the issues with the server_add as I was able to select the staging
 directory and then add over 400 images in a multi-tier structure.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/server_add/controllers/server_add.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 2c6eb5e0..c92b4f7e 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -87,17 +87,20 @@ class Server_Add_Controller extends Controller {
     foreach (array_keys($paths) as $valid_path) {
       $path_length = strlen($valid_path);
       foreach ($input_files as $key => $path) {
-        if (!empty($path) && $valid_path != $path && strpos($path, $valid_path) === 0) {
-          $relative_path = substr(dirname($path), $path_length);
-          $name = basename($path);
-          $files[$valid_path][] = array("path" => $relative_path,
-                                        "parent_id" => $id, "name" => basename($path),
+        if (!empty($path)) {
+          if ($valid_path != $path && strpos($path, $valid_path) === 0) {
+            $relative_path = substr(dirname($path), $path_length);
+            $name = basename($path);
+            $files[$valid_path][] = array("path" => $relative_path,
+                                          "parent_id" => $id, "name" => basename($path),
                                         "type" => is_dir($path) ? "album" : "file");
-          $total_count++;
+            $total_count++;
+          }
           if ($collapsed[$key] === "true") {
             $total_count += $this->_select_children($id, $valid_path, $path, $files[$valid_path]);
           }
           unset($input_files[$key]);
+          unset($collapsed[$key]);
         }
       }
     }
-- 
cgit v1.2.3


From a4a38ba76003f5ca8fec0f50b4a84b930c80dd20 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 10 Jun 2009 08:17:27 +0800
Subject: Created not_authorized.html.php which is a prettier login screen if
 the root album is not publicly browsable.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/controllers/albums.php | 10 ++--------
 themes/default/views/page.html.php     |  7 -------
 2 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 0fd89f05..9b837442 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -26,14 +26,8 @@ class Albums_Controller extends Items_Controller {
     $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
-        $template = new Theme_View("page.html", "album");
-        $template->set_global("page_size", $page_size);
-        $template->set_global("item", $album);
-        $template->set_global("children", array());
-        $template->set_global("children_count", 0);
-        $template->set_global("parents", $album->parents());
-        $template->unauthorized = true;
-        $template->content = new View("album.html");
+        $template = new Theme_View("not_authorized.html", "album");
+        $template->content = new View("login_page.html");
         print $template;
         return;
       } else {
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index a17b643d..6c77fb72 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -52,13 +52,6 @@
     <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
     <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
     <?= $theme->head() ?>
-    <? if (!empty($unauthorized)): ?>
-    <script type="text/javascript">
-       $(document).ready(function() {
-         $("#gLoginLink").click();
-       });
-    </script>
-    <? endif ?>
   </head>
 
     <body <?= $theme->main_element_attributes() ?>>
-- 
cgit v1.2.3


From b276eaa68beca1266bf8fd83625ddfad73f44420 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 10 Jun 2009 08:38:21 +0800
Subject: Add some window dressing to login_page.html in order to make it more
 in line with the overall look of the Gallery3 theme

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/controllers/albums.php       |  4 +-
 themes/default/views/login_page.html.php     | 48 ++++++++++++++++++-
 themes/default/views/not_authorized.html.php | 69 ----------------------------
 3 files changed, 47 insertions(+), 74 deletions(-)
 delete mode 100644 themes/default/views/not_authorized.html.php

(limited to 'modules')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 9b837442..f37609e6 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -26,9 +26,7 @@ class Albums_Controller extends Items_Controller {
     $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
-        $template = new Theme_View("not_authorized.html", "album");
-        $template->content = new View("login_page.html");
-        print $template;
+        print new Theme_View("login_page.html");
         return;
       } else {
         access::forbidden();
diff --git a/themes/default/views/login_page.html.php b/themes/default/views/login_page.html.php
index 27f8571e..c4880727 100644
--- a/themes/default/views/login_page.html.php
+++ b/themes/default/views/login_page.html.php
@@ -7,11 +7,55 @@
     <title>
       <?= t("Please Login to Gallery") ?>
     </title>
+    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
+    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
+          media="screen,print,projection" />
+    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
+          media="screen" />
+    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
+          media="screen,print,projection" />
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
           media="screen,print,projection" />
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+          media="screen,print,projection" />
+    <![endif]-->
+    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
+    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
+    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
+    <?= $theme->head() ?>
   </head>
 
-  <body>
-    <?= user::get_login_form("login/auth_html") ?>
+    <body <?= $theme->main_element_attributes() ?>>
+    <?= $theme->page_top() ?>
+    <div id="doc4" class="yui-t5 gView">
+      <?= $theme->site_status() ?>
+      <div id="gHeader">
+        <?= $theme->display("header.html") ?>
+      </div>
+      <div id="bd">
+        <div id="yui-main">
+          <div class="yui-b">
+            <div id="gContent" class="yui-g">
+              <?= $theme->messages() ?>
+              <?= user::get_login_form("login/auth_html") ?>
+            </div>
+          </div>
+        </div>
+        <div id="gSidebar" class="yui-b">
+        </div>
+      </div>
+      <div id="gFooter">
+        <?= $theme->display("footer.html") ?>
+      </div>
+    </div>
+    <?= $theme->page_bottom() ?>
   </body>
 </html>
diff --git a/themes/default/views/not_authorized.html.php b/themes/default/views/not_authorized.html.php
deleted file mode 100644
index d009a4ac..00000000
--- a/themes/default/views/not_authorized.html.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Tranisitional//EN"
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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" />
-    <title>
-      <? if (empty($page_title)): ?>
-        <?= t("Gallery3 Login") ?>
-        <? if (!empty($item)): ?>
-        :: <?= p::clean($item->title) ?>
-        <? endif ?>
-      <? else: ?>
-        <?= $page_title ?>
-      <? endif ?>
-      <?= $theme->page_type ?>
-    </title>
-    <link rel="shortcut icon" href="<?= $theme->url("images/favicon.ico") ?>" type="image/x-icon" />
-    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/yui/reset-fonts-grids.css") ?>"
-          media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/superfish/css/superfish.css") ?>"
-          media="screen" />
-    <link rel="stylesheet" type="text/css" href="<?= url::file("lib/themeroller/ui.base.css") ?>"
-          media="screen,print,projection" />
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
-          media="screen,print,projection" />
-    <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
-          media="screen,print,projection" />
-    <![endif]-->
-    <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/jquery-ui.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.common.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.dialog.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/gallery.form.js") ?>" type="text/javascript"></script>
-    <script src="<?= url::file("lib/superfish/js/superfish.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/jquery.scrollTo.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/jquery.localscroll.js") ?>" type="text/javascript"></script>
-    <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
-    <?= $theme->head() ?>
-  </head>
-
-    <body <?= $theme->main_element_attributes() ?>>
-    <?= $theme->page_top() ?>
-    <div id="doc4" class="yui-t5 gView">
-      <?= $theme->site_status() ?>
-      <div id="gHeader">
-        <?= $theme->display("header.html") ?>
-      </div>
-      <div id="bd">
-        <div id="yui-main">
-          <div class="yui-b">
-            <div id="gContent" class="yui-g">
-              <?= $theme->messages() ?>
-              <?= $content ?>
-            </div>
-          </div>
-        </div>
-        <div id="gSidebar" class="yui-b">
-        </div>
-      </div>
-      <div id="gFooter">
-        <?= $theme->display("footer.html") ?>
-      </div>
-    </div>
-    <?= $theme->page_bottom() ?>
-  </body>
-</html>
-- 
cgit v1.2.3