Fix broken installer, add groups upon installation.

diff --git a/include/admin/installer.inc.php b/include/admin/installer.inc.php
index e454cb07199036287e9dc7f02767fb58c576124b..129676b2c965531840fb2cc311252797e0515bb5 100644 (file)
--- a/include/admin/installer.inc.php
+++ b/include/admin/installer.inc.php
@@ -417,7 +417,9 @@ if ( (int)$serendipity['GET']['step'] == 0 ) {
         serendipity_set_user_var('mail_comments', $mail_comments, $authorid);
         serendipity_set_user_var('mail_trackbacks', $mail_comments, $authorid);
         serendipity_set_user_var('right_publish', 1, $authorid);
-
+        serendipity_addDefaultGroup(USERLEVEL_EDITOR_DESC, USERLEVEL_EDITOR);
+        serendipity_addDefaultGroup(USERLEVEL_CHIEF_DESC,  USERLEVEL_CHIEF);
+        serendipity_addDefaultGroup(USERLEVEL_ADMIN_DESC,  USERLEVEL_ADMIN);
 
         echo ' <strong>' . DONE . '</strong><br />';
 

diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 67ab51df79f8d174c4edd2574e9746e2e9f6371b..dcdaa99fc98883568716f233dd7bf0fe785419a8 100644 (file)
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -608,6 +608,10 @@ function serendipity_checkPermission($permName, $authorid = null, $returnMyGroup
     static $permissions = null;
     static $group = null;
     
+    if (IS_installed !== true) {
+        return true;
+    }
+
     if ($permissions === null) {
         $permissions = serendipity_getPermissionNames();
     }
@@ -895,5 +899,38 @@ function serendipity_updateGroupConfig($groupid, &$perms, &$values) {
 
     return true;
 }
+
+function serendipity_addDefaultGroup($name, $level) {
+    global $serendipity;
+
+    static $perms = null;
+    if ($perms === null) {
+        $perms = serendipity_getPermissionNames();
+    }
+    
+    serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}groups (name) VALUES ('" . serendipity_db_escape_string($name) . "')");
+    $gid = (int)serendipity_db_insert_id('groups', 'id');
+    serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}groupconfig (id, property, value) VALUES ($gid, 'userlevel', '" . (int)$level . "')");
+
+    $authors = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}authors WHERE userlevel = " . (int)$level);
+    if (!is_array($authors)) {
+        return;
+    }
+    
+    foreach($authors AS $author) {
+        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}authorgroups (authorid, groupid) VALUES ('{$author['authorid']}', '$gid')");
+    }
+    
+    foreach($perms AS $permName => $permArray) {
+        if (in_array($level, $permArray)) {
+            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}groupconfig (id, property, value) VALUES ($gid, '" . serendipity_db_escape_string($permName) . "', 'true')");
+        } else {
+            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}groupconfig (id, property, value) VALUES ($gid, '" . serendipity_db_escape_string($permName) . "', 'false')");
+        }
+    }
+    
+    return true;
+}
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

diff --git a/include/functions_upgrader.inc.php b/include/functions_upgrader.inc.php
index 6691ffa7434f44cb8b5496a55b8955b1ad696230..da3d7b3835141580a532372eec944b9cca8b4cd6 100644 (file)
--- a/include/functions_upgrader.inc.php
+++ b/include/functions_upgrader.inc.php
@@ -123,36 +123,4 @@ function serendipity_addDefaultGroups() {
     serendipity_addDefaultGroup(USERLEVEL_ADMIN_DESC,  USERLEVEL_ADMIN);
 }
 
-function serendipity_addDefaultGroup($name, $level) {
-    global $serendipity;
-
-    static $perms = null;
-    if ($perms === null) {
-        $perms = serendipity_getPermissionNames();
-    }
-    
-    serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}groups (name) VALUES ('" . serendipity_db_escape_string($name) . "')");
-    $gid = (int)serendipity_db_insert_id('groups', 'id');
-    serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}groupconfig (id, property, value) VALUES ($gid, 'userlevel', '" . (int)$level . "')");
-
-    $authors = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}authors WHERE userlevel = " . (int)$level);
-    if (!is_array($authors)) {
-        return;
-    }
-    
-    foreach($authors AS $author) {
-        serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}authorgroups (authorid, groupid) VALUES ('{$author['authorid']}', '$gid')");
-    }
-    
-    foreach($perms AS $permName => $permArray) {
-        if (in_array($level, $permArray)) {
-            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}groupconfig (id, property, value) VALUES ($gid, '" . serendipity_db_escape_string($permName) . "', 'true')");
-        } else {
-            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}groupconfig (id, property, value) VALUES ($gid, '" . serendipity_db_escape_string($permName) . "', 'false')");
-        }
-    }
-    
-    return true;
-}
-
 ?>
\ No newline at end of file