- added fine-grained user permission system which allows us to give

  certain users access to specific administration sections only.
    Ex. a FAQ maintainer can only edit the FAQ, and members of an
        "editorial board" can only edit comments, diaries and
         stories, ..
- code review => rewrote include/user.inc which is much easier now
- fixed 4 small bugs

1 files changed, 5 insertions, 5 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 7ee1034c6..046f6a1cf 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1,6 +1,6 @@
 <?
 
-function conf_load() {
+function conf_init() {
   global $HTTP_HOST, $REQUEST_URI;
   $file = strtr($HTTP_HOST ."". substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")), "/:", "..");
   while ($file && !file_exists("includes/$file.conf")) {
@@ -9,7 +9,7 @@ function conf_load() {
   return $file;
 }
 
-$conf = conf_load();
+$conf = conf_init();
 
 include_once "includes/$conf.conf";
 include_once "includes/database.inc";
@@ -21,8 +21,8 @@ include_once "includes/search.inc";
 include_once "includes/theme.inc";
 include_once "includes/user.inc";
 
-user_load();
-$locale = locale_load();
-$theme = theme_load();
+user_init();
+$locale = locale_init();
+$theme = theme_init();
 
 ?>
\ No newline at end of file