From: <var...@us...> - 2009-03-31 13:16:30
|
Revision: 6748 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6748&view=rev Author: vargenau Date: 2009-03-31 13:16:20 +0000 (Tue, 31 Mar 2009) Log Message: ----------- More variables Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-03-31 13:12:03 UTC (rev 6747) +++ trunk/g 2009-03-31 13:16:20 UTC (rev 6748) @@ -1,51 +1,279 @@ <?php + +/* + * Copyright (C) 2008-2009 Alcatel-Lucent + * + * This file is part of PhpWiki. + * + * PhpWiki is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * PhpWiki is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PhpWiki; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +/* + * Standard Alcatel-Lucent disclaimer for contributing to open source + * + * "The Configuration File ("Contribution") has not been tested and/or + * validated for release as or in products, combinations with products or + * other commercial use. Any use of the Contribution is entirely made at + * the user's own responsibility and the user can not rely on any features, + * functionalities or performances Alcatel-Lucent has attributed to the + * Contribution. + * + * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY + * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE, + * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE + * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER + * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND + * ALONE BASIS." + */ + +ini_set("memory_limit", "64M"); + +// Disable compression, seems needed to get all the messages. +$no_gz_buffer=true; + require_once('pre.php'); + if (!$group_id || !$project) { - exit_error("Invalid Project","Invalid Project"); + exit_error("Invalid Project","Invalid Project"); } else { - define('VIRTUAL_PATH', $_SERVER['SCRIPT_NAME'] . '/' . $project->getUnixName()); - define('PATH_INFO_PREFIX', '/' . $project->getUnixName() . '/'); + $group_name = $project->getUnixName(); + $group_public_name = $project->getPublicName(); - define('WIKI_NAME', $project->getUnixName()); - //define('ALLOW_HTTP_AUTH_LOGIN', 1); - //define('ADMIN_USER', ''); - //define('ADMIN_PASSWD', ''); - define('AUTH_SESS_USER', 'user_id'); - define('AUTH_SESS_LEVEL', 2); - $USER_AUTH_ORDER = "Session : PersonalPage"; - $USER_AUTH_POLICY = "stacked"; - - // Override the default configuration for CONSTANTS before index.php - //$LANG='de'; $LC_ALL='de_DE'; - define('THEME', 'gforge'); - //define('WIKI_NAME', "WikiDemo:$LANG:" . THEME); + define('VIRTUAL_PATH', '/wiki/g/'.$group_name); + define('PAGE_PREFIX', '_g'.$group_id.'_'); - // Load the default configuration. - include "index.php"; + define('THEME', 'gforge'); - error_log ("PATH_INFO_PREFIX " . PATH_INFO_PREFIX); + // For Gforge, we create some specific pages, located in the theme + // except for project "cssforge" + if ($group_name == "cssforge") { + define('WIKI_PGSRC', 'pgsrc/'); + } else { + define('WIKI_PGSRC', 'themes/gforge/pgsrc/'); + } - // Override the default configuration for VARIABLES after index.php: - // E.g. Use another DB: - $DBParams['dbtype'] = 'SQL'; - $DBParams['dsn'] = 'pgsql://' . $sys_dbuser . ':' . - $sys_dbpasswd . '@' . $sys_dbhost .'/' . $sys_dbname -. '_wiki'; - $DBParams['prefix'] = $project->getUnixName() ."_"; + define('GFORGE', true); - // If the user is logged in, let the Wiki know - if (session_loggedin()){ - // let php do it's session stuff too! - //ini_set('session.save_handler', 'files'); - session_start(); - $_SESSION['user_id'] = user_getname(); + define('PATH_INFO_PREFIX', '/'.$group_name . '/'); + define('USE_PATH_INFO', true); - } else { - // clear out the globals, just in case... + define('WIKI_NAME', $group_name); - } - // Start the wiki - include "lib/main.php"; + define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/'); + // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/'); + // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/'); + define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/'); + + // Do not use a directory per user but only one (per project) + define('UPLOAD_USERDIR', false); + + // 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', false); + // define('_DEBUG_LOGIN', true); + + // Disable VACUUM (they are performed every night) + define('DATABASE_OPTIMISE_FREQUENCY', 0); + + // It is not used by it is required by libs. + define('ADMIN_USER', 'Project Administrators'); + define('ADMIN_PASSWD', 'xxx'); + + // Allow ".jpeg" as extension + define('INLINE_IMAGES', 'png|jpg|jpeg|gif'); + + // Allow template with MediaWiki syntax + define('ENABLE_MARKUP_TEMPLATE', true); + + // Allow tables with MediaWiki syntax + define('ENABLE_MARKUP_MEDIAWIKI_TABLE', true); + + // Allow parsing of headers for CreateToc + define('TOC_FULL_SYNTAX', true); + + // Allow <div> and <span> in wiki code + define('ENABLE_MARKUP_DIVSPAN', true); + + // Disable ENABLE_ACDROPDOWN, it creates a <style> in the <body> (illegal) + define('ENABLE_ACDROPDOWN', false); + + define('TOOLBAR_PAGELINK_PULLDOWN', false); + define('TOOLBAR_TEMPLATE_PULLDOWN', false); + define('TOOLBAR_IMAGE_PULLDOWN', true); + + // Disable WYSIWYG + define('ENABLE_WYSIWYG', false); + + // Which backend? Might need to be seperately installed. See lib/WysiwygEdit/ + // Recommended is only Wikiwyg. + // + // Wikiwyg http://openjsan.org/doc/i/in/ingy/Wikiwyg/ + // tinymce http://tinymce.moxiecode.com/ + // FCKeditor http://fckeditor.net/ + // spaw http://sourceforge.net/projects/spaw + // htmlarea3 + // htmlarea2 + define('WYSIWYG_BACKEND', 'tinymce'); + // + // Store all WYSIWYG pages as HTML? Will loose most link and plugin options. + // Not recommended, but presented here to test several WYSIWYG backends. + define('WYSIWYG_DEFAULT_PAGETYPE_HTML', false); + + // Disable public pages + define('ENABLE_PAGE_PUBLIC', false); + + // Let all revisions be stored. Default since 1.3.11 + define('MAJOR_MIN_KEEP', 2147483647); + define('MINOR_MIN_KEEP', 2147483647); + define('MAJOR_MAX_AGE', 2147483647); + define('MAJOR_KEEP', 2147483647); + define('MINOR_MAX_AGE', 2147483647); + define('MINOR_KEEP', 2147483647); + define('AUTHOR_MAX_AGE', 2147483647); + define('AUTHOR_KEEP', 2147483647); + define('AUTHOR_MIN_AGE', 2147483647); + define('AUTHOR_MAX_KEEP', 2147483647); + + // + // 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"); + define('USER_AUTH_ORDER', 'GForge'); + define('USER_AUTH_POLICY', 'strict'); + + define('EXTERNAL_LINK_TARGET', '_top'); + + // Override the default configuration for CONSTANTS before index.php + $LANG='en'; $LC_ALL='en_US'; + + // We use a local interwiki map file + define('INTERWIKI_MAP_FILE', 'themes/gforge/interwiki.map'); + + define('DEFAULT_WIKI_PAGES', ""); + + define('ERROR_REPORTING', E_ERROR); + + define('DBAUTH_AUTH_CHECK', "SELECT IF(passwd='\$password',1,0) as ok FROM plugin_wiki_pref WHERE userid='\$userid'"); + define('DBAUTH_AUTH_USER_EXISTS', "SELECT userid FROM plugin_wiki_pref WHERE userid='\$userid'"); + define('DBAUTH_AUTH_CREATE', "INSERT INTO plugin_wiki_pref (passwd,userid) VALUES ('\$password','\$userid')"); + define('DBAUTH_PREF_SELECT', "SELECT prefs FROM plugin_wiki_pref WHERE userid='\$userid'"); + define('DBAUTH_PREF_UPDATE', "UPDATE plugin_wiki_pref SET prefs='\$pref_blob' WHERE userid='\$userid'"); + define('DBAUTH_PREF_INSERT', "INSERT INTO plugin_wiki_pref (prefs,userid) VALUES ('\$pref_blob','\$userid')"); + define('DBAUTH_IS_MEMBER', "SELECT userid FROM plugin_wiki_pref WHERE userid='\$userid' AND groupname='\$groupname'"); + define('DBAUTH_GROUP_MEMBERS', "SELECT userid FROM plugin_wiki_pref WHERE groupname='\$groupname'"); + define('DBAUTH_USER_GROUPS', "SELECT groupname FROM plugin_wiki_pref WHERE userid='\$userid'"); + + define('USE_DB_SESSION', true); + + define('USE_BYTEA', true); + + define('ENABLE_SPAMBLOCKLIST', false); + + define('ENCRYPTED_PASSWD', true); + + define('ENABLE_REVERSE_DNS', true); + + 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); + + define('DEFAULT_DUMP_DIR', "/tmp/wikidump"); + define('HTML_DUMP_DIR', "/tmp/wikidumphtml"); + define('HTML_DUMP_SUFFIX', ".html"); + + define('MAX_UPLOAD_SIZE', 16777216); + + 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); + + if (isset($sys_use_selenium) && $sys_use_selenium) { + // Temporary disabled for selenium based tests. + define('ENABLE_EDIT_TOOLBAR', false); + } + + // If the user is logged in, let the Wiki know + if (session_loggedin()){ + // let php do it's session stuff too! + //ini_set('session.save_handler', 'files'); + // session_start(); + $user = session_get_user(); + + if ($user && is_object($user) && !$user->isError() && $user->isActive()) { + $user_name = $user->getRealName(); + $_SESSION['user_id'] = $user_name; + $_SERVER['PHP_AUTH_USER'] = $user_name; + $HTTP_SERVER_VARS['PHP_AUTH_USER'] = $user_name; + } + } else { + // clear out the globals, just in case... + } + + // Load the default configuration. + include "index.php"; + + // Override the default configuration for VARIABLES after index.php: + // E.g. Use another DB: + $DBParams['dbtype'] = 'SQL'; + $DBParams['dsn'] = 'pgsql://' . $sys_dbuser . ':' . + $sys_dbpasswd . '@' . $sys_dbhost .'/' . $sys_dbname; + + $DBParams['prefix'] = "plugin_wiki_"; + + // Start the wiki + include "lib/main.php"; } -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-03-31 15:23:56
|
Revision: 6751 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6751&view=rev Author: vargenau Date: 2009-03-31 15:23:40 +0000 (Tue, 31 Mar 2009) Log Message: ----------- define('ADMIN_USER', 'The PhpWiki programming team'); Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-03-31 14:24:51 UTC (rev 6750) +++ trunk/g 2009-03-31 15:23:40 UTC (rev 6751) @@ -96,8 +96,8 @@ // Disable VACUUM (they are performed every night) define('DATABASE_OPTIMISE_FREQUENCY', 0); - // It is not used by it is required by libs. - define('ADMIN_USER', 'Project Administrators'); + // It is not used but it is required by libs. + define('ADMIN_USER', 'The PhpWiki programming team'); define('ADMIN_PASSWD', 'xxx'); // Allow ".jpeg" as extension This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-03-31 15:29:29
|
Revision: 6752 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6752&view=rev Author: vargenau Date: 2009-03-31 15:29:20 +0000 (Tue, 31 Mar 2009) Log Message: ----------- Add svn:keywords Id Modified Paths: -------------- trunk/g Property Changed: ---------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-03-31 15:23:40 UTC (rev 6751) +++ trunk/g 2009-03-31 15:29:20 UTC (rev 6752) @@ -1,4 +1,4 @@ -<?php +<?php // -*-php-*- $Id$ /* * Copyright (C) 2008-2009 Alcatel-Lucent Property changes on: trunk/g ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-04-01 13:23:18
|
Revision: 6759 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6759&view=rev Author: vargenau Date: 2009-04-01 12:45:21 +0000 (Wed, 01 Apr 2009) Log Message: ----------- Set DEBUG according to $sys_install_type Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-04-01 12:43:12 UTC (rev 6758) +++ trunk/g 2009-04-01 12:45:21 UTC (rev 6759) @@ -90,7 +90,7 @@ // Disable access log (already in apache & gforge). define('ACCESS_LOG_SQL', 0); - define('DEBUG', false); + define('DEBUG', ($sys_install_type != 'production')); // define('_DEBUG_LOGIN', true); // Disable VACUUM (they are performed every night) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-04-09 15:58:04
|
Revision: 6775 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6775&view=rev Author: vargenau Date: 2009-04-09 15:57:46 +0000 (Thu, 09 Apr 2009) Log Message: ----------- Check if wiki plugin is activated by the project Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-04-03 15:32:15 UTC (rev 6774) +++ trunk/g 2009-04-09 15:57:46 UTC (rev 6775) @@ -50,7 +50,9 @@ require_once('pre.php'); if (!$group_id || !$project) { - exit_error("Invalid Project","Invalid Project"); + exit_error("Invalid Project", "Invalid Project"); +} else if (!($project->usesPlugin("wiki"))) { + exit_error("Wiki plugin not activated in project", $project->getPublicName()); } else { $group_name = $project->getUnixName(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-07-16 08:51:17
|
Revision: 7042 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7042&view=rev Author: vargenau Date: 2009-07-16 08:51:13 +0000 (Thu, 16 Jul 2009) Log Message: ----------- Use black list of extensions instead of white list Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-07-16 08:42:16 UTC (rev 7041) +++ trunk/g 2009-07-16 08:51:13 UTC (rev 7042) @@ -87,6 +87,9 @@ // Do not use a directory per user but only one (per project) define('UPLOAD_USERDIR', false); + // Use black list of extensions instead of white list + define('DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', true); + // GForge is UTF-8, so use the same. define('CHARSET', 'UTF-8'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-09-09 13:15:25
|
Revision: 7103 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7103&view=rev Author: vargenau Date: 2009-09-09 13:15:16 +0000 (Wed, 09 Sep 2009) Log Message: ----------- define('ENABLE_AJAX', false); Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-09-09 13:11:38 UTC (rev 7102) +++ trunk/g 2009-09-09 13:15:16 UTC (rev 7103) @@ -122,6 +122,7 @@ // Disable ENABLE_ACDROPDOWN, it creates a <style> in the <body> (illegal) define('ENABLE_ACDROPDOWN', false); + define('ENABLE_AJAX', false); define('TOOLBAR_PAGELINK_PULLDOWN', false); define('TOOLBAR_TEMPLATE_PULLDOWN', false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-09-21 10:13:00
|
Revision: 7146 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7146&view=rev Author: vargenau Date: 2009-09-21 10:12:51 +0000 (Mon, 21 Sep 2009) Log Message: ----------- ERROR_REPORTING not used; remove comments Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-09-20 15:13:16 UTC (rev 7145) +++ trunk/g 2009-09-21 10:12:51 UTC (rev 7146) @@ -81,7 +81,6 @@ define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/'); // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/'); - // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/'); define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/'); // Do not use a directory per user but only one (per project) @@ -130,20 +129,7 @@ // Disable WYSIWYG define('ENABLE_WYSIWYG', false); - - // Which backend? Might need to be seperately installed. See lib/WysiwygEdit/ - // Recommended is only Wikiwyg. - // - // Wikiwyg http://openjsan.org/doc/i/in/ingy/Wikiwyg/ - // tinymce http://tinymce.moxiecode.com/ - // FCKeditor http://fckeditor.net/ - // spaw http://sourceforge.net/projects/spaw - // htmlarea3 - // htmlarea2 define('WYSIWYG_BACKEND', 'tinymce'); - // - // Store all WYSIWYG pages as HTML? Will loose most link and plugin options. - // Not recommended, but presented here to test several WYSIWYG backends. define('WYSIWYG_DEFAULT_PAGETYPE_HTML', false); // Disable public pages @@ -193,8 +179,6 @@ define('DEFAULT_WIKI_PAGES', ""); - define('ERROR_REPORTING', E_ERROR); - define('DBAUTH_AUTH_CHECK', "SELECT IF(passwd='\$password',1,0) as ok FROM plugin_wiki_pref WHERE userid='\$userid'"); define('DBAUTH_AUTH_USER_EXISTS', "SELECT userid FROM plugin_wiki_pref WHERE userid='\$userid'"); define('DBAUTH_AUTH_CREATE', "INSERT INTO plugin_wiki_pref (passwd,userid) VALUES ('\$password','\$userid')"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-10-19 07:46:38
|
Revision: 7218 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7218&view=rev Author: vargenau Date: 2009-10-19 07:46:27 +0000 (Mon, 19 Oct 2009) Log Message: ----------- Get the maximum upload filesize from PHP config Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-10-17 15:45:24 UTC (rev 7217) +++ trunk/g 2009-10-19 07:46:27 UTC (rev 7218) @@ -89,6 +89,9 @@ // Use black list of extensions instead of white list define('DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', true); + // 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'); @@ -203,12 +206,11 @@ define('STRICT_MAILABLE_PAGEDUMPS', false); - define('DEFAULT_DUMP_DIR', "/tmp/wikidump"); - define('HTML_DUMP_DIR', "/tmp/wikidumphtml"); + // Perhaps propose Web DAV location ? + define('DEFAULT_DUMP_DIR', ""); + define('HTML_DUMP_DIR', ""); define('HTML_DUMP_SUFFIX', ".html"); - define('MAX_UPLOAD_SIZE', 16777216); - define('MINOR_EDIT_TIMEOUT', 604800); define('COMPRESS_OUTPUT', false); @@ -263,4 +265,22 @@ // Start the wiki include "lib/main.php"; } + +/** + * Return a number of octets from a string like "300M" + */ +function octets($val) { + $val = trim($val); + $last = strtolower($val[strlen($val)-1]); + switch($last) { + // The 'G' modifier is available since PHP 5.1.0 + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; + } + return $val; +} ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-11-04 15:45:32
|
Revision: 7258 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7258&view=rev Author: vargenau Date: 2009-11-04 15:45:25 +0000 (Wed, 04 Nov 2009) Log Message: ----------- Define DATABASE_TYPE so that upgrade works for Gforge when checking db version. Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-11-04 15:28:21 UTC (rev 7257) +++ trunk/g 2009-11-04 15:45:25 UTC (rev 7258) @@ -101,6 +101,9 @@ define('DEBUG', ($sys_install_type != 'production')); // define('_DEBUG_LOGIN', true); + // Postgesql + define('DATABASE_TYPE', 'SQL'); + // Disable VACUUM (they are performed every night) define('DATABASE_OPTIMISE_FREQUENCY', 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2009-12-04 15:34:02
|
Revision: 7281 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7281&view=rev Author: vargenau Date: 2009-12-04 15:33:47 +0000 (Fri, 04 Dec 2009) Log Message: ----------- Define DATABASE_DSN to avoid warning in SystemInfo plugin Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2009-11-26 14:44:49 UTC (rev 7280) +++ trunk/g 2009-12-04 15:33:47 UTC (rev 7281) @@ -103,11 +103,14 @@ // Postgesql define('DATABASE_TYPE', 'SQL'); + // Dummy value (to avoid warning in SystemInfo plugin) + define('DATABASE_DSN', 'pgsql://localhost/user_phpwiki'); // Disable VACUUM (they are performed every night) define('DATABASE_OPTIMISE_FREQUENCY', 0); define('ADMIN_USER', 'ACOS Forge Administrator'); + // Dummy value define('ADMIN_PASSWD', 'xxx'); // Allow ".svg" as extension @@ -134,7 +137,7 @@ // Disable public pages define('ENABLE_PAGE_PUBLIC', false); - + // Enable external pages define('ENABLE_EXTERNAL_PAGES', $is_external); @@ -194,7 +197,7 @@ define('USE_BYTEA', true); define('ENABLE_SPAMBLOCKLIST', false); - + define('ENCRYPTED_PASSWD', true); define('ENABLE_REVERSE_DNS', true); @@ -233,8 +236,8 @@ define('DISABLE_GETIMAGESIZE', true); if (isset($sys_use_selenium) && $sys_use_selenium) { - // Temporary disabled for selenium based tests. - define('ENABLE_EDIT_TOOLBAR', false); + // Temporary disabled for selenium based tests. + define('ENABLE_EDIT_TOOLBAR', false); } // If the user is logged in, let the Wiki know This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-01-22 14:54:43
|
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. |
From: <var...@us...> - 2010-02-04 14:14:28
|
Revision: 7297 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7297&view=rev Author: vargenau Date: 2010-02-04 14:14:18 +0000 (Thu, 04 Feb 2010) Log Message: ----------- Selenium tests work with ENABLE_EDIT_TOOLBAR now Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-02-04 14:08:36 UTC (rev 7296) +++ trunk/g 2010-02-04 14:14:18 UTC (rev 7297) @@ -245,10 +245,7 @@ define('DISABLE_GETIMAGESIZE', true); - if (isset($sys_use_selenium) && $sys_use_selenium) { - // Temporary disabled for selenium based tests. - define('ENABLE_EDIT_TOOLBAR', false); - } + define('ENABLE_EDIT_TOOLBAR', true); // If the user is logged in, let the Wiki know if (session_loggedin()){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-04-01 17:39:23
|
Revision: 7317 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7317&view=rev Author: vargenau Date: 2010-04-01 17:39:07 +0000 (Thu, 01 Apr 2010) Log Message: ----------- Wiki moved into Gforge plugin directory Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-04-01 09:15:31 UTC (rev 7316) +++ trunk/g 2010-04-01 17:39:07 UTC (rev 7317) @@ -47,7 +47,7 @@ // Disable compression, seems needed to get all the messages. $no_gz_buffer=true; -require_once('../env.inc.php'); +require_once('../../env.inc.php'); require_once $gfwww.'include/pre.php'; require_once $gfplugins.'wiki/include/wikiconfig.class.php'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-04-08 08:48:19
|
Revision: 7324 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7324&view=rev Author: vargenau Date: 2010-04-08 08:48:11 +0000 (Thu, 08 Apr 2010) Log Message: ----------- Change Gforge path for Phpwiki Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-04-08 06:20:12 UTC (rev 7323) +++ trunk/g 2010-04-08 08:48:11 UTC (rev 7324) @@ -49,7 +49,7 @@ require_once('../../env.inc.php'); require_once $gfwww.'include/pre.php'; -require_once $gfplugins.'wiki/include/wikiconfig.class.php'; +require_once $gfplugins.'wiki/common/wikiconfig.class.php'; if (!$group_id || !$project) { exit_error("Invalid Project", "Invalid Project"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-05-04 13:26:58
|
Revision: 7373 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7373&view=rev Author: vargenau Date: 2010-05-04 13:26:52 +0000 (Tue, 04 May 2010) Log Message: ----------- define('ENABLE_REVERSE_DNS', false); Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-05-04 13:17:12 UTC (rev 7372) +++ trunk/g 2010-05-04 13:26:52 UTC (rev 7373) @@ -210,7 +210,7 @@ define('ENCRYPTED_PASSWD', true); - define('ENABLE_REVERSE_DNS', true); + define('ENABLE_REVERSE_DNS', false); define('ZIPDUMP_AUTH', false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-05-04 13:30:58
|
Revision: 7374 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7374&view=rev Author: vargenau Date: 2010-05-04 13:30:52 +0000 (Tue, 04 May 2010) Log Message: ----------- Get ENABLE_RATEIT from wiki config Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-05-04 13:26:52 UTC (rev 7373) +++ trunk/g 2010-05-04 13:30:52 UTC (rev 7374) @@ -87,6 +87,8 @@ define('NUM_SPAM_LINKS', 20 * ($wc->getWikiConfig('NUM_SPAM_LINKS'))); + define('ENABLE_RATEIT', $wc->getWikiConfig('ENABLE_RATEIT')); + 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/'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-05-12 09:32:41
|
Revision: 7396 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7396&view=rev Author: vargenau Date: 2010-05-12 09:32:34 +0000 (Wed, 12 May 2010) Log Message: ----------- Better error message: use exit_no_group Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-05-12 09:03:15 UTC (rev 7395) +++ trunk/g 2010-05-12 09:32:34 UTC (rev 7396) @@ -52,7 +52,7 @@ require_once $gfplugins.'wiki/common/wikiconfig.class.php'; if (!$group_id || !$project) { - exit_error("Invalid Project", "Invalid Project"); + exit_no_group(); } else if (!($project->usesPlugin("wiki"))) { exit_error("Wiki plugin not activated in project", $project->getPublicName()); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-05-18 16:30:34
|
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. |
From: <var...@us...> - 2010-07-15 13:39:06
|
Revision: 7609 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7609&view=rev Author: vargenau Date: 2010-07-15 13:38:59 +0000 (Thu, 15 Jul 2010) Log Message: ----------- No trailing slash needed Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-07-15 11:30:54 UTC (rev 7608) +++ trunk/g 2010-07-15 13:38:59 UTC (rev 7609) @@ -71,9 +71,9 @@ // For Gforge, we create some specific pages, located in the theme // except for project "help" if ($group_name == "help") { - define('WIKI_PGSRC', 'pgsrc/'); + define('WIKI_PGSRC', 'pgsrc'); } else { - define('WIKI_PGSRC', 'themes/gforge/pgsrc/'); + define('WIKI_PGSRC', 'themes/gforge/pgsrc'); } define('GFORGE', true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-08-13 14:22:21
|
Revision: 7645 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7645&view=rev Author: vargenau Date: 2010-08-13 14:22:15 +0000 (Fri, 13 Aug 2010) Log Message: ----------- Avoid using index.php Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-08-13 13:34:26 UTC (rev 7644) +++ trunk/g 2010-08-13 14:22:15 UTC (rev 7645) @@ -221,7 +221,9 @@ } // Load the default configuration. - include dirname(__FILE__).'/index.php'; + require_once(dirname(__FILE__).'/lib/prepend.php'); + require_once(dirname(__FILE__).'/lib/IniConfig.php'); + IniConfig(dirname(__FILE__)."/config/config-default.ini"); // Override the default configuration for VARIABLES after index.php: // E.g. Use another DB: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-09-09 13:25:26
|
Revision: 7679 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7679&view=rev Author: vargenau Date: 2010-09-09 13:25:20 +0000 (Thu, 09 Sep 2010) Log Message: ----------- Use gfcommon instead of gfwww (from Fusionforge) Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-09-08 11:17:03 UTC (rev 7678) +++ trunk/g 2010-09-09 13:25:20 UTC (rev 7679) @@ -48,7 +48,7 @@ $no_gz_buffer=true; require_once('../../env.inc.php'); -require_once $gfwww.'include/pre.php'; +require_once $gfcommon.'include/pre.php'; require_once $gfplugins.'wiki/common/wikiconfig.class.php'; if (!$group_id || !$project) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-12-03 19:20:41
|
Revision: 7749 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7749&view=rev Author: vargenau Date: 2010-12-03 19:20:35 +0000 (Fri, 03 Dec 2010) Log Message: ----------- Remove comments Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2010-12-03 19:15:30 UTC (rev 7748) +++ trunk/g 2010-12-03 19:20:35 UTC (rev 7749) @@ -205,12 +205,8 @@ define('DISABLE_GETIMAGESIZE', true); // If the user is logged in, let the Wiki know - if (session_loggedin()){ - // let php do it's session stuff too! - //ini_set('session.save_handler', 'files'); - // session_start(); + if (session_loggedin()) { $user = session_get_user(); - if ($user && is_object($user) && !$user->isError() && $user->isActive()) { $user_name = $user->getRealName(); $_SESSION['user_id'] = $user_name; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-03-03 09:16:58
|
Revision: 7949 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7949&view=rev Author: vargenau Date: 2011-03-03 09:16:52 +0000 (Thu, 03 Mar 2011) Log Message: ----------- Take $LC_ALL and $LANG from Fusionforge Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2011-03-02 17:24:25 UTC (rev 7948) +++ trunk/g 2011-03-03 09:16:52 UTC (rev 7949) @@ -169,7 +169,8 @@ define('EXTERNAL_LINK_TARGET', '_top'); // Override the default configuration for CONSTANTS before index.php - $LANG='en'; $LC_ALL='en_US'; + $LC_ALL = language_name_to_locale_code(choose_language_from_context()); + $LANG = preg_replace('/_.*/', '', $LC_ALL); // We use a local interwiki map file define('INTERWIKI_MAP_FILE', 'themes/fusionforge/interwiki.map'); @@ -200,7 +201,9 @@ define('CACHE_CONTROL', "NO_CACHE"); - define('DEFAULT_LANGUAGE', "en"); + $lg = language_name_to_locale_code(forge_get_config('default_language')); + $lg = preg_replace('/_.*/', '', $lg); + define('DEFAULT_LANGUAGE', $lg); define('DISABLE_GETIMAGESIZE', true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-04-08 13:00:47
|
Revision: 8026 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8026&view=rev Author: vargenau Date: 2011-04-08 13:00:41 +0000 (Fri, 08 Apr 2011) Log Message: ----------- Web DAV location for DEFAULT_DUMP_DIR and HTML_DUMP_DIR Modified Paths: -------------- trunk/g Modified: trunk/g =================================================================== --- trunk/g 2011-04-08 12:54:42 UTC (rev 8025) +++ trunk/g 2011-04-08 13:00:41 UTC (rev 8026) @@ -193,9 +193,9 @@ define('ENABLE_REVERSE_DNS', false); - // Perhaps propose Web DAV location ? - define('DEFAULT_DUMP_DIR', ""); - define('HTML_DUMP_DIR', ""); + // Web DAV location + define('DEFAULT_DUMP_DIR', "/opt/groups/".$group_name."/wikidump/"); + define('HTML_DUMP_DIR', "/opt/groups/".$group_name."/wikidumphtml/"); define('COMPRESS_OUTPUT', false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |