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

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

Revision: 7410
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7410&view=rev
Author:   vargenau
Date:     2010-05-18 16:30:28 +0000 (Tue, 18 May 2010)

Log Message:
-----------
Do not define in "g" what is defined with the same value in "config/config-default.ini"

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

Modified: trunk/g
===================================================================
--- trunk/g	2010-05-18 16:09:22 UTC (rev 7409)
+++ trunk/g	2010-05-18 16:30:28 UTC (rev 7410)
@@ -102,14 +102,10 @@
     // Get the maximum upload filesize from PHP config
     define('MAX_UPLOAD_SIZE', octets(ini_get('upload_max_filesize')));
 
-    // GForge is UTF-8, so use the same.
-    define('CHARSET', 'UTF-8');
-
     // Disable access log (already in apache & gforge).
     define('ACCESS_LOG_SQL', 0);
 
     define('DEBUG', ($sys_install_type != 'production'));
-    // define('_DEBUG_LOGIN', true);
 
     // Postgresql
     define('DATABASE_TYPE', 'SQL');
@@ -128,9 +124,6 @@
     // Allow ".svg" as extension
     define('INLINE_IMAGES', 'png|jpg|jpeg|gif|svg');
 
-    // Allow parsing of headers for CreateToc
-    define('TOC_FULL_SYNTAX', true);
-
     // Allow <div> and <span> in wiki code
     define('ENABLE_MARKUP_DIVSPAN', true);
 
@@ -142,14 +135,6 @@
     define('TOOLBAR_TEMPLATE_PULLDOWN', false);
     define('TOOLBAR_IMAGE_PULLDOWN', true);
 
-    // Disable WYSIWYG
-    define('ENABLE_WYSIWYG', false);
-    define('WYSIWYG_BACKEND', 'tinymce');
-    define('WYSIWYG_DEFAULT_PAGETYPE_HTML', false);
-
-    // Disable public pages
-    define('ENABLE_PAGE_PUBLIC', false);
-
     // Enable external pages
     define('ENABLE_EXTERNAL_PAGES', $is_external);
 
@@ -169,15 +154,11 @@
     // Define access rights for the wiki.
     //
 
-    // Allow anonymous user to view the pages.
-    define('ALLOW_ANON_USER', true);
-
     // Do not allow anon users to edit pages
     define('ALLOW_ANON_EDIT', false);
 
     // Do not allow fake user
     define('ALLOW_BOGO_LOGIN', false);
-    define('ALLOW_USER_PASSWORDS', true);
 
     // A dedicated auth has been created to get auth from GForge
     $USER_AUTH_ORDER = array("GForge");
@@ -208,47 +189,20 @@
 
     define('USE_BYTEA', true);
 
-    define('ENABLE_SPAMBLOCKLIST', false);
-
-    define('ENCRYPTED_PASSWD', true);
-
     define('ENABLE_REVERSE_DNS', false);
 
-    define('ZIPDUMP_AUTH', false);
-
-    define('ENABLE_RAW_HTML', true);
-
-    define('ENABLE_RAW_HTML_LOCKEDONLY', true);
-
-    define('ENABLE_RAW_HTML_SAFE', true);
-
-    define('STRICT_MAILABLE_PAGEDUMPS', false);
-
     // Perhaps propose Web DAV location ?
     define('DEFAULT_DUMP_DIR', "");
     define('HTML_DUMP_DIR', "");
-    define('HTML_DUMP_SUFFIX', ".html");
 
-    define('MINOR_EDIT_TIMEOUT', 604800);
-
     define('COMPRESS_OUTPUT', false);
 
     define('CACHE_CONTROL', "NO_CACHE");
 
-    define('CACHE_CONTROL_MAX_AGE', 600);
-
-    define('COOKIE_EXPIRATION_DAYS', 365);
-
-    define('GROUP_METHOD', "WIKIPAGE");
-
-    define('DBAUTH_AUTH_CRYPT_METHOD', "plain");
-
     define('DEFAULT_LANGUAGE', "en");
 
     define('DISABLE_GETIMAGESIZE', true);
 
-    define('ENABLE_EDIT_TOOLBAR', true);
-
     // If the user is logged in, let the Wiki know
     if (session_loggedin()){
         // let php do it's session stuff too!


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