Revert "Use call_user_func instead of call_user_func_array as we don't need to pass the parameters by reference."

This reverts commit 75cc4962a2c945e3e3ad37fda3b5de32d512b929.

Revert "Make sure that calls to the theme::get_var() have sane defaults in the event that the theme does not supply them."
This reverts commit 51f2b547672ab69a7a04d37b723c6afbeb584a59.

Revert "Update the installer to reflect the new location of the theme related options."
This reverts commit 678e22996d73b96833c48d94751344a6bd8f2899.

Revert "Create theme::get_var(), theme::set_var() methods to set the options of the active site theme.  Change all refrences to theme options to use these methods.  Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme."
This reverts commit 26114972c3388f065220b94a0d5962f20a6ccd0c.

Revert "Currently Admin_Theme_Options controller assumes that all the themes will provide the same values. This change corrects that assumption and moves the management of the theme options, including creating the form and updating the theme options into the theme."
This reverts commit 1692ee130887a6ad1ba68aa34a96ad36161600f9.

12 files changed, 76 insertions, 99 deletions

diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php
index 99d28fd7..1c65f482 100644
--- a/modules/g2_import/controllers/admin_g2_import.php
+++ b/modules/g2_import/controllers/admin_g2_import.php
@@ -35,8 +35,8 @@ class Admin_g2_import_Controller extends Admin_Controller {
     if (g2_import::is_initialized()) {
       $view->content->g2_stats = $g2_stats;
       $view->content->g2_sizes = $g2_sizes;
-      $view->content->thumb_size = theme::get_var("thumb_size", 200);
-      $view->content->resize_size = theme::get_var("resize_size", 640);
+      $view->content->thumb_size = module::get_var("gallery", "thumb_size");
+      $view->content->resize_size = module::get_var("gallery", "resize_size");
     }
     print $view;
   }
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 519da40f..202a0e92 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -671,8 +671,8 @@ class g2_import_Core {
     $g2_item_id = self::$current_g2_item->getId();
     $derivatives = g2(GalleryCoreApi::fetchDerivativesByItemIds(array($g2_item_id)));
 
-    $target_thumb_size = theme::get_var("thumb_size", 200);
-    $target_resize_size = theme::get_var("resize_size", 640);
+    $target_thumb_size = module::get_var("gallery", "thumb_size");
+    $target_resize_size = module::get_var("gallery", "resize_size");
     if (!empty($derivatives[$g2_item_id])) {
       foreach ($derivatives[$g2_item_id] as $derivative) {
         if ($derivative->getPostFilterOperations()) {
diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index c75aebaa..27a67bdb 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -21,41 +21,48 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_theme_options.html");
-
-    $theme_name = theme::$site;
-    $info = theme::get_info($theme_name);
-
-    // Don't use the Kohana cascading file system because we don't want to mess up the admin theme
-    $theme_helper = THEMEPATH . "$theme_name/helpers/{$theme_name}.php";
-    @require_once($theme_helper);
-    $view->content->form =
-      call_user_func("{$theme_name}::get_admin_form", "admin/theme_options/save/");
-
-    $view->content->title = t("%name options", array("name" => $info->name));
-
+    $view->content->form = theme::get_edit_form_admin();
     print $view;
   }
 
   public function save() {
     access::verify_csrf();
 
-    // Don't use the Kohana cascading file system because we don't want to mess up the admin theme
-    $theme_name = theme::$site;
-    $theme_helper = THEMEPATH . "$theme_name/helpers/{$theme_name}.php";
-    @require_once($theme_helper);
+    $form = theme::get_edit_form_admin();
+    if ($form->validate()) {
+      module::set_var("gallery", "page_size", $form->edit_theme->page_size->value);
 
-    $info = theme::get_info($theme_name);
+      $thumb_size = $form->edit_theme->thumb_size->value;
+      $thumb_dirty = false;
+      if (module::get_var("gallery", "thumb_size") != $thumb_size) {
+        graphics::remove_rule("gallery", "thumb", "gallery_graphics::resize");
+        graphics::add_rule(
+          "gallery", "thumb", "gallery_graphics::resize",
+          array("width" => $thumb_size, "height" => $thumb_size, "master" => Image::AUTO),
+          100);
+        module::set_var("gallery", "thumb_size", $thumb_size);
+      }
 
-    $form = call_user_func("{$theme_name}::get_admin_form", "admin/theme_options/save/");
-    if ($form->validate()) {
-      call_user_func("{$theme_name}::update_options", $form);
+      $resize_size = $form->edit_theme->resize_size->value;
+      $resize_dirty = false;
+      if (module::get_var("gallery", "resize_size") != $resize_size) {
+        graphics::remove_rule("gallery", "resize", "gallery_graphics::resize");
+        graphics::add_rule(
+          "gallery", "resize", "gallery_graphics::resize",
+          array("width" => $resize_size, "height" => $resize_size, "master" => Image::AUTO),
+          100);
+        module::set_var("gallery", "resize_size", $resize_size);
+      }
+
+      module::set_var("gallery", "header_text", $form->edit_theme->header_text->value);
+      module::set_var("gallery", "footer_text", $form->edit_theme->footer_text->value);
+      module::set_var("gallery", "show_credits", $form->edit_theme->show_credits->value);
 
-      message::success(t("Updated %name options", array("name" => $info->name)));
+      message::success(t("Updated theme details"));
       url::redirect("admin/theme_options");
     } else {
       $view = new Admin_View("admin.html");
       $view->content = $form;
-      $view->content->title = t("%name options", array("name" => $info->name));
       print $view;
     }
   }
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 749fb520..e67df6f6 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -23,7 +23,7 @@ class Albums_Controller extends Items_Controller {
    *  @see REST_Controller::_show($resource)
    */
   public function _show($album) {
-    $page_size = theme::get_var("page_size", 9);
+    $page_size = module::get_var("gallery", "page_size", 9);
     if (!access::can("view", $album)) {
       if ($album->id == 1) {
         $view = new Theme_View("page.html", "other", "login");
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 88f4a67b..3139951f 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -245,7 +245,11 @@ class gallery_event_Core {
                         ->id("themes")
                         ->label(t("Theme choice"))
                         ->url(url::site("admin/themes")))
-              ->append(Menu::factory("link")
+               ->append(Menu::factory("link")
+                        ->id("theme_options")
+                        ->label(t("Theme options"))
+                        ->url(url::site("admin/theme_options")))
+               ->append(Menu::factory("link")
                         ->id("sidebar")
                         ->label(t("Manage sidebar"))
                         ->url(url::site("admin/sidebar"))))
@@ -256,21 +260,6 @@ class gallery_event_Core {
                ->id("maintenance")
                ->label(t("Maintenance"))
                ->url(url::site("admin/maintenance")));
-
-    $theme_name = theme::$site;
-    $theme_helper = THEMEPATH . "$theme_name/helpers/{$theme_name}.php";
-    if (file_exists($theme_helper)) {
-      require_once($theme_helper);
-
-      if (method_exists($theme_name, "get_admin_form")) {
-        $info = theme::get_info($theme_name);
-        $menu->get("appearance_menu")
-          ->add_after("themes", Menu::factory("link")
-                      ->id("theme_options")
-                      ->label(t("%name options", array("name" => $info->name)))
-                      ->url(url::site("admin/theme_options")));
-      }
-    }
     return $menu;
   }
 
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 4051c6e9..57a5ee9f 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -226,9 +226,9 @@ class gallery_installer {
 
     module::set_var("gallery", "active_site_theme", "wind");
     module::set_var("gallery", "active_admin_theme", "admin_wind");
-    module::set_var("wind", "page_size", 9);
-    module::set_var("wind", "thumb_size", 200);
-    module::set_var("wind", "resize_size", 640);
+    module::set_var("gallery", "page_size", 9);
+    module::set_var("gallery", "thumb_size", 200);
+    module::set_var("gallery", "resize_size", 640);
     module::set_var("gallery", "default_locale", "en_US");
     module::set_var("gallery", "image_quality", 75);
     module::set_var("gallery", "image_sharpen", 15);
@@ -265,10 +265,10 @@ class gallery_installer {
     module::set_var("gallery", "date_format", "Y-M-d");
     module::set_var("gallery", "date_time_format", "Y-M-d H:i:s");
     module::set_var("gallery", "time_format", "H:i:s");
-    module::set_var("wind", "show_credits", 1);
+    module::set_var("gallery", "show_credits", 1);
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
-    module::set_version("gallery", 20);
+    module::set_version("gallery", 19);
   }
 
   static function upgrade($version) {
@@ -432,17 +432,6 @@ class gallery_installer {
       module::clear_var("gallery", "blocks_site.sidebar");
       module::set_version("gallery", $version = 19);
     }
-
-    // Move the theme related variables into the current theme
-    if ($version == 19) {
-      foreach (array("page_size", "thumb_size", "resize_size", "header_text",
-                     "footer_text", "show_credits") as $var) {
-        $value = module::get_var("gallery", $var);
-        theme::set_var($var, $value);
-        module::clear_var("gallery", $var);
-      }
-      module::set_version("gallery", $version = 20);
-    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index c7b773d1..16ed104e 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -24,9 +24,6 @@
  * Note: by design, this class does not do any permission checking.
  */
 class theme_Core {
-  public static $site;
-  public static $admin;
-
   /**
    * Load the active theme.  This is called at bootstrap time.  We will only ever have one theme
    * active for any given request.
@@ -38,16 +35,39 @@ class theme_Core {
       $path = "/" . $input->get("kohana_uri");
     }
 
-    self::$site = module::get_var("gallery", "active_site_theme");
-    self::$admin = module::get_var("gallery", "active_admin_theme");
     if (!(identity::active_user()->admin && $theme_name = $input->get("theme"))) {
-      $theme_name = $path == "/admin" || !strncmp($path, "/admin/", 7) ? self::$admin : self::$site;
+      $theme_name = module::get_var(
+        "gallery",
+        $path == "/admin" || !strncmp($path, "/admin/", 7) ?
+          "active_admin_theme" : "active_site_theme");
     }
     $modules = Kohana::config("core.modules");
     array_unshift($modules, THEMEPATH . $theme_name);
     Kohana::config_set("core.modules", $modules);
   }
 
+  static function get_edit_form_admin() {
+    $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"g-theme-options-form"));
+    $group = $form->group("edit_theme");
+    $group->input("page_size")->label(t("Items per page"))->id("g-page-size")
+      ->rules("required|valid_digit")
+      ->value(module::get_var("gallery", "page_size"));
+    $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("g-thumb-size")
+      ->rules("required|valid_digit")
+      ->value(module::get_var("gallery", "thumb_size"));
+    $group->input("resize_size")->label(t("Resized image size (in pixels)"))->id("g-resize-size")
+      ->rules("required|valid_digit")
+      ->value(module::get_var("gallery", "resize_size"));
+    $group->textarea("header_text")->label(t("Header text"))->id("g-header-text")
+      ->value(module::get_var("gallery", "header_text"));
+    $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text")
+      ->value(module::get_var("gallery", "footer_text"));
+    $group->checkbox("show_credits")->label(t("Show site credits"))->id("g-footer-text")
+      ->checked(module::get_var("gallery", "show_credits"));
+    $group->submit("")->value(t("Save"));
+    return $form;
+  }
+
   static function get_info($theme_name) {
     $theme_name = preg_replace("/[^\w]/", "", $theme_name);
     $file = THEMEPATH . "$theme_name/theme.info";
@@ -57,33 +77,5 @@ class theme_Core {
 
     return $theme_info;
   }
-
-  /**
-   * Get a variable from the active theme
-   * @param string $name
-   * @param string $default_value
-   * @return the value
-   */
-  static function get_var($name, $default_value=null) {
-    return module::get_var(self::$site, $name, $default_value);
-  }
-
-  /**
-   * Store a variable for active theme
-   * @param string $module_name
-   * @param string $name
-   * @param string $value
-   */
-  static function set_var($name, $value) {
-    module::set_var(self::$site, $name, $value);
-  }
-
- /**
-   * Remove a variable for this module.
-   * @param string $module_name
-   * @param string $name
-   */
-  static function clear_var($name) {
-    module::clear_var(self::$site, $name);
-  }
 }
+
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 87d8de56..b1167d0e 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -65,7 +65,7 @@ class Theme_View_Core extends Gallery_View {
   public function thumb_proportion() {
     // @TODO change the 200 to a theme supplied value when and if we come up with an
     // API to allow the theme to set defaults.
-    return theme::get_var("thumb_size", 200) / 200;
+    return module::get_var("gallery", "thumb_size", 200) / 200;
   }
 
   public function item() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index ecce9118..2dc62ecd 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 20
+version = 19
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
index 9f28e055..a4bf1c4e 100644
--- a/modules/gallery/views/admin_theme_options.html.php
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div class="g-block">
-  <h1> <?= t($title) ?> </h1>
+  <h1> <?= t("Theme Options") ?> </h1>
 
   <div class="g-block-content">
   <?= $form ?>
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index fcee5233..539e063f 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -19,7 +19,7 @@
  */
 class Search_Controller extends Controller {
   public function index() {
-    $page_size = theme::get_var("page_size", 9);
+    $page_size = module::get_var("gallery", "page_size", 9);
     $q = $this->input->get("q");
     $page = $this->input->get("page", 1);
     $offset = ($page - 1) * $page_size;
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 6dc77d56..52001719 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -21,7 +21,7 @@ class Tags_Controller extends REST_Controller {
   protected $resource_type = "tag";
 
   public function _show($tag) {
-    $page_size = theme::get_var("page_size", 9);
+    $page_size = module::get_var("gallery", "page_size", 9);
     $page = (int) $this->input->get("page", "1");
     $children_count = $tag->items_count();
     $offset = ($page-1) * $page_size;