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

3 files changed, 80 insertions, 43 deletions

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 1b6b875d..d46f21ac 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -116,13 +116,7 @@ class album_Core {
 
     $sort_order->dropdown("column", array("id" => "gAlbumSortColumn"))
       ->label(t("Sort by"))
-      ->options(array("weight" => t("Manual"),
-                      "captured" => t("Date captured"),
-                      "created" => t("Date uploaded"),
-                      "title" => t("Title"),
-                      "updated" => t("Date modified"),
-                      "view_count" => t("Number of views"),
-                      "rand_key" => t("Random")))
+      ->options(album::get_sort_order_options())
       ->selected($parent->sort_column);
     $sort_order->dropdown("direction", array("id" => "gAlbumSortDirection"))
       ->label(t("Order"))
@@ -137,4 +131,17 @@ class album_Core {
     $form->add_rules_from(ORM::factory("item"));
     return $form;
   }
+
+  /**
+   * Return a structured set of all the possible sort orders.
+   */
+  static function get_sort_order_options() {
+    return array("weight" => t("Manual"),
+                 "captured" => t("Date captured"),
+                 "created" => t("Date uploaded"),
+                 "title" => t("Title"),
+                 "updated" => t("Date modified"),
+                 "view_count" => t("Number of views"),
+                 "rand_key" => t("Random"));
+  }
 }
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index c81af842..122227fc 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -82,9 +82,9 @@ class gallery_Core {
   static function site_menu($menu, $theme) {
     if ($theme->page_type != "login") {
       $menu->append(Menu::factory("link")
-                    ->id("home")
-                    ->label(t("Home"))
-                    ->url(url::site("albums/1")));
+              ->id("home")
+              ->label(t("Home"))
+              ->url(url::site("albums/1")));
 
       $item = $theme->item();
 
@@ -92,48 +92,47 @@ class gallery_Core {
       $can_add = $item && access::can("add", $item);
 
       if ($can_add) {
-        $menu->append(Menu::factory("dialog")
-                      ->id("add_photos_item")
-                      ->label(t("Add photos"))
-                      ->url(url::site("simple_uploader/app/$item->id")));
+      	$menu->append($add_menu = Menu::factory("submenu")
+                    ->id("add_menu")
+                    ->label(t("Add")));
+        $add_menu->append(Menu::factory("dialog")
+                    ->id("add_photos_item")
+                    ->label(t("Add photos"))
+                    ->url(url::site("simple_uploader/app/$item->id")));
+        if ($item->is_album()) {
+        	$add_menu->append(Menu::factory("dialog")
+                      ->id("add_album_item")
+                      ->label(t("Add an album"))
+                      ->url(url::site("form/add/albums/$item->id?type=album")));
+				}
       }
 
       $menu->append($options_menu = Menu::factory("submenu")
-                    ->id("options_menu")
-                    ->label(t("Options")));
+              ->id("options_menu")
+              ->label(t("Photo options")));
       if ($item && ($can_edit || $can_add)) {
         if ($can_edit) {
-          $options_menu
-            ->append(Menu::factory("dialog")
-                     ->id("edit_item")
-                     ->label($item->is_album() ? t("Edit album") : t("Edit photo"))
-                     ->url(url::site("form/edit/{$item->type}s/$item->id")));
+          $options_menu->append(Menu::factory("dialog")
+                          ->id("edit_item")
+                          ->label($item->is_album() ? t("Edit album") : t("Edit photo"))
+                          ->url(url::site("form/edit/{$item->type}s/$item->id")));
         }
 
-        // @todo Move album options menu to the album quick edit pane
         if ($item->is_album()) {
-          if ($can_add) {
-            $options_menu
-              ->append(Menu::factory("dialog")
-                       ->id("add_album")
-                       ->label(t("Add an album"))
-                       ->url(url::site("form/add/albums/$item->id?type=album")));
-          }
-
+          $options_menu->label(t("Album options"));
           if ($can_edit) {
-            $options_menu
-              ->append(Menu::factory("dialog")
-                       ->id("edit_permissions")
-                       ->label(t("Edit permissions"))
-                       ->url(url::site("permissions/browse/$item->id")));
+            $options_menu->append(Menu::factory("dialog")
+                            ->id("edit_permissions")
+                            ->label(t("Edit permissions"))
+                            ->url(url::site("permissions/browse/$item->id")));
           }
         }
       }
 
       if (user::active()->admin) {
         $menu->append($admin_menu = Menu::factory("submenu")
-                      ->id("admin_menu")
-                      ->label(t("Admin")));
+                ->id("admin_menu")
+                ->label(t("Admin")));
         gallery::admin_menu($admin_menu, $theme);
         module::event("admin_menu", $admin_menu, $theme);
       }
@@ -160,12 +159,6 @@ class gallery_Core {
                         ->label(t("Languages"))
                         ->url(url::site("admin/languages")))
                ->append(Menu::factory("link")
-                        ->id("l10n_mode")
-                        ->label(Session::instance()->get("l10n_mode", false)
-                                ? t("Stop translating") : t("Start translating"))
-                        ->url(url::site("l10n_client/toggle_l10n_mode?csrf=" .
-                                        access::csrf_token())))
-               ->append(Menu::factory("link")
                         ->id("advanced")
                         ->label(t("Advanced"))
                         ->url(url::site("admin/advanced_settings"))))
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index a2d3859f..8839861f 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -151,4 +151,41 @@ class item_Core {
       ->get()->current();
     return ($result ? $result->weight : 0) + 1;
   }
+
+  /**
+   * Add a set of restrictions to any following queries to restrict access only to items
+   * viewable by the active user.
+   * @chainable
+   */
+  static function viewable($model) {
+    $view_restrictions = array();
+    if (!user::active()->admin) {
+      foreach (user::group_ids() as $id) {
+        // Separate the first restriction from the rest to make it easier for us to formulate
+        // our where clause below
+        if (empty($view_restrictions)) {
+          $view_restrictions[0] = "items.view_$id";
+        } else {
+          $view_restrictions[1]["items.view_$id"] = access::ALLOW;
+        }
+      }
+    }
+    switch (count($view_restrictions)) {
+    case 0:
+      break;
+
+    case 1:
+      $model->where($view_restrictions[0], access::ALLOW);
+      break;
+
+    default:
+      $model->open_paren();
+      $model->where($view_restrictions[0], access::ALLOW);
+      $model->orwhere($view_restrictions[1]);
+      $model->close_paren();
+      break;
+    }
+
+    return $model;
+  }
 }
\ No newline at end of file