Menu
▾
▴
[phpwiki-checkins] CVS: phpwiki/lib IniConfig.php,1.2,1.3 InlineParser.php,1.36,1.37 PageType.php,1.26,1.27 interwiki.php,1.23,1.24 loadsave.php,1.95,1.96 prepend.php,1.16,1.17 stdlib.php,1.170,1.171
|
From: Joseph (J. W. <zo...@us...> - 2004-04-19 23:13:13
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6015/lib Modified Files: IniConfig.php InlineParser.php PageType.php interwiki.php loadsave.php prepend.php stdlib.php Log Message: Connect the rest of PhpWiki to the IniConfig system. Also the keyword regular expression is not a config setting Index: IniConfig.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/IniConfig.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -2 -b -p -d -r1.2 -r1.3 --- IniConfig.php 19 Apr 2004 18:33:13 -0000 1.2 +++ IniConfig.php 19 Apr 2004 23:13:03 -0000 1.3 @@ -52,5 +52,6 @@ $_IC_VALID_VALUE = array('WIKI_NAME', 'A 'LDAP_BASE_DN', 'LDAP_AUTH_USER', 'LDAP_AUTH_PASSWORD', 'LDAP_SEARCH_FIELD', 'IMAP_AUTH_HOST', 'POP3_AUTH_HOST', - 'POP3_AUTH_PORT', 'AUTH_USER_FILE', 'GROUP_METHOD', + 'POP3_AUTH_PORT', 'AUTH_USER_FILE', 'AUTH_SESS_USER', + 'AUTH_SESS_LEVEL', 'GROUP_METHOD', 'AUTH_GROUP_FILE', 'EDITING_POLICY', 'THEME', 'CHARSET', 'DEFAULT_LANGUAGE', 'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC', @@ -61,7 +62,7 @@ $_IC_VALID_VALUE = array('WIKI_NAME', 'A // List of all valid config options to be define()d which take booleans. -$_IC_VALID_BOOL = array('DEBUG', 'ENABLE_USER_NEW', 'ENABLE_REVERSE_DNS', - 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH', 'ENABLE_RAW_HTML', - 'STRICT_MAILABLE_PAGEDUMPS', 'COMPRESS_OUTPUT', +$_IC_VALID_BOOL = array('DEBUG', 'ENABLE_USER_NEW', 'JS_SEARCHREPLACE', + 'ENABLE_REVERSE_DNS', 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH', + 'ENABLE_RAW_HTML', 'STRICT_MAILABLE_PAGEDUMPS', 'COMPRESS_OUTPUT', 'WIKIDB_NOCACHE_MARKUP', 'ALLOW_ANON_USER', 'ALLOW_ANON_EDIT', 'ALLOW_BOGO_LOGIN', 'ALLOW_USER_PASSWORDS', @@ -76,5 +77,5 @@ function IniConfig($file) $config = new Config(); - $root = &$config->parseConfig('config/config.ini', 'inicommented'); + $root = &$config->parseConfig($file, 'inicommented'); $out = $root->toArray(); @@ -226,8 +227,9 @@ function IniConfig($file) // Another "too-tricky" redefine global $KeywordLinkRegexp; - $KeywordLinkRegexp = @$rs['KEYWORD_LINK_REGEXP']; + $keywords = preg_split('/\s*:\s*/', @$rs['KEYWORDS']); + $KeywordLinkRegexp = '(?<=' . implode('|^', $keywords) . ')[[:upper:]].*$'; global $DisabledActions; - $DisabledActions = preg_split('/\s*:\s*/', @$rs['DisabledActions']); + $DisabledActions = preg_split('/\s*:\s*/', @$rs['DISABLED_ACTIONS']); } \ No newline at end of file Index: InlineParser.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/InlineParser.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -2 -b -p -d -r1.36 -r1.37 --- InlineParser.php 19 Apr 2004 18:27:45 -0000 1.36 +++ InlineParser.php 19 Apr 2004 23:13:03 -0000 1.37 @@ -256,6 +256,4 @@ class Markup_escape extends SimpleMarku function LinkBracketLink($bracketlink) { - global $AllowedProtocols, $InlineImages; - //include_once("lib/interwiki.php"); $intermap = getInterwikiMap(); @@ -283,10 +281,10 @@ function LinkBracketLink($bracketlink) { // [label|link] // if label looks like a url to an image, we want an image link. - if (preg_match("/\\.($InlineImages)$/i", $label)) { + if (preg_match("/\\.(" . INLINE_IMAGES . ")$/i", $label)) { $imgurl = $label; if (preg_match("/^" . $intermap->getRegexp() . ":/", $label)) { $imgurl = $intermap->link($label); $imgurl = $imgurl->getAttr('href'); - } elseif (! preg_match("#^($AllowedProtocols):#", $imgurl)) { + } elseif (! preg_match("#^(" . ALLOWED_PROTOCOLS . "):#", $imgurl)) { // local theme linkname like 'images/next.gif'. global $Theme; @@ -303,7 +301,7 @@ function LinkBracketLink($bracketlink) { } - if (preg_match("#^($AllowedProtocols):#", $link)) { + if (preg_match("#^(" . ALLOWED_PROTOCOLS . "):#", $link)) { // if it's an image, embed it; otherwise, it's a regular link - if (preg_match("/\\.($InlineImages)$/i", $link)) + if (preg_match("/\\.(" . INLINE_IMAGES . ")$/i", $link)) return LinkImage($link, $label); else @@ -320,5 +318,5 @@ function LinkBracketLink($bracketlink) { */ elseif (preg_match("/^" . $intermap->getRegexp() . ":/", $link)) { - if (empty($label) && preg_match("/\\.($InlineImages)$/i", $link)) { + if (empty($label) && preg_match("/\\.(" . INLINE_IMAGES . ")$/i", $link)) { // if without label => inlined image [File:xx.gif] $imgurl = $intermap->link($link); @@ -357,6 +355,5 @@ class Markup_url extends SimpleMarkup { function getMatchRegexp () { - global $AllowedProtocols; - return "(?<![[:alnum:]]) (?:$AllowedProtocols) : [^\s<>\"']+ (?<![ ,.?; \] \) ])"; + return "(?<![[:alnum:]]) (?:" . ALLOWED_PROTOCOLS . ") : [^\s<>\"']+ (?<![ ,.?; \] \) ])"; } Index: PageType.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/PageType.php,v retrieving revision 1.26 retrieving revision 1.27 diff -u -2 -b -p -d -r1.26 -r1.27 --- PageType.php 19 Apr 2004 18:27:45 -0000 1.26 +++ PageType.php 19 Apr 2004 23:13:03 -0000 1.27 @@ -189,5 +189,4 @@ class PageType_interwikimap extends Page function _parseMap ($text) { - global $AllowedProtocols; if (!preg_match_all("/^\s*(\S+)\s+(\S+)/m", $text, $matches, PREG_SET_ORDER)) Index: interwiki.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -2 -b -p -d -r1.23 -r1.24 --- interwiki.php 6 Oct 2002 16:45:10 -0000 1.23 +++ interwiki.php 19 Apr 2004 23:13:03 -0000 1.24 @@ -62,5 +62,4 @@ class InterWikiMap { function _parseMap ($text) { - global $AllowedProtocols; if (!preg_match_all("/^\s*(\S+)\s+(\S+)/m", $text, $matches, PREG_SET_ORDER)) Index: loadsave.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v retrieving revision 1.95 retrieving revision 1.96 diff -u -2 -b -p -d -r1.95 -r1.96 --- loadsave.php 18 Apr 2004 01:11:52 -0000 1.95 +++ loadsave.php 19 Apr 2004 23:13:03 -0000 1.96 @@ -251,7 +251,7 @@ function DumpHtmlToDir (&$request) $pages = $dbi->getAllPages(); - global $HTML_DUMP_SUFFIX, $Theme; - if ($HTML_DUMP_SUFFIX) - $Theme->HTML_DUMP_SUFFIX = $HTML_DUMP_SUFFIX; + global $Theme; + if (defined('HTML_DUMP_SUFFIX')) + $Theme->HTML_DUMP_SUFFIX = HTML_DUMP_SUFFIX; $Theme->DUMP_MODE = 'HTML'; @@ -347,7 +347,7 @@ function MakeWikiZipHtml (&$request) $pages = $dbi->getAllPages(); - global $HTML_DUMP_SUFFIX, $Theme; - if ($HTML_DUMP_SUFFIX) - $Theme->HTML_DUMP_SUFFIX = $HTML_DUMP_SUFFIX; + global $Theme; + if (defined('HTML_DUMP_SUFFIX')) + $Theme->HTML_DUMP_SUFFIX = HTML_DUMP_SUFFIX; while ($page = $pages->next()) { @@ -882,4 +882,7 @@ function LoadPostFile (&$request) /** $Log$ + Revision 1.96 2004/04/19 23:13:03 zorloc + Connect the rest of PhpWiki to the IniConfig system. Also the keyword regular expression is not a config setting + Revision 1.95 2004/04/18 01:11:52 rurban more numeric pagename fixes. Index: prepend.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/prepend.php,v retrieving revision 1.16 retrieving revision 1.17 diff -u -2 -b -p -d -r1.16 -r1.17 --- prepend.php 28 Feb 2004 21:14:08 -0000 1.16 +++ prepend.php 19 Apr 2004 23:13:03 -0000 1.17 @@ -8,4 +8,18 @@ function rcs_id ($id) { $GLOBALS['RCS_ID rcs_id('$Id$'); +define ('PHPWIKI_VERSION', '1.3.10pre'); + +// If your php was compiled with --enable-trans-sid it tries to +// add a PHPSESSID query argument to all URL strings when cookie +// support isn't detected in the client browser. For reasons +// which aren't entirely clear (PHP bug) this screws up the URLs +// generated by PhpWiki. Therefore, transparent session ids +// should be disabled. This next line does that. +// +// (At the present time, you will not be able to log-in to PhpWiki, +// unless your browser supports cookies.) +@ini_set('session.use_trans_sid', 0); + + // Used for debugging purposes class DebugTimer { Index: stdlib.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v retrieving revision 1.170 retrieving revision 1.171 diff -u -2 -b -p -d -r1.170 -r1.171 --- stdlib.php 19 Apr 2004 18:27:45 -0000 1.170 +++ stdlib.php 19 Apr 2004 23:13:03 -0000 1.171 @@ -561,8 +561,8 @@ function ConvertOldMarkup ($text, $marku // change ! escapes to ~'s. - global $AllowedProtocols, $WikiNameRegexp, $request; + global $WikiNameRegexp, $request; //include_once('lib/interwiki.php'); $map = getInterwikiMap(); - $bang_esc[] = "(?:$AllowedProtocols):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]"; + $bang_esc[] = "(?:" . ALLOWED_PROTOCOLS . "):[^\s<>\[\]\"'()]*[^\s<>\[\]\"'(),.?]"; $bang_esc[] = $map->getRegexp() . ":[^\\s.,;?()]+"; // FIXME: is this really needed? $bang_esc[] = $WikiNameRegexp; @@ -1383,4 +1383,7 @@ function obj2hash ($obj, $exclude = fals // $Log$ +// Revision 1.171 2004/04/19 23:13:03 zorloc +// Connect the rest of PhpWiki to the IniConfig system. Also the keyword regular expression is not a config setting +// // Revision 1.170 2004/04/19 18:27:45 rurban // Prevent from some PHP5 warnings (ref args, no :: object init) |