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

7 files changed, 76 insertions, 43 deletions

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 224b51e0..c84527f4 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -66,9 +66,10 @@
  *   the Access_Intent_Model
  */
 class access_Core {
-  const DENY      = 0;
-  const ALLOW     = 1;
-  const UNKNOWN   = 2;
+  const DENY      = false;
+  const ALLOW     = true;
+  const INHERIT   = null; // access_intent
+  const UNKNOWN   = null; // cache (access_cache, items)
 
   /**
    * Does the active user have this permission on this item?
@@ -100,8 +101,8 @@ class access_Core {
 
     $resource = $perm_name == "view" ?
       $item : model_cache::get("access_cache", $item->id, "item_id");
-    foreach (user::group_ids() as $id) {
-      if ($resource->__get("{$perm_name}_$id") === self::ALLOW) {
+    foreach ($user->groups as $group) {
+      if ($resource->__get("{$perm_name}_{$group->id}") === self::ALLOW) {
         return true;
       }
     }
@@ -141,7 +142,7 @@ class access_Core {
    * @param  Group_Model $group
    * @param  string      $perm_name
    * @param  Item_Model  $item
-   * @return integer     access::ALLOW, access::DENY or null for no intent
+   * @return boolean     access::ALLOW, access::DENY or access::INHERIT (null) for no intent
    */
   static function group_intent($group, $perm_name, $item) {
     $intent = model_cache::get("access_intent", $item->id, "item_id");
@@ -169,7 +170,7 @@ class access_Core {
       ->where("`right` >= $item->right")
       ->where("items.id <> $item->id")
       ->join("access_intents", "items.id", "access_intents.item_id")
-      ->where("access_intents.view_$group->id", 0)
+      ->where("access_intents.view_$group->id", self::DENY)
       ->orderby("level", "DESC")
       ->limit(1)
       ->find();
@@ -253,7 +254,7 @@ class access_Core {
     if ($item->id == 1) {
       throw new Exception("@todo CANT_RESET_ROOT_PERMISSION");
     }
-    self::_set($group, $perm_name, $item, null);
+    self::_set($group, $perm_name, $item, self::INHERIT);
   }
 
   /**
@@ -455,9 +456,10 @@ class access_Core {
     $db = Database::instance();
     $field = "{$perm_name}_{$group->id}";
     $cache_table = $perm_name == "view" ? "items" : "access_caches";
-    $db->query("ALTER TABLE {{$cache_table}} ADD `$field` SMALLINT NOT NULL DEFAULT 0");
-    $db->query("ALTER TABLE {access_intents} ADD `$field` BOOLEAN DEFAULT NULL");
-    $db->update("access_intents", array($field => 0), array("item_id" => 1));
+    $not_null = $cache_table == "items" ? "" : "NOT NULL";
+    $db->query("ALTER TABLE {{$cache_table}} ADD `$field` BINARY $not_null DEFAULT FALSE");
+    $db->query("ALTER TABLE {access_intents} ADD `$field` BINARY DEFAULT NULL");
+    $db->update("access_intents", array($field => self::DENY), array("item_id" => 1));
     model_cache::clear();
     ORM::factory("access_intent")->clear_cache();
   }
@@ -513,7 +515,7 @@ class access_Core {
       ->where("left >=", $item->left)
       ->where("right <=", $item->right)
       ->where("type", "album")
-      ->where("access_intents.$field IS NOT", null)
+      ->where("access_intents.$field IS NOT", self::INHERIT)
       ->orderby("level", "DESC")
       ->find_all();
     foreach ($query as $row) {
@@ -557,12 +559,12 @@ class access_Core {
     //
     // @todo To optimize this, we wouldn't need to propagate from the parent, we could just
     //       propagate from here with the parent's intent.
-    if ($access->$field === null) {
+    if ($access->$field === self::INHERIT) {
       $tmp_item = ORM::factory("item")
         ->join("access_intents", "items.id", "access_intents.item_id")
         ->where("left <", $item->left)
         ->where("right >", $item->right)
-        ->where("$field IS NOT", null)
+        ->where("$field IS NOT", self::UNKNOWN)
         ->orderby("left", "DESC")
         ->limit(1)
         ->find();
@@ -578,12 +580,13 @@ class access_Core {
       ->join("items", "items.id", "access_intents.item_id")
       ->where("left >=", $item->left)
       ->where("right <=", $item->right)
-      ->where("$field IS NOT", null)
+      ->where("$field IS NOT", self::INHERIT)
       ->orderby("level", "ASC")
       ->find_all();
     foreach  ($query as $row) {
+      $value = ($row->$field === self::ALLOW) ? "TRUE" : "FALSE";
       $db->query(
-        "UPDATE {access_caches} SET `$field` = {$row->$field} " .
+        "UPDATE {access_caches} SET `$field` = $value " .
         "WHERE `item_id` IN " .
         "  (SELECT `id` FROM {items} " .
         "  WHERE `left` >= $row->left " .
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 5f10bd02..0263e0e1 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -94,9 +94,11 @@ class album_Core {
   }
 
   static function get_edit_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
-    $form->hidden("_method")->value("put");
-    $group = $form->group("edit_item")->label(t("Edit Album"));
+    $view = new View("item_edit.html");
+    $view->script = array();
+    $view->form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
+    $view->form->hidden("_method")->value("put");
+    $group = $view->form->group("edit_item")->label(t("Edit Album"));
 
     $group->input("title")->label(t("Title"))->value($parent->title);
     $group->textarea("description")->label(t("Description"))->value($parent->description);
@@ -127,11 +129,11 @@ class album_Core {
                       "DESC" => t("Descending")))
       ->selected($parent->sort_order);
 
-    module::event("item_edit_form", $parent, $form);
+    module::event("item_edit_form", $parent, $view);
 
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Modify"));
-    $form->add_rules_from(ORM::factory("item"));
-    return $form;
+    $view->form->add_rules_from(ORM::factory("item"));
+    return $view;
   }
 }
diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index a32ac484..2fa7ad1c 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class gallery_Core {
-  const VERSION = "3.0 beta 2";
+  const VERSION = "3.0 git (pre-beta3)";
 
   /**
    * If Gallery is in maintenance mode, then force all non-admins to get routed to a "This site is
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 28c1990f..db13307f 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -305,6 +305,24 @@ class gallery_installer {
       module::clear_var("gallery", "version");
       module::set_version("gallery", $version = 7);
     }
+
+    if ($version == 7) {
+      $groups = ORM::factory("group")->find_all();
+      $permissions = ORM::factory("permission")->find_all();
+      foreach($groups as $group) {
+        foreach($permissions as $permission) {
+          // Update access intents
+          $db->query("ALTER TABLE {access_intents} MODIFY COLUMN {$permission->name}_{$group->id} BINARY(1) DEFAULT NULL");
+          // Update access cache
+          if ($permission->name === "view") {
+            $db->query("ALTER TABLE {items} MODIFY COLUMN {$permission->name}_{$group->id} BINARY(1) DEFAULT FALSE");
+          } else {
+            $db->query("ALTER TABLE {access_caches} MODIFY COLUMN {$permission->name}_{$group->id} BINARY(1) NOT NULL DEFAULT FALSE");
+          }
+        }
+      }
+      module::set_version("gallery", $version = 8);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/gallery_quick.php b/modules/gallery/helpers/gallery_quick.php
index d0ffc584..8a92890b 100644
--- a/modules/gallery/helpers/gallery_quick.php
+++ b/modules/gallery/helpers/gallery_quick.php
@@ -108,12 +108,20 @@ class gallery_quick_Core {
         "href" => url::site("move/browse/$item->id"));
     }
 
-    if (access::can("edit", $item->parent())) {
-      $disabledState =
-        $item->type == "album" && empty($item->album_cover_item_id) ? " ui-state-disabled" : "";
+    $parent = $item->parent();
+    if (access::can("edit", $parent)) {
+      // We can't make this item the highlight if it's an album with no album cover, or if it's
+      // already the album cover.
+      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
+          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
+          $parent->album_cover_item_id == $item->id) {
+        $disabledState = " ui-state-disabled";
+      } else {
+        $disabledState = " ";
+      }
       $elements["right"][] = (object)array(
         "title" => $cover_title,
-        "class" => "gButtonLink{$disabledState}",
+        "class" => "gButtonLink$disabledState",
         "icon" => "ui-icon-star",
         "href" => url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type"));
 
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index f245ea31..998eb289 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -22,12 +22,12 @@ class gallery_theme_Core {
     $session = Session::instance();
     $buf = "";
     if ($session->get("debug")) {
-      $theme->css("modules/gallery/css/debug.css");
+      $theme->css("debug.css");
     }
     if (($theme->page_type == "album" || $theme->page_type == "photo")
         && access::can("edit", $theme->item())) {
-      $theme->css("modules/gallery/css/quick.css");
-      $theme->script("modules/gallery/js/quick.js");
+      $theme->css("quick.css");
+      $theme->script("quick.js");
     }
 
     if (module::is_active("rss")) {
@@ -43,9 +43,9 @@ class gallery_theme_Core {
     }
 
     if ($session->get("l10n_mode", false)) {
-      $theme->css("modules/gallery/css/l10n_client.css");
-      $theme->script("lib/jquery.cookie.js");
-      $theme->script("modules/gallery/js/l10n_client.js");
+      $theme->css("l10n_client.css");
+      $theme->script("jquery.cookie.js");
+      $theme->script("l10n_client.js");
     }
 
     return $buf;
@@ -80,13 +80,13 @@ class gallery_theme_Core {
   static function admin_head($theme) {
     $session = Session::instance();
     if ($session->get("debug")) {
-      $theme->css("modules/gallery/css/debug.css");
+      $theme->css("debug.css");
     }
 
     if ($session->get("l10n_mode", false)) {
-      $theme->css("modules/gallery/css/l10n_client.css");
-      $theme->script("lib/jquery.cookie.js");
-      $theme->script("modules/gallery/js/l10n_client.js");
+      $theme->css("l10n_client.css");
+      $theme->script("jquery.cookie.js");
+      $theme->script("l10n_client.js");
     }
   }
 
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 5cf37de1..299195e9 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -135,9 +135,11 @@ class photo_Core {
   }
 
   static function get_edit_form($photo) {
-    $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
-    $form->hidden("_method")->value("put");
-    $group = $form->group("edit_item")->label(t("Edit Photo"));
+    $view = new View("item_edit.html");
+    $view->script = array();
+    $view->form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
+    $view->form->hidden("_method")->value("put");
+    $group = $view->form->group("edit_item")->label(t("Edit Photo"));
     $group->input("title")->label(t("Title"))->value($photo->title);
     $group->textarea("description")->label(t("Description"))->value($photo->description);
     $group->input("filename")->label(t("Filename"))->value($photo->name)
@@ -147,11 +149,11 @@ class photo_Core {
       ->callback("item::validate_no_trailing_period")
       ->error_messages("no_trailing_period", t("The photo name can't end in \".\""));
 
-    module::event("item_edit_form", $photo, $form);
+    module::event("item_edit_form", $photo, $view);
 
     $group->submit("")->value(t("Modify"));
-    $form->add_rules_from(ORM::factory("item"));
-    return $form;
+    $view->form->add_rules_from(ORM::factory("item"));
+    return $view;
   }
 
   /**