Changeset 1175 in ExiteCMS for modules/common/wiki/php-files/modules/wiki/wikka.config.php

Timestamp:

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

Author:

hverton

Message:

several small fixes

File:

• modules/common/wiki/php-files/modules/wiki/wikka.config.php (modified) (4 diffs)

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'] : "*") : "";
 ?>