[phpwiki-checkins] SF.net SVN: phpwiki:[7288] trunk/g

[<var...@us...>]

Revision: 7288
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7288&view=rev
Author:   vargenau
Date:     2010-01-22 14:54:05 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
New Fusion Forge syntax; WikiConfig for Fusion Forge

Modified Paths:
--------------
    trunk/g

Modified: trunk/g
===================================================================
--- trunk/g	2010-01-22 14:40:20 UTC (rev 7287)
+++ trunk/g	2010-01-22 14:54:05 UTC (rev 7288)
@@ -47,7 +47,9 @@
 // Disable compression, seems needed to get all the messages.
 $no_gz_buffer=true;
 
-require_once('pre.php');
+require_once('../env.inc.php');
+require_once $gfwww.'include/pre.php';
+require_once $gfplugins.'wiki/include/wikiconfig.class.php';
 
 if (!$group_id || !$project) {
     exit_error("Invalid Project", "Invalid Project");
@@ -59,6 +61,8 @@
     $group_public_name = $project->getPublicName();
     $is_external = $project->getIsExternal();
 
+    $wc = new WikiConfig($group_id);
+
     define('VIRTUAL_PATH', '/wiki/g/'.$group_name);
     define('PAGE_PREFIX', '_g'.$group_id.'_');
 
@@ -79,6 +83,10 @@
 
     define('WIKI_NAME', $group_name);
 
+    define('DISABLE_MARKUP_WIKIWORD', $wc->getWikiConfig('DISABLE_MARKUP_WIKIWORD'));
+
+    define('NUM_SPAM_LINKS', 20 * ($wc->getWikiConfig('NUM_SPAM_LINKS')));
+
     define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/');
     // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
     define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
@@ -101,7 +109,7 @@
     define('DEBUG', ($sys_install_type != 'production'));
     // define('_DEBUG_LOGIN', true);
 
-    // Postgesql
+    // Postgresql
     define('DATABASE_TYPE', 'SQL');
     // Dummy value (to avoid warning in SystemInfo plugin)
     define('DATABASE_DSN', 'pgsql://localhost/user_phpwiki');
@@ -109,7 +117,9 @@
     // Disable VACUUM (they are performed every night)
     define('DATABASE_OPTIMISE_FREQUENCY', 0);
 
-    define('ADMIN_USER', 'ACOS Forge Administrator');
+    // TBD: the name should be taken from Gforge
+    // define('ADMIN_USER', 'ACOS Forge Administrator');
+    define('ADMIN_USER', 'The PhpWiki programming team');
     // Dummy value
     define('ADMIN_PASSWD', 'xxx');
 
@@ -258,7 +268,7 @@
     }
 
     // Load the default configuration.
-    include "index.php";
+    include dirname(__FILE__).'/index.php';
 
     // Override the default configuration for VARIABLES after index.php:
     // E.g. Use another DB:
@@ -269,7 +279,7 @@
     $DBParams['prefix'] = "plugin_wiki_";
 
     // Start the wiki
-    include "lib/main.php";
+    include dirname(__FILE__).'/lib/main.php';
 }
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.