From: <ru...@us...> - 2010-09-17 11:33:21
|
Revision: 7693 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7693&view=rev Author: rurban Date: 2010-09-17 11:33:14 +0000 (Fri, 17 Sep 2010) Log Message: ----------- avoid setup error Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2010-09-17 11:32:55 UTC (rev 7692) +++ trunk/lib/IniConfig.php 2010-09-17 11:33:14 UTC (rev 7693) @@ -125,6 +125,7 @@ if (!file_exists($file)) { // We need to DATA_PATH for configurator, or pass the posted values // somewhow to the script + $GLOBALS['charset'] = 'utf-8'; include_once(dirname(__FILE__)."/install.php"); run_install("_part1"); if (!defined("_PHPWIKI_INSTALL_RUNNING")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2011-03-31 07:51:57
|
Revision: 8004 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8004&view=rev Author: vargenau Date: 2011-03-31 07:51:51 +0000 (Thu, 31 Mar 2011) Log Message: ----------- Check if PATH_INFO_PREFIX and ACCESS_LOG_SQL are already defined (for Fusionforge) Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2011-03-23 15:37:48 UTC (rev 8003) +++ trunk/lib/IniConfig.php 2011-03-31 07:51:51 UTC (rev 8004) @@ -148,7 +148,7 @@ 'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR', /*'KEYWORDS',*/ // extra logic: //'DATABASE_PREFIX', 'DATABASE_DSN', 'DATABASE_TYPE', 'DATABASE_DBHANDLER', - 'DATABASE_OPTIMISE_FREQUENCY', + 'DATABASE_OPTIMISE_FREQUENCY', 'INTERWIKI_MAP_FILE', 'COPYRIGHTPAGE_TITLE', 'COPYRIGHTPAGE_URL', 'AUTHORPAGE_TITLE', 'AUTHORPAGE_URL', 'WIKI_NAME_REGEXP', @@ -158,7 +158,7 @@ 'WYSIWYG_BACKEND', 'PLUGIN_MARKUP_MAP', // extra logic: 'SERVER_NAME','SERVER_PORT','SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH', - 'EXTERNAL_HTML2PDF_PAGELIST', 'PLUGIN_CACHED_CACHE_DIR' + 'EXTERNAL_HTML2PDF_PAGELIST', 'PLUGIN_CACHED_CACHE_DIR' ); // Optional values which need to be defined. @@ -176,7 +176,7 @@ 'SESSION_SAVE_PATH', 'TOOLBAR_PAGELINK_PULLDOWN', 'TOOLBAR_TEMPLATE_PULLDOWN', 'TOOLBAR_IMAGE_PULLDOWN', 'EXTERNAL_LINK_TARGET', 'ACCESS_LOG_SQL', 'USE_EXTERNAL_HTML2PDF', - 'LOGIN_LOG','LDAP_SEARCH_FILTER' + 'LOGIN_LOG','LDAP_SEARCH_FILTER' ); // List of all valid config options to be define()d which take booleans. @@ -201,7 +201,7 @@ 'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE', 'ENABLE_MARKUP_MEDIAWIKI_TABLE', 'ENABLE_MARKUP_DIVSPAN', 'USE_BYTEA', 'UPLOAD_USERDIR', 'DISABLE_UNITS', - 'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', + 'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', 'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY', 'ENABLE_MAILNOTIFY', 'ENABLE_RECENTCHANGESBOX', 'ENABLE_PAGE_PUBLIC', 'ENABLE_AJAX', 'ENABLE_EXTERNAL_PAGES', @@ -409,17 +409,19 @@ // TODO: Currently unsupported on non-SQL. Nice to have for RhNavPlugin // CHECKME: PDO - if (array_key_exists('ACCESS_LOG_SQL', $rs)) { - // WikiDB_backend::isSql() not yet loaded - if (!in_array(DATABASE_TYPE, array('SQL','ADODB','PDO'))) - // override false config setting on no SQL WikiDB database. - define('ACCESS_LOG_SQL', 0); + if (!defined('ACCESS_LOG_SQL')) { + if (array_key_exists('ACCESS_LOG_SQL', $rs)) { + // WikiDB_backend::isSql() not yet loaded + if (!in_array(DATABASE_TYPE, array('SQL','ADODB','PDO'))) { + // override false config setting on no SQL WikiDB database. + define('ACCESS_LOG_SQL', 0); + } + // SQL defaults to ACCESS_LOG_SQL = 2 + } else { + define('ACCESS_LOG_SQL', + in_array(DATABASE_TYPE, array('SQL','ADODB','PDO')) ? 2 : 0); + } } - // SQL defaults to ACCESS_LOG_SQL = 2 - else { - define('ACCESS_LOG_SQL', - in_array(DATABASE_TYPE, array('SQL','ADODB','PDO')) ? 2 : 0); - } global $PLUGIN_MARKUP_MAP; $PLUGIN_MARKUP_MAP = array(); @@ -1096,12 +1098,14 @@ } } - if (VIRTUAL_PATH != SCRIPT_NAME) { - // Apache action handlers are used. - define('PATH_INFO_PREFIX', VIRTUAL_PATH . '/'); + if (!defined('PATH_INFO_PREFIX')) { + if (VIRTUAL_PATH != SCRIPT_NAME) { + // Apache action handlers are used. + define('PATH_INFO_PREFIX', VIRTUAL_PATH . '/'); + } else { + define('PATH_INFO_PREFIX', '/'); + } } - else - define('PATH_INFO_PREFIX', '/'); define('PHPWIKI_BASE_URL', SERVER_URL . (USE_PATH_INFO ? VIRTUAL_PATH . '/' : SCRIPT_NAME)); @@ -1118,7 +1122,7 @@ $SCRIPT_FILENAME = str_replace('\\\\','\\',strtr($SCRIPT_FILENAME, '/', '\\')); define('SCRIPT_FILENAME', $SCRIPT_FILENAME); - // Get remote host name, if apache hasn't done it for us + // Get remote host name, if Apache hasn't done it for us if (empty($HTTP_SERVER_VARS['REMOTE_HOST']) and !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) and ENABLE_REVERSE_DNS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-11-15 09:26:07
|
Revision: 8467 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8467&view=rev Author: vargenau Date: 2012-11-15 09:26:01 +0000 (Thu, 15 Nov 2012) Log Message: ----------- Define function __ Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2012-11-14 18:15:33 UTC (rev 8466) +++ trunk/lib/IniConfig.php 2012-11-15 09:26:01 UTC (rev 8467) @@ -1013,7 +1013,7 @@ if (!defined('WIKI_NAME')) define('WIKI_NAME', _("An unnamed PhpWiki")); if (!defined('HOME_PAGE')) - define('HOME_PAGE', _("HomePage")); + define('HOME_PAGE', __("HomePage")); ////////////////////////////////////////////////////////////////// // Autodetect URL settings: @@ -1151,6 +1151,21 @@ } +/* + * We have to handle three languages: + * 1) English, the language of the source code + * 2) The language in which the wiki was created (DEFAULT_LANGUAGE) + * 3) The language selected by the user, in which the wiki is displayed (LANG) + * + * The function "_" translates from English to LANG. + * The function "__" translates from English to DEFAULT_LANGUAGE. + */ + +function __($text) +{ + return $text; +} + // Local Variables: // mode: php // tab-width: 8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-11-19 16:41:04
|
Revision: 8489 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8489&view=rev Author: vargenau Date: 2012-11-19 16:40:58 +0000 (Mon, 19 Nov 2012) Log Message: ----------- Allow AsciiMath plugin in Fusionforge Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2012-11-18 17:58:55 UTC (rev 8488) +++ trunk/lib/IniConfig.php 2012-11-19 16:40:58 UTC (rev 8489) @@ -659,6 +659,7 @@ global $AllAllowedPlugins; $AllAllowedPlugins = $ActionPages; // Add plugins that have no corresponding action page + $AllAllowedPlugins[] = 'AsciiMath'; $AllAllowedPlugins[] = 'AsciiSVG'; $AllAllowedPlugins[] = 'AtomFeed'; $AllAllowedPlugins[] = 'BoxRight'; @@ -730,7 +731,6 @@ if (!FUSIONFORGE) { $AllAllowedPlugins[] = 'AddComment'; $AllAllowedPlugins[] = 'AnalyseAccessLogSql'; - $AllAllowedPlugins[] = 'AsciiMath'; $AllAllowedPlugins[] = '_AuthInfo'; $AllAllowedPlugins[] = '_BackendInfo'; $AllAllowedPlugins[] = 'CacheTest'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-11-21 14:06:19
|
Revision: 8516 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8516&view=rev Author: vargenau Date: 2012-11-21 14:06:13 +0000 (Wed, 21 Nov 2012) Log Message: ----------- No argument for fixup_dynamic_configs Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2012-11-21 13:38:10 UTC (rev 8515) +++ trunk/lib/IniConfig.php 2012-11-21 14:06:13 UTC (rev 8516) @@ -567,7 +567,7 @@ save_dump($dump); } // store locale[] in config.php? This is too problematic. - fixup_dynamic_configs($file); // [100ms] + fixup_dynamic_configs(); // [100ms] } function _ignore_unknown_charset_warning(&$error) @@ -922,7 +922,7 @@ * Such as the language, and the virtual and server paths, which might be overridden * by startup scripts for wiki farms. */ -function fixup_dynamic_configs($file) +function fixup_dynamic_configs() { global $WikiNameRegexp; global $HTTP_SERVER_VARS, $DBParams, $LANG; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-11-30 16:28:40
|
Revision: 8583 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8583&view=rev Author: vargenau Date: 2012-11-30 16:28:33 +0000 (Fri, 30 Nov 2012) Log Message: ----------- Allow AddCommentPlugin in Fusionforge Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2012-11-30 16:18:50 UTC (rev 8582) +++ trunk/lib/IniConfig.php 2012-11-30 16:28:33 UTC (rev 8583) @@ -656,6 +656,7 @@ global $AllAllowedPlugins; $AllAllowedPlugins = $ActionPages; // Add plugins that have no corresponding action page + $AllAllowedPlugins[] = 'AddComment'; $AllAllowedPlugins[] = 'AsciiMath'; $AllAllowedPlugins[] = 'AsciiSVG'; $AllAllowedPlugins[] = 'AtomFeed'; @@ -726,7 +727,6 @@ // The FUSIONFORGE theme omits them if (!FUSIONFORGE) { - $AllAllowedPlugins[] = 'AddComment'; $AllAllowedPlugins[] = 'AnalyseAccessLogSql'; $AllAllowedPlugins[] = '_AuthInfo'; $AllAllowedPlugins[] = '_BackendInfo'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-11-30 16:31:25
|
Revision: 8584 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8584&view=rev Author: vargenau Date: 2012-11-30 16:31:16 +0000 (Fri, 30 Nov 2012) Log Message: ----------- Allow EditMetaData plugin Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2012-11-30 16:28:33 UTC (rev 8583) +++ trunk/lib/IniConfig.php 2012-11-30 16:31:16 UTC (rev 8584) @@ -639,11 +639,11 @@ // Add some some action pages depending on configuration if (DEBUG) { $ActionPages[] = 'DebugInfo'; - $ActionPages[] = 'EditMetaData'; $ActionPages[] = 'SpellCheck'; // SpellCheck does not work } $ActionPages[] = 'BlogArchives'; $ActionPages[] = 'BlogJournal'; + $ActionPages[] = 'EditMetaData'; $ActionPages[] = 'InterWikiSearch'; $ActionPages[] = 'LdapSearch'; $ActionPages[] = 'PasswordReset'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-04 11:55:12
|
Revision: 8954 http://sourceforge.net/p/phpwiki/code/8954 Author: vargenau Date: 2014-07-04 11:55:05 +0000 (Fri, 04 Jul 2014) Log Message: ----------- wiki: allow DebugGroupInfo, DebugAuthInfo and DebugBackendInfo for Fusionforge Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2014-07-04 11:53:19 UTC (rev 8953) +++ trunk/lib/IniConfig.php 2014-07-04 11:55:05 UTC (rev 8954) @@ -700,18 +700,18 @@ $AllAllowedPlugins[] = 'WikiFormRich'; $AllAllowedPlugins[] = 'WikiPoll'; $AllAllowedPlugins[] = 'YouTube'; + $AllAllowedPlugins[] = 'DebugGroupInfo'; + $AllAllowedPlugins[] = 'DebugAuthInfo'; + $AllAllowedPlugins[] = 'DebugBackendInfo'; // The FUSIONFORGE theme omits them if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { $AllAllowedPlugins[] = 'AnalyseAccessLogSql'; - $AllAllowedPlugins[] = 'DebugAuthInfo'; - $AllAllowedPlugins[] = 'DebugBackendInfo'; $AllAllowedPlugins[] = 'CacheTest'; $AllAllowedPlugins[] = 'CategoryPage'; $AllAllowedPlugins[] = 'FoafViewer'; $AllAllowedPlugins[] = 'FrameInclude'; $AllAllowedPlugins[] = 'GraphViz'; - $AllAllowedPlugins[] = 'DebugGroupInfo'; $AllAllowedPlugins[] = 'HtmlConverter'; $AllAllowedPlugins[] = 'JabberPresence'; $AllAllowedPlugins[] = 'ListPages'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-28 13:52:04
|
Revision: 9017 http://sourceforge.net/p/phpwiki/code/9017 Author: vargenau Date: 2014-07-28 13:51:56 +0000 (Mon, 28 Jul 2014) Log Message: ----------- Always add DebugInfo and SpellCheck Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2014-07-28 13:11:28 UTC (rev 9016) +++ trunk/lib/IniConfig.php 2014-07-28 13:51:56 UTC (rev 9017) @@ -612,11 +612,9 @@ // The FUSIONFORGE theme omits them if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { - // Add some some action pages depending on configuration - if (DEBUG) { - $ActionPages[] = 'DebugInfo'; - $ActionPages[] = 'SpellCheck'; // SpellCheck does not work - } + // Add some some action pages + $ActionPages[] = 'DebugInfo'; + $ActionPages[] = 'SpellCheck'; // SpellCheck does not work $ActionPages[] = 'BlogArchives'; $ActionPages[] = 'BlogJournal'; $ActionPages[] = 'EditMetaData'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-03 15:26:21
|
Revision: 9186 http://sourceforge.net/p/phpwiki/code/9186 Author: vargenau Date: 2014-10-03 15:26:18 +0000 (Fri, 03 Oct 2014) Log Message: ----------- function crypt exists Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2014-10-03 15:25:29 UTC (rev 9185) +++ trunk/lib/IniConfig.php 2014-10-03 15:26:18 UTC (rev 9186) @@ -798,21 +798,6 @@ if (!defined('THEME')) define('THEME', 'default'); - /*$configurator_link = HTML(HTML::br(), "=>", - HTML::a(array('href'=>DATA_PATH."/configurator.php"), - _("Configurator")));*/ - // check whether the crypt() function is needed and present - if (defined('ENCRYPTED_PASSWD') && !function_exists('crypt')) { - $error = sprintf("Encrypted passwords cannot be used: %s.", - "'function crypt()' not available in this version of php"); - trigger_error($error, E_USER_WARNING); - if (!preg_match("/config\-dist\.ini$/", $file)) { // protect against recursion - include_once(dirname(__FILE__) . "/install.php"); - run_install("_part1"); - exit(); - } - } - // Basic configurator validation if (!defined('ADMIN_USER') or ADMIN_USER == '') { $error = sprintf("%s may not be empty. Please update your configuration.", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-12-09 15:10:17
|
Revision: 9438 http://sourceforge.net/p/phpwiki/code/9438 Author: vargenau Date: 2014-12-09 15:10:09 +0000 (Tue, 09 Dec 2014) Log Message: ----------- Remove unused Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2014-12-09 10:56:24 UTC (rev 9437) +++ trunk/lib/IniConfig.php 2014-12-09 15:10:09 UTC (rev 9438) @@ -354,9 +354,11 @@ foreach (array('major', 'minor', 'author') as $major) { foreach (array('max_age', 'min_age', 'min_keep', 'keep', 'max_keep') as $max) { $item = strtoupper($major) . '_' . strtoupper($max); - if (defined($item)) $val = constant($item); + if (defined($item)) + $val = constant($item); elseif (array_key_exists($item, $rs)) - $val = $rs[$item]; elseif (array_key_exists($item, $rsdef)) + $val = $rs[$item]; + elseif (array_key_exists($item, $rsdef)) $val = $rsdef[$item]; if (!isset($ExpireParams[$major])) $ExpireParams[$major] = array(); @@ -570,8 +572,8 @@ // moved from lib/config.php [1ms] function fixup_static_configs($file) { - global $FieldSeparator, $WikiNameRegexp, $AllActionPages; - global $DBParams, $LANG, $ErrorManager; + global $FieldSeparator, $AllActionPages; + global $DBParams; // init FileFinder to add proper include paths FindFile("lib/interwiki.map", true); @@ -847,8 +849,7 @@ */ function fixup_dynamic_configs() { - global $WikiNameRegexp; - global $DBParams, $LANG; + global $LANG; if (defined('INCLUDE_PATH') and INCLUDE_PATH) { @ini_set('include_path', INCLUDE_PATH); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-25 15:07:08
|
Revision: 9561 http://sourceforge.net/p/phpwiki/code/9561 Author: vargenau Date: 2015-02-25 15:07:06 +0000 (Wed, 25 Feb 2015) Log Message: ----------- Add BlogArchives, BlogJournal, WikiBlog for Fusionforge Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2015-02-25 15:06:23 UTC (rev 9560) +++ trunk/lib/IniConfig.php 2015-02-25 15:07:06 UTC (rev 9561) @@ -583,7 +583,7 @@ // All pages containing plugins of the same name as the filename $ActionPages = explode(':', 'AllPages:AllUsers:AppendText:AuthorHistory:' - . 'BackLinks:' + . 'BackLinks:BlogArchives:BlogJournal:' . 'CreatePage:' . 'FullTextSearch:FuzzyPages:' . 'LikePages:LinkDatabase:LinkSearch:ListRelations:' @@ -597,15 +597,13 @@ . 'TitleSearch:' . 'UpLoad:UserPreferences:' . 'UserRatings:' // UserRatings works only in wikilens derived themes - . 'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect'); + . 'WantedPages:WatchPage:WikiBlog:WhoIsOnline:WikiAdminSelect'); // The FUSIONFORGE theme omits them if (!(defined('FUSIONFORGE') && FUSIONFORGE)) { // Add some some action pages $ActionPages[] = 'DebugInfo'; $ActionPages[] = 'SpellCheck'; // SpellCheck does not work - $ActionPages[] = 'BlogArchives'; - $ActionPages[] = 'BlogJournal'; $ActionPages[] = 'EditMetaData'; $ActionPages[] = 'InterWikiSearch'; $ActionPages[] = 'LdapSearch'; @@ -613,7 +611,6 @@ $ActionPages[] = 'RecentComments'; $ActionPages[] = 'TranslateText'; $ActionPages[] = 'UriResolver'; - $ActionPages[] = 'WikiBlog'; } global $AllAllowedPlugins; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-28 16:57:36
|
Revision: 9576 http://sourceforge.net/p/phpwiki/code/9576 Author: vargenau Date: 2015-02-28 16:57:34 +0000 (Sat, 28 Feb 2015) Log Message: ----------- PDO is part of language now Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2015-02-27 18:16:08 UTC (rev 9575) +++ trunk/lib/IniConfig.php 2015-02-28 16:57:34 UTC (rev 9576) @@ -324,15 +324,7 @@ DATABASE_TYPE, join(",", $valid_database_types)), E_USER_ERROR); unset($valid_database_types); - if (DATABASE_TYPE == 'PDO') { - // try to load it dynamically (unix only) - if (!loadPhpExtension("pdo")) { - echo $GLOBALS['php_errormsg'], "<br>\n"; - trigger_error(sprintf("dl() problem: Required extension “%s” could not be loaded!", - "pdo"), - E_USER_ERROR); - } - } + // Detect readonly database, e.g. system mounted read-only for maintenance // via dbh->readonly later. Unfortunately not possible as constant. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2015-02-28 17:02:35
|
Revision: 9577 http://sourceforge.net/p/phpwiki/code/9577 Author: vargenau Date: 2015-02-28 17:02:28 +0000 (Sat, 28 Feb 2015) Log Message: ----------- Remove unused function Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2015-02-28 16:57:34 UTC (rev 9576) +++ trunk/lib/IniConfig.php 2015-02-28 17:02:28 UTC (rev 9577) @@ -550,17 +550,6 @@ fixup_dynamic_configs(); // [100ms] } -function _ignore_unknown_charset_warning(&$error) -{ - if (preg_match('/^htmlspecialchars\(\): charset \`.+\' not supported, assuming iso-8859-1/', - $error->errstr) - ) { - $error->errno = 0; - return true; // Ignore error - } - return false; -} - // moved from lib/config.php [1ms] function fixup_static_configs($file) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-02-10 17:47:43
|
Revision: 9790 http://sourceforge.net/p/phpwiki/code/9790 Author: vargenau Date: 2016-02-10 17:47:41 +0000 (Wed, 10 Feb 2016) Log Message: ----------- ereg --> preg_match Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2016-02-10 17:34:26 UTC (rev 9789) +++ trunk/lib/IniConfig.php 2016-02-10 17:47:41 UTC (rev 9790) @@ -962,7 +962,7 @@ define('USE_PATH_INFO', false); break; default: - define('USE_PATH_INFO', ereg('\.(php3?|cgi)$', SCRIPT_NAME)); + define('USE_PATH_INFO', preg_match('/\.(php3?|cgi)$/', SCRIPT_NAME)); break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2016-03-17 08:16:21
|
Revision: 9810 http://sourceforge.net/p/phpwiki/code/9810 Author: vargenau Date: 2016-03-17 08:16:19 +0000 (Thu, 17 Mar 2016) Log Message: ----------- HtmlConverter plugin allowed in Fusionforge Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2016-03-11 13:06:51 UTC (rev 9809) +++ trunk/lib/IniConfig.php 2016-03-17 08:16:19 UTC (rev 9810) @@ -620,6 +620,7 @@ $AllAllowedPlugins[] = 'GooglePlugin'; $AllAllowedPlugins[] = 'GoTo'; $AllAllowedPlugins[] = 'HelloWorld'; + $AllAllowedPlugins[] = 'HtmlConverter'; $AllAllowedPlugins[] = 'IncludePage'; $AllAllowedPlugins[] = 'IncludePages'; $AllAllowedPlugins[] = 'IncludeSiteMap'; @@ -678,7 +679,6 @@ $AllAllowedPlugins[] = 'CategoryPage'; $AllAllowedPlugins[] = 'FoafViewer'; $AllAllowedPlugins[] = 'GraphViz'; - $AllAllowedPlugins[] = 'HtmlConverter'; $AllAllowedPlugins[] = 'JabberPresence'; $AllAllowedPlugins[] = 'ListPages'; $AllAllowedPlugins[] = 'Ploticus'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-01-11 12:26:21
|
Revision: 9997 http://sourceforge.net/p/phpwiki/code/9997 Author: vargenau Date: 2017-01-11 12:26:18 +0000 (Wed, 11 Jan 2017) Log Message: ----------- Remove unused global $FieldSeparator Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2017-01-11 12:14:43 UTC (rev 9996) +++ trunk/lib/IniConfig.php 2017-01-11 12:26:18 UTC (rev 9997) @@ -50,7 +50,7 @@ * (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...) * Use one global $phpwiki object instead which holds the cfg vars, constants * and all other globals. - * (global $FieldSeparator, $WikiNameRegexp, $KeywordLinkRegexp; + * (global $WikiNameRegexp, $KeywordLinkRegexp; * global $DisabledActions, $DBParams, $LANG, $AllActionPages) * * - Resurrect the larger "config object" code (in config/) so it'll aid the @@ -556,14 +556,11 @@ // moved from lib/config.php [1ms] function fixup_static_configs($file) { - global $FieldSeparator, $AllActionPages; + global $AllActionPages; global $DBParams; // init FileFinder to add proper include paths findFile("lib/interwiki.map", true); - // $FieldSeparator = "\xFF"; // this byte should never appear in utf-8 - $FieldSeparator = "\xFF"; - // All pages containing plugins of the same name as the filename $ActionPages = explode(':', 'AllPages:AllUsers:AppendText:AuthorHistory:' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-09-30 12:43:53
|
Revision: 10602 http://sourceforge.net/p/phpwiki/code/10602 Author: vargenau Date: 2021-09-30 12:43:51 +0000 (Thu, 30 Sep 2021) Log Message: ----------- Remove function save_dump Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2021-09-30 11:00:26 UTC (rev 10601) +++ trunk/lib/IniConfig.php 2021-09-30 12:43:51 UTC (rev 10602) @@ -65,48 +65,6 @@ include_once (dirname(__FILE__) . "/config.php"); include_once (dirname(__FILE__) . "/FileFinder.php"); -/** - * Speed-up iniconfig loading. - * - * Dump the static parts of the parsed config/config.ini settings to a fast-loadable config.php file. - * The dynamic parts are then evaluated as before. - * Requires write-permissions to config/config.php - * - * @param string $file - */ -function save_dump($file) -{ - $vars =& $GLOBALS; // copy + unset not possible - $ignore = array(); - foreach (array("SERVER", "ENV", "GET", "POST", "REQUEST", "COOKIE", "FILES") as $key) { - $ignore["HTTP_" . $key . "_VARS"]++; - $ignore["_" . $key]++; - } - foreach (array("HTTP_POST_FILES", "GLOBALS", "RUNTIMER", "ErrorManager", 'LANG', - 'HOME_PAGE', 'request', 'SCRIPT_NAME', 'VIRTUAL_PATH', 'SCRIPT_FILENAME') as $key) - $ignore[$key]++; - $fp = fopen($file, "wb"); - fwrite($fp, "<?php\n"); - fwrite($fp, "function wiki_configrestore(){\n"); - //TODO: optimize this by removing ignore, big serialized array and merge into existing GLOBALS - foreach ($vars as $var => $val) { - if (!$ignore[$var]) - fwrite($fp, "\$GLOBALS['" . $var . "']=unserialize(\"" - . addslashes(serialize($val)) . "\");\n"); - } - // cannot be optimized, maybe leave away predefined consts somehow - foreach (get_defined_constants() as $var => $val) { - if (substr($var, 0, 4) != "PHP_" and substr($var, 0, 2) != "E_" - and substr($var, 0, 2) != "T_" and substr($var, 0, 2) != "M_" - ) - fwrite($fp, "if(!defined('" . $var . "')) define('" . $var . "',unserialize(\"" - . addslashes(serialize($val)) . "\"));\n"); - } - fwrite($fp, "return 'noerr';}"); - fwrite($fp, "?>"); - fclose($fp); -} - function _check_int_constant(&$c) { // if int value == string value, force int type @@ -521,12 +479,6 @@ unset($rsdef); fixup_static_configs($file); //[1ms] - // Dump all globals and constants - // The question is if reading this is faster then doing IniConfig() + fixup_static_configs() - if (is_writable($dump)) { - save_dump($dump); - } - // store locale[] in config.php? This is too problematic. fixup_dynamic_configs(); // [100ms] } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-09-30 12:59:11
|
Revision: 10604 http://sourceforge.net/p/phpwiki/code/10604 Author: vargenau Date: 2021-09-30 12:59:09 +0000 (Thu, 30 Sep 2021) Log Message: ----------- lib/IniConfig.php: config/config.php no longer exists Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2021-09-30 12:52:20 UTC (rev 10603) +++ trunk/lib/IniConfig.php 2021-09-30 12:59:09 UTC (rev 10604) @@ -44,8 +44,6 @@ * - config.ini => config.php dumper for faster startup. (really faster? to time) * * TODO: - * - Old-style index.php => config/config.ini converter. - * * - Don't use too much globals for easier integration into other projects * (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...) * Use one global $phpwiki object instead which holds the cfg vars, constants @@ -75,17 +73,6 @@ function IniConfig($file) { - - // Optionally check config/config.php dump for faster startup - $dump = substr($file, 0, -3) . "php"; - if (file_exists($dump) and is_readable($dump) and filesize($dump) > 0 and sort_file_mtime($dump, $file) < 0) { - @include($dump) or die("Error including " . $dump); - if (function_exists('wiki_configrestore') and (wiki_configrestore() === 'noerr')) { - fixup_dynamic_configs(); - return; - } - } - // First-time installer detection here... // Similar to SetupWiki() if (!file_exists($file)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-09-30 13:32:07
|
Revision: 10605 http://sourceforge.net/p/phpwiki/code/10605 Author: vargenau Date: 2021-09-30 13:32:04 +0000 (Thu, 30 Sep 2021) Log Message: ----------- lib/IniConfig.php: remove old comments Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2021-09-30 12:59:09 UTC (rev 10604) +++ trunk/lib/IniConfig.php 2021-09-30 13:32:04 UTC (rev 10605) @@ -37,12 +37,6 @@ */ /** - * DONE: - * - Convert the value lists to provide defaults, so that every "if - * (defined())" and "if (!defined())" can fuck off to the dismal hole - * it belongs in. - * - config.ini => config.php dumper for faster startup. (really faster? to time) - * * TODO: * - Don't use too much globals for easier integration into other projects * (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...) @@ -330,7 +324,7 @@ unset($rskey); unset($apkey); - // TODO: Currently unsupported on non-SQL. Nice to have for RhNavPlugin + // TODO: Currently unsupported on non-SQL. // CHECKME: PDO if (!defined('ACCESS_LOG_SQL')) { if (array_key_exists('ACCESS_LOG_SQL', $rs)) { @@ -469,7 +463,6 @@ fixup_dynamic_configs(); // [100ms] } -// moved from lib/config.php [1ms] function fixup_static_configs($file) { global $AllActionPages; @@ -664,10 +657,6 @@ if (($temp == '/') || ($temp == '\\')) $temp = ''; define('DATA_PATH', $temp); - /* - if (USE_PATH_INFO) - define('DATA_PATH', '..'); - */ } ////////////////////////////////////////////////////////////////// This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-06 13:34:28
|
Revision: 10733 http://sourceforge.net/p/phpwiki/code/10733 Author: vargenau Date: 2021-12-06 13:34:26 +0000 (Mon, 06 Dec 2021) Log Message: ----------- Remove ENABLE_MARKUP_MEDIAWIKI_TABLE Modified Paths: -------------- trunk/lib/IniConfig.php Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2021-12-06 13:00:41 UTC (rev 10732) +++ trunk/lib/IniConfig.php 2021-12-06 13:34:26 UTC (rev 10733) @@ -144,7 +144,6 @@ 'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA', 'ENABLE_WYSIWYG', 'WYSIWYG_DEFAULT_PAGETYPE_HTML', 'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE', - 'ENABLE_MARKUP_MEDIAWIKI_TABLE', 'ENABLE_MARKUP_DIVSPAN', 'USE_BYTEA', 'UPLOAD_USERDIR', 'DISABLE_UNITS', 'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', 'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |