Remove unused theme code left over from before virshu moved theme

settings into Admin_Themedetails.

2 files changed, 6 insertions, 53 deletions

diff --git a/core/controllers/admin_themes.php b/core/controllers/admin_themes.php
index 194b9d17..e6751bed 100644
--- a/core/controllers/admin_themes.php
+++ b/core/controllers/admin_themes.php
@@ -43,6 +43,7 @@ class Admin_Themes_Controller extends Admin_Controller {
 
   public function preview($type, $theme_name) {
     $view = new View("admin_themes_preview.html");
+    $theme_name = preg_replace("/[^\w]/", "", $theme_name);
     $view->info = new ArrayObject(
       parse_ini_file(THEMEPATH . "$theme_name/theme.info"), ArrayObject::ARRAY_AS_PROPS);
     $view->theme_name = $theme_name;
@@ -58,6 +59,7 @@ class Admin_Themes_Controller extends Admin_Controller {
   public function choose($type, $theme_name) {
     access::verify_csrf();
 
+    $theme_name = preg_replace("/[^\w]/", "", $theme_name);
     $info = new ArrayObject(
       parse_ini_file(THEMEPATH . "$theme_name/theme.info"), ArrayObject::ARRAY_AS_PROPS);
 
@@ -73,45 +75,5 @@ class Admin_Themes_Controller extends Admin_Controller {
 
     url::redirect("admin/themes");
   }
-
-  public function edit_form($theme_name) {
-    $file = THEMEPATH . $theme_name . "/theme.info";
-    $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-    $theme_info['id'] = $theme_name;
-    print theme::get_edit_form_admin($theme_info);
-  }
-
-  public function edit($theme_name) {
-    $file = THEMEPATH . $theme_name . "/theme.info";
-    $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-    $theme_info['id'] = $theme_name;
-    $form = theme::get_edit_form_admin($theme_info);
-    $valid = $form->validate();
-    if ($valid) {
-      foreach (array("page_size", "thumb_size", "resize_size") as $param) {
-        $val = theme::get_var($theme_name, $param);
-        $input_val = $form->edit_theme->{$param}->value;
-        if ($val != $input_val) {
-          module::set_var($theme_name, $param, $input_val);
-        }
-      }
-      print json_encode(array("result" => "success",
-                              "message" => t("Theme was successfully updated")));
-    } else {
-      print json_encode(array("result" => "error",
-                              "message" => t("Error saving theme values")));
-    }
-  }
-
-  public function save() {
-    access::verify_csrf();
-    $theme = $this->input->post("themes");
-    if ($theme != module::get_var("core", "active_theme")) {
-      module::set_var("core", "active_theme", $theme);
-      message::success(t("Updated Theme"));
-      log::success("graphics", t("Changed theme to %theme_name", array("theme_name" => $theme)));
-    }
-    url::redirect("admin/themes");
-  }
 }
 
diff --git a/core/helpers/theme.php b/core/helpers/theme.php
index a2766028..174c5fbc 100644
--- a/core/helpers/theme.php
+++ b/core/helpers/theme.php
@@ -29,13 +29,13 @@ class theme_Core {
    * active for any given request.
    */
   static function load_themes() {
-    $modules = Kohana::config('core.modules');
+    $modules = Kohana::config("core.modules");
     if (Router::$controller == "admin") {
-      array_unshift($modules, THEMEPATH . 'admin_default');
+      array_unshift($modules, THEMEPATH . "admin_default");
     } else {
-      array_unshift($modules, THEMEPATH . 'default');
+      array_unshift($modules, THEMEPATH . "default");
     }
-    Kohana::config_set('core.modules', $modules);
+    Kohana::config_set("core.modules", $modules);
   }
 
   static function get_edit_form_admin() {
@@ -53,14 +53,5 @@ class theme_Core {
     $group->submit("")->value(t("Save"));
     return $form;
   }
-
-  static function get_edit_form_content($theme_name) {
-    $file = THEMEPATH . $theme_name . "/theme.info";
-    $theme_info = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
-  }
-
-  static function get_var($theme_id, $name, $default_value = null) {
-    return module::get_var($theme_id, $name, module::get_var("core", $name, $default_value));
-  }
 }