From 9fbdcf3efd37e2c6bf67b197b8c93f8790a79cbe Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 5 Sep 2009 13:39:30 -0700
Subject: Change the module installer so that you don't need to provide your
 own install() function if all you're going to do is to set the version of the
 module from module.info into the database.  This means that for some simple
 modules, you don't need an install.php file at all.

---
 modules/akismet/helpers/akismet_installer.php      |  4 ----
 modules/gallery/helpers/module.php                 |  9 ++++++++
 .../image_block/helpers/image_block_installer.php  | 24 ----------------------
 modules/info/helpers/info_installer.php            | 24 ----------------------
 modules/organize/helpers/organize_installer.php    | 24 ----------------------
 modules/recaptcha/helpers/recaptcha_installer.php  |  4 ----
 modules/rss/helpers/rss_installer.php              | 24 ----------------------
 modules/slideshow/helpers/slideshow_installer.php  |  4 ----
 8 files changed, 9 insertions(+), 108 deletions(-)
 delete mode 100644 modules/image_block/helpers/image_block_installer.php
 delete mode 100644 modules/info/helpers/info_installer.php
 delete mode 100644 modules/organize/helpers/organize_installer.php
 delete mode 100644 modules/rss/helpers/rss_installer.php

(limited to 'modules')

diff --git a/modules/akismet/helpers/akismet_installer.php b/modules/akismet/helpers/akismet_installer.php
index 5d8c0e07..b891fc7b 100644
--- a/modules/akismet/helpers/akismet_installer.php
+++ b/modules/akismet/helpers/akismet_installer.php
@@ -18,10 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class akismet_installer {
-  static function install() {
-    module::set_version("akismet", 1);
-  }
-
   static function activate() {
     akismet::check_config();
   }
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 03d538a9..a3088c38 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -119,6 +119,8 @@ class module_Core {
     $installer_class = "{$module_name}_installer";
     if (method_exists($installer_class, "install")) {
       call_user_func_array(array($installer_class, "install"), array());
+    } else {
+      module::set_version($module_name, 1);
     }
     module::load_modules();
 
@@ -145,6 +147,13 @@ class module_Core {
     $installer_class = "{$module_name}_installer";
     if (method_exists($installer_class, "upgrade")) {
       call_user_func_array(array($installer_class, "upgrade"), array($version_before));
+    } else {
+      $available = module::available();
+      if (isset($available->$module_name->code_version)) {
+        module::set_version($module_name, $available->$module_name->code_version);
+      } else {
+        throw new Exception("@todo UNKNOWN_MODULE");
+      }
     }
     module::load_modules();
 
diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php
deleted file mode 100644
index 7ea6a229..00000000
--- a/modules/image_block/helpers/image_block_installer.php
+++ /dev/null
@@ -1,24 +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 image_block_installer {
-  static function install() {
-    module::set_version("image_block", 1);
-  }
-}
diff --git a/modules/info/helpers/info_installer.php b/modules/info/helpers/info_installer.php
deleted file mode 100644
index e3e78b90..00000000
--- a/modules/info/helpers/info_installer.php
+++ /dev/null
@@ -1,24 +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 info_installer {
-  static function install() {
-    module::set_version("info", 1);
-  }
-}
diff --git a/modules/organize/helpers/organize_installer.php b/modules/organize/helpers/organize_installer.php
deleted file mode 100644
index 22ca1793..00000000
--- a/modules/organize/helpers/organize_installer.php
+++ /dev/null
@@ -1,24 +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 organize_installer {
-  static function install() {
-    module::set_version("organize", 1);
-  }
-}
diff --git a/modules/recaptcha/helpers/recaptcha_installer.php b/modules/recaptcha/helpers/recaptcha_installer.php
index 12044a1b..e04822ea 100644
--- a/modules/recaptcha/helpers/recaptcha_installer.php
+++ b/modules/recaptcha/helpers/recaptcha_installer.php
@@ -18,10 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class recaptcha_installer {
-  static function install() {
-    module::set_version("recaptcha", 1);
-  }
-
   static function activate() {
     recaptcha::check_config();
   }
diff --git a/modules/rss/helpers/rss_installer.php b/modules/rss/helpers/rss_installer.php
deleted file mode 100644
index 7766fdfa..00000000
--- a/modules/rss/helpers/rss_installer.php
+++ /dev/null
@@ -1,24 +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 rss_installer {
-  static function install() {
-    module::set_version("rss", 1);
-  }
-}
diff --git a/modules/slideshow/helpers/slideshow_installer.php b/modules/slideshow/helpers/slideshow_installer.php
index cd1c6e05..56874a6a 100644
--- a/modules/slideshow/helpers/slideshow_installer.php
+++ b/modules/slideshow/helpers/slideshow_installer.php
@@ -18,10 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class slideshow_installer {
-  static function install() {
-    module::set_version("slideshow", 1);
-  }
-
   static function deactivate() {
     site_status::clear("slideshow_needs_rss");
   }
-- 
cgit v1.2.3