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

3 files changed, 33 insertions, 14 deletions

diff --git a/modules/server_add/helpers/server_add_installer.php b/modules/server_add/helpers/server_add_installer.php
index b592b448..f8773a2e 100644
--- a/modules/server_add/helpers/server_add_installer.php
+++ b/modules/server_add/helpers/server_add_installer.php
@@ -22,7 +22,6 @@ class server_add_installer {
     $db = Database::instance();
     $version = module::get_version("server_add");
     if ($version == 0) {
-      access::register_permission("server_add", t("Add files from server"));
       module::set_version("server_add", 1);
     }
     server_add::check_config();
@@ -31,8 +30,4 @@ class server_add_installer {
   static function deactivate() {
     site_status::clear("server_add_configuration");
   }
-
-  static function uninstall() {
-    access::delete_permission("server_add");
-  }
 }
diff --git a/modules/server_add/helpers/server_add_menu.php b/modules/server_add/helpers/server_add_menu.php
index 04c94493..f02223f7 100644
--- a/modules/server_add/helpers/server_add_menu.php
+++ b/modules/server_add/helpers/server_add_menu.php
@@ -28,16 +28,41 @@ class server_add_menu_Core {
 
   static function site($menu, $theme) {
     $item = $theme->item();
-
     $paths = unserialize(module::get_var("server_add", "authorized_paths"));
 
-    if ($item && access::can("edit", $item) && access::can("server_add", $item) &&
-        $item->is_album() && !empty($paths)) {
-      $options_menu = $menu->get("options_menu")
-        ->append(Menu::factory("dialog")
-                 ->id("server_add")
-                 ->label(t("Add from server"))
-                 ->url(url::site("server_add/index/$item->id")));
+    if (user::active()->admin && $item->is_album() && !empty($paths)) {
+      // This is a little tricky.  Normally there's an "Add Photo" menu option, but we want to
+      // turn that into a dropdown if there are two different ways to add things.  Do that in a
+      // portable way for now.  If we find ourselves duplicating this pattern, we should make an
+      // API method for this.
+      $server_add = Menu::factory("dialog")
+        ->id("server_add")
+        ->label(t("Add from server"))
+        ->url(url::site("server_add/index/$item->id"));
+      $options_menu = $menu->get("options_menu");
+      $add_photos_item = $menu->get("add_photos_item");
+      $add_photos_menu = $menu->get("add_photos_menu");
+
+      if ($add_photos_item && !$add_photos_menu) {
+        // Assuming that $add_menu is unset, create add_menu and add our item
+        $menu->add_after(
+          "home",
+          Menu::factory("submenu")
+          ->id("add_photos_menu")
+          ->label(t("Add Photos"))
+          ->append(Menu::factory("dialog")
+                   ->id("add_photos_submenu_item")
+                   ->label(t("via Simple Uploader"))
+                   ->url(url::site("simple_uploader/app/$item->id")))
+          ->append($server_add));
+        $menu->remove("add_photos_item");
+      } else if ($add_photos_menu) {
+        // Append to the existing sub-menu
+        $add_photos_menu->append($server_add);
+      } else {
+        // Else just add it in at the end of Options
+        $options_menu->append($server_add);
+      }
     }
   }
 }
diff --git a/modules/server_add/helpers/server_add_task.php b/modules/server_add/helpers/server_add_task.php
index c5a7f067..98575915 100644
--- a/modules/server_add/helpers/server_add_task.php
+++ b/modules/server_add/helpers/server_add_task.php
@@ -31,7 +31,6 @@ class server_add_task_Core {
       if (!empty($context["files"][$path])) {
         $file = $context["files"][$path][$context["position"]];
         $parent = ORM::factory("item", $file["parent_id"]);
-        access::required("server_add", $parent);
         access::required("add", $parent);
         if (!$parent->is_album()) {
           throw new Exception("@todo BAD_ALBUM");