Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 15 insertions, 3 deletions

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 761843b0..dd53cf43 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -42,7 +42,7 @@ class gallery_installer {
                 KEY (`tags`))
                 DEFAULT CHARSET=utf8;");
 
-    $db->query("CREATE TABLE {failed_logins} (
+    $db->query("CREATE TABLE {failed_auths} (
                 `id` int(9) NOT NULL auto_increment,
                 `count` int(9) NOT NULL,
                 `name` varchar(255) NOT NULL,
@@ -287,7 +287,8 @@ class gallery_installer {
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
     module::set_var("gallery", "simultaneous_upload_limit", 5);
-    module::set_version("gallery", 26);
+    module::set_var("gallery", "admin_area_timeout", 90 * 60);
+    module::set_version("gallery", 28);
   }
 
   static function upgrade($version) {
@@ -526,6 +527,17 @@ class gallery_installer {
         ->execute();
       module::set_version("gallery", $version = 26);
     }
+
+    if ($version == 26) {
+      $db->query("RENAME TABLE {failed_logins} TO {failed_auths}");
+      module::set_version("gallery", $version = 27);
+    }
+
+    if ($version == 27) {
+      // Set the admin area timeout to 90 minutes
+      module::set_var("gallery", "admin_area_timeout", 90 * 60);
+      module::set_version("gallery", $version = 28);
+    }
   }
 
   static function uninstall() {
@@ -534,7 +546,7 @@ class gallery_installer {
     $db->query("DROP TABLE IF EXISTS {access_intents}");
     $db->query("DROP TABLE IF EXISTS {graphics_rules}");
     $db->query("DROP TABLE IF EXISTS {incoming_translations}");
-    $db->query("DROP TABLE IF EXISTS {failed_logins}");
+    $db->query("DROP TABLE IF EXISTS {failed_auths}");
     $db->query("DROP TABLE IF EXISTS {items}");
     $db->query("DROP TABLE IF EXISTS {logs}");
     $db->query("DROP TABLE IF EXISTS {modules}");