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.

2 files changed, 3 insertions, 76 deletions

diff --git a/themes/wind/helpers/wind.php b/themes/wind/helpers/wind.php
deleted file mode 100644
index beef3d41..00000000
--- a/themes/wind/helpers/wind.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-class wind {
-  static function get_admin_form($action) {
-    $form = new Forge($action, "", null, array("id" =>"g-wind-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("wind", "page_size"));
-    $group->input("thumb_size")->label(t("Thumbnail size (in pixels)"))->id("g-thumb-size")
-      ->rules("required|valid_digit")
-      ->value(module::get_var("wind", "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("wind", "resize_size"));
-    $group->textarea("header_text")->label(t("Header text"))->id("g-header-text")
-      ->value(module::get_var("wind", "header_text"));
-    $group->textarea("footer_text")->label(t("Footer text"))->id("g-footer-text")
-      ->value(module::get_var("wind", "footer_text"));
-    $group->checkbox("show_credits")->label(t("Show site credits"))->id("g-footer-text")
-      ->checked(module::get_var("wind", "show_credits"));
-    $group->submit("")->value(t("Save"));
-    return $form;
-  }
-
-  static function update_options($form) {
-    module::set_var("wind", "page_size", $form->edit_theme->page_size->value);
-
-    $thumb_size = $form->edit_theme->thumb_size->value;
-    $thumb_dirty = false;
-    if (module::get_var("wind", "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("wind", "thumb_size", $thumb_size);
-    }
-
-    $resize_size = $form->edit_theme->resize_size->value;
-    $resize_dirty = false;
-    if (module::get_var("wind", "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("wind", "resize_size", $resize_size);
-    }
-
-    module::set_var("wind", "header_text", $form->edit_theme->header_text->value);
-    module::set_var("wind", "footer_text", $form->edit_theme->footer_text->value);
-    module::set_var("wind", "show_credits", $form->edit_theme->show_credits->value);
-  }
-}
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index ddaf33d0..03d43918 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -77,7 +77,7 @@
       <?= $theme->site_status() ?>
       <div id="g-header" class="ui-helper-clearfix">
         <div id="g-banner">
-          <? if ($header_text = theme::get_var("header_text")): ?>
+          <? if ($header_text = module::get_var("gallery", "header_text")): ?>
           <?= $header_text ?>
           <? else: ?>
           <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
@@ -129,11 +129,11 @@
       </div>
       <div id="g-footer" class="ui-helper-clearfix">
         <?= $theme->footer() ?>
-        <? if ($footer_text = theme::get_var("footer_text")): ?>
+        <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
         <?= $footer_text ?>
         <? endif ?>
 
-        <? if (theme::get_var("show_credits")): ?>
+        <? if (module::get_var("gallery", "show_credits")): ?>
         <ul id="g-credits" class="g-inline">
           <?= $theme->credits() ?>
         </ul>