Menu
▾
▴
phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
| 2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
| 2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
| 2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
| 2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
| 2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
| 2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
| 2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
| 2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
| 2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
| 2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
| 2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
| 2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
| 2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
| 2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
| 2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
| 2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
| 2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
| 2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
| 2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
| 2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <var...@us...> - 2014-11-21 16:51:12
|
Revision: 9362
http://sourceforge.net/p/phpwiki/code/9362
Author: vargenau
Date: 2014-11-21 16:51:08 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
SUBPAGE_SEPARATOR *must* be "/"
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/PageType.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/display.php
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/BlogJournal.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UnfoldSubpages.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/stdlib.php
trunk/tests/unit/lib/TextSearchTest.php
trunk/themes/Crao/templates/head.tmpl
trunk/themes/Crao/templates/navbar.tmpl
trunk/themes/MonoBook/templates/actionbar.tmpl
trunk/themes/Sidebar/templates/calendar.tmpl
trunk/themes/Wordpress/templates/actionbar.tmpl
trunk/themes/blog/templates/sidebar.tmpl
trunk/themes/default/templates/head.tmpl
trunk/themes/default/templates/homepage.tmpl
trunk/themes/default/templates/navbar.tmpl
trunk/themes/fusionforge/templates/actionbar.tmpl
trunk/themes/wikilens/templates/head.tmpl
trunk/themes/wikilens/templates/navbar.tmpl
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/config/config-default.ini 2014-11-21 16:51:08 UTC (rev 9362)
@@ -135,7 +135,6 @@
ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
-SUBPAGE_SEPARATOR = "/"
INTERWIKI_MAP_FILE = lib/interwiki.map
WARN_NONPUBLIC_INTERWIKIMAP = false
KEYWORDS = "Category* OR Topic*"
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/config/config-dist.ini 2014-11-21 16:51:08 UTC (rev 9362)
@@ -959,9 +959,6 @@
; Default old behaviour, no digits as lowerchars.
;WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])"
-; Defaults to '/', but '.' was also used.
-;SUBPAGE_SEPARATOR = /
-
; InterWiki linking -- wiki-style links to other wikis on the web
;
; The map will be taken from a page name InterWikiMap.
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/configurator.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -1343,12 +1343,6 @@
Perl regexp for WikiNames (\"bumpy words\")
(?<!..) & (?!...) used instead of '\b' because \b matches '_' as well");
-$properties["Subpage Separator"] =
- new _define_optional('SUBPAGE_SEPARATOR', '"/"', "
-One character which separates pages from subpages. Defaults to '/', but '.' or ':' were also used.",
- "onchange=\"validate_ereg('Sorry, \'%s\' must be a single character. Currently only :, / or .', '^[/:.]$', 'SUBPAGE_SEPARATOR', this);\""
- );
-
$properties["InterWiki Map File"] =
new _define('INTERWIKI_MAP_FILE', 'lib/interwiki.map', "
InterWiki linking -- wiki-style links to other wikis on the web
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/IniConfig.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -150,7 +150,7 @@
'GROUP_METHOD',
'EDITING_POLICY', 'THEME',
'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC',
- 'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR', /*'KEYWORDS',*/
+ 'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', /*'KEYWORDS',*/
// extra logic:
//'DATABASE_PREFIX', 'DATABASE_DSN', 'DATABASE_TYPE', 'DATABASE_DBHANDLER',
'DATABASE_OPTIMISE_FREQUENCY',
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/InlineParser.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -350,14 +350,9 @@
/* Relatives links by Joel Schaubert.
* Recognize [../bla] or [/bla] as relative links, without needing http://
- * but [ /link ] only if SUBPAGE_SEPERATOR is not "/".
* Normally /Page links to the subpage /Page.
*/
- if (SUBPAGE_SEPARATOR == '/') {
- if (preg_match('/^\.\.\//', $link)) {
- return new Cached_ExternalLink($link, $label);
- }
- } elseif (preg_match('/^(\.\.\/|\/)/', $link)) {
+ if (preg_match('/^\.\.\//', $link)) {
return new Cached_ExternalLink($link, $label);
}
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/PageType.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -286,10 +286,10 @@
if (empty($map["Talk"])) {
$pagename = $GLOBALS['request']->getArg('pagename');
// against PageName/Discussion/Discussion
- if (string_ends_with($pagename, SUBPAGE_SEPARATOR . _("Discussion")))
+ if (string_ends_with($pagename, '/' . _("Discussion")))
$map["Talk"] = "%s";
else
- $map["Talk"] = "%s" . SUBPAGE_SEPARATOR . _("Discussion");
+ $map["Talk"] = "%s" . '/' . _("Discussion");
}
foreach (array('Upload', 'User', 'Talk') as $special) {
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/WikiTheme.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -103,21 +103,21 @@
// Todo: test external ImageLinks http://some/images/next.gif
if (is_a($wikipage, 'WikiPageName') and
!$label and
- strchr(substr($wikipage->shortName, 1), SUBPAGE_SEPARATOR)
+ strchr(substr($wikipage->shortName, 1), '/')
) {
- $parts = explode(SUBPAGE_SEPARATOR, $wikipage->shortName);
+ $parts = explode('/', $wikipage->shortName);
$last_part = array_pop($parts);
$sep = '';
$link = HTML::span();
foreach ($parts as $part) {
$path[] = $part;
- $parent = join(SUBPAGE_SEPARATOR, $path);
+ $parent = join('/', $path);
if ($WikiTheme->_autosplitWikiWords)
$part = " " . $part;
if ($part)
$link->pushContent($WikiTheme->linkExistingWikiWord($parent, $sep . $part));
$sep = $WikiTheme->_autosplitWikiWords
- ? ' ' . SUBPAGE_SEPARATOR : SUBPAGE_SEPARATOR;
+ ? ' ' . '/' : '/';
}
if ($exists)
$link->pushContent($WikiTheme->linkExistingWikiWord($wikipage, $sep . $last_part,
@@ -1549,7 +1549,7 @@
function calendarLink($date = false)
{
- return $this->calendarBase() . SUBPAGE_SEPARATOR .
+ return $this->calendarBase() . '/' .
strftime("%Y-%m-%d", $date ? $date : time());
}
@@ -1560,10 +1560,10 @@
if (!$UserCalPageTitle)
$UserCalPageTitle = $request->_user->getId() .
- SUBPAGE_SEPARATOR . _("Calendar");
+ '/' . _("Calendar");
if (!$UserCalPageTitle)
$UserCalPageTitle = (BLOG_EMPTY_DEFAULT_PREFIX ? ''
- : ($request->_user->getId() . SUBPAGE_SEPARATOR)) . "Blog";
+ : ($request->_user->getId() . '/')) . "Blog";
return $UserCalPageTitle;
}
@@ -1590,7 +1590,7 @@
// Get existing date entries for the current user
require_once 'lib/TextSearchQuery.php';
- $iter = $dbi->titleSearch(new TextSearchQuery("^" . $this->calendarBase() . SUBPAGE_SEPARATOR, true, "auto"));
+ $iter = $dbi->titleSearch(new TextSearchQuery("^" . $this->calendarBase() . '/', true, "auto"));
$existing = array();
while ($page = $iter->next()) {
if ($page->exists())
Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/WikiUser/HttpAuth.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -118,8 +118,8 @@
) {
// allow domain\user, change userid to domain/user
$username = str_ireplace("\\\\", "\\", $username); // php bug with _SERVER
- $username = str_ireplace("\\", SUBPAGE_SEPARATOR, $username);
- $this->_userid = str_ireplace("\\", SUBPAGE_SEPARATOR, $this->_userid);
+ $username = str_ireplace("\\", '/', $username);
+ $this->_userid = str_ireplace("\\", '/', $this->_userid);
}
// FIXME: if AUTH_TYPE = NTLM there's a domain\\name <> domain\name mismatch
if (empty($username)
Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/WikiUser/HttpAuthUpper.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -132,8 +132,8 @@
) {
// allow domain\user, change userid to domain/user
$username = str_ireplace("\\\\", "\\", $username); // php bug with _SERVER
- $username = str_ireplace("\\", SUBPAGE_SEPARATOR, $username);
- $this->_userid = str_ireplace("\\", SUBPAGE_SEPARATOR, $this->_userid);
+ $username = str_ireplace("\\", '/', $username);
+ $this->_userid = str_ireplace("\\", '/', $this->_userid);
}
// FIXME: if AUTH_TYPE = NTLM there's a domain\\name <> domain\name mismatch
if (empty($username)
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/display.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -265,19 +265,19 @@
}
if (isSubPage($pagename)) {
- $pages = explode(SUBPAGE_SEPARATOR, $pagename);
+ $pages = explode('/', $pagename);
$last_page = array_pop($pages); // deletes last element from array as side-effect
$pageheader = HTML::span(HTML::a(array('href' => WikiURL($pages[0]),
'class' => 'pagetitle'
),
- $WikiTheme->maybeSplitWikiWord($pages[0] . SUBPAGE_SEPARATOR)));
- $first_pages = $pages[0] . SUBPAGE_SEPARATOR;
+ $WikiTheme->maybeSplitWikiWord($pages[0] . '/')));
+ $first_pages = $pages[0] . '/';
array_shift($pages);
foreach ($pages as $p) {
$pageheader->pushContent(HTML::a(array('href' => WikiURL($first_pages . $p),
'class' => 'backlinks'),
- $WikiTheme->maybeSplitWikiWord($p . SUBPAGE_SEPARATOR)));
- $first_pages .= $p . SUBPAGE_SEPARATOR;
+ $WikiTheme->maybeSplitWikiWord($p . '/')));
+ $first_pages .= $p . '/';
}
$backlink = HTML::a(array('href' => WikiURL($pagename,
array('action' => __("BackLinks"))),
Modified: trunk/lib/plugin/BlogArchives.php
===================================================================
--- trunk/lib/plugin/BlogArchives.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/BlogArchives.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -82,7 +82,7 @@
else
$args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages
}
- $parent = (empty($args['user']) ? '' : $args['user'] . SUBPAGE_SEPARATOR);
+ $parent = (empty($args['user']) ? '' : $args['user'] . '/');
//$info = explode(',', $args['info']);
//$pagelist = new PageList($args['info'], $args['exclude'], $args);
@@ -90,7 +90,7 @@
// unset($pagelist->_columns['pagename']);
if (!empty($args['month'])) {
- $prefix = $parent . $this->blogPrefix('wikiblog') . SUBPAGE_SEPARATOR . $args['month'];
+ $prefix = $parent . $this->blogPrefix('wikiblog') . '/' . $args['month'];
$pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix, true, 'posix'));
$html = HTML::ul();
while ($page = $pages->next()) {
Modified: trunk/lib/plugin/BlogJournal.php
===================================================================
--- trunk/lib/plugin/BlogJournal.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/BlogJournal.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -79,12 +79,12 @@
$args['user'] = ADMIN_USER; // "Admin/Blogs/day" pages
}
}
- $parent = (empty($args['user']) ? '' : $args['user'] . SUBPAGE_SEPARATOR);
+ $parent = (empty($args['user']) ? '' : $args['user'] . '/');
$prefix = $base = $parent . $this->blogPrefix('wikiblog');
if ($args['month'])
- $prefix .= (SUBPAGE_SEPARATOR . $args['month']);
- $pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix . SUBPAGE_SEPARATOR, true, 'posix'));
+ $prefix .= ('/' . $args['month']);
+ $pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix . '/', true, 'posix'));
$html = HTML();
$i = 0;
while (($page = $pages->next()) and $i < $args['count']) {
Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/Calendar.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -46,7 +46,7 @@
function getDefaultArguments()
{
- return array('prefix' => '[pagename]' . SUBPAGE_SEPARATOR,
+ return array('prefix' => '[pagename]' . '/',
'date_format' => '%Y-%m-%d',
'year' => '',
'month' => '',
Modified: trunk/lib/plugin/CalendarList.php
===================================================================
--- trunk/lib/plugin/CalendarList.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/CalendarList.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -106,7 +106,7 @@
for ($i = 0; $i <= 180; $i++) { // loop thru 180 days, past or future
$date_string = strftime($args['date_format'], $t);
- $page_for_date = $args['prefix'] . SUBPAGE_SEPARATOR . $date_string;
+ $page_for_date = $args['prefix'] . '/' . $date_string;
if ($dbi->isWikiPage($page_for_date)) { // if this date has any comments/events
$timeTMP = $t; // capture the date of this event for return
if ($n-- <= 0) break; // if we reached the limit, return the date
@@ -123,7 +123,7 @@
$args = &$this->args;
$date_string = strftime($args['date_format'], $time);
- $page_for_date = $args['prefix'] . SUBPAGE_SEPARATOR . $date_string;
+ $page_for_date = $args['prefix'] . '/' . $date_string;
if ($dbi->isWikiPage($page_for_date)) {
// Extract the page contents for this date
Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/CreatePage.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -71,7 +71,7 @@
if (!$s) {
return $this->error(_("Cannot create page with empty name!"));
}
- // TODO: javascript warning if "/" or SUBPAGE_SEPARATOR in s
+ // TODO: javascript warning if "/" in s
if ($verify) {
$head = _("CreatePage failed");
if ($dbi->isWikiPage($verify)) {
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/GraphViz.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -216,7 +216,7 @@
$source = "digraph GraphViz {\n"; // }
foreach ($argarray['pages'] as $name) { // support <!plugin-list !> pagelists
// allow Page/SubPage
- $url = str_replace(urlencode(SUBPAGE_SEPARATOR), SUBPAGE_SEPARATOR,
+ $url = str_replace(urlencode('/'), '/',
rawurlencode($name));
$source .= " \"$name\" [URL=\"$url\"];\n";
}
Modified: trunk/lib/plugin/ListSubpages.php
===================================================================
--- trunk/lib/plugin/ListSubpages.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/ListSubpages.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -71,7 +71,7 @@
// FIXME: explodePageList from stdlib doesn't seem to work as
// expected when there are no subpages. (see also
// UnfoldSubPages plugin)
- $subpages = explodePageList($pagename . SUBPAGE_SEPARATOR . '*');
+ $subpages = explodePageList($pagename . '/' . '*');
if (!$subpages) {
return HTML::p(array('class' => 'warning'),
sprintf(_("%s has no subpages defined."), $pagename));
Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/TranslateText.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -82,7 +82,7 @@
//save translation in a users subpage
$user = $request->getUser();
$homepage = $user->_HomePagehandle;
- $transpagename = $homepage->getName() . SUBPAGE_SEPARATOR . _("ContributedTranslations");
+ $transpagename = $homepage->getName() . '/' . _("ContributedTranslations");
$page = $dbi->getPage($transpagename);
$current = $page->getCurrentRevision();
Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/UnfoldSubpages.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -82,7 +82,7 @@
$args = $this->getArgs($argstr, $request);
extract($args);
- $query = new TextSearchQuery($pagename . SUBPAGE_SEPARATOR . '*', true, 'glob');
+ $query = new TextSearchQuery($pagename . '/' . '*', true, 'glob');
$subpages = $dbi->titleSearch($query, $sortby, $limit, $exclude);
//if ($sortby)
// $subpages = $subpages->applyFilters(array('sortby' => $sortby, 'limit' => $limit, 'exclude' => $exclude));
@@ -156,7 +156,7 @@
array_push($included_pages, $cpagename);
if ($smalltitle) {
- $pname = array_pop(explode(SUBPAGE_SEPARATOR, $cpagename)); // get last subpage name
+ $pname = array_pop(explode('/', $cpagename)); // get last subpage name
// Use _("%s: %s") instead of .": ". for French punctuation
$ct = TransformText(sprintf(_("%s: %s"), "[$pname|$cpagename]", $ct),
$cpagename);
Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/VisualWiki.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -449,7 +449,7 @@
$url = rawurlencode($name);
// patch to allow Page/SubPage
- $url = str_replace(urlencode(SUBPAGE_SEPARATOR), SUBPAGE_SEPARATOR, $url);
+ $url = str_replace(urlencode('/'), '/', $url);
$nodename = ($label != 'name' ? $nametonumber[$name] + 1 : $name);
$dot .= " \"$nodename\" [URL=\"$url\"";
Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/plugin/WikiBlog.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -154,7 +154,7 @@
$prefix = "";
$parent = ''; // 'Forum';
} else {
- $prefix = $parent . SUBPAGE_SEPARATOR;
+ $prefix = $parent . '/';
}
//$request->finish(fmt("No pagename specified for %s",$type));
@@ -231,7 +231,7 @@
);
SavePage($request, $pageinfo, '', '');
}
- $redirected = $prefix . $pagename . SUBPAGE_SEPARATOR . preg_replace("/T.*/", "", "$time");
+ $redirected = $prefix . $pagename . '/' . preg_replace("/T.*/", "", "$time");
if (!$dbi->isWikiPage($redirected)) {
if (!$parent) $parent = HOME_PAGE;
require_once 'lib/loadsave.php';
@@ -243,8 +243,8 @@
SavePage($request, $pageinfo, '', '');
}
- $p = $dbi->getPage($prefix . $pagename . SUBPAGE_SEPARATOR
- . str_replace("T", SUBPAGE_SEPARATOR, "$time"));
+ $p = $dbi->getPage($prefix . $pagename . '/'
+ . str_replace("T", '/', "$time"));
$pr = $p->getCurrentRevision();
// Version should be zero. If not, page already exists
@@ -340,7 +340,7 @@
{
$prefix = (empty($basepage)
? ""
- : $basepage . SUBPAGE_SEPARATOR) . $this->blogPrefix($type);
+ : $basepage . '/') . $this->blogPrefix($type);
$pages = $dbi->titleSearch(new TextSearchQuery('"' . $prefix . '"', true, 'none'));
$blogs = array();
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/lib/stdlib.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -827,7 +827,7 @@
// expand Talk or User, but not to absolute urls!
if (strstr($url, '//')) {
if ($moniker == 'Talk')
- $name = $name . SUBPAGE_SEPARATOR . _("Discussion");
+ $name = $name . '/' . _("Discussion");
} else {
$name = $url;
}
@@ -835,7 +835,7 @@
}
}
// FIXME: We should really fix the cause for "/PageName" in the WikiDB
- if ($name == '' or $name[0] == SUBPAGE_SEPARATOR) {
+ if ($name == '' or $name[0] == '/') {
if ($basename)
$name = $this->_pagename($basename) . $name;
else {
@@ -860,7 +860,7 @@
function getParent()
{
$name = $this->name;
- if (!($tail = strrchr($name, SUBPAGE_SEPARATOR)))
+ if (!($tail = strrchr($name, '/')))
return false;
return substr($name, 0, -strlen($tail));
}
@@ -906,8 +906,8 @@
global $request;
return $request->getArg('pagename');
}
- assert($name[0] == SUBPAGE_SEPARATOR);
- $this->_errors[] = sprintf(_("Leading %s not allowed"), SUBPAGE_SEPARATOR);
+ assert($name[0] == '/');
+ $this->_errors[] = sprintf(_("Leading %s not allowed"), '/');
return substr($name, 1);
}
@@ -936,10 +936,10 @@
$pagename = trim($pagename);
$orig = $pagename;
- while ($pagename and $pagename[0] == SUBPAGE_SEPARATOR)
+ while ($pagename and $pagename[0] == '/')
$pagename = substr($pagename, 1);
if ($pagename != $orig)
- $this->_errors[] = sprintf(_("Leading %s not allowed"), SUBPAGE_SEPARATOR);
+ $this->_errors[] = sprintf(_("Leading %s not allowed"), '/');
// ";" is urlencoded, so safe from php arg-delim problems
/*if (strstr($pagename, ';')) {
@@ -1026,7 +1026,7 @@
$RE[] = '/([[:lower:]])((?<!Mc|Di)[[:upper:]]|\d)/';
break;
}
- $sep = preg_quote(SUBPAGE_SEPARATOR, '/');
+ $sep = preg_quote('/', '/');
// This the single-letter words 'I' and 'A' from any following
// capitalized words.
switch ($GLOBALS['LANG']) {
@@ -1585,12 +1585,12 @@
function isSubPage($pagename)
{
- return (strstr($pagename, SUBPAGE_SEPARATOR));
+ return (strstr($pagename, '/'));
}
function subPageSlice($pagename, $pos)
{
- $pages = explode(SUBPAGE_SEPARATOR, $pagename);
+ $pages = explode('/', $pagename);
$pages = array_slice($pages, $pos, 1);
return $pages[0];
}
Modified: trunk/tests/unit/lib/TextSearchTest.php
===================================================================
--- trunk/tests/unit/lib/TextSearchTest.php 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/tests/unit/lib/TextSearchTest.php 2014-11-21 16:51:08 UTC (rev 9362)
@@ -9,7 +9,7 @@
global $request;
// find subpages
$pagename = "PgsrcTranslation";
- $query = new TextSearchQuery($pagename . SUBPAGE_SEPARATOR . '*', true, 'glob');
+ $query = new TextSearchQuery($pagename . '/' . '*', true, 'glob');
$sortby = false; $limit = 20; $exclude = "";
$dbi = $request->getDbh();
$subpages = $dbi->titleSearch($query, $sortby, $limit, $exclude);
Modified: trunk/themes/Crao/templates/head.tmpl
===================================================================
--- trunk/themes/Crao/templates/head.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/Crao/templates/head.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -62,12 +62,12 @@
/* For signed-in users */ ?>
<?php /* User's calendar page
*/
- $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR ._("Calendar");
+ $UserCalPageTitle = $user->getId() . '/' ._("Calendar");
$UserCalPageUrl = WikiURL($UserCalPageTitle);
?>
<?php /* Today's calendar page for the user if it exists
*/
- $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time()); //FIXME
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
Modified: trunk/themes/Crao/templates/navbar.tmpl
===================================================================
--- trunk/themes/Crao/templates/navbar.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/Crao/templates/navbar.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -23,7 +23,7 @@
<?php if (!empty($user)) { ?>
<?php
/* Today's calendar page for the user, if the Calender subpage is defined. */
- $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR . _("Calendar");
+ $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
$UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
Modified: trunk/themes/MonoBook/templates/actionbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/actionbar.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/MonoBook/templates/actionbar.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -8,7 +8,7 @@
?>
<div class="portlet" id="p-cactions">
<ul>
- <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
+ <?php if (!string_ends_with($pagename, '/'._("Discussion"))) { ?>
<?php $talk = new WikiPageName('Talk:'.$pagename); ?>
<?php echo ActionButton(array(),
$isActionPage ? _("ActionPage") : _("Article"),
Modified: trunk/themes/Sidebar/templates/calendar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/calendar.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/Sidebar/templates/calendar.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -7,7 +7,7 @@
var d = calendar.date.getDate(); // integer, 1..31
m = m < 10 ? "0" + m : m;
d = d < 10 ? "0" + d : d;
- window.location = "' . WikiUrl($WikiTheme->calendarBase(),0,1) . SUBPAGE_SEPARATOR . '" + y + "-" + m + "-" + d;
+ window.location = "' . WikiUrl($WikiTheme->calendarBase(),0,1) . '/' . '" + y + "-" + m + "-" + d;
}
};
Calendar.setup({flat : "calendar", flatCallback : dateChanged, setDateStatusFunc : dateStatusFunc, weekNumbers : false})') ?>
Modified: trunk/themes/Wordpress/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/actionbar.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/Wordpress/templates/actionbar.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -27,10 +27,10 @@
<?php if (!empty($user)) { ?>
<?php
/* Today's calendar page for the user, if the Calender subpage is defined. */
- $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR . _("Calendar");
+ $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
?>
<li>
<?php echo $SEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
Modified: trunk/themes/blog/templates/sidebar.tmpl
===================================================================
--- trunk/themes/blog/templates/sidebar.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/blog/templates/sidebar.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -4,7 +4,7 @@
<div id="<?php echo $id?>">
<?php
/* Today's Blogs page for the current or admin user, if the subpage is defined. */
- $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR . _("Blog");
+ $UserCalPageTitle = $user->getId() . '/' . _("Blog");
$dbi = $request->getDbh();
// display flat calender dhtml under the clock
if (!$dbi->isWikiPage($UserCalPageTitle) and BLOG_DEFAULT_EMPTY_PREFIX) {
Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/default/templates/head.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -68,12 +68,12 @@
/* For signed-in users */ ?>
<?php /* User's calendar page
*/
- $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR ._("Calendar");
+ $UserCalPageTitle = $user->getId() . '/' ._("Calendar");
$UserCalPageUrl = WikiURL($UserCalPageTitle);
?>
<?php /* Today's calendar page for the user if it exists
*/
- $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time()); //FIXME
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
Modified: trunk/themes/default/templates/homepage.tmpl
===================================================================
--- trunk/themes/default/templates/homepage.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/default/templates/homepage.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -11,7 +11,7 @@
$UserPreferencesMessage[1] =
_("(Your preferences are stored as hidden data within this page.)");
-$CalendarSubpage = sprintf('[%s]', SUBPAGE_SEPARATOR . _("Calendar"));
+$CalendarSubpage = sprintf('[%s]', '/' . _("Calendar"));
$calendarMessage = sprintf(_("The %s subpage enables simple weblogging."),
$CalendarSubpage);
Modified: trunk/themes/default/templates/navbar.tmpl
===================================================================
--- trunk/themes/default/templates/navbar.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/default/templates/navbar.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -2,7 +2,7 @@
<div id="navbuttons">
<?php if (ENABLE_DISCUSSION_LINK) { ?>
<?php // This requires Talk: map to end in "/Discussion"
- if (!string_ends_with($page->getName(), SUBPAGE_SEPARATOR._("Discussion"))) { ?>
+ if (!string_ends_with($page->getName(), '/'._("Discussion"))) { ?>
<?php echo $SEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()),
'button', _("Discussion")) ?>
<?php } else { ?>
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -9,7 +9,7 @@
<nav id="actionbuttons">
<ul>
- <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
+ <?php if (!string_ends_with($pagename, '/'._("Discussion"))) { ?>
<?php $talk = new WikiPageName('Talk:'.$pagename); ?>
<li class="bold">
<?php echo Button(array(), $isActionPage ? _("Action Page") : _("Page"), $talk->getParent()) ?>
Modified: trunk/themes/wikilens/templates/head.tmpl
===================================================================
--- trunk/themes/wikilens/templates/head.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/wikilens/templates/head.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -61,12 +61,12 @@
/* For signed-in users */ ?>
<?php /* User's calendar page
*/
- $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR ._("Calendar");
+ $UserCalPageTitle = $user->getId() . '/' ._("Calendar");
$UserCalPageUrl = WikiURL($UserCalPageTitle);
?>
<?php /* Today's calendar page for the user if it exists
*/
- $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time()); //FIXME
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time()); //FIXME
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTodayTitle)) {
$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
Modified: trunk/themes/wikilens/templates/navbar.tmpl
===================================================================
--- trunk/themes/wikilens/templates/navbar.tmpl 2014-11-21 16:27:17 UTC (rev 9361)
+++ trunk/themes/wikilens/templates/navbar.tmpl 2014-11-21 16:51:08 UTC (rev 9362)
@@ -5,7 +5,7 @@
<div id="navbuttons">
<?php if (ENABLE_DISCUSSION_LINK) { ?>
<?php // This requires Talk: map to end in "/Discussion"
- if (!string_ends_with($page->getName(), SUBPAGE_SEPARATOR._("Discussion"))) { ?>
+ if (!string_ends_with($page->getName(), '/'._("Discussion"))) { ?>
<?php echo $NSEP?><?php echo WikiLink(new WikiPagename('Talk:'.$page->getName(), $page->getName()),
'button', _("Discussion")) ?>
<?php } else { ?>
@@ -21,10 +21,10 @@
?><?php echo $NSEP?><?php echo $WikiTheme->makeLinkButton($revision,_("BackLinks"),_("BackLinks"))
?><?php echo $NSEP?><?php echo WikiLink(_("UserPreferences"), 'button',_("Preferences")) ?><?php
/* Today's calendar page for the user, if the Calender subpage is defined. */
- $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR . _("Calendar");
+ $UserCalPageTitle = $user->getId() . '/' . _("Calendar");
$dbi = $request->getDbh();
if ($dbi->isWikiPage($UserCalPageTitle)) {
- $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time());
+ $UserCalPageTodayTitle = $UserCalPageTitle . '/' . strftime("%Y-%m-%d", time());
//$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle);
?><?php echo $NSEP?><?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?>
<?php }} ?><?php if (!empty($user) && $user->isAdmin()) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-21 16:27:20
|
Revision: 9361
http://sourceforge.net/p/phpwiki/code/9361
Author: vargenau
Date: 2014-11-21 16:27:17 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Check constants are defined
Modified Paths:
--------------
trunk/lib/Captcha.php
trunk/lib/EditToolbar.php
trunk/lib/InlineParser.php
trunk/lib/PagePerm.php
trunk/lib/Units.php
trunk/lib/WikiDB.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/loadsave.php
trunk/lib/main.php
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/Captcha.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -88,7 +88,7 @@
function get_word()
{
- if (USE_CAPTCHA_RANDOM_WORD)
+ if (defined('USE_CAPTCHA_RANDOM_WORD') and USE_CAPTCHA_RANDOM_WORD)
return $this->get_dictionary_word();
else
return rand_ascii_readable($this->length); // lib/stdlib.php
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/EditToolbar.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -39,7 +39,7 @@
$this->tokens = array();
//FIXME: enable Undo button for all other buttons also, not only the search/replace button
- if (JS_SEARCHREPLACE) {
+ if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) {
$this->tokens['JS_SEARCHREPLACE'] = 1;
$undo_btn = $WikiTheme->getImageURL("ed_undo.png");
$undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
@@ -68,7 +68,7 @@
$WikiTheme->addMoreAttr('body', "editfocus", "document.getElementById('edit-content]').editarea.focus()");
}
- if (ENABLE_EDIT_TOOLBAR) {
+ if (defined('ENABLE_EDIT_TOOLBAR') and ENABLE_EDIT_TOOLBAR) {
$init = JavaScript("var data_path = '" . javascript_quote_string(DATA_PATH) . "';\n");
$js = JavaScript('', array('src' => $WikiTheme->_findData("toolbar.js")));
if (empty($WikiTheme->_headers_printed)) {
@@ -87,13 +87,13 @@
// regenerate if number of pages changes (categories, pages, templates, images uploaded)
$key = $dbi->numPages();
$key .= '+categories+plugin' . (isBrowserSafari() ? '+safari' : '');
- if (TOOLBAR_PAGELINK_PULLDOWN) {
+ if (defined('TOOLBAR_PAGELINK_PULLDOWN') and TOOLBAR_PAGELINK_PULLDOWN) {
$key .= "+pages";
}
- if (TOOLBAR_TEMPLATE_PULLDOWN) {
+ if (defined('TOOLBAR_TEMPLATE_PULLDOWN') and TOOLBAR_TEMPLATE_PULLDOWN) {
$key .= "+templates_" . $dbi->getTimestamp();
}
- if (TOOLBAR_IMAGE_PULLDOWN) {
+ if (defined('TOOLBAR_IMAGE_PULLDOWN') and TOOLBAR_IMAGE_PULLDOWN) {
if (file_exists(getUploadFilePath())) {
$key .= "+images_" . filemtime(getUploadFilePath());
}
@@ -122,7 +122,7 @@
$toolbar = "document.writeln(\"<div class=\\\"edit-toolbar\\\" id=\\\"toolbar\\\">\");\n";
- if (ENABLE_EDIT_TOOLBAR) {
+ if (defined('ENABLE_EDIT_TOOLBAR') and ENABLE_EDIT_TOOLBAR) {
$username = $request->_user->UserName();
if ((defined('FUSIONFORGE') and FUSIONFORGE) or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) {
$username = '[[' . $username . ']]';
@@ -246,7 +246,7 @@
}
}
- if (JS_SEARCHREPLACE) {
+ if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) {
$undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
//$redo_btn = $WikiTheme->getImageURL("ed_redo.png");
$sr_btn = $WikiTheme->getImageURL("ed_replace.png");
@@ -279,14 +279,14 @@
$sr_html = HTML($sr_html, $this->pluginPulldown());
// Button to generate pagenames, display in extra window as popup and insert
- if (TOOLBAR_PAGELINK_PULLDOWN)
+ if (defined('TOOLBAR_PAGELINK_PULLDOWN') and TOOLBAR_PAGELINK_PULLDOWN)
$sr_html = HTML($sr_html, $this->pagesPulldown(TOOLBAR_PAGELINK_PULLDOWN));
// Button to insert from an template, display pagename in extra window as popup and insert
- if (TOOLBAR_TEMPLATE_PULLDOWN)
+ if (defined('TOOLBAR_TEMPLATE_PULLDOWN') and TOOLBAR_TEMPLATE_PULLDOWN)
$sr_html = HTML($sr_html, $this->templatePulldown(TOOLBAR_TEMPLATE_PULLDOWN));
// Button to add images, display in extra window as popup and insert
- if (TOOLBAR_IMAGE_PULLDOWN)
+ if (defined('TOOLBAR_IMAGE_PULLDOWN') and TOOLBAR_IMAGE_PULLDOWN)
$sr_html = HTML($sr_html, $this->imagePulldown());
// don't use document.write for replace, otherwise self.opener is not defined.
@@ -399,7 +399,7 @@
$pages = array();
while ($p = $page_iter->next()) {
$page = $p->getName();
- if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page)))
+ if (defined('DISABLE_MARKUP_WIKIWORD') and DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page)))
$pages[] = "['$page', '%5B" . $page . "%5D']";
else
$pages[] = "['$page', '$page']";
@@ -427,7 +427,7 @@
$pd = new imageOrVideoSet($image_dir, '*');
$images = $pd->getFiles();
unset($pd);
- if (UPLOAD_USERDIR) {
+ if (defined('UPLOAD_USERDIR') and UPLOAD_USERDIR) {
$image_dir .= "/" . $request->_user->_userid;
$pd = new imageOrVideoSet($image_dir, '*');
$images = array_merge($images, $pd->getFiles());
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/InlineParser.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -1215,7 +1215,7 @@
'html_emphasis', 'html_abbr', 'plugin', 'plugin_wikicreole',
'isonumchars', 'isohexchars', /*'html_entities'*/
);
- if (DISABLE_MARKUP_WIKIWORD)
+ if (defined('DISABLE_MARKUP_WIKIWORD') and DISABLE_MARKUP_WIKIWORD)
$markup_types = array_remove($markup_types, 'wikiword');
$action = $request->getArg('action');
@@ -1234,13 +1234,13 @@
$this->_addMarkup(new $class);
}
$this->_addMarkup(new Markup_nowiki);
- if (ENABLE_MARKUP_DIVSPAN and !$non_default)
+ if (defined('ENABLE_MARKUP_DIVSPAN') and ENABLE_MARKUP_DIVSPAN and !$non_default)
$this->_addMarkup(new Markup_html_divspan);
- if (ENABLE_MARKUP_COLOR and !$non_default)
+ if (defined('ENABLE_MARKUP_COLOR') and ENABLE_MARKUP_COLOR and !$non_default)
$this->_addMarkup(new Markup_color);
// Markup_wikicreole_preformatted must be before Markup_template_plugin
$this->_addMarkup(new Markup_wikicreole_preformatted);
- if (ENABLE_MARKUP_TEMPLATE and !$non_default)
+ if (defined('ENABLE_MARKUP_TEMPLATE') and ENABLE_MARKUP_TEMPLATE and !$non_default)
$this->_addMarkup(new Markup_template_plugin);
}
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/PagePerm.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -468,10 +468,10 @@
ACL_OWNER => true),
'change' => array(ACL_ADMIN => true,
ACL_OWNER => true));
- if (ZIPDUMP_AUTH)
+ if (defined('ZIPDUMP_AUTH') and ZIPDUMP_AUTH)
$perm['dump'] = array(ACL_ADMIN => true,
ACL_OWNER => true);
- elseif (INSECURE_ACTIONS_LOCALHOST_ONLY) {
+ elseif (defined('INSECURE_ACTIONS_LOCALHOST_ONLY') and INSECURE_ACTIONS_LOCALHOST_ONLY) {
if (is_localhost())
$perm['dump'] = array(ACL_EVERY => true);
else
Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/Units.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -25,7 +25,7 @@
{
function __construct()
{
- if (DISABLE_UNITS)
+ if (defined('DISABLE_UNITS') and DISABLE_UNITS)
$this->errcode = 1;
elseif (defined("UNITS_EXE")) // ignore dynamic check
$this->errcode = 0;
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/WikiDB.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -222,7 +222,7 @@
$result = -1;
/* Generate notification emails */
- if (ENABLE_MAILNOTIFY) {
+ if (defined('ENABLE_MAILNOTIFY') and ENABLE_MAILNOTIFY) {
include_once 'lib/MailNotify.php';
$MailNotify = new MailNotify($pagename);
$MailNotify->onDeletePage($this, $pagename);
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/display.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -91,7 +91,7 @@
RecentChanges or AllPages might be an exception.
*/
$args = array();
- if (GOOGLE_LINKS_NOFOLLOW) {
+ if (defined('GOOGLE_LINKS_NOFOLLOW') and GOOGLE_LINKS_NOFOLLOW) {
$robots = "noindex,nofollow";
$args = array('ROBOTS_META' => $robots);
}
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/editpage.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -48,14 +48,14 @@
$this->tokens = array();
- if (ENABLE_WYSIWYG) {
+ if (defined('ENABLE_WYSIWYG') and ENABLE_WYSIWYG) {
$backend = WYSIWYG_BACKEND;
// TODO: error message
require_once("lib/WysiwygEdit/$backend.php");
$class = "WysiwygEdit_$backend";
$this->WysiwygEdit = new $class();
}
- if (ENABLE_CAPTCHA) {
+ if (defined('ENABLE_CAPTCHA' and ENABLE_CAPTCHA)) {
require_once 'lib/Captcha.php';
$this->Captcha = new Captcha($this->meta);
}
@@ -119,7 +119,7 @@
return $this->viewSource();
$tokens['PAGE_LOCKED_MESSAGE'] = $this->getLockedMessage();
} elseif ($r->getArg('save_and_redirect_to') != "") {
- if (ENABLE_CAPTCHA && $this->Captcha->Failed()) {
+ if (defined('ENABLE_CAPTCHA') and ENABLE_CAPTCHA && $this->Captcha->Failed()) {
$this->tokens['PAGE_LOCKED_MESSAGE'] =
HTML::p(HTML::h1($this->Captcha->failed_msg));
} elseif ($this->savePage()) {
@@ -131,7 +131,7 @@
}
$saveFailed = true;
} elseif ($this->editaction == 'save') {
- if (ENABLE_CAPTCHA && $this->Captcha->Failed()) {
+ if (defined('ENABLE_CAPTCHA') and ENABLE_CAPTCHA && $this->Captcha->Failed()) {
$this->tokens['PAGE_LOCKED_MESSAGE'] =
HTML::p(HTML::h1($this->Captcha->failed_msg));
} elseif ($this->savePage()) {
@@ -226,13 +226,13 @@
$title = new FormattedText ($title_fs, $pagelink);
// not for dumphtml or viewsource
- if (ENABLE_WYSIWYG and $template == 'editpage') {
+ if (defined('ENABLE_WYSIWYG') and ENABLE_WYSIWYG and $template == 'editpage') {
$WikiTheme->addMoreHeaders($this->WysiwygEdit->Head());
//$tokens['PAGE_SOURCE'] = $this->WysiwygEdit->ConvertBefore($this->_content);
}
$template = Template($template, $this->tokens);
/* Tell google (and others) not to take notice of edit links */
- if (GOOGLE_LINKS_NOFOLLOW)
+ if (defined('GOOGLE_LINKS_NOFOLLOW') and GOOGLE_LINKS_NOFOLLOW)
$args = array('ROBOTS_META' => "noindex,nofollow");
GeneratePage($template, $title, $rev);
return true;
@@ -268,7 +268,7 @@
: _("Page now unlocked.") . " ");
$changed = true;
}
- if (ENABLE_PAGE_PUBLIC and (bool)$this->page->get('public') != (bool)$this->public) {
+ if (defined('ENABLE_PAGE_PUBLIC') and ENABLE_PAGE_PUBLIC and (bool)$this->page->get('public') != (bool)$this->public) {
$this->page->set('public', (bool)$this->public);
$this->tokens['LOCK_CHANGED_MSG']
.= ($this->public
@@ -277,7 +277,7 @@
$changed = true;
}
- if (ENABLE_EXTERNAL_PAGES) {
+ if (defined('ENABLE_EXTERNAL_PAGES') and ENABLE_EXTERNAL_PAGES) {
if ((bool)$this->page->get('external') != (bool)$this->external) {
$this->page->set('external', (bool)$this->external);
$this->tokens['LOCK_CHANGED_MSG']
@@ -449,7 +449,7 @@
}
}
// 3. extract (new) links and check surbl for blocked domains
- if (ENABLE_SPAMBLOCKLIST and ($newlinks > 5)) {
+ if (defined('ENABLE_SPAMBLOCKLIST') and ENABLE_SPAMBLOCKLIST and ($newlinks > 5)) {
require_once 'lib/SpamBlocklist.php';
require_once 'lib/InlineParser.php';
$parsed = TransformLinks($newtext);
@@ -629,7 +629,7 @@
'cols' => $request->getPref('editWidth'),
'readonly' => (bool)$readonly),
$this->_content);
- if (ENABLE_WYSIWYG) {
+ if (defined('ENABLE_WYSIWYG') and ENABLE_WYSIWYG) {
return $this->WysiwygEdit->Textarea($textarea, $this->_wikicontent,
$textarea->getAttr('name'));
} else
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/loadsave.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -169,7 +169,7 @@
$current = $page->getCurrentRevision(false);
$head = '';
- if (STRICT_MAILABLE_PAGEDUMPS) {
+ if (defined('STRICT_MAILABLE_PAGEDUMPS') and STRICT_MAILABLE_PAGEDUMPS) {
$from = defined('SERVER_ADMIN') ? SERVER_ADMIN : 'foo@bar';
//This is for unix mailbox format: (not RFC (2)822)
// $head .= "From $from " . CTime(time()) . "\r\n";
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2014-11-21 15:59:41 UTC (rev 9360)
+++ trunk/lib/main.php 2014-11-21 16:27:17 UTC (rev 9361)
@@ -30,7 +30,7 @@
require_once 'lib/WikiDB.php';
require_once 'lib/WikiUser.php';
require_once 'lib/WikiGroup.php';
-if (ENABLE_PAGEPERM)
+if (defined('ENABLE_PAGEPERM') and ENABLE_PAGEPERM)
require_once 'lib/PagePerm.php';
/**
@@ -39,7 +39,7 @@
*/
function mayAccessPage($access, $pagename)
{
- if (ENABLE_PAGEPERM)
+ if (defined('ENABLE_PAGEPERM') and ENABLE_PAGEPERM)
return _requiredAuthorityForPagename($access, $pagename); // typically [10-20ms per page]
else
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-21 15:59:43
|
Revision: 9360
http://sourceforge.net/p/phpwiki/code/9360
Author: vargenau
Date: 2014-11-21 15:59:41 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Add class variables definition
Modified Paths:
--------------
trunk/lib/BlockParser.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2014-11-21 14:54:39 UTC (rev 9359)
+++ trunk/lib/BlockParser.php 2014-11-21 15:59:41 UTC (rev 9360)
@@ -94,7 +94,8 @@
*/
function match($text)
{
- if (!is_string($text)) return false;
+ if (!is_string($text))
+ return false;
if (!preg_match($this->_re, $text, $m)) {
return false;
}
@@ -250,7 +251,12 @@
class BlockParser_InputSubBlock extends BlockParser_Input
{
- function __construct(&$input, $prefix_re, $initial_prefix = false)
+ /**
+ * @param BlockParser_Input $input
+ * @param string $prefix_re
+ * @param string $initial_prefix
+ */
+ function __construct(&$input, $prefix_re, $initial_prefix = '')
{
$this->_input = &$input;
$this->_prefix_pat = "/$prefix_re|\\s*\$/Ax";
@@ -355,6 +361,11 @@
class ParsedBlock extends Block_HtmlElement
{
+ private $_block_types;
+ private $_regexps;
+ private $_regexpset;
+ private $_atSpace;
+
function __construct(&$input, $tag = 'div', $attr = array())
{
parent::__construct($tag, $attr);
@@ -395,7 +406,7 @@
'email_blockquote', 'wikicreole_indented',
'plugin', 'plugin_wikicreole', 'p');
// insert it before p!
- if (ENABLE_MARKUP_DIVSPAN) {
+ if (defined('ENABLE_MARKUP_DIVSPAN') and ENABLE_MARKUP_DIVSPAN) {
array_pop($Block_types);
$Block_types[] = 'divspan';
$Block_types[] = 'p';
@@ -500,6 +511,7 @@
abstract class BlockMarkup
{
public $_re;
+ protected $_element;
abstract function _match(&$input, $match);
@@ -522,6 +534,7 @@
{
public $_depth;
public $_re = '\ +(?=\S)';
+ protected $_element;
function _match(&$input, $m)
{
@@ -547,7 +560,6 @@
class Block_list extends BlockMarkup
{
- //public $_tag = 'ol' or 'ul';
public $_re = '\ {0,4}
(?: \+
| \\#\ (?!\[.*\])
@@ -556,6 +568,7 @@
| [*]\ (?!(?=\S)[^*]*(?<=\S)[*](?:\\s|[-)}>"\'\\/:.,;!?_*=]) )
)\ *(?=\S)';
public $_content = array();
+ public $_tag; //'ol' or 'ul'
function _match(&$input, $m)
{
@@ -603,6 +616,7 @@
class Block_dl extends Block_list
{
public $_tag = 'dl';
+ private $_tight_defn;
function __construct()
{
@@ -657,6 +671,9 @@
{
public $nrows;
public $ncols;
+ private $_accum;
+ private $_tight_top;
+ private $_tight_bot;
function __construct($term, $defn)
{
@@ -665,16 +682,16 @@
$defn = $defn->getContent();
$this->_next_tight_top = false; // value irrelevant - gets fixed later
- $this->_ncols = $this->_ComputeNcols($defn);
+ $this->_ncols = $this->ComputeNcols($defn);
$this->_nrows = 0;
foreach ($defn as $item) {
- if ($this->_IsASubtable($item))
- $this->_addSubtable($item);
+ if ($this->IsASubtable($item))
+ $this->addSubtable($item);
else
- $this->_addToRow($item);
+ $this->addToRow($item);
}
- $this->_flushRow();
+ $this->flushRow();
$th = HTML::th($term);
if ($this->_nrows > 1)
@@ -688,7 +705,7 @@
$this->_tight_bot = $tight_bot;
}
- private function _addToRow($item)
+ private function addToRow($item)
{
if (empty($this->_accum)) {
$this->_accum = HTML::td();
@@ -698,7 +715,7 @@
$this->_accum->pushContent($item);
}
- private function _flushRow($tight_bottom = false)
+ private function flushRow($tight_bottom = false)
{
if (!empty($this->_accum)) {
$row = new Block_HtmlElement('tr', false, $this->_accum);
@@ -712,12 +729,12 @@
}
}
- private function _addSubtable($table)
+ private function addSubtable($table)
{
if (!($table_rows = $table->getContent()))
return;
- $this->_flushRow($table_rows[0]->_tight_top);
+ $this->flushRow($table_rows[0]->_tight_top);
foreach ($table_rows as $subdef) {
$this->pushContent($subdef);
@@ -735,26 +752,26 @@
$first_row->unshiftContent($th);
}
- private function _ComputeNcols($defn)
+ private function ComputeNcols($defn)
{
$ncols = 2;
foreach ($defn as $item) {
- if ($this->_IsASubtable($item)) {
- $row = $this->_FirstDefn($item);
+ if ($this->IsASubtable($item)) {
+ $row = $this->FirstDefn($item);
$ncols = max($ncols, $row->ncols() + 1);
}
}
return $ncols;
}
- private function _IsASubtable($item)
+ private function IsASubtable($item)
{
return is_a($item, 'HtmlElement')
&& $item->getTag() == 'table'
&& $item->getAttr('class') == 'wiki-dl-table';
}
- private function _FirstDefn($subtable)
+ private function FirstDefn($subtable)
{
$defs = $subtable->getContent();
return $defs[0];
@@ -1292,6 +1309,8 @@
public $_tag = 'p';
public $_re = '\S.*';
public $_text = '';
+ private $_tight_bot;
+ private $_tight_top;
function _match(&$input, $m)
{
@@ -1387,7 +1406,7 @@
/**
* Transform the text of a page, and return a parse tree.
*/
-function TransformTextPre($text, $basepage = false)
+function TransformTextPre($text)
{
if (is_a($text, 'WikiDB_PageRevision')) {
$rev = $text;
@@ -1406,7 +1425,7 @@
*/
function TransformText($text, $basepage = false)
{
- $output = TransformTextPre($text, $basepage);
+ $output = TransformTextPre($text);
if ($basepage) {
// This is for immediate consumption.
// We must bind the contents to a base pagename so that
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-21 14:54:42
|
Revision: 9359
http://sourceforge.net/p/phpwiki/code/9359
Author: vargenau
Date: 2014-11-21 14:54:39 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Remove function setTightness
Modified Paths:
--------------
trunk/lib/CachedMarkup.php
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2014-11-21 11:46:38 UTC (rev 9358)
+++ trunk/lib/CachedMarkup.php 2014-11-21 14:54:39 UTC (rev 9359)
@@ -838,10 +838,6 @@
}
}
- function setTightness($top, $bottom)
- {
- }
-
function isInlineElement()
{
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-21 11:46:42
|
Revision: 9358
http://sourceforge.net/p/phpwiki/code/9358
Author: vargenau
Date: 2014-11-21 11:46:38 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Easier file upload: forbidden characters in filename are replaced by dashes (instead of rejecting upload)
Modified Paths:
--------------
trunk/lib/plugin/UpLoad.php
trunk/lib/stdlib.php
trunk/pgsrc/ReleaseNotes
Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php 2014-11-21 09:38:52 UTC (rev 9357)
+++ trunk/lib/plugin/UpLoad.php 2014-11-21 11:46:38 UTC (rev 9358)
@@ -1,5 +1,4 @@
<?php
-
/*
* Copyright 2003,2004,2007 $ThePhpWikiProgrammingTeam
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -19,18 +18,16 @@
* You should have received a copy of the GNU General Public License along
* with PhpWiki; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
*/
/**
* UpLoad: Allow Administrator to upload files to a special directory,
* which should preferably be added to the InterWikiMap
- * Usage: <<UpLoad >>
+ * Usage: <<UpLoad>>
* Author: NathanGass <ga...@io...>
* Changes: ReiniUrban <ru...@x-...>,
* qubit <rt...@da...>
* Marc-Etienne Vargenau, Alcatel-Lucent
- * Note: See also Jochen Kalmbach's plugin/UserFileManagement.php
*/
class WikiPlugin_UpLoad
@@ -43,7 +40,7 @@
function getDescription()
{
- return _("Upload files to the local InterWiki Upload:<filename>");
+ return _("Upload files to the local InterWiki [[Upload:filename]]");
}
function getDefaultArguments()
@@ -134,11 +131,10 @@
$userfile_name = $userfile->getName();
$userfile_name = trim(basename($userfile_name));
if (UPLOAD_USERDIR) {
- $file_dir .= $request->_user->_userid;
+ $username = $request->_user->_userid;
+ $file_dir .= $username;
$file_dir .= "/";
- $u_userfile = $request->_user->_userid . "/" . $userfile_name;
- } else {
- $u_userfile = $userfile_name;
+ // $userfile_name = $request->_user->_userid . "/" . $userfile_name;
}
$trimmed_file_dir = rtrim($file_dir, '/');
@@ -155,38 +151,58 @@
return HTML($message, $form);
}
- $u_userfile = preg_replace("/ /", "%20", $u_userfile);
$userfile_tmpname = $userfile->getTmpName();
$err_header = HTML::div(array('class' => 'error'), HTML::p(fmt("Error uploading “%s”", $userfile_name)));
if (preg_match("/(\." . join("|\.", $this->disallowed_extensions) . ")(\.|\$)/i", $userfile_name)) {
$err_header->pushContent(HTML::p(fmt("Files with extension %s are not allowed.",
join(", ", $this->disallowed_extensions))));
$message->pushContent($err_header);
- } elseif (!DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS and
- !preg_match("/(\." . join("|\.", $this->allowed_extensions) . ")\$/i",
- $userfile_name)
- ) {
+ return HTML($message, $form);
+ }
+ if (!DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS and
+ !preg_match("/(\." . join("|\.", $this->allowed_extensions) . ")\$/i", $userfile_name)) {
$err_header->pushContent(HTML::p(fmt("Only files with the extension %s are allowed.",
join(", ", $this->allowed_extensions))));
$message->pushContent($err_header);
- } elseif (preg_match("/[^._a-zA-Z0-9- ]/", strip_accents($userfile_name))) {
- $err_header->pushContent(HTML::p(_("Invalid filename. File names may only contain alphanumeric characters and dot, underscore, space or dash.")));
+ return HTML($message, $form);
+ }
+ if ($userfile->getSize() > (MAX_UPLOAD_SIZE)) {
+ $err_header->pushContent(HTML::p(_("Sorry but this file is too big.")));
$message->pushContent($err_header);
- } elseif (file_exists($file_dir . $userfile_name)) {
- $err_header->pushContent(HTML::p(fmt("There is already a file with name “%s” uploaded.", $userfile_name)));
+ return HTML($message, $form);
+ }
+
+ $sanified_userfile_name = sanify_filename($userfile_name);
+
+ if (preg_match("/[^._a-zA-Z0-9- ]/", strip_accents($sanified_userfile_name))) {
+ $err_header->pushContent(HTML::p(_("Invalid filename.")));
$message->pushContent($err_header);
- } elseif ($userfile->getSize() > (MAX_UPLOAD_SIZE)) {
- $err_header->pushContent(HTML::p(_("Sorry but this file is too big.")));
+ return HTML($message, $form);
+ }
+
+ if (file_exists($file_dir . $sanified_userfile_name)) {
+ $err_header->pushContent(HTML::p(fmt("There is already a file with name “%s” uploaded.", $sanified_userfile_name)));
$message->pushContent($err_header);
- } elseif (move_uploaded_file($userfile_tmpname, $file_dir . $userfile_name) or
- (IsWindows() and rename($userfile_tmpname, $file_dir . $userfile_name))
- ) {
+ return HTML($message, $form);
+ }
+ if (move_uploaded_file($userfile_tmpname, $file_dir . $sanified_userfile_name) or
+ (IsWindows() and rename($userfile_tmpname, $file_dir . $sanified_userfile_name))) {
$interwiki = new PageType_interwikimap();
- $link = $interwiki->link("Upload:$u_userfile");
- $message->pushContent(HTML::div(array('class' => 'feedback'),
- HTML::p(_("File successfully uploaded.")),
- HTML::p($link)));
-
+ if (UPLOAD_USERDIR) {
+ $link = $interwiki->link("[[Upload:$username/$sanified_userfile_name]]");
+ } else {
+ $link = $interwiki->link("[[Upload:$sanified_userfile_name]]");
+ }
+ if ($sanified_userfile_name != $userfile_name) {
+ $message->pushContent(HTML::div(array('class' => 'feedback'),
+ HTML::p(_("File successfully uploaded.")),
+ HTML::p($link),
+ HTML::p("Note: some forbidded characters in filename have been replaced by dash.")));
+ } else {
+ $message->pushContent(HTML::div(array('class' => 'feedback'),
+ HTML::p(_("File successfully uploaded.")),
+ HTML::p($link)));
+ }
// the upload was a success and we need to mark this event in the "upload log"
if ($logfile) {
$upload_log = $file_dir . basename($logfile);
@@ -199,9 +215,18 @@
$current = $pagehandle->getCurrentRevision();
$version = $current->getVersion();
$text = $current->getPackedContent();
- $newtext = $text . "\n* Upload:$u_userfile"; // don't inline images
+ // don't inline images
+ if (UPLOAD_USERDIR) {
+ $newtext = $text . "\n* [[Upload:$username/$sanified_userfile_name]]";
+ } else {
+ $newtext = $text . "\n* [[Upload:$sanified_userfile_name]]";
+ }
$meta = $current->_data;
- $meta['summary'] = sprintf(_("uploaded %s"), $u_userfile);
+ if (UPLOAD_USERDIR) {
+ $meta['summary'] = sprintf(_("uploaded %s"), $username.'/'.$sanified_userfile_name);
+ } else {
+ $meta['summary'] = sprintf(_("uploaded %s"), $sanified_userfile_name);
+ }
$pagehandle->save($newtext, $version + 1, $meta);
}
}
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2014-11-21 09:38:52 UTC (rev 9357)
+++ trunk/lib/stdlib.php 2014-11-21 11:46:38 UTC (rev 9358)
@@ -2110,6 +2110,14 @@
return utf8_encode($res);
}
+/**
+ * Sanify filename: replace all disallowed characters with dashes
+ */
+function sanify_filename($filename)
+{
+ return mb_ereg_replace('[^\w\. \-]', '-', $filename);
+}
+
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2014-11-21 09:38:52 UTC (rev 9357)
+++ trunk/pgsrc/ReleaseNotes 2014-11-21 11:46:38 UTC (rev 9358)
@@ -1,4 +1,4 @@
-Date: Wed, 19 Nov 2014 11:28:40 +0000
+Date: Fri, 21 Nov 2014 12:46:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -10,7 +10,7 @@
== 1.5.3 2014-11-XX Marc-Etienne Vargenau ==
-* easiest file upload: forbidden characters in filename are replaced by dashes (instead of rejecting upload)
+* easier file upload: forbidden characters in filename are replaced by dashes (instead of rejecting upload)
* improve handling of image insertion icon in edit toolbar (icon did not always appear after image uploading)
* bigger wikipaging font
* remove FPDF, lib/gif.php, lib/font (was not used)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-21 09:42:59
|
Revision: 9357
http://sourceforge.net/p/phpwiki/code/9357
Author: vargenau
Date: 2014-11-21 09:38:52 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Avoid constant reassignment
Modified Paths:
--------------
trunk/lib/plugin/TexToPng.php
Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php 2014-11-21 09:38:11 UTC (rev 9356)
+++ trunk/lib/plugin/TexToPng.php 2014-11-21 09:38:52 UTC (rev 9357)
@@ -74,18 +74,6 @@
|
*----------------------------------------------------------------------*/
-// check boolean constants
-
-if (!defined('TexToPng_debug')) {
- define('TexToPng_debug', false);
-}
-if (!defined('TexToPng_antialias')) {
- define('TexToPng_antialias', false);
-}
-if (!defined('TexToPng_transparent')) {
- define('TexToPng_transparent', false);
-}
-
/*-----------------------------------------------------------------------
| WikiPlugin_TexToPng
*----------------------------------------------------------------------*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-20 18:06:20
|
Revision: 9355
http://sourceforge.net/p/phpwiki/code/9355
Author: vargenau
Date: 2014-11-20 18:06:13 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Remove PLUGIN_MARKUP_MAP
Modified Paths:
--------------
trunk/TODO
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2014-11-20 18:03:37 UTC (rev 9354)
+++ trunk/TODO 2014-11-20 18:06:13 UTC (rev 9355)
@@ -20,9 +20,6 @@
architecture:
* flush <head> before <body> to parallelize css/js requests
* Optimization: try template_lite or try simple regex replacements as before.
-* Evaluate some xml syntax for plugins (as in MediaWiki):
- <IncludePages pages=<plugin-list BackLinks/> />
- <BackLink include_self=false />
* Fix postgresql stored procedures.
* Move serialized data from page_data / version_data to separate SQL columns.
* WikiDB hooks. (?)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-20 18:03:46
|
Revision: 9354
http://sourceforge.net/p/phpwiki/code/9354
Author: vargenau
Date: 2014-11-20 18:03:37 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Remove PLUGIN_MARKUP_MAP
Modified Paths:
--------------
trunk/TODO
trunk/config/config-default.ini
trunk/lib/IniConfig.php
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2014-11-20 17:56:52 UTC (rev 9353)
+++ trunk/TODO 2014-11-20 18:03:37 UTC (rev 9354)
@@ -9,7 +9,7 @@
short-term TODO:
* rename should check existing subpages and rename these also.
-* Sidebar: merge AVL theme (internal MonoBook derivate with customizable
+* Sidebar: merge AVL theme (internal MonoBook derivate with customizable
box states) with Sidebar
* clarify issues with pagenames: "," breaks PageList. Escape with "~" or "\"?
or htmlencode forbidden chars.
@@ -23,7 +23,6 @@
* Evaluate some xml syntax for plugins (as in MediaWiki):
<IncludePages pages=<plugin-list BackLinks/> />
<BackLink include_self=false />
-4 And/or fix PLUGIN_MARKUP_MAP aliases which break the InlineParser.
* Fix postgresql stored procedures.
* Move serialized data from page_data / version_data to separate SQL columns.
* WikiDB hooks. (?)
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2014-11-20 17:56:52 UTC (rev 9353)
+++ trunk/config/config-default.ini 2014-11-20 18:03:37 UTC (rev 9354)
@@ -153,7 +153,6 @@
ENABLE_MARKUP_TEMPLATE = true
DISABLE_MARKUP_WIKIWORD = false
ENABLE_MARKUP_DIVSPAN = false
-PLUGIN_MARKUP_MAP = ""
; these not:
; DBAUTH_AUTH_DSN =
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2014-11-20 17:56:52 UTC (rev 9353)
+++ trunk/lib/IniConfig.php 2014-11-20 18:03:37 UTC (rev 9354)
@@ -160,7 +160,7 @@
'PLUGIN_CACHED_DATABASE', 'PLUGIN_CACHED_FILENAME_PREFIX',
'PLUGIN_CACHED_HIGHWATER', 'PLUGIN_CACHED_LOWWATER', 'PLUGIN_CACHED_MAXLIFETIME',
'PLUGIN_CACHED_MAXARGLEN', 'PLUGIN_CACHED_IMGTYPES',
- 'WYSIWYG_BACKEND', 'PLUGIN_MARKUP_MAP',
+ 'WYSIWYG_BACKEND',
// extra logic:
'SERVER_NAME', 'SERVER_PORT', 'SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH',
'EXTERNAL_HTML2PDF_PAGELIST', 'PLUGIN_CACHED_CACHE_DIR'
@@ -427,21 +427,6 @@
}
}
- global $PLUGIN_MARKUP_MAP;
- $PLUGIN_MARKUP_MAP = array();
- if (defined('PLUGIN_MARKUP_MAP') and trim(PLUGIN_MARKUP_MAP) != "") {
- $_map = preg_split('/\s+/', PLUGIN_MARKUP_MAP);
- foreach ($_map as $v) {
- list($xml, $plugin) = explode(':', $v);
- if (!empty($xml) and !empty($plugin))
- $PLUGIN_MARKUP_MAP[$xml] = $plugin;
- }
- unset($_map);
- unset($xml);
- unset($plugin);
- unset($v);
- }
-
if (empty($rs['TEMP_DIR'])) {
$rs['TEMP_DIR'] = "/tmp";
if (getenv("TEMP"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-20 17:56:54
|
Revision: 9353
http://sourceforge.net/p/phpwiki/code/9353
Author: vargenau
Date: 2014-11-20 17:56:52 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Rename private functions without underscores
Modified Paths:
--------------
trunk/lib/BlockParser.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2014-11-20 17:49:49 UTC (rev 9352)
+++ trunk/lib/BlockParser.php 2014-11-20 17:56:52 UTC (rev 9353)
@@ -355,11 +355,10 @@
class ParsedBlock extends Block_HtmlElement
{
-
function __construct(&$input, $tag = 'div', $attr = array())
{
parent::__construct($tag, $attr);
- $this->_initBlockTypes();
+ $this->initBlockTypes();
$this->_parse($input);
}
@@ -367,10 +366,10 @@
{
// php5 failed to advance the block. php5 copies objects by ref.
// nextBlock == block, both are the same objects. So we have to clone it.
- for ($block = $this->_getBlock($input);
+ for ($block = $this->getBlock($input);
$block;
$block = (is_object($nextBlock) ? clone($nextBlock) : $nextBlock)) {
- while ($nextBlock = $this->_getBlock($input)) {
+ while ($nextBlock = $this->getBlock($input)) {
// Attempt to merge current with following block.
if (!($merged = $block->merge($nextBlock))) {
break; // can't merge
@@ -382,7 +381,7 @@
}
// FIXME: hackish. This should only be called once.
- private function _initBlockTypes()
+ private function initBlockTypes()
{
// better static or global?
static $_regexpset, $_block_types;
@@ -417,7 +416,7 @@
}
}
- private function _getBlock(&$input)
+ private function getBlock(&$input)
{
$this->_atSpace = $input->skipSpace();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-20 17:49:56
|
Revision: 9352
http://sourceforge.net/p/phpwiki/code/9352
Author: vargenau
Date: 2014-11-20 17:49:49 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Remove Markup_xml_plugin
Modified Paths:
--------------
trunk/lib/InlineParser.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2014-11-20 17:47:06 UTC (rev 9351)
+++ trunk/lib/InlineParser.php 2014-11-20 17:49:49 UTC (rev 9352)
@@ -1001,47 +1001,6 @@
}
}
-// Special version for plugins in xml syntax, mediawiki-style
-// <name arg=value>body</name> or <name /> => < ? plugin pluginname arg=value body ? >
-// PLUGIN_MARKUP_MAP = "html:RawHtml dot:GraphViz toc:CreateToc amath:AsciiMath richtable:RichTable include:IncludePage tex:TexToPng"
-class Markup_xml_plugin extends BalancedMarkup
-{
- //public $_start_regexp = "<(?: ".join('|',PLUGIN_MARKUP_MAP)." )(?: \s[^>]*)>";
-
- function getStartRegexp()
- {
- global $PLUGIN_MARKUP_MAP;
- static $_start_regexp;
- if ($_start_regexp) return $_start_regexp;
- if (empty($PLUGIN_MARKUP_MAP)) return '';
- //"<(?: html|search|extsearch|dot|toc|math|richtable|include|tex )(?: \s[^>]*)>"
- $_start_regexp = "<(?: " . join('|', array_keys($PLUGIN_MARKUP_MAP)) . " )(?: \s[^>]*|\\/ )>";
- return $_start_regexp;
- }
-
- function getEndRegexp($match)
- {
- return "<\\/" . $match . '>';
- }
-
- function markup($match, $body)
- {
- global $PLUGIN_MARKUP_MAP;
- $name = substr($match, 2, -2);
- $vars = '';
- if (preg_match('/^(\S+)\|(.*)$/', $name, $_m)) {
- $name = $_m[1];
- $vars = $_m[2]; //str_replace(' ', '&', $_m[2]);
- }
- if (!isset($PLUGIN_MARKUP_MAP[$name])) {
- trigger_error("No plugin for $name $vars defined.", E_USER_WARNING);
- return "";
- }
- $plugin = $PLUGIN_MARKUP_MAP[$name];
- return new Cached_PluginInvocation("<" . "?plugin $plugin $vars $body ?" . ">");
- }
-}
-
/**
* Mediawiki <nowiki>
* <nowiki>...</nowiki>
@@ -1283,9 +1242,6 @@
$this->_addMarkup(new Markup_wikicreole_preformatted);
if (ENABLE_MARKUP_TEMPLATE and !$non_default)
$this->_addMarkup(new Markup_template_plugin);
- // This does not work yet
- if (PLUGIN_MARKUP_MAP and !$non_default)
- $this->_addMarkup(new Markup_xml_plugin);
}
function _addMarkup($markup)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-20 17:47:09
|
Revision: 9351
http://sourceforge.net/p/phpwiki/code/9351
Author: vargenau
Date: 2014-11-20 17:47:06 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Remove unused code and debug
Modified Paths:
--------------
trunk/lib/InlineParser.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2014-11-20 17:14:06 UTC (rev 9350)
+++ trunk/lib/InlineParser.php 2014-11-20 17:47:06 UTC (rev 9351)
@@ -89,7 +89,6 @@
{
assert($regexps);
$this->_regexps = array_unique($regexps);
- if (!defined('_INLINE_OPTIMIZATION')) define('_INLINE_OPTIMIZATION', 0);
}
/**
@@ -146,83 +145,29 @@
// s - DOTALL
// A - ANCHORED
// S - STUDY
- function _match($text, $regexps, $repeat)
+ private function _match($text, $regexps, $repeat)
{
- // If one of the regexps is an empty string, php will crash here:
- // sf.net: Fatal error: Allowed memory size of 8388608 bytes exhausted
- // (tried to allocate 634 bytes)
- if (_INLINE_OPTIMIZATION) { // disabled, wrong
- // So we try to minize memory usage, by looping explicitly,
- // and storing only those regexp which actually match.
- // There may be more than one, so we have to find the longest,
- // and match inside until the shortest is empty.
- $matched = array();
- $matched_ind = array();
- for ($i = 0; $i < count($regexps); $i++) {
- if (!trim($regexps[$i])) {
- trigger_error("empty regexp $i", E_USER_WARNING);
- continue;
- }
- $pat = "/ ( . $repeat ) ( " . $regexps[$i] . " ) /x";
- if (preg_match($pat, $text, $_m)) {
- $m = $_m; // FIXME: prematch, postmatch is wrong
- $matched[] = $regexps[$i];
- $matched_ind[] = $i;
- $regexp_ind = $i;
- }
- }
- // To overcome ANCHORED:
- // We could sort by longest match and iterate over these.
- if (empty($matched))
- return false;
- }
$match = new RegexpSet_match;
// Optimization: if the matches are only "$" and another, then omit "$"
- if (!_INLINE_OPTIMIZATION or count($matched) > 2) {
- assert(!empty($repeat));
- assert(!empty($regexps));
- // We could do much better, if we would know the matching markup for the
- // longest regexp match:
- $hugepat = "/ ( . $repeat ) ( (" . join(')|(', $regexps) . ") ) /Asx";
- // Proposed premature optimization 1:
- //$hugepat= "/ ( . $repeat ) ( (" . join(')|(', array_values($matched)) . ") ) /Asx";
- if (!preg_match($hugepat, $text, $m)) {
- return false;
- }
- // Proposed premature optimization 1:
- //$match->regexp_ind = $matched_ind[count($m) - 4];
- $match->regexp_ind = count($m) - 4;
- } else {
- $match->regexp_ind = $regexp_ind;
+ assert(!empty($repeat));
+ assert(!empty($regexps));
+ // We could do much better, if we would know the matching markup for the
+ // longest regexp match:
+ $hugepat = "/ ( . $repeat ) ( (" . join(')|(', $regexps) . ") ) /Asx";
+ // Proposed premature optimization 1:
+ //$hugepat= "/ ( . $repeat ) ( (" . join(')|(', array_values($matched)) . ") ) /Asx";
+ if (!preg_match($hugepat, $text, $m)) {
+ return false;
}
+ // Proposed premature optimization 1:
+ //$match->regexp_ind = $matched_ind[count($m) - 4];
+ $match->regexp_ind = count($m) - 4;
$match->postmatch = substr($text, strlen($m[0]));
$match->prematch = $m[1];
$match->match = $m[2];
- /* DEBUGGING */
- if (DEBUG & _DEBUG_PARSER) {
- static $_already_dumped = 0;
- if (!$_already_dumped) {
- var_dump($regexps);
- if (_INLINE_OPTIMIZATION)
- var_dump($matched);
- var_dump($matched_ind);
- }
- $_already_dumped = 1;
- PrintXML(HTML::dl(HTML::dt("input"),
- HTML::dd(HTML::pre($text)),
- HTML::dt("regexp"),
- HTML::dd(HTML::pre($match->regexp_ind, ":", $regexps[$match->regexp_ind])),
- HTML::dt("prematch"),
- HTML::dd(HTML::pre($match->prematch)),
- HTML::dt("match"),
- HTML::dd(HTML::pre($match->match)),
- HTML::dt("postmatch"),
- HTML::dd(HTML::pre($match->postmatch))
- ));
- }
return $match;
}
}
@@ -622,7 +567,8 @@
function getMatchRegexp()
{
global $WikiNameRegexp;
- if (!trim($WikiNameRegexp)) return " " . WIKI_NAME_REGEXP;
+ if (!trim($WikiNameRegexp))
+ return " " . WIKI_NAME_REGEXP;
return " $WikiNameRegexp";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-20 17:14:14
|
Revision: 9350
http://sourceforge.net/p/phpwiki/code/9350
Author: vargenau
Date: 2014-11-20 17:14:06 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Fix About PhpWiki link
Modified Paths:
--------------
trunk/themes/MonoBook/templates/browse-footer.tmpl
Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-11-20 15:18:14 UTC (rev 9349)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-11-20 17:14:06 UTC (rev 9350)
@@ -14,7 +14,7 @@
<?php if ($request->_dbi->isWikiPage(_("About".WIKI_NAME))) { ?>
<?php echo WikiLink(_("About".WIKI_NAME)) ?>
<?php } else { ?>
- <li id="f-about"><a href="http://www.phpwiki.fr/PhpWiki">About PhpWiki</a></li>
+ <li id="f-about"><a href="http://www.phpwiki.fr/Help/PhpWiki">About PhpWiki</a></li>
<?php } ?>
<li id="f-disclaimer">
<?php if ($request->_dbi->isWikiPage(_("GeneralDisclaimer"))) { ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-20 15:18:16
|
Revision: 9349
http://sourceforge.net/p/phpwiki/code/9349
Author: vargenau
Date: 2014-11-20 15:18:14 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
More abstraction
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/InlineParser.php
trunk/lib/WysiwygEdit.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2014-11-20 13:27:16 UTC (rev 9348)
+++ trunk/lib/BlockParser.php 2014-11-20 15:18:14 UTC (rev 9349)
@@ -19,7 +19,6 @@
* with PhpWiki; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-//require_once('lib/HtmlElement.php');
require_once 'lib/CachedMarkup.php';
require_once 'lib/InlineParser.php';
@@ -143,7 +142,7 @@
$match->postmatch = substr($text, strlen($m[0]));
$match->match = $m[1];
$match->regexp_ind = count($m) - 3 + $prevMatch->regexp_ind + 1;
- ;
+
return $match;
}
}
@@ -151,9 +150,8 @@
class BlockParser_Input
{
- function BlockParser_Input($text)
+ function __construct($text)
{
-
// Expand leading tabs.
// FIXME: do this better.
//
@@ -345,7 +343,7 @@
class Block_HtmlElement extends HtmlElement
{
- function Block_HtmlElement($tag /*, ... */)
+ function __construct($tag /*, ... */)
{
$this->_init(func_get_args());
}
@@ -358,14 +356,14 @@
class ParsedBlock extends Block_HtmlElement
{
- function ParsedBlock(&$input, $tag = 'div', $attr = array())
+ function __construct(&$input, $tag = 'div', $attr = array())
{
- $this->Block_HtmlElement($tag, $attr);
+ parent::__construct($tag, $attr);
$this->_initBlockTypes();
$this->_parse($input);
}
- function _parse(&$input)
+ private function _parse(&$input)
{
// php5 failed to advance the block. php5 copies objects by ref.
// nextBlock == block, both are the same objects. So we have to clone it.
@@ -384,7 +382,7 @@
}
// FIXME: hackish. This should only be called once.
- function _initBlockTypes()
+ private function _initBlockTypes()
{
// better static or global?
static $_regexpset, $_block_types;
@@ -419,7 +417,7 @@
}
}
- function _getBlock(&$input)
+ private function _getBlock(&$input)
{
$this->_atSpace = $input->skipSpace();
@@ -456,20 +454,20 @@
class WikiText extends ParsedBlock
{
- function WikiText($text)
+ function __construct($text)
{
$input = new BlockParser_Input($text);
- $this->ParsedBlock($input);
+ parent::__construct($input);
}
}
class SubBlock extends ParsedBlock
{
- function SubBlock(&$input, $indent_re, $initial_indent = false,
- $tag = 'div', $attr = array())
+ function __construct(&$input, $indent_re, $initial_indent = false,
+ $tag = 'div', $attr = array())
{
$subinput = new BlockParser_InputSubBlock($input, $indent_re, $initial_indent);
- $this->ParsedBlock($subinput, $tag, $attr);
+ parent::__construct($subinput, $tag, $attr);
}
}
@@ -488,7 +486,7 @@
function __construct(&$input, $indent_re, $initial_indent = false,
$tag = 'div', $attr = array())
{
- $this->SubBlock($input, $indent_re, $initial_indent, $tag, $attr);
+ parent::__construct($input, $indent_re, $initial_indent, $tag, $attr);
// If content is a single paragraph, eliminate the paragraph...
if (count($this->_content) == 1) {
@@ -691,7 +689,7 @@
$this->_tight_bot = $tight_bot;
}
- function _addToRow($item)
+ private function _addToRow($item)
{
if (empty($this->_accum)) {
$this->_accum = HTML::td();
@@ -701,7 +699,7 @@
$this->_accum->pushContent($item);
}
- function _flushRow($tight_bottom = false)
+ private function _flushRow($tight_bottom = false)
{
if (!empty($this->_accum)) {
$row = new Block_HtmlElement('tr', false, $this->_accum);
@@ -715,7 +713,7 @@
}
}
- function _addSubtable($table)
+ private function _addSubtable($table)
{
if (!($table_rows = $table->getContent()))
return;
@@ -729,7 +727,7 @@
}
}
- function _setTerm($th)
+ private function _setTerm($th)
{
$first_row = &$this->_content[0];
if (is_a($first_row, 'Block_table_dl_defn'))
@@ -738,7 +736,7 @@
$first_row->unshiftContent($th);
}
- function _ComputeNcols($defn)
+ private function _ComputeNcols($defn)
{
$ncols = 2;
foreach ($defn as $item) {
@@ -750,14 +748,14 @@
return $ncols;
}
- function _IsASubtable($item)
+ private function _IsASubtable($item)
{
return is_a($item, 'HtmlElement')
&& $item->getTag() == 'table'
&& $item->getAttr('class') == 'wiki-dl-table';
}
- function _FirstDefn($subtable)
+ private function _FirstDefn($subtable)
{
$defs = $subtable->getContent();
return $defs[0];
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2014-11-20 13:27:16 UTC (rev 9348)
+++ trunk/lib/InlineParser.php 2014-11-20 15:18:14 UTC (rev 9349)
@@ -173,7 +173,8 @@
}
// To overcome ANCHORED:
// We could sort by longest match and iterate over these.
- if (empty($matched)) return false;
+ if (empty($matched))
+ return false;
}
$match = new RegexpSet_match;
@@ -264,16 +265,11 @@
*/
abstract class BalancedMarkup
{
- public $_start_regexp;
-
/** Get the starting regexp for this rule.
*
* @return string The starting regexp.
*/
- function getStartRegexp()
- {
- return $this->_start_regexp;
- }
+ abstract function getStartRegexp();
/** Get the ending regexp for this rule.
*
@@ -281,10 +277,7 @@
*
* @return string The ending regexp.
*/
- function getEndRegexp($match)
- {
- return $this->_end_regexp;
- }
+ abstract function getEndRegexp($match);
/** Get expansion for matching input.
*
@@ -347,8 +340,8 @@
preg_match('/(\#?) \[\s* (?: (.*?) \s* (?<!' . ESCAPE_CHAR . ')(\|) )? \s* (.+?) \s*\]/x',
str_replace("\n", " ", $bracketlink), $matches);
if (count($matches) < 4) {
- trigger_error(_("Invalid [] syntax ignored") . _(": ") . $bracketlink, E_USER_WARNING);
- return new Cached_Link;
+ return HTML::span(array('class' => 'error'),
+ _("Invalid [] syntax ignored") . _(": ") . $bracketlink);
}
list (, $hash, $label, $bar, $rawlink) = $matches;
@@ -675,7 +668,10 @@
class Markup_wikicreole_italics extends BalancedMarkup
{
- public $_start_regexp = "\\/\\/";
+ function getStartRegexp()
+ {
+ return "\\/\\/";
+ }
function getEndRegexp($match)
{
@@ -691,7 +687,10 @@
class Markup_wikicreole_bold extends BalancedMarkup
{
- public $_start_regexp = "\\*\\*";
+ function getStartRegexp()
+ {
+ return "\\*\\*";
+ }
function getEndRegexp($match)
{
@@ -707,7 +706,10 @@
class Markup_wikicreole_monospace extends BalancedMarkup
{
- public $_start_regexp = "\\#\\#";
+ function getStartRegexp()
+ {
+ return "\\#\\#";
+ }
function getEndRegexp($match)
{
@@ -722,7 +724,10 @@
class Markup_wikicreole_underline extends BalancedMarkup
{
- public $_start_regexp = "\\_\\_";
+ function getStartRegexp()
+ {
+ return "\\_\\_";
+ }
function getEndRegexp($match)
{
@@ -738,7 +743,10 @@
class Markup_wikicreole_superscript extends BalancedMarkup
{
- public $_start_regexp = "\\^\\^";
+ function getStartRegexp()
+ {
+ return "\\^\\^";
+ }
function getEndRegexp($match)
{
@@ -754,11 +762,14 @@
class Markup_wikicreole_subscript extends BalancedMarkup
{
- public $_start_regexp = ",,";
+ function getStartRegexp()
+ {
+ return ",,";
+ }
function getEndRegexp($match)
{
- return $match;
+ return ",,";
}
function markup($match, $body)
@@ -770,11 +781,14 @@
class Markup_old_emphasis extends BalancedMarkup
{
- public $_start_regexp = "''";
+ function getStartRegexp()
+ {
+ return "''";
+ }
function getEndRegexp($match)
{
- return $match;
+ return "''";
}
function markup($match, $body)
@@ -846,8 +860,10 @@
class Markup_html_emphasis extends BalancedMarkup
{
- public $_start_regexp =
- "<(?: b|big|i|small|tt|em|strong|cite|code|dfn|kbd|samp|s|strike|del|var|sup|sub )>";
+ function getStartRegexp()
+ {
+ return "<(?: b|big|i|small|tt|em|strong|cite|code|dfn|kbd|samp|s|strike|del|var|sup|sub )>";
+ }
function getEndRegexp($match)
{
@@ -866,9 +882,10 @@
class Markup_html_divspan extends BalancedMarkup
{
- public $_start_regexp =
- "<(?: div|span )(?: \s[^>]*)?>";
-
+ function getStartRegexp()
+ {
+ return "<(?: div|span )(?: \s[^>]*)?>";
+ }
function getEndRegexp($match)
{
if (substr($match, 1, 4) == 'span')
@@ -898,8 +915,12 @@
{
//rurban: abbr|acronym need an optional title tag.
//sf.net bug #728595
- public $_start_regexp = "<(?: abbr|acronym )(?: [^>]*)?>";
+ function getStartRegexp()
+ {
+ return "<(?: abbr|acronym )(?: [^>]*)?>";
+ }
+
function getEndRegexp($match)
{
if (substr($match, 1, 4) == 'abbr')
@@ -933,9 +954,17 @@
class Markup_color extends BalancedMarkup
{
// %color=blue% blue text %% and back to normal
- public $_start_regexp = "%color=(?: [^%]*)%";
- public $_end_regexp = "%%";
+ function getStartRegexp()
+ {
+ return "%color=(?: [^%]*)%";
+ }
+
+ function getEndRegexp($match)
+ {
+ return "%%";
+ }
+
function markup($match, $body)
{
$color = strtolower(substr($match, 7, -1));
@@ -1261,12 +1290,12 @@
public $_regexps = array();
public $_markup = array();
- function __construct($markup_types = false)
+ function __construct($markup_types = array())
{
global $request;
// We need to extend the inline parsers by certain actions, like SearchHighlight,
// SpellCheck and maybe CreateToc.
- if (!$markup_types) {
+ if (empty($markup_types)) {
$non_default = false;
$markup_types = array
('escape', 'wikicreolebracketlink', 'bracketlink', 'url',
Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php 2014-11-20 13:27:16 UTC (rev 9348)
+++ trunk/lib/WysiwygEdit.php 2014-11-20 15:18:14 UTC (rev 9349)
@@ -103,7 +103,10 @@
class Markup_html_p extends BalancedMarkup
{
- public $_start_regexp = "<(?:p|P)( class=\".*\")?>";
+ function getStartRegexp()
+ {
+ return "<(?:p|P)( class=\".*\")?>";
+ }
function getEndRegexp($match)
{
@@ -119,7 +122,10 @@
//'<span style="font-weight: bold">text</span>' => '*text*'
class Markup_html_spanbold extends BalancedMarkup
{
- public $_start_regexp = "<(?:span|SPAN) style=\"font-weight: bold\">";
+ function getStartRegexp()
+ {
+ return "<(?:span|SPAN) style=\"font-weight: bold\">";
+ }
function getEndRegexp($match)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-20 13:27:21
|
Revision: 9348
http://sourceforge.net/p/phpwiki/code/9348
Author: vargenau
Date: 2014-11-20 13:27:16 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Fix links to PhpWiki website
Modified Paths:
--------------
trunk/config/config-dist.ini
trunk/lib/Request.php
trunk/lib/SemanticWeb.php
trunk/lib/pdf.php
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/RawHtml.php
trunk/lib/plugin/RssFeed.php
trunk/locale/README
trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
trunk/locale/es/pgsrc/Ayuda%2FPhpWiki
trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
trunk/locale/fr/pgsrc/Aide%2FPhpWiki
trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
trunk/locale/it/pgsrc/Aiuto%2FPhpWiki
trunk/locale/nl/pgsrc/Help%2FPhpWiki
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki
trunk/locale/zh/pgsrc/Help%2FLinkIcons
trunk/locale/zh/pgsrc/Help%2FPhpWiki
trunk/pgsrc/Help%2FLinkIcons
trunk/pgsrc/Help%2FPhpWiki
trunk/pgsrc/Help%2FRssFeedPlugin
trunk/pgsrc/PhpWikiRecentChanges
trunk/themes/blog/templates/sidebar.tmpl
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/config/config-dist.ini 2014-11-20 13:27:16 UTC (rev 9348)
@@ -89,7 +89,7 @@
; Needed for FacebookLike plugin
;ENABLE_OPEN_GRAPH = true
-; Needs babycart installed. See http://phpwiki.fr/SpamAssassinIntegration
+; Needs babycart installed.
; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart
;ENABLE_SPAMASSASSIN = true
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/lib/Request.php 2014-11-20 13:27:16 UTC (rev 9348)
@@ -380,7 +380,6 @@
// Even if they are sending the accept-encoding gzip header!
// wget is, Mozilla, and MSIE no.
// Of the RSS readers only MagpieRSS 0.5.2 is. http://www.rssgov.com/rssparsers.html
- // See also http://phpwiki.sourceforge.net/phpwiki/KnownBugs
if ($compress
and $this->getArg('format')
and strstr($this->getArg('format'), 'rss')
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/lib/SemanticWeb.php 2014-11-20 13:27:16 UTC (rev 9348)
@@ -72,7 +72,7 @@
... (facts and rules described in XML)
*
* Links:
- * http://phpwiki.fr/SemanticWeb,
+ * http://phpwiki.fr/Help/SemanticRelations,
* http://en.wikipedia.org/wiki/Knowledge_representation
* http://www.ontoweb.org/
* http://www.semwebcentral.org/ (OWL on top of FusionForge)
Modified: trunk/lib/pdf.php
===================================================================
--- trunk/lib/pdf.php 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/lib/pdf.php 2014-11-20 13:27:16 UTC (rev 9348)
@@ -25,7 +25,6 @@
//define("USE_EXTERNAL_HTML2PDF", "htmldoc --quiet --format pdf14 --jpeg --webpage --no-toc --no-title %s");
/**
* handler for format=pdf
- * http://phpwiki.sourceforge.net/phpwiki/PhpWikiToDocBookAndPDF
* htmldoc or ghostscript + html2ps or docbook (dbdoclet, xsltproc, fop)
* http://www.easysw.com/htmldoc
*/
@@ -81,8 +80,7 @@
// check hook for external converters
if (defined('USE_EXTERNAL_HTML2PDF')
and USE_EXTERNAL_HTML2PDF
- ) { // See http://phpwiki.sourceforge.net/phpwiki/PhpWikiToDocBookAndPDF
- // htmldoc or ghostscript + html2ps or docbook (dbdoclet, xsltproc, fop)
+ ) { // htmldoc or ghostscript + html2ps or docbook (dbdoclet, xsltproc, fop)
Header('Content-Type: application/pdf');
$request->discardOutput();
$request->buffer_output(false /*'nocompress'*/);
Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/lib/plugin/ExternalSearch.php 2014-11-20 13:27:16 UTC (rev 9348)
@@ -22,7 +22,6 @@
/**
* Redirect to an external web site based on form input.
- * See http://phpwiki.sourceforge.net/phpwiki/ExternalSearchPlugin
*
* useimage sample:
ExternalSearch
Modified: trunk/lib/plugin/LdapSearch.php
===================================================================
--- trunk/lib/plugin/LdapSearch.php 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/lib/plugin/LdapSearch.php 2014-11-20 13:27:16 UTC (rev 9348)
@@ -24,7 +24,7 @@
* WikiPlugin which searches an LDAP directory.
*
* Uses the config.ini constants as defaults.
- * See http://phpwiki.fr/LdapSearchPlugin
+ * See http://phpwiki.fr/Help/LdapSearchPlugin
* TODO: Return a pagelist on certain attributes
*
* Usage Samples:
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/lib/plugin/ModeratedPage.php 2014-11-20 13:27:16 UTC (rev 9348)
@@ -29,7 +29,7 @@
*
* Not yet ready! part 3/3 is missing: The moderator approve/reject methods.
*
- * See http://phpwiki.fr/PageModeration
+ * See http://phpwiki.fr/Help/ModeratedPagePlugin
* Author: ReiniUrban
*/
Modified: trunk/lib/plugin/RawHtml.php
===================================================================
--- trunk/lib/plugin/RawHtml.php 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/lib/plugin/RawHtml.php 2014-11-20 13:27:16 UTC (rev 9348)
@@ -40,7 +40,6 @@
* ENABLE_RAW_HTML_SAFE:
* - Allow some sort of "safe" html tags and attributes.
* Unsafe attributes are automatically stripped. (Experimental!)
- * See http://phpwiki.sourceforge.net/phpwiki/allowing%20safe%20HTML
*/
/**
Modified: trunk/lib/plugin/RssFeed.php
===================================================================
--- trunk/lib/plugin/RssFeed.php 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/lib/plugin/RssFeed.php 2014-11-20 13:27:16 UTC (rev 9348)
@@ -121,10 +121,13 @@
{
if (!$request) $request =& $GLOBALS['request'];
extract($args);
- if (empty($title)) $title = _("RssFeed");
- if (empty($url)) $url = 'http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss';
+ if (empty($title))
+ $title = _("RssFeed");
+ if (empty($url))
+ $url = 'http://phpwiki.fr/RecentChanges?format=rss';
$argstr = "url=$url";
- if (isset($maxitem) and is_numeric($maxitem)) $argstr .= " maxitem=$maxitem";
+ if (isset($maxitem) and is_numeric($maxitem))
+ $argstr .= " maxitem=$maxitem";
return $this->makeBox($title,
$this->run($request->_dbi, $argstr, $request, $basepage));
}
Modified: trunk/locale/README
===================================================================
--- trunk/locale/README 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/README 2014-11-20 13:27:16 UTC (rev 9348)
@@ -22,7 +22,7 @@
Phpwiki uses the DEFAULT_LANGUAGE internally, when no $GLOBALS['LANG'] is given.
With certain starter script which set $LANG you can easily provide a multi-lingual wiki.
For convenience provide some InterWikiMap entries for easier switching to the other
-languages then. See http://phpwiki.fr/MultiLingualWiki
+languages then.
Phpwiki uses GNU gettext tools to provide and maintain multi-lingual
messages for different languages. Even if you are already familiar
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:52 +0000
+Date: Thu, 20 Nov 2014 14:24:56 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhpWiki;
@@ -9,6 +9,5 @@
Sie verwenden jetzt gerade PhpWiki. Faszinierend, oder?
Besuchen Sie die Website von PhpWiki unter
-http://phpwiki.sourceforge.net/ und schauen Sie PhpWiki in Aktion an
-unter http://phpwiki.sourceforge.net/phpwiki/ (und natürlich auch
-hier :-)).
+[[http://phpwiki.sourceforge.net/]] und schauen Sie PhpWiki in Aktion an
+unter [[http://phpwiki.fr]] (und natürlich auch hier :-)).
Modified: trunk/locale/es/pgsrc/Ayuda%2FPhpWiki
===================================================================
--- trunk/locale/es/pgsrc/Ayuda%2FPhpWiki 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/es/pgsrc/Ayuda%2FPhpWiki 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:51 +0000
+Date: Thu, 20 Nov 2014 14:25:01 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Ayuda%2FPhpWiki;
@@ -8,6 +8,5 @@
Esta usando PhpWiki en este momento. ¿No es increible?
-Visite nuestra web en http://phpwiki.sourceforge.net/ y vea PhpWiki
-en acción en http://phpwiki.sourceforge.net/phpwiki/.
-
+Visite nuestra web en [[http://phpwiki.sourceforge.net/]] y vea PhpWiki
+en acción en [[http://phpwiki.fr]].
Modified: trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Wed, 19 Nov 2014 15:29:12 +0000
+Date: Thu, 20 Nov 2014 14:25:52 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Aide%2FIc%C3%B4nesDeLien;
@@ -35,9 +35,9 @@
=== URL ===
* Adresse électronique [PhpWiki-talk mailing list|mailto:php...@li...]
-* Lien http normal [Page d'accueil de PhpWiki|http://phpwiki.sourceforge.net/phpwiki/]
-* Lien http sécurisé [PhpWiki's Home Page|https://phpwiki.sourceforge.net/phpwiki/]
-* Serveur ftp ftp://ftp.sourceforge.net/
+* Lien http normal [[http://phpwiki.fr|Page d'accueil de PhpWiki]]
+* Lien https sécurisé [[https://phpwiki.fr|Page d'accueil de PhpWiki]]
+* Serveur ftp [[ftp://ftp.sourceforge.net/]]
//Une icône générique est affichée pour les autres liens d'un type moins commun.//
* news://nntp.news.com]
Modified: trunk/locale/fr/pgsrc/Aide%2FPhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPhpWiki 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/fr/pgsrc/Aide%2FPhpWiki 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:46 +0000
+Date: Thu, 20 Nov 2014 14:25:52 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Aide%2FPhpWiki;
@@ -9,8 +9,7 @@
Vous utilisez ~PhpWiki en ce moment même. Incroyable, n'est-ce pas ?
Visitez notre page d'accueil (en anglais) sur [[http://phpwiki.sourceforge.net/]]
-et voyez ~PhpWiki en action sur [[http://phpwiki.sourceforge.net/phpwiki/]]
-(et bien sûr, ici aussi :-)).
+et voyez ~PhpWiki en action sur [[http://phpwiki.fr]] (et bien sûr, ici aussi :-)).
<noinclude>
----
Modified: trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:46 +0000
+Date: Thu, 20 Nov 2014 14:25:52 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Aide%2FPluginRessourcesRss;
@@ -49,10 +49,10 @@
=== Exemples
-* sources ~PhpWikiRss pour PhpWiki:RecentChanges :
+* sources ~PhpWikiRss
{{{
- <<RssFeed feed=PhpWikiRss description="PhpWiki:RecentChanges"
- url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
+ <<RssFeed feed=PhpWikiRss description="PhpWiki RecentChanges"
+ url=http://phpwiki.fr/RecentChanges?format=rss>>
}}}
* [PhpWikiDemo:sidebar/] _Exemple barre verticale_
Modified: trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
===================================================================
--- trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:46 +0000
+Date: Thu, 20 Nov 2014 14:25:52 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=ModifsR%C3%A9centesPhpWiki;
@@ -6,5 +6,5 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<RssFeed feed=PhpWikiRecentChanges description="PhpWiki:RecentChanges"
- url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
+<<RssFeed feed=PhpWikiRecentChanges description="PhpWiki RecentChanges"
+ url=http://phpwiki.fr/RecentChanges?format=rss>>
Modified: trunk/locale/it/pgsrc/Aiuto%2FPhpWiki
===================================================================
--- trunk/locale/it/pgsrc/Aiuto%2FPhpWiki 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/it/pgsrc/Aiuto%2FPhpWiki 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:44 +0000
+Date: Thu, 20 Nov 2014 14:25:47 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Aiuto%2FPhpWiki;
@@ -8,5 +8,5 @@
Stai usando PhpWiki in questo momento. Incredibile, vero?
-Visita la nostra home page su http://phpwiki.sourceforge.net e guarda
-PhpWiki in azione su http://phpwiki.sourceforge.net/phpwiki/.
+Visita la nostra home page su [[http://phpwiki.sourceforge.net]] e guarda
+PhpWiki in azione su [[http://phpwiki.fr]].
Modified: trunk/locale/nl/pgsrc/Help%2FPhpWiki
===================================================================
--- trunk/locale/nl/pgsrc/Help%2FPhpWiki 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/nl/pgsrc/Help%2FPhpWiki 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:49 +0000
+Date: Thu, 20 Nov 2014 14:25:20 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Help%2FPhpWiki;
@@ -8,6 +8,6 @@
Je gebruikt PhpWiki nu, op dit moment. Ongelooflijk, nietwaar?
-Bezoek onze thuispagina op http://phpwiki.sourceforge.net/ en zie PhpWiki
-in actie op http://phpwiki.sourceforge.net/phpwiki/.
+Bezoek onze thuispagina op [[http://phpwiki.sourceforge.net/]] en zie PhpWiki
+in actie op [[http://phpwiki.fr]].
Modified: trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki
===================================================================
--- trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:48 +0000
+Date: Thu, 20 Nov 2014 14:25:15 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Hj%C3%A4lp%2FPhpWiki;
@@ -8,5 +8,5 @@
Du använder ~PhpWiki just nu. Otroligt eller hur?
-Besök vår hemsida på http://phpwiki.sourceforge.net/ och se hur
-~PhpWiki fungerar på http://phpwiki.sourceforge.net/phpwiki/.
+Besök vår hemsida på [[http://phpwiki.sourceforge.net/]] och se hur
+~PhpWiki fungerar på [[http://phpwiki.fr]].
Modified: trunk/locale/zh/pgsrc/Help%2FLinkIcons
===================================================================
--- trunk/locale/zh/pgsrc/Help%2FLinkIcons 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/zh/pgsrc/Help%2FLinkIcons 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Wed, 19 Nov 2014 16:21:30 +0000
+Date: Thu, 20 Nov 2014 14:25:06 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Help%2FLinkIcons;
@@ -33,9 +33,9 @@
===URLs
* Email address [PhpWiki-talk mailing list|mailto:php...@li...]
-* Normal http link [PhpWiki's Home Page|http://phpwiki.sourceforge.net/phpwiki/]
-* Secure http link [PhpWiki's Home Page|https://phpwiki.sourceforge.net/phpwiki/]
-* File transfer ftp://ftp.sourceforge.net/
+* Normal http link [[http://phpwiki.fr|PhpWiki's Home Page]]
+* Secure https link [[https://phpwiki.fr|PhpWiki's Home Page]]
+* File transfer [[ftp://ftp.sourceforge.net/]]
''A generic icon is shown for other less common link types.''
Modified: trunk/locale/zh/pgsrc/Help%2FPhpWiki
===================================================================
--- trunk/locale/zh/pgsrc/Help%2FPhpWiki 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/locale/zh/pgsrc/Help%2FPhpWiki 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:50 +0000
+Date: Thu, 20 Nov 2014 14:25:06 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Help%2FPhpWiki;
@@ -8,8 +8,8 @@
你現在正在使用 PhpWiki. 很難以置信,不是嗎?
-參訪我們位於 http://phpwiki.sourceforge.net 的首頁並參閱這兒的 PhpWiki
-http://phpwiki.sourceforge.net/phpwiki/.
+參訪我們位於 [[http://phpwiki.sourceforge.net]] 的首頁並參閱這兒的 PhpWiki
+[[http://phpwiki.fr]].
<noinclude>
----
Modified: trunk/pgsrc/Help%2FLinkIcons
===================================================================
--- trunk/pgsrc/Help%2FLinkIcons 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/pgsrc/Help%2FLinkIcons 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Wed, 19 Nov 2014 15:29:32 +0000
+Date: Thu, 20 Nov 2014 14:24:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Help%2FLinkIcons;
@@ -34,9 +34,9 @@
=== URLs ===
* Email address [[mailto:php...@li...|PhpWiki-talk mailing list]]
-* Normal http link [[http://phpwiki.sourceforge.net/phpwiki/|PhpWiki's Home Page]]
-* Secure http link [[https://phpwiki.sourceforge.net/phpwiki/|PhpWiki's Home Page]]
-* File transfer ftp://ftp.sourceforge.net/
+* Normal http link [[http://phpwiki.fr|PhpWiki's Home Page]]
+* Secure http link [[https://phpwiki.fr|PhpWiki's Home Page]]
+* File transfer [[ftp://ftp.sourceforge.net]]
//A generic icon is shown for other less common link types.//
Modified: trunk/pgsrc/Help%2FPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FPhpWiki 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/pgsrc/Help%2FPhpWiki 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:57 +0000
+Date: Thu, 20 Nov 2014 14:24:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Help%2FPhpWiki;
@@ -8,9 +8,8 @@
You are using ~PhpWiki at this very moment. Incredible, ain't it?
-Visit our home page at http://phpwiki.sourceforge.net/ and see ~PhpWiki
-in action at http://phpwiki.sourceforge.net/phpwiki/ (and of course
-here too :-)).
+Visit our home page at [[http://phpwiki.fr]] and see ~PhpWiki
+in action at [[http://phpwiki.fr]] (and of course here too :-)).
<noinclude>
----
Modified: trunk/pgsrc/Help%2FRssFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FRssFeedPlugin 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/pgsrc/Help%2FRssFeedPlugin 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:57 +0000
+Date: Thu, 20 Nov 2014 14:24:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Help%2FRssFeedPlugin;
@@ -48,8 +48,8 @@
=== ~PhpWikiRss feed for [[PhpWiki:RecentChanges]] ===
{{{
-<<RssFeed feed=PhpWikiRss description="PhpWiki:RecentChanges"
- url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
+<<RssFeed feed=PhpWikiRss description="PhpWiki RecentChanges"
+ url=http://phpwiki.fr/RecentChanges?format=rss>>
}}}
<noinclude>
Modified: trunk/pgsrc/PhpWikiRecentChanges
===================================================================
--- trunk/pgsrc/PhpWikiRecentChanges 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/pgsrc/PhpWikiRecentChanges 2014-11-20 13:27:16 UTC (rev 9348)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:57 +0000
+Date: Thu, 20 Nov 2014 14:24:05 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=PhpWikiRecentChanges;
@@ -6,8 +6,8 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-<<RssFeed feed=PhpWikiRecentChanges description="PhpWiki:RecentChanges"
- url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
+<<RssFeed feed=PhpWikiRecentChanges description="PhpWiki RecentChanges"
+ url=http://phpwiki.fr/RecentChanges?format=rss>>
----
[[PhpWikiDocumentation]]
Modified: trunk/themes/blog/templates/sidebar.tmpl
===================================================================
--- trunk/themes/blog/templates/sidebar.tmpl 2014-11-20 11:12:40 UTC (rev 9347)
+++ trunk/themes/blog/templates/sidebar.tmpl 2014-11-20 13:27:16 UTC (rev 9348)
@@ -33,7 +33,7 @@
printXml($box->format());
/*
$box = new PluginSidebarBox("RssFeed",
- array('url' => 'http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss',
+ array('url' => 'http://phpwiki.fr/RecentChanges?format=rss',
'title' => _("PhpWiki News")));
printXml($box->format());
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-20 11:12:44
|
Revision: 9347
http://sourceforge.net/p/phpwiki/code/9347
Author: vargenau
Date: 2014-11-20 11:12:40 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Update Interwiki map
Modified Paths:
--------------
trunk/lib/interwiki.map
trunk/themes/fusionforge/interwiki.map
Modified: trunk/lib/interwiki.map
===================================================================
--- trunk/lib/interwiki.map 2014-11-19 15:39:29 UTC (rev 9346)
+++ trunk/lib/interwiki.map 2014-11-20 11:12:40 UTC (rev 9347)
@@ -88,11 +88,9 @@
PersonalTelco http://www.personaltelco.net/index.cgi/
php-function http://www.php.net/%s
php-lookup http://www.php.net/manual-lookup.php?pattern=
-PhpWiki http://phpwiki.sourceforge.net/phpwiki/
-PhpWikiCvs http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/pgsrc/%s?view=log
-PhpWikiSvn http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/pgsrc/%s?view=log
-PhpWikiDemo http://phpwiki.sourceforge.net/demo/
-PhpWikiTest http://phpwiki.sourceforge.net/test/
+PhpWiki http://phpwiki.fr/
+PhpWikiCvs https://sourceforge.net/p/phpwiki/code/HEAD/tree/trunk/
+PhpWikiSvn https://sourceforge.net/p/phpwiki/code/HEAD/tree/trunk/
Pikie http://pikie.darktech.org/cgi/pikie?
PlWikiPedia http://pl.wikipedia.org/wiki/
PolitizenWiki http://www.politizen.com/wiki.asp?
Modified: trunk/themes/fusionforge/interwiki.map
===================================================================
--- trunk/themes/fusionforge/interwiki.map 2014-11-19 15:39:29 UTC (rev 9346)
+++ trunk/themes/fusionforge/interwiki.map 2014-11-20 11:12:40 UTC (rev 9347)
@@ -19,11 +19,9 @@
MoinMoin http://moinmoin.wikiwikiweb.de/
php-function http://www.php.net/%s
php-lookup http://www.php.net/manual-lookup.php?pattern=
-PhpWiki http://phpwiki.sourceforge.net/phpwiki/
-PhpWikiCvs http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/pgsrc/%s?view=log
-PhpWikiSvn http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/pgsrc/%s?view=log
-PhpWikiDemo http://phpwiki.sourceforge.net/demo/
-PhpWikiTest http://phpwiki.sourceforge.net/test/
+PhpWiki http://phpwiki.fr/
+PhpWikiCvs https://sourceforge.net/p/phpwiki/code/HEAD/tree/trunk/
+PhpWikiSvn https://sourceforge.net/p/phpwiki/code/HEAD/tree/trunk/
SourceForge http://sourceforge.net/
TWiki http://twiki.org/cgi-bin/view/
UseMod http://www.usemod.com/cgi-bin/wiki.pl?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 15:39:36
|
Revision: 9346
http://sourceforge.net/p/phpwiki/code/9346
Author: vargenau
Date: 2014-11-19 15:39:29 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
PhpWiki:InterWikiMap
Modified Paths:
--------------
trunk/locale/zh/pgsrc/Help%2FLinkIcons
Modified: trunk/locale/zh/pgsrc/Help%2FLinkIcons
===================================================================
--- trunk/locale/zh/pgsrc/Help%2FLinkIcons 2014-11-19 15:38:39 UTC (rev 9345)
+++ trunk/locale/zh/pgsrc/Help%2FLinkIcons 2014-11-19 15:39:29 UTC (rev 9346)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:50 +0000
+Date: Wed, 19 Nov 2014 16:21:30 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Help%2FLinkIcons;
@@ -27,8 +27,8 @@
=== InterWiki links
-* InterWiki link PhpWiki:InterWiki
-* A named InterWiki [read WhyWikiWorks at c2|Wiki:WhyWikiWorks].
+* ~InterWiki link [[PhpWiki:InterWikiMap]]
+* A named ~InterWiki [[Wiki:WhyWikiWorks|read WhyWikiWorks at c2]].
===URLs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 15:38:42
|
Revision: 9345
http://sourceforge.net/p/phpwiki/code/9345
Author: vargenau
Date: 2014-11-19 15:38:39 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
PhpWiki:InterWikiMap
Modified Paths:
--------------
trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
trunk/pgsrc/Help%2FLinkIcons
Modified: trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien 2014-11-19 15:37:34 UTC (rev 9344)
+++ trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien 2014-11-19 15:38:39 UTC (rev 9345)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:46 +0000
+Date: Wed, 19 Nov 2014 15:29:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Aide%2FIc%C3%B4nesDeLien;
@@ -29,7 +29,7 @@
=== Liens ~InterWiki ===
-* Lien ~InterWiki [[PhpWiki:InterWiki]]
+* Lien ~InterWiki [[PhpWiki:InterWikiMap]]
* Un ~InterWiki nommé [[Wiki:WhyWikiWorks|lire WhyWikiWorks à c2]].
=== URL ===
Modified: trunk/pgsrc/Help%2FLinkIcons
===================================================================
--- trunk/pgsrc/Help%2FLinkIcons 2014-11-19 15:37:34 UTC (rev 9344)
+++ trunk/pgsrc/Help%2FLinkIcons 2014-11-19 15:38:39 UTC (rev 9345)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:57 +0000
+Date: Wed, 19 Nov 2014 15:29:32 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Help%2FLinkIcons;
@@ -28,7 +28,7 @@
=== ~InterWiki links ===
-* ~InterWiki link [[PhpWiki:InterWiki]]
+* ~InterWiki link [[PhpWiki:InterWikiMap]]
* A named ~InterWiki [[Wiki:WhyWikiWorks|read WhyWikiWorks at c2]].
=== URLs ===
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 15:37:36
|
Revision: 9344
http://sourceforge.net/p/phpwiki/code/9344
Author: vargenau
Date: 2014-11-19 15:37:34 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
Add pgsrc/Copyrights pgsrc/GeneralDisclaimer
Added Paths:
-----------
trunk/pgsrc/Copyrights
trunk/pgsrc/GeneralDisclaimer
Added: trunk/pgsrc/Copyrights
===================================================================
--- trunk/pgsrc/Copyrights (rev 0)
+++ trunk/pgsrc/Copyrights 2014-11-19 15:37:34 UTC (rev 9344)
@@ -0,0 +1,13 @@
+Date: Tue, 7 Oct 2014 19:05:57 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
+Content-Type: application/x-phpwiki;
+ pagename=Copyrights;
+ flags=PAGE_LOCKED;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<!-- Insert your Copyrights statements here -->
+
+Content in this Website is Copyright [[The PhpWiki programming team]].
+
+It is licensed under GNU Free Documentation License (GFDL).
Added: trunk/pgsrc/GeneralDisclaimer
===================================================================
--- trunk/pgsrc/GeneralDisclaimer (rev 0)
+++ trunk/pgsrc/GeneralDisclaimer 2014-11-19 15:37:34 UTC (rev 9344)
@@ -0,0 +1,12 @@
+Date: Tue, 7 Oct 2014 19:05:57 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
+Content-Type: application/x-phpwiki;
+ pagename=GeneralDisclaimer;
+ flags=PAGE_LOCKED;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<!-- Insert your General Disclaimer here -->
+
+Content in this Website is licensed under GNU Free Documentation License
+(GFDL).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 14:38:10
|
Revision: 9343
http://sourceforge.net/p/phpwiki/code/9343
Author: vargenau
Date: 2014-11-19 14:38:08 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
Remove useless titles
Modified Paths:
--------------
trunk/themes/MonoBook/templates/browse-footer.tmpl
Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-11-19 14:36:37 UTC (rev 9342)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-11-19 14:38:08 UTC (rev 9343)
@@ -8,19 +8,19 @@
<?php if ($request->_dbi->isWikiPage(_("Copyrights"))) { ?>
<?php echo WikiLink(_("Copyrights")) ?>
<?php } else { ?>
- <a class="internal" href="http://www.phpwiki.fr/Copyrights" title ="PhpWiki:Copyrights">Copyrights</a>
+ <a class="internal" href="http://www.phpwiki.fr/Copyrights">Copyrights</a>
<?php } ?>
</b> for details).<br /></li>
<?php if ($request->_dbi->isWikiPage(_("About".WIKI_NAME))) { ?>
<?php echo WikiLink(_("About".WIKI_NAME)) ?>
<?php } else { ?>
- <li id="f-about"><a href="http://www.phpwiki.fr/PhpWiki" title ="PhpWiki:About">About PhpWiki</a></li>
+ <li id="f-about"><a href="http://www.phpwiki.fr/PhpWiki">About PhpWiki</a></li>
<?php } ?>
<li id="f-disclaimer">
<?php if ($request->_dbi->isWikiPage(_("GeneralDisclaimer"))) { ?>
<?php echo WikiLink(_("GeneralDisclaimer")) ?>
<?php } else { ?>
- <a href="http://www.phpwiki.fr/GeneralDisclaimer" title ="PhpWiki:Disclaimer">Disclaimer</a>
+ <a href="http://www.phpwiki.fr/GeneralDisclaimer">Disclaimer</a>
<?php } ?>
</li>
</ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 14:36:40
|
Revision: 9342
http://sourceforge.net/p/phpwiki/code/9342
Author: vargenau
Date: 2014-11-19 14:36:37 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
Remove nonexistent link
Modified Paths:
--------------
trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2014-11-19 14:34:11 UTC (rev 9341)
+++ trunk/themes/default/templates/userprefs.tmpl 2014-11-19 14:36:37 UTC (rev 9342)
@@ -283,7 +283,7 @@
<?php echo fmt("Enable DoubleClick Edit") ?>
</label>
</td>
- <td><p class="hint"><?php echo fmt("Enabled makes it hard to double-click words and sentences for cut and paste. See %s.", WikiLink("PhpWiki:DoubleClickToEditPage"))?></p>
+ <td><p class="hint"><?php echo _("Enabled makes it hard to double-click words and sentences for cut and paste.") ?></p>
</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 14:34:15
|
Revision: 9341
http://sourceforge.net/p/phpwiki/code/9341
Author: vargenau
Date: 2014-11-19 14:34:11 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
Remove comment
Modified Paths:
--------------
trunk/lib/plugin/RawHtml.php
Modified: trunk/lib/plugin/RawHtml.php
===================================================================
--- trunk/lib/plugin/RawHtml.php 2014-11-19 14:33:38 UTC (rev 9340)
+++ trunk/lib/plugin/RawHtml.php 2014-11-19 14:34:11 UTC (rev 9341)
@@ -97,10 +97,6 @@
// http://chxo.com/scripts/safe_html-test.php looks better
$argstr = $this->safe_html($argstr);
- /*return $this->disabled(HTML(fmt("This %s plugin on %s is disabled because of unsafe HTML code. ",$this->getName(), $basepage),
- fmt("See PhpWiki:allowing%20safe%20HTML")
- ));
- */
}
return HTML::raw($argstr);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 14:33:45
|
Revision: 9340
http://sourceforge.net/p/phpwiki/code/9340
Author: vargenau
Date: 2014-11-19 14:33:38 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
Remove comment
Modified Paths:
--------------
trunk/lib/InlineParser.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2014-11-19 14:30:44 UTC (rev 9339)
+++ trunk/lib/InlineParser.php 2014-11-19 14:33:38 UTC (rev 9340)
@@ -347,7 +347,6 @@
preg_match('/(\#?) \[\s* (?: (.*?) \s* (?<!' . ESCAPE_CHAR . ')(\|) )? \s* (.+?) \s*\]/x',
str_replace("\n", " ", $bracketlink), $matches);
if (count($matches) < 4) {
- // "[ personal\ninformation manager | PhpWiki:PersonalWiki ]"
trigger_error(_("Invalid [] syntax ignored") . _(": ") . $bracketlink, E_USER_WARNING);
return new Cached_Link;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 14:30:54
|
Revision: 9339
http://sourceforge.net/p/phpwiki/code/9339
Author: vargenau
Date: 2014-11-19 14:30:44 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
PhpWiki:DanFr --> Dan Frankowski
Modified Paths:
--------------
trunk/lib/CachedMarkup.php
trunk/lib/PageList.php
trunk/lib/WikiDB/backend.php
trunk/pgsrc/Help%2FCategoryPagePlugin
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2014-11-19 10:29:20 UTC (rev 9338)
+++ trunk/lib/CachedMarkup.php 2014-11-19 14:30:44 UTC (rev 9339)
@@ -802,7 +802,7 @@
}
// Needed to put UserPages to backlinks. Special method to markup userpages with icons
-// Thanks to PhpWiki:DanFr for finding this bug.
+// Thanks to Dan Frankowski for finding this bug.
// Fixed since 1.3.8, prev. versions had no userpages in backlinks
class Cached_UserLink extends Cached_WikiLink
{
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2014-11-19 10:29:20 UTC (rev 9338)
+++ trunk/lib/PageList.php 2014-11-19 14:30:44 UTC (rev 9339)
@@ -1017,7 +1017,7 @@
* 'db' : "-pagename" => "pagename DESC"
* 'check' :
*
- * Now all columns are sortable. (patch by DanFr)
+ * Now all columns are sortable. (patch by Dan Frankowski)
* Some columns have native DB backend methods, some not.
*/
function sortby($column, $action, $valid_fields = false)
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2014-11-19 10:29:20 UTC (rev 9338)
+++ trunk/lib/WikiDB/backend.php 2014-11-19 14:30:44 UTC (rev 9339)
@@ -565,7 +565,7 @@
* Prefix the column with + or - like "+pagename","-mtime", ...
* supported actions: 'flip_order' "mtime" => "+mtime" => "-mtime" ...
* 'db' "-pagename" => "pagename DESC"
- * In PageList all columns are sortable. (patch by DanFr)
+ * In PageList all columns are sortable. (patch by Dan Frankowski)
* Here with the backend only some, the rest is delayed to PageList.
* (some kind of DumbIter)
* Duplicate the PageList function here to avoid loading the whole
Modified: trunk/pgsrc/Help%2FCategoryPagePlugin
===================================================================
--- trunk/pgsrc/Help%2FCategoryPagePlugin 2014-11-19 10:29:20 UTC (rev 9338)
+++ trunk/pgsrc/Help%2FCategoryPagePlugin 2014-11-19 14:30:44 UTC (rev 9339)
@@ -1,4 +1,4 @@
-Date: Tue, 7 Oct 2014 19:05:57 +0000
+Date: Wed, 19 Nov 2014 15:29:32 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=Help%2FCategoryPagePlugin;
@@ -59,7 +59,7 @@
<?plugin-form CategoryPage pagename=CategoryExample?>
== Author ==
-* [[WikiLens:DanFr]]
+* Dan Frankowski
== See Also ==
* [[Help:TemplatePlugin|TemplatePlugin]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 10:29:23
|
Revision: 9338
http://sourceforge.net/p/phpwiki/code/9338
Author: vargenau
Date: 2014-11-19 10:29:20 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
pgsrc: escape links
Modified Paths:
--------------
trunk/pgsrc/ReleaseNotes
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2014-11-19 10:23:36 UTC (rev 9337)
+++ trunk/pgsrc/ReleaseNotes 2014-11-19 10:29:20 UTC (rev 9338)
@@ -1,4 +1,4 @@
-Date: Mon, 3 Nov 2014 15:32:08 +0000
+Date: Wed, 19 Nov 2014 11:28:40 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.5.2)
Content-Type: application/x-phpwiki;
pagename=ReleaseNotes;
@@ -20,7 +20,7 @@
This is a security fix release.
* Fix CVE-2014-5519: vulnerability in Ploticus plugin. [[http://www.cvedetails.com/cve/CVE-2014-5519/]]
-This vulnerability is present in PhpWiki 1.5.0 and 1.5.1. All users are advised to upgrade to PhpWiki 1.5.2.
+This vulnerability is present in ~PhpWiki 1.5.0 and 1.5.1. All users are advised to upgrade to ~PhpWiki 1.5.2.
== 1.5.1 2014-10-02 Marc-Etienne Vargenau ==
@@ -33,7 +33,7 @@
* fix Bug#607 BackLinks do not work inside a [[Help:RichTablePlugin|RichTable]]
* fix Bug#646 Wrong number of links in BackLinks
* make <includeonly> work
-* remove old WikiUser code (ENABLE_USER_NEW)
+* remove old ~WikiUser code (ENABLE_USER_NEW)
* admin always has rights to see and modify pages, regardless of ACLs, to avoid locking himself out
* add missing images in Sidebar theme
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2014-11-19 10:23:45
|
Revision: 9337
http://sourceforge.net/p/phpwiki/code/9337
Author: vargenau
Date: 2014-11-19 10:23:36 +0000 (Wed, 19 Nov 2014)
Log Message:
-----------
Translate strings
Modified Paths:
--------------
trunk/lib/Request.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/lib/Request.php 2014-11-19 10:23:36 UTC (rev 9337)
@@ -420,7 +420,7 @@
if (ob_get_length()) ob_clean();
$this->_is_buffering_output = false;
} else {
- trigger_error("Not buffering output", E_USER_NOTICE);
+ trigger_error(_("Not buffering output"), E_USER_NOTICE);
}
}
@@ -604,7 +604,8 @@
$vars = &$GLOBALS['HTTP_SESSION_VARS'];
if (!function_usable('ini_get') or ini_get('register_globals'))
unset($GLOBALS[$key]);
- if (DEBUG) trigger_error("delete session $key", E_USER_WARNING);
+ if (DEBUG)
+ trigger_error("delete session $key", E_USER_WARNING);
unset($vars[$key]);
if (isset($_SESSION)) // php-5.2
unset($_SESSION[$key]);
@@ -853,7 +854,7 @@
if ($do_sql) {
global $DBParams;
if (!in_array($DBParams['dbtype'], array('SQL', 'ADODB', 'PDO'))) {
- trigger_error("Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or ADODB or PDO.");
+ trigger_error(_("Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or ADODB or PDO."));
} else {
$this->logtable = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '') . "accesslog";
}
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/de.po 2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -4512,6 +4512,9 @@
"neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch "
"von der Datenbank permanent löschen wollen."
+msgid "Not buffering output"
+msgstr ""
+
msgid "Upload error: file too big"
msgstr ""
@@ -4531,6 +4534,11 @@
msgid "the file “%s”"
msgstr "die Datei »%s«"
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
msgid "Bad URL -- remove all of <, >, \""
msgstr "URL Formfehler - Entfernen Sie alle Zeichen mit <, >, \""
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/es.po 2014-11-19 10:23:36 UTC (rev 9337)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -4388,6 +4388,9 @@
"from the database."
msgstr ""
+msgid "Not buffering output"
+msgstr ""
+
msgid "Upload error: file too big"
msgstr "Error del upload: archivo demasiado grande"
@@ -4407,6 +4410,11 @@
msgid "the file “%s”"
msgstr "el archivo %s"
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
msgid "Bad URL -- remove all of <, >, \""
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/fr.po 2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -4454,6 +4454,9 @@
"enregistré une nouvelle version de %s. Veuillez vérifier que vous désirez "
"toujours retirer de façon permanente cette page de la base de données."
+msgid "Not buffering output"
+msgstr ""
+
msgid "Upload error: file too big"
msgstr ""
@@ -4473,6 +4476,11 @@
msgid "the file “%s”"
msgstr "le fichier « %s »"
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
msgid "Bad URL -- remove all of <, >, \""
msgstr "Mauvaise URL -- retirez tous les <, >, \""
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/it.po 2014-11-19 10:23:36 UTC (rev 9337)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -4353,6 +4353,9 @@
"from the database."
msgstr ""
+msgid "Not buffering output"
+msgstr ""
+
msgid "Upload error: file too big"
msgstr ""
@@ -4372,6 +4375,11 @@
msgid "the file “%s”"
msgstr ""
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
msgid "Bad URL -- remove all of <, >, \""
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/ja.po 2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4490,6 +4490,9 @@
"from the database."
msgstr ""
+msgid "Not buffering output"
+msgstr ""
+
msgid "Upload error: file too big"
msgstr ""
@@ -4509,6 +4512,11 @@
msgid "the file “%s”"
msgstr "MIMEファイル %s"
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
msgid "Bad URL -- remove all of <, >, \""
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/nl.po 2014-11-19 10:23:36 UTC (rev 9337)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -4345,6 +4345,9 @@
"from the database."
msgstr ""
+msgid "Not buffering output"
+msgstr ""
+
msgid "Upload error: file too big"
msgstr ""
@@ -4364,6 +4367,11 @@
msgid "the file “%s”"
msgstr ""
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
msgid "Bad URL -- remove all of <, >, \""
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/phpwiki.pot 2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -4337,6 +4337,9 @@
"from the database."
msgstr ""
+msgid "Not buffering output"
+msgstr ""
+
msgid "Upload error: file too big"
msgstr ""
@@ -4356,6 +4359,11 @@
msgid "the file “%s”"
msgstr ""
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
msgid "Bad URL -- remove all of <, >, \""
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/sv.po 2014-11-19 10:23:36 UTC (rev 9337)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -4338,6 +4338,9 @@
"from the database."
msgstr ""
+msgid "Not buffering output"
+msgstr ""
+
msgid "Upload error: file too big"
msgstr ""
@@ -4357,6 +4360,11 @@
msgid "the file “%s”"
msgstr ""
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
msgid "Bad URL -- remove all of <, >, \""
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2014-11-19 10:16:06 UTC (rev 9336)
+++ trunk/locale/po/zh.po 2014-11-19 10:23:36 UTC (rev 9337)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-18 18:29+0100\n"
+"POT-Creation-Date: 2014-11-19 11:21+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -4568,6 +4568,9 @@
"從你開始刪除到現在,有人已經儲存了一份 %s 的較新版本. 請檢查以確定你仍想要從資"
"料庫中永久刪除此頁面."
+msgid "Not buffering output"
+msgstr ""
+
msgid "Upload error: file too big"
msgstr ""
@@ -4587,6 +4590,11 @@
msgid "the file “%s”"
msgstr "檔案 “%s”"
+msgid ""
+"Unsupported database backend for ACCESS_LOG_SQL. Need DATABASE_TYPE=SQL or "
+"ADODB or PDO."
+msgstr ""
+
#, fuzzy
msgid "Bad URL -- remove all of <, >, \""
msgstr "錯誤 URL -- 移除所有的 <, >, \""
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
286 messages has been excluded from this view by a project administrator.
