Update of /cvsroot/phpwiki/phpwiki/lib
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30792
Modified Files:
stdlib.php
Log Message:
"phpwiki:" protocol patch -- omitted stdlib.php in previous commit - *sigh*
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** stdlib.php 2000/10/26 11:34:36 1.6
--- stdlib.php 2000/10/31 19:23:03 1.7
***************
*** 342,346 ****
global $remoteuser; // this is set in the config
global $dateformat;
- global $ScriptUrl;
global $WikiPageStore;
--- 342,345 ----
***************
*** 391,395 ****
$newpage[$k++] = "* [$pagename] (new) ..... $remoteuser\r";
} else {
! $diffurl = "$ScriptUrl?diff=" . rawurlencode($pagename);
$newpage[$k++] = "* [$pagename] ([diff|$diffurl]) ..... $remoteuser\r";
}
--- 390,394 ----
$newpage[$k++] = "* [$pagename] (new) ..... $remoteuser\r";
} else {
! $diffurl = "phpwiki:?diff=" . rawurlencode($pagename);
$newpage[$k++] = "* [$pagename] ([diff|$diffurl]) ..... $remoteuser\r";
}
***************
*** 414,418 ****
function ParseAndLink($bracketlink) {
! global $dbi, $AllowedProtocols, $InlineImages;
// $bracketlink will start and end with brackets; in between
--- 413,417 ----
function ParseAndLink($bracketlink) {
! global $dbi, $ScriptUrl, $AllowedProtocols, $InlineImages;
// $bracketlink will start and end with brackets; in between
***************
*** 424,428 ****
preg_match("/([^|]+)(\|)?([^|]+)?/", $match[2], $matches);
-
// if $matches[3] is set, this is a link in the form of:
// [some link name | http://blippy.com/]
--- 423,426 ----
***************
*** 440,444 ****
$link['link'] = "<a href=\"$URL\">$linkname</a>";
}
! } else {
$link['type'] = 'url-bad';
$link['link'] = "<b><u>BAD URL -- links have to start with one" .
--- 438,445 ----
$link['link'] = "<a href=\"$URL\">$linkname</a>";
}
! } elseif (preg_match("#^phpwiki:(.*)#", $URL, $match)) {
! $link['type'] = 'url-wiki-named';
! $link['link'] = "<a href=\"$ScriptUrl$match[1]\">$linkname</a>";
! } else {
$link['type'] = 'url-bad';
$link['link'] = "<b><u>BAD URL -- links have to start with one" .
***************
*** 470,477 ****
$link['link'] = LinkUnknownWikiWord($linkname);
}
-
return $link;
}
-
$link['type'] = 'unknown';
--- 471,476 ----
|
