From 64b02026ed645761e910bc31334b66171c58cb5a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 5 Mar 2009 02:26:39 +0000
Subject: Cleanups.

- Show the "Server Add needs configuration" message whenever
  there are no paths.

- Un-ajaxify the admin code to remove complexity and allow us to
  update the status message as appropriate.

- Rename server_add_admin.html.php to admin_server_add.html.php
  for consistency.

- Fix up form to properly display error messages

- Get rid of server_add_dir_list.html.php now that we're
  non-ajaxified.

- Change delete <span> to an <a> for non-ajax world.
---
 modules/server_add/helpers/server_add.php          | 32 ++++++++++++++++++++++
 .../server_add/helpers/server_add_installer.php    | 10 ++-----
 2 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 modules/server_add/helpers/server_add.php

(limited to 'modules/server_add/helpers')

diff --git a/modules/server_add/helpers/server_add.php b/modules/server_add/helpers/server_add.php
new file mode 100644
index 00000000..e51d3d98
--- /dev/null
+++ b/modules/server_add/helpers/server_add.php
@@ -0,0 +1,32 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 server_add_Core {
+  static function check_config() {
+    $paths = unserialize(module::get_var("server_add", "authorized_paths"));
+    if (empty($paths)) {
+      site_status::warning(
+        t("Server Add needs configuration. <a href=\"%url\">Configure it now!</a>",
+          array("url" => url::site("/admin/server_add"))),
+        "server_add_configuration");
+    } else {
+      site_status::clear("server_add_configuration");
+    }
+  }
+}
diff --git a/modules/server_add/helpers/server_add_installer.php b/modules/server_add/helpers/server_add_installer.php
index 0418ea15..26d8bd0d 100644
--- a/modules/server_add/helpers/server_add_installer.php
+++ b/modules/server_add/helpers/server_add_installer.php
@@ -28,18 +28,14 @@ class server_add_installer {
 
       module::set_version("server_add", 1);
       module::set_var("server_add", "authorized_paths", serialize(array()));
-      message::warning(
-        t("Server Add needs configuration. <a href=\"%url\">Configure it now!</a>",
-          array("url" => url::site("/admin/server_add"))));
+
+      server_add::check_config();
     }
   }
 
   static function uninstall() {
     access::delete_permission("server_add");
-    $module = module::get("server_add");
-
-    // @todo remove this after the next alpha
-    module::delete("local_import");
     module::delete("server_add");
+    site_status::clear("server_add_configuration");
   }
 }
-- 
cgit v1.2.3