From 2fd322deeaf6b6b3f880fe21bf78664870d630a3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 21:26:37 -0700
Subject: ACtually implement the upgrader, and add a confirmation box when the
 upgrade is complete.

---
 modules/gallery/controllers/upgrader.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'modules/gallery/controllers')

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index e8798de5..b8769b27 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -20,6 +20,27 @@
 class Upgrader_Controller extends Controller {
   public function index() {
     $view = new View("upgrader.html");
+    $view->available = module::available();
+    $view->done = Input::instance()->get("done");
     print $view;
   }
+
+  public function upgrade() {
+    // Upgrade gallery and user first
+    module::install("gallery");
+    module::install("user");
+
+    // Then upgrade the rest
+    foreach (module::available() as $id => $module) {
+      if ($id == "gallery") {
+        continue;
+      }
+
+      if ($module->active && $module->code_version != $module->version) {
+        module::install($id);
+      }
+    }
+
+    url::redirect("upgrader?done=1");
+  }
 }
-- 
cgit v1.2.3


From d6b808b726a20570e294e6d3eeeb8ea384979ecf Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 9 Jun 2009 21:27:55 -0700
Subject: Add security checks

---
 modules/gallery/controllers/upgrader.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'modules/gallery/controllers')

diff --git a/modules/gallery/controllers/upgrader.php b/modules/gallery/controllers/upgrader.php
index b8769b27..0d5bb4f6 100644
--- a/modules/gallery/controllers/upgrader.php
+++ b/modules/gallery/controllers/upgrader.php
@@ -19,6 +19,11 @@
  */
 class Upgrader_Controller extends Controller {
   public function index() {
+    // Todo: give the admin a chance to log in here
+    if (!user::active()->admin) {
+      access::forbidden();
+    }
+
     $view = new View("upgrader.html");
     $view->available = module::available();
     $view->done = Input::instance()->get("done");
@@ -26,6 +31,11 @@ class Upgrader_Controller extends Controller {
   }
 
   public function upgrade() {
+    // Todo: give the admin a chance to log in here
+    if (!user::active()->admin) {
+      access::forbidden();
+    }
+
     // Upgrade gallery and user first
     module::install("gallery");
     module::install("user");
-- 
cgit v1.2.3