Changeset 1175 in ExiteCMS

Timestamp:

12/16/07 22:55:37 (4 years ago)

Author:

hverton

Message:

several small fixes

Location:

modules/common/wiki/php-files/modules/wiki

Files:

• actions/footer.php (modified) (1 diff)
• handlers/page/acls.php (modified) (1 diff)
• libs/Wakka.class.php (modified) (1 diff)
• module_installer.php (modified) (1 diff)
• wikka.config.php (modified) (4 diffs)

modules/common/wiki/php-files/modules/wiki/actions/footer.php

@@ -13 +13 @@
     if ($this->page)
     {
-        switch ($owner = $this->GetPageOwner()) {
-            case "(Public)":
-                print("Public page\n");
-                break;
-            case $this->UserIsOwner():
-                print("You own this page\n");
-                break;
-            case false;
-                print("Nobody".($this->GetUser() ? " (<a href=\"".$this->href("claim")."\">Take Ownership</a>)\n" : "\n"));
-            default:
-                if (iMEMBER) {
-                    print("Owner: <a href='".BASEDIR."profile.php?lookup=$owner'>".$owner."</a>\n");
-                } else {
-                    print("Owner: $owner\n");
-                }
+        $owner = $this->GetPageOwner();
+        if ($owner == "(Public)") {
+            print("Public page\n");
+        } elseif ($owner == false) {
+            print("Nobody".($this->GetUser() ? " (<a href=\"".$this->href("claim")."\">Take Ownership</a>)\n" : "\n"));
+        } elseif (iMEMBER && $GLOBALS['userdata']['user_name'] == $owner) {
+            print("You own this page\n");
+        } else {
+            if (iMEMBER) {
+                print("Owner: <a href='".BASEDIR."profile.php?lookup=$owner'>".$owner."</a>\n");
+            } else {
+                print("Owner: $owner\n");
+            }
         }
-        if ($this->IsAdmin()) {
-            print("| <a href=\"".$this->href("acls")."\">Edit ACLs</a>\n");
-        }   
     }
 

modules/common/wiki/php-files/modules/wiki/handlers/page/acls.php

@@ -29 +29 @@
 if (!defined('SET_NO_OWNER_LABEL')) define('SET_NO_OWNER_LABEL', '(Nobody - Set free)');
 if (!defined('USERS_LABEL')) define('USERS_LABEL', 'Users:');
-if (!defined('SELECTED_LABEL')) define('SELECTED_LABEL', 'Selected:');
+if (!defined('SELECTED_LABEL')) define('SELECTED_LABEL', 'Give access to:');
 if (!defined('GROUPS_LABEL')) define('GROUPS_LABEL', 'Usergroups:');
 if (!defined('INSTRUCTION_LABEL')) define('INSTRUCTION_LABEL', 'Click on the user or groupname to move it in or out of the selected box');

modules/common/wiki/php-files/modules/wiki/libs/Wakka.class.php

@@ -1167 +1167 @@
     //returns true if user is listed in configuration list as admin
     function IsAdmin() {
-        $adminstring = $this->config["admin_users"];
-        $adminarray = explode(',' , $adminstring);
-
-        foreach ($adminarray as $admin) {
-            if (trim($admin) == $this->GetUserName()) return true;
+        $admingroup = $this->config["admin_group"];
+        if ($admingroup{0} == "G") {
+            return checkgroup(substr($admingroup,1));
+        } else {
+            return (iMEMBER && $admingroup == $GLOBALS['userdata']['user_id']);
         }
     }

modules/common/wiki/php-files/modules/wiki/module_installer.php

@@ -166 +166 @@
 
 // and add initial record(s) to it
-$mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##wiki_pages (id, tag, time, body, owner, user, latest, note, handler) VALUES (1, 'HomePage', now(), '{{image url=\"images/wikka_logo.jpg\" alt=\"wikka logo\" title=\"Welcome to this Wikka Wiki!\"}}\n\nThis site is running on version ##{{wikkaversion}}## (see WikkaReleaseNotes). \nYou need to double-click on any page or click on the \"Edit page\" link at the bottom to get started. \n\nFor more information, visit the [[Wikka:HomePage WikkaWiki website]]! \n\nUseful pages: FormattingRules, WikkaDocumentation, OrphanedPages, WantedPages, TextSearch.', '##WEBMASTER##', '##WEBMASTER##', 'Y', '', 'page')");
+$mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##wiki_pages (id, tag, time, body, owner, user, latest, note, handler) VALUES (1, 'HomePage', now(), '{{image url=\"images/wikka_logo.jpg\" alt=\"wikka logo\" title=\"Welcome to the ExiteCMS implementation of Wikka Wiki!\"}}\n\nThis wiki is based on Wikka Wiki version ##{{wikkaversion}}## (see WikkaReleaseNotes). \nTo edit a page, double-click on it or click on the \"Edit page\" link at the bottom. \n\nFor more information, visit the [[Wikka:HomePage WikkaWiki website]]! \n\nUseful pages: FormattingRules, WikkaDocumentation, OrphanedPages, WantedPages, TextSearch.', '##WEBMASTER##', '##WEBMASTER##', 'Y', '', 'page')");
 $mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##wiki_pages (id, tag, time, body, owner, user, latest, note, handler) VALUES (2, 'RecentChanges', now(), '{{RecentChanges}}{{nocomments}}\n\n\n----\nCategoryWiki', '(Public)', '##WEBMASTER##', 'Y', '', 'page')");
 $mod_install_cmds[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##wiki_pages (id, tag, time, body, owner, user, latest, note, handler) VALUES (3, 'RecentlyCommented', now(), '{{RecentlyCommented}}{{nocomments}}\n\n\n----\nCategoryWiki', '(Public)', '##WEBMASTER##', 'Y', '', 'page')");

modules/common/wiki/php-files/modules/wiki/wikka.config.php

@@ -1 +1 @@
 <?php
+
 // default config
-
 $wakkaConfig = array(
     'mysql_host' => $db_host,
@@ -34 +34 @@
     'external_link_new_window' => 1,
     'sql_debugging' => '0',
-    'admin_users' => '',
     'admin_email' => $settings['siteemail'],
     'upload_path' => IMAGES."wiki",
@@ -52 +51 @@
 );
 
-// get wiki config variables from the CMSconfig table. They override the default config
-$result = dbquery("SELECT * FROM ".$db_prefix."CMSconfig WHERE cfg_name LIKE 'wiki_%'");
-while ($data = dbarray($result)) {
-    // extract the wakkaConfig key from the cfg_name
-    $cfgkey = substr($data['cfg_name'],5);
-    // if the wakkaConfig key exists, overwrite the value
-    if (isset($wakkaConfig[$cfgkey])) {
-        $wakkaConfig[$cfgkey] = $data['cfg_value'];
+// get wiki config variables from the CMSconfig settings. They override the default config
+foreach($settings as $configkey => $configvalue) {
+    if (substr($configkey,0,5) == "wiki_") {
+        // extract the wakkaConfig key from the cfg_name
+        $cfgkey = substr($configkey,5);
+        // add the value to the wakkaconfig array
+        $wakkaConfig[$cfgkey] = $configvalue;
     }
 }
@@ -70 +68 @@
     $wakkaConfig['stylesheet'] = 'css/wikka.css';
 }
-// if the current user is an admin, add the username to the list of admins
-$wakkaConfig['admin_users'] = checkgroup($wakkaConfig['admin_group']) ? (iMEMBER ? $userdata['user_name'] : "*") : "";
 ?>