Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2011-03-04 13:58:29
|
Revision: 7960
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7960&view=rev
Author: vargenau
Date: 2011-03-04 13:58:21 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/ImageTile.php
trunk/SOAP.php
trunk/configurator.php
trunk/lib/IniConfig.php
trunk/wikiadmin.php
Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php 2011-03-03 18:02:58 UTC (rev 7959)
+++ trunk/ImageTile.php 2011-03-04 13:58:21 UTC (rev 7960)
@@ -13,9 +13,9 @@
if (preg_match('/DATA_PATH/',$config[0])) {
list($key,$value) = explode('=', $config[0]);
$data_path = trim($value).'/';
- break;
- }
+ break;
}
+ }
fclose($fp);
@mkdir($data_path."uploads/thumbs",0775);
$file = $data_path."uploads/thumbs/image_" . ((float)$usec + (float)$sec);
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php 2011-03-03 18:02:58 UTC (rev 7959)
+++ trunk/SOAP.php 2011-03-04 13:58:21 UTC (rev 7960)
@@ -64,7 +64,7 @@
$request->_user = new WikiUser($request, $credentials['username']);
}
$request->_user->AuthCheck(array('userid' => $credentials['username'],
- 'passwd' => $credentials['password']));
+ 'passwd' => $credentials['password']));
if (! mayAccessPage ($access, $pagename))
$server->fault(401,'',"no permission");
}
@@ -86,12 +86,12 @@
$server->soapaction = $url; // soap_transport_http
$actions = array('getPageContent','getPageRevision','getCurrentRevision',
- 'getPageMeta','doSavePage','getAllPagenames',
- 'getBackLinks','doTitleSearch','doFullTextSearch',
- 'getRecentChanges','listLinks','listPlugins',
- 'getPluginSynopsis','callPlugin','listRelations',
- 'linkSearch'
- );
+ 'getPageMeta','doSavePage','getAllPagenames',
+ 'getBackLinks','doTitleSearch','doFullTextSearch',
+ 'getRecentChanges','listLinks','listPlugins',
+ 'getPluginSynopsis','callPlugin','listRelations',
+ 'linkSearch'
+ );
foreach ($actions as $action) {
$server->register($actions);
$server->operations[$actions]['soapaction'] = $url;
@@ -214,16 +214,16 @@
checkCredentials($server,$credentials,'view',_("RecentChanges"));
$dbi = WikiDB::open($GLOBALS['DBParams']);
$params = array('limit' => $limit, 'since' => $since,
- 'include_minor_revisions' => $include_minor);
+ 'include_minor_revisions' => $include_minor);
$page_iter = $dbi->mostRecent($params);
$pages = array();
while ($page = $page_iter->next()) {
$pages[] = array('pagename' => $page->getName(),
- 'lastModified' => $page->get('mtime'),
- 'author' => $page->get('author'),
- 'summary' => $page->get('summary'), // added with 1.3.13
- 'version' => $page->getVersion()
- );
+ 'lastModified' => $page->get('mtime'),
+ 'author' => $page->get('author'),
+ 'summary' => $page->get('summary'), // added with 1.3.13
+ 'version' => $page->getVersion()
+ );
}
return $pages;
}
@@ -236,8 +236,8 @@
$linkiterator = $page->getPageLinks();
$links = array();
while ($currentpage = $linkiterator->next()) {
- if ($currentpage->exists())
- $links[] = array('pagename' => $currentpage->getName());
+ if ($currentpage->exists())
+ $links[] = array('pagename' => $currentpage->getName());
}
return $links;
}
@@ -298,8 +298,8 @@
$pagelist = $p->run($dbi, $pluginargs, $request, $basepage);
$pages = array();
if (is_object($pagelist) and isa($pagelist, 'PageList')) {
- foreach ($pagelist->pageNames() as $name)
- $pages[] = array('pagename' => $name);
+ foreach ($pagelist->pageNames() as $name)
+ $pages[] = array('pagename' => $name);
}
return $pages;
}
@@ -322,8 +322,8 @@
$only_attributes = $option & 2 and !($option & 1);
$sorted = !($option & 4);
return $dbh->listRelations($also_attributes,
- $only_attributes,
- $sorted);
+ $only_attributes,
+ $sorted);
}
// some basic semantic search
function linkSearch($linktype, $search, $pages="*", $relation="*", $credentials=false) {
@@ -334,17 +334,17 @@
$pagequery = new TextSearchQuery($pages);
$linkquery = new TextSearchQuery($search);
if ($linktype == 'relation') {
- $relquery = new TextSearchQuery($relation);
- $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
+ $relquery = new TextSearchQuery($relation);
+ $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
} elseif ($linktype == 'attribute') { // only numeric search withh attributes!
- $relquery = new TextSearchQuery($relation);
- require_once("lib/SemanticWeb.php");
- // search: "population > 1 million and area < 200 km^2" relation="*" pages="*"
- $linkquery = new SemanticAttributeSearchQuery($search, $relation);
- $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
+ $relquery = new TextSearchQuery($relation);
+ require_once("lib/SemanticWeb.php");
+ // search: "population > 1 million and area < 200 km^2" relation="*" pages="*"
+ $linkquery = new SemanticAttributeSearchQuery($search, $relation);
+ $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
} else {
- // we already do have forward and backlinks as SOAP
- $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype);
+ // we already do have forward and backlinks as SOAP
+ $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype);
}
return $links->asArray();
}
@@ -357,5 +357,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2011-03-03 18:02:58 UTC (rev 7959)
+++ trunk/configurator.php 2011-03-04 13:58:21 UTC (rev 7960)
@@ -1,7 +1,7 @@
<?php // -*-php-*- $Id$
/*
* Copyright 2002,2003,2005,2008-2010 $ThePhpWikiProgrammingTeam
- * Copyright 2002 Martin Geisler <gim...@gi...>
+ * Copyright 2002 Martin Geisler <gim...@gi...>
* Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
*
* This file is part of PhpWiki.
@@ -12,19 +12,19 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* PhpWiki is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with PhpWiki; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/**
- * Starts automatically the first time by IniConfig("config/config.ini")
+ * Starts automatically the first time by IniConfig("config/config.ini")
* if it doesn't exist.
*
* DONE:
@@ -40,24 +40,24 @@
* o parse_ini_file("config-dist.ini") for the commented vars
* o check automatically for commented and optional vars
* o fix _optional, to ignore existing config.ini and only use config-default.ini values
- * o mixin class for commented
+ * o mixin class for commented
* o fix SQL quotes, AUTH_ORDER quotes and file forward slashes
* o posted values validation, extend js validation for sane DB values
* o read config-dist.ini into sections, comments, and optional/required settings
*
* A file config/config.ini will be automatically generated, if writable.
*
- * NOTE: If you have a starterscript outside PHPWIKI_DIR but no
- * config/config.ini yet (very unlikely!), you must define DATA_PATH in the
- * starterscript, otherwise the webpath to configurator is unknown, and
+ * NOTE: If you have a starterscript outside PHPWIKI_DIR but no
+ * config/config.ini yet (very unlikely!), you must define DATA_PATH in the
+ * starterscript, otherwise the webpath to configurator is unknown, and
* subsequent requests will fail. (POST to save the INI)
*/
global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth;
-if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
-if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS'];
-if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS'];
-if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS'];
+if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
+if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS'];
+if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS'];
+if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS'];
if (empty($configurator))
$configurator = "configurator.php";
@@ -66,9 +66,9 @@
$scriptname = str_replace('configurator.php', 'index.php', $_SERVER["SCRIPT_NAME"]);
if (strstr($_SERVER["SCRIPT_NAME"],"/php")) { // cgi got this different
if (defined('DATA_PATH'))
- $scriptname = DATA_PATH . "/index.php";
+ $scriptname = DATA_PATH . "/index.php";
else
- $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]);
+ $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]);
}
$tdwidth = 700;
@@ -81,22 +81,22 @@
function _http_user() {
if (!isset($_SERVER))
$_SERVER = $GLOBALS['HTTP_SERVER_VARS'];
- if (!empty($_SERVER['PHP_AUTH_USER']))
- return array($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
- if (!empty($_SERVER['REMOTE_USER']))
- return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']);
+ if (!empty($_SERVER['PHP_AUTH_USER']))
+ return array($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
+ if (!empty($_SERVER['REMOTE_USER']))
+ return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']);
if (!empty($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER']))
- return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'],
- $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
- if (!empty($GLOBALS['REMOTE_USER']))
- return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']);
-
- // MsWindows IIS:
- if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
+ return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'],
+ $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
+ if (!empty($GLOBALS['REMOTE_USER']))
+ return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']);
+
+ // MsWindows IIS:
+ if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
list($userid, $passwd) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
return array($userid, $passwd);
- }
- return array('','');
+ }
+ return array('','');
}
function _http_logout() {
if (!isset($_SERVER))
@@ -105,52 +105,52 @@
// better_srand(); $realm = microtime().rand();
header('WWW-Authenticate: Basic realm="'.WIKI_NAME.'"');
if (strstr(php_sapi_name(), 'apache'))
- header('HTTP/1.0 401 Unauthorized');
- else
+ header('HTTP/1.0 401 Unauthorized');
+ else
header("Status: 401 Access Denied"); //IIS and CGI need that
unset($GLOBALS['REMOTE_USER']);
unset($_SERVER['PHP_AUTH_USER']);
unset($_SERVER['PHP_AUTH_PW']);
- trigger_error("Permission denied. Require ADMIN_USER.", E_USER_ERROR);
- exit();
+ trigger_error("Permission denied. Require ADMIN_USER.", E_USER_ERROR);
+ exit();
}
}
-// If config.ini exists, we require ADMIN_USER access by faking HttpAuth.
+// If config.ini exists, we require ADMIN_USER access by faking HttpAuth.
// So nobody can see or reset the password(s).
if (file_exists($fs_config_file)) {
// Require admin user
if (!defined('ADMIN_USER') or !defined('ADMIN_PASSWD')) {
- if (!function_exists("IniConfig")) {
- include_once("lib/prepend.php");
- include_once("lib/IniConfig.php");
- }
- IniConfig($fs_config_file);
+ if (!function_exists("IniConfig")) {
+ include_once("lib/prepend.php");
+ include_once("lib/IniConfig.php");
+ }
+ IniConfig($fs_config_file);
}
if (!defined('ADMIN_USER') or ADMIN_USER == '') {
- trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n"
- . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
- exit();
+ trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n"
+ . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
+ exit();
}
list($admin_user, $admin_pw) = _http_user();
//$required_user = ADMIN_USER;
if (empty($admin_user) or $admin_user != ADMIN_USER)
{
- _http_logout();
+ _http_logout();
}
// check password
if (ENCRYPTED_PASSWD and function_exists('crypt')) {
- if (crypt($admin_pw, ADMIN_PASSWD) != ADMIN_PASSWD)
- _http_logout();
+ if (crypt($admin_pw, ADMIN_PASSWD) != ADMIN_PASSWD)
+ _http_logout();
} elseif ($admin_pw != ADMIN_PASSWD) {
_http_logout();
}
} else {
if (!function_exists("IniConfig")) {
include_once("lib/prepend.php");
- include_once("lib/IniConfig.php");
+ include_once("lib/IniConfig.php");
}
$def_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
$fs_def_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $def_file;
@@ -247,8 +247,8 @@
for (var i = 0; i < rows.length; i++) {
var tr = rows[i];
if (tr.className == 'header')
- if (!show || tr.id != show)
- toggle_group(tr.id);
+ if (!show || tr.id != show)
+ toggle_group(tr.id);
}
// Select text in textarea upon focus
@@ -258,7 +258,7 @@
area.addEventListener('focus', listener, false);
}
}
-
+
-->
</script>
</head>
@@ -282,7 +282,7 @@
* TO CHANGE THE CONFIGURATION OF YOUR PHPWIKI, DO *NOT* MODIFY THIS FILE!
* more instructions go here
*
- * Todo:
+ * Todo:
* * fix include_path
* * eval config.ini to get the actual settings.
*/
@@ -305,8 +305,8 @@
* for the html version of the descriptive text.
*
* - Double-quotes and dollar signs in the descriptive text must be
- * escaped: \" and \$. Instead of escaping double-quotes you can use
- * single (') quotes for the enclosing quotes.
+ * escaped: \" and \$. Instead of escaping double-quotes you can use
+ * single (') quotes for the enclosing quotes.
*
* - Special characters like < and > must use html entities,
* they will be converted back to characters for the final output.
@@ -316,11 +316,11 @@
$preamble = "
; This is the main configuration file for PhpWiki in INI-style format.
-; Note that certain characters are used as comment char and therefore
+; Note that certain characters are used as comment char and therefore
; these entries must be in double-quotes. Such as \":\", \";\", \",\" and \"|\"
; Take special care for DBAUTH_ sql statements. (Part 3a)
;
-; This file is divided into several parts: Each one has different configuration
+; This file is divided into several parts: Each one has different configuration
; settings you can change; in all cases the default should work on your system,
; however, we recommend you tailor things to your particular setting.
; Here undefined definitions get defined by config-default.ini settings.
@@ -341,7 +341,7 @@
if (substr(PHP_OS,0,3) == 'WIN') {
$include_path = dirname(__FILE__) . ';' . ini_get('include_path');
if (strchr(ini_get('include_path'),'/'))
- $include_path = strtr($include_path,'\\','/');
+ $include_path = strtr($include_path,'\\','/');
} else {
$include_path = dirname(__FILE__) . ':' . ini_get('include_path');
}
@@ -369,12 +369,12 @@
$properties["WYSIWYG_BACKEND"] =
new _define_selection(
-'WYSIWYG_BACKEND',
+'WYSIWYG_BACKEND',
array('Wikiwyg' => 'Wikiwyg',
'tinymce' => 'tinymce',
- 'FCKeditor' => 'FCKeditor',
- 'spaw' => 'spaw',
- 'htmlarea3' => 'htmlarea3',
+ 'FCKeditor' => 'FCKeditor',
+ 'spaw' => 'spaw',
+ 'htmlarea3' => 'htmlarea3',
'htmlarea2' => 'htmlarea2',
));
@@ -446,11 +446,11 @@
$properties["Admin Password"] =
new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, "
-You must set this!
+You must set this!
For heaven's sake pick a good password.
If your version of PHP supports encrypted passwords, your password will be
-automatically encrypted within the generated config file.
+automatically encrypted within the generated config file.
Use the \"Create Random Password\" button to create a good (random) password.
ADMIN_PASSWD is ignored on HttpAuth",
@@ -469,7 +469,7 @@
'false' => "false. just record the address as given by the httpd server"));
$properties["ZIP Dump Authentication"] =
-new boolean_define_optional('ZIPDUMP_AUTH',
+new boolean_define_optional('ZIPDUMP_AUTH',
array('false' => "false. Everyone may download zip dumps",
'true' => "true. Only admin may download zip dumps"));
@@ -502,14 +502,14 @@
$properties["Access Log SQL"] =
new _define_selection(
-'ACCESS_LOG_SQL',
+'ACCESS_LOG_SQL',
array('0' => 'disabled',
'1' => 'read only',
'2' => 'read + write'));
$properties["Compress Output"] =
new boolean_define_commented_optional
-( 'COMPRESS_OUTPUT',
+( 'COMPRESS_OUTPUT',
array('' => 'undefined - GZIP compress when appropriate.',
'false' => 'Never compress output.',
'true' => 'Always try to compress output.'));
@@ -525,7 +525,7 @@
HTTP CACHE_CONTROL
This controls how PhpWiki sets the HTTP cache control
-headers (Expires: and Cache-Control:)
+headers (Expires: and Cache-Control:)
Choose one of:
<dl>
@@ -579,7 +579,7 @@
$properties["Force PHP Database Sessions"] =
new boolean_define_commented_optional
-('USE_DB_SESSION',
+('USE_DB_SESSION',
array('false' => 'Disable database sessions, use files',
'true' => 'Enable database sessions'));
@@ -663,7 +663,7 @@
<pre>
unix(/var/lib/mysql/mysql.sock)
</pre>
-here.
+here.
mysql on Windows via named pipes might need 127.0.0.1");
$properties["SQL Database Name"] =
@@ -678,7 +678,7 @@
$dsn_sqlstring = $dsn_sqltype."://{$dsn_sqluser}:{$dsn_sqlpass}@{$dsn_sqlhostorsock}/{$dsn_sqldbname}";
$properties["SQL dsn"] =
-new unchangeable_define("DATABASE_DSN",
+new unchangeable_define("DATABASE_DSN",
$dsn_sqlstring, "
Calculated from the settings above:");
@@ -698,7 +698,7 @@
$properties["DATABASE_PERSISTENT"] =
new boolean_define_commented_optional
-('DATABASE_PERSISTENT',
+('DATABASE_PERSISTENT',
array('false' => "Disabled",
'true' => "Enabled"));
@@ -724,7 +724,7 @@
'db4' => "DB4 - BerkeleyDB (Sleepycat) DB4."), "
Use 'gdbm', 'dbm', 'db2', 'db3' or 'db4' depending on your DBA handler methods supported: <br /> "
. (function_exists("dba_handlers") ? join(", ",dba_handlers()) : "")
- . "\n\nBetter not use other hacks such as inifile, flatfile or cdb");
+ . "\n\nBetter not use other hacks such as inifile, flatfile or cdb");
$properties["dba timeout"] =
new numeric_define("DATABASE_TIMEOUT", DATABASE_TIMEOUT, "
@@ -754,7 +754,7 @@
class a revision belongs in is determined by whether the author
checked the \"this is a minor revision\" checkbox when they saved the
page.
-
+
There is, additionally, a third class of revisions: author
revisions. The most recent non-mergable revision from each distinct
author is and author revision.
@@ -803,11 +803,11 @@
$properties["Major Edits: keep minimum days"] =
new numeric_define('MAJOR_MIN_KEEP', MAJOR_MIN_KEEP, "
-Default: Keep for unlimited time.
+Default: Keep for unlimited time.
Set to 0 to enable archive cleanup");
$properties["Minor Edits: keep minumum days"] =
new numeric_define('MINOR_MIN_KEEP', MINOR_MIN_KEEP, "
-Default: Keep for unlimited time.
+Default: Keep for unlimited time.
Set to 0 to enable archive cleanup");
$properties["Major Edits: how many"] =
@@ -863,42 +863,42 @@
new boolean_define_optional('ALLOW_BOGO_LOGIN',
array('true' => "true. Users may Sign In with any WikiWord, without password. (Default)",
'false' => "false. Require stricter authentication."), "
-If ALLOW_BOGO_LOGIN is false, you may not login with any wikiword username and empty password.
+If ALLOW_BOGO_LOGIN is false, you may not login with any wikiword username and empty password.
If true, users are allowed to create themselves with any WikiWord username. See below.");
$properties["Allow User Passwords"] =
new boolean_define_optional('ALLOW_USER_PASSWORDS',
array('true' => "True user authentication with password checking. (Default)",
'false' => "false. Ignore authentication settings below."), "
-If ALLOW_USER_PASSWORDS is true, the authentication settings below define where and how to
+If ALLOW_USER_PASSWORDS is true, the authentication settings below define where and how to
check against given username/passwords. For completely security disable BOGO_LOGIN and ANON_EDIT above.");
$properties["User Authentication Methods"] =
new array_define('USER_AUTH_ORDER', array("PersonalPage", "Db"), "
-Many different methods can be used to check user's passwords.
+Many different methods can be used to check user's passwords.
Try any of these in the given order:
<dl>
<dt>BogoLogin</dt>
- <dd>WikiWord username, with no *actual* password checking,
+ <dd>WikiWord username, with no *actual* password checking,
although the user will still have to enter one.</dd>
<dt>PersonalPage</dt>
- <dd>Store passwords in the users homepage metadata (simple)</dd>
+ <dd>Store passwords in the users homepage metadata (simple)</dd>
<dt>Db</dt>
- <dd>Use DBAUTH_AUTH_* (see below) with PearDB or ADODB only.</dd>
+ <dd>Use DBAUTH_AUTH_* (see below) with PearDB or ADODB only.</dd>
<dt>LDAP</dt>
- <dd>Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN.</dd>
+ <dd>Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN.</dd>
<dt>IMAP</dt>
- <dd>Authenticate against IMAP_AUTH_HOST (email account)</dd>
+ <dd>Authenticate against IMAP_AUTH_HOST (email account)</dd>
<dt>POP3</dt>
- <dd>Authenticate against POP3_AUTH_HOST (email account)</dd>
+ <dd>Authenticate against POP3_AUTH_HOST (email account)</dd>
<dt>Session</dt>
- <dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd>
+ <dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd>
<dt>File</dt>
- <dd>Store username:crypted-passwords in .htaccess like files.
+ <dd>Store username:crypted-passwords in .htaccess like files.
Use Apache's htpasswd to manage this file.</dd>
<dt>HttpAuth</dt>
- <dd>Use the protection by the webserver (.htaccess/.htpasswd) (experimental)
- Enforcing HTTP Auth not yet. Note that the ADMIN_USER should exist also.
+ <dd>Use the protection by the webserver (.htaccess/.htpasswd) (experimental)
+ Enforcing HTTP Auth not yet. Note that the ADMIN_USER should exist also.
Using HttpAuth disables all other methods and no userauth sessions are used.</dd>
</dl>
@@ -919,22 +919,22 @@
$properties["USER_AUTH_POLICY"] =
new _define_selection('USER_AUTH_POLICY',
array('first-only' => "first-only - use only the first method in USER_AUTH_ORDER",
- 'old' => "old - ignore USER_AUTH_ORDER (legacy)",
- 'strict' => "strict - check all methods for userid + password (recommended)",
- 'stacked' => "stacked - check all methods for userid, and if found for password"), "
+ 'old' => "old - ignore USER_AUTH_ORDER (legacy)",
+ 'strict' => "strict - check all methods for userid + password (recommended)",
+ 'stacked' => "stacked - check all methods for userid, and if found for password"), "
The following policies are available for user authentication:
<dl>
<dt>first-only</dt>
- <dd>use only the first method in USER_AUTH_ORDER</dd>
+ <dd>use only the first method in USER_AUTH_ORDER</dd>
<dt>old</dt>
- <dd>ignore USER_AUTH_ORDER and try to use all available
+ <dd>ignore USER_AUTH_ORDER and try to use all available
methods as in the previous PhpWiki releases (slow)</dd>
<dt>strict</dt>
- <dd>check if the user exists for all methods:
- on the first existing user, try the password.
+ <dd>check if the user exists for all methods:
+ on the first existing user, try the password.
dont try the other methods on failure then</dd>
<dt>stacked</dt>
- <dd>check the given user - password combination for all
+ <dd>check the given user - password combination for all
methods and return true on the first success.</dd></dl>");
$properties["ENABLE_USER_NEW"] =
@@ -971,7 +971,7 @@
<dt>FILE</dt>
<dd>Flatfile. See AUTH_GROUP_FILE below.</dd>
<dt>LDAP</dt>
- <dd>LDAP groups. See \"LDAP authentication options\" above and
+ <dd>LDAP groups. See \"LDAP authentication options\" above and
lib/WikiGroup.php. (experimental)</dd></dl>");
$properties["CATEGORY_GROUP_PAGE"] =
@@ -1112,12 +1112,12 @@
$properties["LDAP AUTH USER"] =
new _define_optional('LDAP_AUTH_USER', "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com", "
-DN to initially bind to the LDAP server as. This is needed if the server doesn't
+DN to initially bind to the LDAP server as. This is needed if the server doesn't
allow anonymous queries. (Windows Active Directory Server)");
$properties["LDAP AUTH PASSWORD"] =
new _define_optional('LDAP_AUTH_PASSWORD', "secret", "
-Password to use to initially bind to the LDAP server, as the DN
+Password to use to initially bind to the LDAP server, as the DN
specified in the LDAP_AUTH_USER option (above).");
$properties["LDAP SEARCH FIELD"] =
@@ -1145,12 +1145,12 @@
$properties["LDAP Authentication"] =
new unchangeable_variable('LDAP Authentication', "
; If USER_AUTH_ORDER contains Ldap:
-;
+;
; The LDAP server to connect to. Can either be a hostname, or a complete
; URL to the server (useful if you want to use ldaps or specify a different
; port number).
;LDAP_AUTH_HOST = \"ldap://localhost:389\"
-;
+;
; The organizational or domain BASE DN: e.g. \"dc=mydomain,dc=com\".
;
; Note: ou=Users and ou=Groups are used for GroupLdap Membership
@@ -1162,11 +1162,11 @@
; and their values as NAME=value pairs separated by colons.
; LDAP_SET_OPTION = \"LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0\"
-; DN to initially bind to the LDAP server as. This is needed if the server doesn't
+; DN to initially bind to the LDAP server as. This is needed if the server doesn't
; allow anonymous queries. (Windows Active Directory Server)
; LDAP_AUTH_USER = \"CN=ldapuser,ou=Users,o=Development,dc=mycompany.com\"
-; Password to use to initially bind to the LDAP server, as the DN
+; Password to use to initially bind to the LDAP server, as the DN
; specified in the LDAP_AUTH_USER option (above).
; LDAP_AUTH_PASSWORD = secret
@@ -1196,7 +1196,7 @@
The IMAP server to check usernames from. Defaults to localhost.
Some IMAP_AUTH_HOST samples:
- localhost, localhost:143/imap/notls,
+ localhost, localhost:143/imap/notls,
localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)");
} else { // function_exists('imap_open')
@@ -1205,9 +1205,9 @@
new unchangeable_variable('IMAP_AUTH_HOST',"
; If USER_AUTH_ORDER contains IMAP:
; The IMAP server to check usernames from. Defaults to localhost.
-;
+;
; Some IMAP_AUTH_HOST samples:
-; localhost, localhost:143/imap/notls,
+; localhost, localhost:143/imap/notls,
; localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)
;IMAP_AUTH_HOST = localhost:143/imap/notls", "
Ignored. No IMAP support in this php. configure --with-imap");
@@ -1262,7 +1262,7 @@
'SpaceWiki' => "SpaceWiki",
'Hawaiian' => "Hawaiian",
'MonoBook' => 'MonoBook [experimental]',
- 'blog' => 'blog [experimental]',
+ 'blog' => 'blog [experimental]',
), "
THEME
@@ -1330,11 +1330,11 @@
WIKI_PGSRC is scanned for files -- one file per page.
<pre>
// Default (old) behavior:
-define('WIKI_PGSRC', 'pgsrc');
+define('WIKI_PGSRC', 'pgsrc');
// New style:
-define('WIKI_PGSRC', 'wiki.zip');
-define('WIKI_PGSRC',
- '../Logs/Hamwiki/hamwiki-20010830.zip');
+define('WIKI_PGSRC', 'wiki.zip');
+define('WIKI_PGSRC',
+ '../Logs/Hamwiki/hamwiki-20010830.zip');
</pre>");
$properties["Default Wiki Page Source"] =
@@ -1394,7 +1394,7 @@
new _define_optional('KEYWORDS', '\"Category* OR Topic*\"', "
Search term used for automatic page classification by keyword extraction.
-Any links on a page to pages whose names match this search
+Any links on a page to pages whose names match this search
will be used keywords in the keywords html meta tag. This is an aid to
classification by search engines. The value of the match is
used as the keyword.
@@ -1438,7 +1438,7 @@
$properties["DISABLE_MARKUP_WIKIWORD"] =
new boolean_define_optional('DISABLE_MARKUP_WIKIWORD');
-$properties["ENABLE_MARKUP_DIVSPAN" ] =
+$properties["ENABLE_MARKUP_DIVSPAN" ] =
new boolean_define_optional('ENABLE_MARKUP_DIVSPAN');
///////////////////
@@ -1461,9 +1461,9 @@
"onchange=\"validate_ereg('Sorry, \'%s\' is no valid port number.', '^[0-9]+$', 'SERVER_PORT', this);\"");
$properties["Server Protocol"] =
- new _define_selection_optional_commented('SERVER_PROTOCOL',
- array('http' => 'http',
- 'https' => 'https'));
+ new _define_selection_optional_commented('SERVER_PROTOCOL',
+ array('http' => 'http',
+ 'https' => 'https'));
$properties["Script Name"] =
new _define_commented_optional('SCRIPT_NAME', $scriptname);
@@ -1475,18 +1475,18 @@
new _define_commented_optional('PHPWIKI_DIR', dirname(__FILE__));
$properties["Use PATH_INFO"] =
-new _define_selection_optional_commented('USE_PATH_INFO',
- array('' => 'automatic',
- 'true' => 'use PATH_INFO',
- 'false' => 'do not use PATH_INFO'), "
-PhpWiki will try to use short urls to pages, eg
+new _define_selection_optional_commented('USE_PATH_INFO',
+ array('' => 'automatic',
+ 'true' => 'use PATH_INFO',
+ 'false' => 'do not use PATH_INFO'), "
+PhpWiki will try to use short urls to pages, eg
http://www.example.com/index.php/HomePage
-If you want to use urls like
+If you want to use urls like
http://www.example.com/index.php?pagename=HomePage
then define 'USE_PATH_INFO' as false by uncommenting the line below.
NB: If you are using Apache >= 2.0.30, then you may need to to use
the directive \"AcceptPathInfo On\" in your Apache configuration file
-(or in an appropriate <.htaccess> file) for the short urls to work:
+(or in an appropriate <.htaccess> file) for the short urls to work:
See http://httpd.apache.org/docs-2.0/mod/core.html#acceptpathinfo
See also http://phpwiki.sourceforge.net/phpwiki/PrettyWiki for more ideas
@@ -1500,7 +1500,7 @@
new _define_commented_optional('VIRTUAL_PATH', '/SomeWiki', "
VIRTUAL_PATH is the canonical URL path under which your your wiki
appears. Normally this is the same as dirname(SCRIPT_NAME), however
-using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite),
+using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite),
you can make it something different.
If you do this, you should set VIRTUAL_PATH here or in the starter scripts.
@@ -1542,7 +1542,7 @@
");
$properties["Strict Mailable Pagedumps"] =
- new boolean_define_optional('STRICT_MAILABLE_PAGEDUMPS',
+ new boolean_define_optional('STRICT_MAILABLE_PAGEDUMPS',
array('false' => "binary",
'true' => "quoted-printable"));
@@ -1556,8 +1556,8 @@
new _define_optional('HTML_DUMP_SUFFIX');
$properties["Pagename of Recent Changes"] =
- new _define_optional('RECENT_CHANGES',
- "RecentChanges");
+ new _define_optional('RECENT_CHANGES',
+ "RecentChanges");
$properties["Disable HTTP Redirects"] =
new boolean_define_commented_optional('DISABLE_HTTP_REDIRECT');
@@ -1637,14 +1637,14 @@
");
$properties["pear Cache USECACHE"] =
-new boolean_define_optional('PLUGIN_CACHED_USECACHE',
+new boolean_define_optional('PLUGIN_CACHED_USECACHE',
array('true' => 'Enabled',
- 'false' => 'Disabled'), "
+ 'false' => 'Disabled'), "
Enable or disable pear caching of plugins.");
$properties["pear Cache Database Container"] =
-new _define_selection_optional('PLUGIN_CACHED_DATABASE',
+new _define_selection_optional('PLUGIN_CACHED_DATABASE',
array('file' => 'file'), "
-Curently only file is supported.
+Curently only file is supported.
db, trifile and imgfile might be supported, but you must hack that by yourself.");
$properties["pear Cache cache directory"] =
@@ -1665,9 +1665,9 @@
new numeric_define_optional('PLUGIN_CACHED_MAXARGLEN', "1000", "
max. generated url length.");
$properties["pear Cache FORCE_SYNCMAP"] =
-new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP',
+new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP',
array('true' => 'Enabled',
- 'false' => 'Disabled'), "");
+ 'false' => 'Disabled'), "");
$properties["pear Cache IMGTYPES"] =
new list_define('PLUGIN_CACHED_IMGTYPES', "png|gif|gd|gd2|jpeg|wbmp|xbm|xpm", "
Handle those image types via GD handles. Check your GD supported image types.");
@@ -1682,7 +1682,7 @@
// begin class definitions
/**
- * A basic config-dist.ini configuration line in the form of a variable.
+ * A basic config-dist.ini configuration line in the form of a variable.
* (not needed anymore, we have only defines)
*
* Produces a string in the form "$name = value;"
@@ -1699,40 +1699,40 @@
function _variable($config_item_name, $default_value='', $description = '', $jscheck = '') {
$this->config_item_name = $config_item_name;
- if (!$description)
- $description = text_from_dist($config_item_name);
+ if (!$description)
+ $description = text_from_dist($config_item_name);
$this->description = $description;
- if (defined($config_item_name)
- and !preg_match("/(selection|boolean)/", get_class($this))
- and !preg_match("/^(SCRIPT_NAME|VIRTUAL_PATH|TEMP_DIR)$/", $config_item_name))
- $this->default_value = constant($config_item_name); // ignore given default value
- elseif ($config_item_name == $default_value)
- $this->default_value = '';
- else
- $this->default_value = $default_value;
- $this->jscheck = $jscheck;
+ if (defined($config_item_name)
+ and !preg_match("/(selection|boolean)/", get_class($this))
+ and !preg_match("/^(SCRIPT_NAME|VIRTUAL_PATH|TEMP_DIR)$/", $config_item_name))
+ $this->default_value = constant($config_item_name); // ignore given default value
+ elseif ($config_item_name == $default_value)
+ $this->default_value = '';
+ else
+ $this->default_value = $default_value;
+ $this->jscheck = $jscheck;
if (preg_match("/variable/i", get_class($this)))
- $this->prefix = "\$";
- elseif (preg_match("/ini_set/i", get_class($this)))
+ $this->prefix = "\$";
+ elseif (preg_match("/ini_set/i", get_class($this)))
$this->prefix = "ini_get: ";
else
- $this->prefix = "";
+ $this->prefix = "";
}
function _define($config_item_name, $default_value='', $description = '', $jscheck = '') {
- $this->_variable($config_item_name, $default_value, $description, $jscheck);
+ $this->_variable($config_item_name, $default_value, $description, $jscheck);
}
function value() {
global $HTTP_POST_VARS;
if (isset($HTTP_POST_VARS[$this->config_item_name]))
return $HTTP_POST_VARS[$this->config_item_name];
- else
+ else
return $this->default_value;
}
function _config_format($value) {
- return '';
+ return '';
$v = $this->get_config_item_name();
// handle arrays: a|b --> a['b']
if (strpos($v, '|')) {
@@ -1755,11 +1755,11 @@
function get_config_item_header() {
if (strchr($this->config_item_name,'|')) {
list($var,$param) = explode('|',$this->config_item_name);
- return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />";
+ return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />";
}
elseif ($this->config_item_name[0] != '_')
- return "<b>" . $this->prefix . $this->config_item_name . "</b><br />";
- else
+ return "<b>" . $this->prefix . $this->config_item_name . "</b><br />";
+ else
return '';
}
@@ -1784,10 +1784,10 @@
}
function get_html() {
- $size = strlen($this->default_value) > 45 ? 90 : 50;
- return $this->get_config_item_header() .
- "<input type=\"text\" size=\"$50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " .
- $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $size = strlen($this->default_value) > 45 ? 90 : 50;
+ return $this->get_config_item_header() .
+ "<input type=\"text\" size=\"$50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " .
+ $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
}
}
@@ -1798,9 +1798,9 @@
}
// function get_html() { return false; }
function get_html() {
- return $this->get_config_item_header() .
- "<em>Not editable.</em>" .
- "<pre>" . $this->default_value."</pre>";
+ return $this->get_config_item_header() .
+ "<em>Not editable.</em>" .
+ "<pre>" . $this->default_value."</pre>";
}
function _get_config_line($posted_value) {
if ($this->description)
@@ -1808,11 +1808,11 @@
return "${n}".$this->default_value;
}
function get_instructions($title) {
- global $tdwidth;
+ global $tdwidth;
$i = "<h3>" . $title . "</h3>\n " . nl2p($this->_get_description()) . "\n";
// $i .= "<em>Not editable.</em><br />\n<pre>" . $this->default_value."</pre>";
- return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">'."\n".$i."</td></tr>\n"
- . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="'.$tdwidth.'"> </td>';
+ return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">'."\n".$i."</td></tr>\n"
+ . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="'.$tdwidth.'"> </td>';
}
}
@@ -1843,25 +1843,25 @@
if (!empty($HTTP_POST_VARS[$this->config_item_name]))
return $HTTP_POST_VARS[$this->config_item_name];
else {
- list($option, $label) = each($this->default_value);
+ list($option, $label) = each($this->default_value);
return $option;
}
}
function get_html() {
- $output = $this->get_config_item_header();
+ $output = $this->get_config_item_header();
$output .= '<select name="' . $this->get_config_item_name() . "\">\n";
/* The first option is the default */
- $values = $this->default_value;
- if (defined($this->get_config_item_name()))
- $this->default_value = constant($this->get_config_item_name());
- else
- $this->default_value = null;
+ $values = $this->default_value;
+ if (defined($this->get_config_item_name()))
+ $this->default_value = constant($this->get_config_item_name());
+ else
+ $this->default_value = null;
foreach ($values as $option => $label) {
- if (!is_null($this->default_value) && $this->default_value === $option)
- $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n";
- else
- $output .= " <option value=\"$option\">$label</option>\n";
+ if (!is_null($this->default_value) && $this->default_value === $option)
+ $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n";
+ else
+ $output .= " <option value=\"$option\">$label</option>\n";
}
$output .= "</select>\n";
return $output;
@@ -1883,10 +1883,10 @@
return "${n}" . $this->_config_format($posted_value);
}
function get_html() {
- $size = strlen($this->default_value) > 45 ? 90 : 50;
- return $this->get_config_item_header()
- . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name())
- . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />"
+ $size = strlen($this->default_value) > 45 ? 90 : 50;
+ return $this->get_config_item_header()
+ . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name())
+ . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />"
. "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
}
}
@@ -1905,8 +1905,8 @@
}
}
-/**
- * We don't use _optional anymore, because INI-style config's don't need that.
+/**
+ * We don't use _optional anymore, because INI-style config's don't need that.
* IniConfig.php does the optional logic now.
* But we use _optional for config-default.ini options
*/
@@ -1919,13 +1919,13 @@
class _define_notempty
extends _define {
function get_html() {
- $s = $this->get_config_item_header()
- . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name()
+ $s = $this->get_config_item_header()
+ . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name()
. "\" value=\"" . $this->default_value . "\" {$this->jscheck} />";
if (empty($this->default_value))
- return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
- else
- return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
+ else
+ return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
}
}
@@ -2002,7 +2002,7 @@
extends _variable_selection { }
class _define_selection_optional_commented
-extends _define_selection_optional {
+extends _define_selection_optional {
function _get_config_line($posted_value) {
if ($this->description)
$n = "\n";
@@ -2019,11 +2019,11 @@
extends _define {
function _define_password($config_item_name, $default_value='', $description = '', $jscheck = '') {
- if ($config_item_name == $default_value) $default_value = '';
+ if ($config_item_name == $default_value) $default_value = '';
$this->_define($config_item_name, $default_value, $description, $jscheck);
if (!$jscheck)
- $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '"
- . $this->get_config_item_name() . "', this);\"";
+ $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '"
+ . $this->get_config_item_name() . "', this);\"";
}
function _get_config_line($posted_value) {
if ($this->description)
@@ -2060,10 +2060,10 @@
}
class _define_password_optional
-extends _define_password {
+extends _define_password {
function _define_password_optional($config_item_name, $default_value='', $description = '', $jscheck = '') {
- if ($config_item_name == $default_value) $default_value = '';
+ if ($config_item_name == $default_value) $default_value = '';
if (!$jscheck) $this->jscheck = " ";
$this->_define($config_item_name, $default_value, $description, $jscheck);
}
@@ -2074,20 +2074,20 @@
if ($posted_value == '') {
return "${n};" . $this->_config_format("");
} else {
- return "${n}" . $this->_config_format($posted_value);
+ return "${n}" . $this->_config_format($posted_value);
}
}
function get_html() {
- $s = $this->get_config_item_header();
- // dont re-encrypt already encrypted passwords
- $value = $this->value();
- $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and
- $GLOBALS['properties']["Encrypted Passwords"]->value();
- if (empty($value))
- $encrypted = false;
+ $s = $this->get_config_item_header();
+ // dont re-encrypt already encrypted passwords
+ $value = $this->value();
+ $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and
+ $GLOBALS['properties']["Encrypted Passwords"]->value();
+ if (empty($value))
+ $encrypted = false;
$s .= "<input type=\"". ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name()
. "\" value=\"" . $value . "\" {$this->jscheck} />";
- return $s;
+ return $s;
}
}
@@ -2097,35 +2097,35 @@
class _variable_password
extends _variable {
function _variable_password($config_item_name, $default_value='', $description = '', $jscheck = '') {
- if ($config_item_name == $default_value) $default_value = '';
+ if ($config_item_name == $default_value) $default_value = '';
$this->_define($config_item_name, $default_value, $description, $jscheck);
if (!$jscheck)
$this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" . $this->get_config_item_name() . "', this);\"";
}
function get_html() {
- global $HTTP_POST_VARS, $HTTP_GET_VARS;
- $s = $this->get_config_item_header();
+ global $HTTP_POST_VARS, $HTTP_GET_VARS;
+ $s = $this->get_config_item_header();
if (isset($HTTP_POST_VARS['create']) or isset($HTTP_GET_VARS['create'])) {
- $new_password = random_good_password();
- $this->default_value = $new_password;
- $s .= "Created password: <strong>$new_password</strong><br /> <br />";
- }
- // dont re-encrypt already encrypted passwords
- $value = $this->value();
- $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and
- $GLOBALS['properties']["Encrypted Passwords"]->value();
- if (empty($value))
- $encrypted = false;
+ $new_password = random_good_password();
+ $this->default_value = $new_password;
+ $s .= "Created password: <strong>$new_password</strong><br /> <br />";
+ }
+ // dont re-encrypt already encrypted passwords
+ $value = $this->value();
+ $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and
+ $GLOBALS['properties']["Encrypted Passwords"]->value();
+ if (empty($value))
+ $encrypted = false;
$s .= "<input type=\"". ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name()
- . "\" value=\"" . $value . "\" {$this->jscheck} />"
+ . "\" value=\"" . $value . "\" {$this->jscheck} />"
. " <input type=\"submit\" name=\"create\" value=\"Create Random Password\" />";
- if (empty($value))
- $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
- elseif (strlen($this->default_value) < 4)
- $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Must be longer than 4 chars.</p>";
- else
- $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
- return $s;
+ if (empty($value))
+ $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>";
+ elseif (strlen($this->default_value) < 4)
+ $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Must be longer than 4 chars.</p>";
+ else
+ $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ return $s;
}
}
@@ -2144,9 +2144,9 @@
$rows = max(3, count($list_values) +1);
$list_values = join("\n", $list_values);
$ta = $this->get_config_item_header();
- $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
+ $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
$ta .= $list_values . "</textarea>";
- $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
return $ta;
}
}
@@ -2165,9 +2165,9 @@
if ($list_values)
$list_values = join("\n", $list_values);
$ta = $this->get_config_item_header();
- $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
+ $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
$ta .= $list_values . "</textarea>";
- $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
return $ta;
}
}
@@ -2175,7 +2175,7 @@
class array_variable
extends _variable {
function _config_format($value) {
- return sprintf("%s = \"%s\"", $this->get_config_item_name(),
+ return sprintf("%s = \"%s\"", $this->get_config_item_name(),
is_array($value) ? join(':', $value) : $value);
}
function _get_config_line($posted_value) {
@@ -2189,15 +2189,15 @@
return "\n;" . $this->_config_format('');
}
function get_html() {
- if (is_array($this->default_value))
+ if (is_array($this->default_value))
$list_values = join("\n", $this->default_value);
- else
+ else
$list_values = $this->default_value;
$rows = max(3, count($this->default_value) +1);
$ta = $this->get_config_item_header();
$ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
$ta .= $list_values . "</textarea>";
- $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
return $ta;
}
}
@@ -2205,7 +2205,7 @@
class array_define
extends _define {
function _config_format($value) {
- return sprintf("%s = \"%s\"", $this->get_config_item_name(),
+ return sprintf("%s = \"%s\"", $this->get_config_item_name(),
is_array($value) ? join(' : ', $value) : $value);
}
function _get_config_line($posted_value) {
@@ -2219,16 +2219,16 @@
return "\n;" . $this->_config_format('');
}
function get_html () {
- if (!$this->default_value)
- $this->default_value = array();
- elseif (is_string($this->default_value))
- $this->default_value = preg_split("/[\s,:]+/", $this->default_value, -1, PREG_SPLIT_NO_EMPTY);
- $list_values = join(" : \n", $this->default_value);
+ if (!$this->default_value)
+ $this->default_value = array();
+ elseif (is_string($this->default_value))
+ $this->default_value = preg_split("/[\s,:]+/", $this->default_value, -1, PREG_SPLIT_NO_EMPTY);
+ $list_values = join(" : \n", $this->default_value);
$rows = max(3, count($this->default_value) + 1);
$ta = $this->get_config_item_header();
$ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>";
$ta .= $list_values . "</textarea>";
- $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
+ $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>";
return $ta;
}
}
@@ -2241,7 +2241,7 @@
if ($v = $HTTP_POST_VARS[$this->config_item_name])
return $v;
else {
- return ini_get($this->get_config_item_name);
+ return ini_get($this->get_config_item_name);
}
}
function _config_format($value) {
@@ -2262,20 +2262,20 @@
// adds ->values property, instead of ->default_value
function boolean_define($config_item_name, $values = false, $description = '', $jscheck = '') {
$this->config_item_name = $config_item_name;
- if (!$description)
- $description = text_from_dist($config_item_name);
+ if (!$description)
+ $description = text_from_dist($config_item_name);
$this->description = $description;
- // TESTME: get boolean default value from config-default.ini
- if (defined($config_item_name))
- $this->default_value = constant($config_item_name); // ignore given default value
+ // TESTME: get boolean default value from config-default.ini
+ if (defined($config_item_name))
+ $this->default_value = constant($config_item_name); // ignore given default value
elseif (is_array($values))
- list($this->default_value,$dummy) = $values[0];
- if (!$values)
+ list($this->default_value,$dummy) = $values[0];
+ if (!$values)
$values = array('false' => "Disabled",
'true' => "Enabled");
- $this->values = $values;
- $this->jscheck = $jscheck;
- $this->prefix = "";
+ $this->values = $values;
+ $this->jscheck = $jscheck;
+ $this->prefix = "";
}
function _get_config_line($posted_value) {
if ($this->description)
@@ -2291,18 +2291,18 @@
//TODO: radiobuttons, no list
function get_html() {
$output = $this->get_config_item_header();
- $name = $this->get_config_item_name();
+ $name = $this->get_config_item_name();
$output .= '<select name="' . $name . "\" {$this->jscheck}>\n";
- $values = $this->values;
- $default_value = $this->default_value ? 'true' : 'false';
+ $values = $this->values;
+ $default_value = $this->default_value ? 'true' : 'false';
/* There can usually only be two options, there can be
* three options in the case of a boolean_define_commented_optional */
while (list($option, $label) = each($values)) {
- if (!is_null($this->default_value) and $option === $default_value)
- $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n";
- else
- $output .= " <option value=\"$option\">$label</option>\n";
- }
+ if (!is_null($this->default_value) and $option === $default_value)
+ $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n";
+ else
+ $output .= " <option value=\"$option\">$label</option>\n";
+ }
$output .= "</select>\n";
return $output;
}
@@ -2338,11 +2338,11 @@
return "\n".$SEPARATOR . str_replace("\n", "\n; ", $d) ."\n".$this->default_value;
}
function get_instructions($title) {
- $id = preg_replace("/\W/","",$this->config_item_name);
- $group_name = preg_replace("/\W/","",$title);
- $i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n";
+ $id = preg_replace("/\W/","",$this->config_item_name);
+ $group_name = preg_replace("/\W/","",$title);
+ $i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n";
$i .= "<h2>" . $title . "</h2>\n " . nl2p($this->_get_description()) ."\n";
- $i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>";
+ $i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>";
return $i ."</td>\n";
}
function get_html() {
@@ -2369,30 +2369,30 @@
function text_from_dist($var) {
static $distfile = 0;
static $f;
-
+
if (!$distfile) {
- $sep = (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/');
- $distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini";
- $f = fopen($distfile, "r");
+ $sep = (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/');
+ $distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini";
+ $f = fopen($distfile, "r");
}
if ($var == '_MAGIC_CLOSE_FILE') {
- fclose($f);
- return;
+ fclose($f);
+ return;
}
// if all vars would be in natural order as in the config-dist this would not be needed.
- fseek($f, 0);
+ fseek($f, 0);
$par = "\n";
while (!feof($f)) {
- $s = fgets($f);
- if (preg_match("/^; \w/", $s)) {
- $par .= (substr($s,2) . " ");
- } elseif (preg_match("/^;\s*$/", $s)) {
- $par .= "\n\n";
- }
- if (preg_match("/^;?".preg_quote($var)."\s*=/", $s))
- return $par;
- if (preg_match("/^\s*$/", $s)) // new paragraph
- $par = "\n";
+ $s = fgets($f);
+ if (preg_match("/^; \w/", $s)) {
+ $par .= (substr($s,2) . " ");
+ } elseif (preg_match("/^;\s*$/", $s)) {
+ $par .= "\n\n";
+ }
+ if (preg_match("/^;?".preg_quote($var)."\s*=/", $s))
+ return $par;
+ if (preg_match("/^\s*$/", $s)) // new paragraph
+ $par = "\n";
}
return '';
}
@@ -2432,13 +2432,13 @@
better_srand();
if (function_exists('mt_rand')) // mersenne twister
$length = mt_rand($minlength, $maxlength);
- else // the usually bad glibc rand()
+ else // the usually bad glibc rand()
$length = rand($minlength, $maxlength);
while ($length > 0) {
if (function_exists('mt_rand'))
- $newchar = mt_rand($start, $end);
+ $newchar = mt_rand($start, $end);
else
- $newchar = rand($start, $end);
+ $newchar = rand($start, $end);
if (! strrpos($valid_chars,$newchar) ) continue; // skip holes
$newpass .= sprintf("%c", $newchar);
$length--;
@@ -2465,7 +2465,7 @@
}
-if (!empty($HTTP_POST_VARS['action'])
+if (!empty($HTTP_POST_VARS['action'])
and $HTTP_POST_VARS['action'] == 'make_config'
and !empty($HTTP_POST_VARS['ADMIN_USER'])
and !empty($HTTP_POST_VARS['ADMIN_PASSWD'])
@@ -2508,7 +2508,7 @@
else {
$fp = false;
}
-
+
if ($fp) {
fputs($fp, utf8_encode($config));
fclose($fp);
@@ -2520,8 +2520,8 @@
}
} ...
[truncated message content] |
|
From: <var...@us...> - 2011-03-05 17:05:39
|
Revision: 7964
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7964&view=rev
Author: vargenau
Date: 2011-03-05 17:05:30 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/lib/AccessLog.php
trunk/lib/ArchiveCleaner.php
trunk/lib/AtomParser.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/Captcha.php
trunk/lib/DbSession.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/DbaPartition.php
trunk/lib/EditToolbar.php
trunk/lib/ErrorManager.php
trunk/lib/ExternalReferrer.php
trunk/lib/FileFinder.php
trunk/lib/Google.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/HtmlParser.php
trunk/lib/HttpClient.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/SpamBlocklist.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/WysiwygEdit.php
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/config.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/fpdf.php
trunk/lib/gif.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/pdf.php
trunk/lib/prepend.php
trunk/lib/spam_babycart.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/ziplib.php
trunk/tests/CompatInfo.php
trunk/tests/unit_test_backend_cvs.php
trunk/uploads/index.php
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/AccessLog.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -57,7 +57,7 @@
if (!$request->_dbi->isSQL()) {
trigger_error("Unsupported database backend for ACCESS_LOG_SQL.\nNeed DATABASE_TYPE=SQL or ADODB or PDO");
} else {
- global $DBParams;
+ global $DBParams;
//$this->_dbi =& $request->_dbi;
$this->logtable = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '')."accesslog";
}
@@ -126,8 +126,8 @@
if ($this->logtable) {
// mysql specific only:
return $this->read_sql("request_host=".$this->_dbi->quote($host)
- ." AND time_stamp > ". (time()-$since_minutes*60)
- ." ORDER BY time_stamp DESC");
+ ." AND time_stamp > ". (time()-$since_minutes*60)
+ ." ORDER BY time_stamp DESC");
} else {
$iter = new WikiDB_Array_generic_iter();
$logs =& $iter->_array;
@@ -160,7 +160,7 @@
$entry = new Request_AccessLogEntry($this);
$re = '/^(\S+)\s(\S+)\s(\S+)\s\[(.+?)\] "([^"]+)" (\d+) (\d+) "([^"]*)" "([^"]*)"$/';
if (preg_match($re, $s, $m)) {
- list(,$entry->host, $entry->ident, $entry->user, $entry->time,
+ list(,$entry->host, $entry->ident, $entry->user, $entry->time,
$entry->request, $entry->status, $entry->size,
$entry->referer, $entry->user_agent) = $m;
}
@@ -176,8 +176,8 @@
return $this->sqliter->next();
}
function _read_sql_query($where='') {
- global $request;
- $dbh =& $request->_dbi;
+ global $request;
+ $dbh =& $request->_dbi;
$log_tbl =& $this->logtable;
return $dbh->genericSqlIter("SELECT *,request_uri as request,request_time as time,remote_user as user,"
."remote_host as host,agent as user_agent"
@@ -187,8 +187,8 @@
/* done in request->finish() before the db is closed */
function write_sql() {
- global $request;
- $dbh =& $request->_dbi;
+ global $request;
+ $dbh =& $request->_dbi;
if (isset($this->entries) and $dbh and $dbh->isOpen())
foreach ($this->entries as $entry) {
$entry->write_sql();
@@ -236,7 +236,7 @@
$this->logfile = $accesslog->logfile;
$this->time = time();
$this->status = 200; // see setStatus()
- $this->size = 0; // see setSize()
+ $this->size = 0; // see setSize()
}
/**
@@ -350,7 +350,7 @@
/* This is better been done by apache mod_log_sql */
/* If ACCESS_LOG_SQL & 2 we do write it by our own */
function write_sql() {
- global $request;
+ global $request;
$dbh =& $request->_dbi;
if ($dbh and $dbh->isOpen() and $this->_accesslog->logtable) {
@@ -365,7 +365,7 @@
if (!empty($args['pref']['passwd2'])) $args['pref']['passwd2'] = '<not displayed>';
$this->request_args = substr(serialize($args),0,254); // if VARCHAR(255) is used.
} else {
- $this->request_args = $request->get('QUERY_STRING');
+ $this->request_args = $request->get('QUERY_STRING');
}
$this->request_method = $request->get('REQUEST_METHOD');
$this->request_uri = $request->get('REQUEST_URI');
Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/ArchiveCleaner.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -1,19 +1,19 @@
-<?php
+<?php
// $Id$
/* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
*
* This file is part of PhpWiki.
- *
+ *
* PhpWiki is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* PhpWiki is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with PhpWiki; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -24,7 +24,7 @@
function ArchiveCleaner ($expire_params) {
$this->expire_params = $expire_params;
}
-
+
function isMergeable($revision) {
if ( ! $revision->get('is_minor_edit') )
return false;
@@ -43,20 +43,20 @@
while ($page = $iter->next())
$this->cleanPageRevisions($page);
}
-
+
function cleanPageRevisions($page) {
$INFINITY = 0x7fffffff;
$expire = &$this->expire_params;
foreach (array('major', 'minor', 'author') as $class)
$counter[$class] = new ArchiveCleaner_Counter($expire[$class]);
- // shortcut to keep all
- if (($counter['minor']->min_keep == $INFINITY)
+ // shortcut to keep all
+ if (($counter['minor']->min_keep == $INFINITY)
and ($counter['major']->min_keep == $INFINITY))
return;
$authors_seen = array();
-
+
$current = $page->getCurrentRevision(false);
for ( $revision = $page->getRevisionBefore($current,false);
@@ -117,11 +117,11 @@
if ($this->min_age > $this->max_age)
$this->min_age = $this->max_age;
-
+
$this->now = time();
$this->count = 0;
$this->previous_supplanted = false;
-
+
}
function computeAge($revision) {
@@ -148,14 +148,14 @@
$this->previous_supplanted = $supplanted;
return ($this->now - $supplanted) / (24 * 3600);
}
-
+
function keep($revision) {
- $INFINITY = 0x7fffffff;
- if ($this->min_keep == $INFINITY)
- return true;
+ $INFINITY = 0x7fffffff;
+ if ($this->min_keep == $INFINITY)
+ return true;
$count = ++$this->count;
$age = $this->computeAge($revision);
-
+
if ($count > $this->max_keep)
return false;
if ($age <= $this->min_age || $count <= $this->min_keep)
@@ -170,5 +170,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/AtomParser.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -23,7 +23,7 @@
* This class is a poor-man Atom parser, it does no validation of the feed.
* The content of an entry ("payload") is not parsed but rather returned "as-is",
* as its format can be text, html or xhtml.
- *
+ *
* @author: Sébastien Le Callonnec
*/
require_once('lib/XmlParser.php');
@@ -44,7 +44,7 @@
var $icon = '';
var $rights = '';
var $logo = '';
-
+
var $categories = array();
var $authors = array();
@@ -64,7 +64,7 @@
var $id = '';
var $links = array();
var $summary = '';
-
+
var $inside_content = false;
var $content = '';
@@ -165,7 +165,7 @@
function cdata($parser, $data) {
global $current_tag, $current_attrs;
-
+
if ($this->inside_content) {
$this->content .= $data;
} else {
@@ -244,7 +244,7 @@
return trim($element);
}
}
-
+
function serialize_tag($tag_name, $attributes) {
$tag = "<" . $tag_name;
foreach ($attributes as $k => $v) {
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/BlockParser.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -93,11 +93,11 @@
* @return object A RegexpSet_match object, or false if no match.
*/
function match ($text) {
- if (!is_string($text)) return false;
+ if (!is_string($text)) return false;
if (! preg_match($this->_re, $text, $m)) {
return false;
}
-
+
$match = new AnchoredRegexpSet_match;
$match->postmatch = substr($text, strlen($m[0]));
$match->match = $m[1];
@@ -136,7 +136,7 @@
if (! preg_match($pat, $text, $m)) {
return false;
}
-
+
$match = new AnchoredRegexpSet_match;
$match->postmatch = substr($text, strlen($m[0]));
$match->match = $m[1];
@@ -146,11 +146,11 @@
}
-
+
class BlockParser_Input {
function BlockParser_Input ($text) {
-
+
// Expand leading tabs.
// FIXME: do this better.
//
@@ -182,14 +182,14 @@
}
return $this->_atSpace;
}
-
+
function currentLine () {
if ($this->_pos >= count($this->_lines)) {
return false;
}
return $this->_lines[$this->_pos];
}
-
+
function nextLine () {
$this->_atSpace = $this->_lines[$this->_pos++] === '';
if ($this->_pos >= count($this->_lines)) {
@@ -202,7 +202,7 @@
$this->_atSpace = ($this->_lines[$this->_pos] === '');
$this->_pos++;
}
-
+
function getPos () {
return array($this->_pos, $this->_atSpace);
}
@@ -225,7 +225,7 @@
else
return "<EOF>";
}
-
+
function _debug ($tab, $msg) {
//return ;
$where = $this->where();
@@ -233,7 +233,7 @@
printXML(HTML::div("$tab $msg: at: '",
HTML::tt($where),
"'"));
- flush();
+ flush();
}
}
@@ -271,7 +271,7 @@
else
return $this->_atSpace;
}
-
+
function currentLine () {
return $this->_line;
}
@@ -296,7 +296,7 @@
function advance () {
$this->nextLine();
}
-
+
function getPos () {
return array($this->_line, $this->_atSpace, $this->_input->getPos());
}
@@ -306,7 +306,7 @@
$this->_atSpace = $pos[1];
$this->_input->setPos($pos[2]);
}
-
+
function getPrefix () {
assert ($this->_line !== false);
$line = $this->_input->currentLine();
@@ -322,8 +322,8 @@
return $this->_input->where();
}
}
-
+
class Block_HtmlElement extends HtmlElement
{
function Block_HtmlElement($tag /*, ... */) {
@@ -335,7 +335,7 @@
}
class ParsedBlock extends Block_HtmlElement {
-
+
function ParsedBlock (&$input, $tag = 'div', $attr = false) {
$this->Block_HtmlElement($tag, $attr);
$this->_initBlockTypes();
@@ -362,22 +362,22 @@
// FIXME: hackish. This should only be called once.
function _initBlockTypes () {
- // better static or global?
- static $_regexpset, $_block_types;
+ // better static or global?
+ static $_regexpset, $_block_types;
- if (!is_object($_regexpset)) {
+ if (!is_object($_regexpset)) {
// nowiki_wikicreole must be before template_plugin
- $Block_types = array
- ('nowiki_wikicreole', 'template_plugin', 'placeholder', 'oldlists', 'list', 'dl',
+ $Block_types = array
+ ('nowiki_wikicreole', 'template_plugin', 'placeholder', 'oldlists', 'list', 'dl',
'table_dl', 'table_wikicreole', 'table_mediawiki',
'blockquote', 'heading', 'heading_wikicreole', 'hr', 'pre',
'email_blockquote', 'wikicreole_indented',
- 'plugin', 'plugin_wikicreole', 'p');
+ 'plugin', 'plugin_wikicreole', 'p');
// insert it before p!
if (ENABLE_MARKUP_DIVSPAN) {
- array_pop($Block_types);
- $Block_types[] = 'divspan';
- $Block_types[] = 'p';
+ array_pop($Block_types);
+ $Block_types[] = 'divspan';
+ $Block_types[] = 'p';
}
foreach ($Block_types as $type) {
$class = "Block_$type";
@@ -389,7 +389,7 @@
$_regexpset = $this->_regexpset;
$_block_types = $this->_block_types;
unset($Block_types);
- } else {
+ } else {
$this->_regexpset = $_regexpset;
$this->_block_types = $_block_types;
}
@@ -409,9 +409,9 @@
$block = clone($this->_block_types[$m->regexp_ind]);
if (DEBUG & _DEBUG_PARSER)
$input->_debug('>', get_class($block));
-
+
if ($block->_match($input, $m)) {
- //$block->_text = $line;
+ //$block->_text = $line;
if (DEBUG & _DEBUG_PARSER)
$input->_debug('<', get_class($block));
$tight_bottom = ! $input->skipSpace();
@@ -500,12 +500,12 @@
'blockquote');
return true;
}
-
+
function merge ($nextBlock) {
if (get_class($nextBlock) == get_class($this)) {
assert ($nextBlock->_depth < $this->_depth);
$nextBlock->_element->unshiftContent($this->_element);
- if (!empty($this->_tight_top))
+ if (!empty($this->_tight_top))
$nextBlock->_tight_top = $this->_tight_top;
return $nextBlock;
}
@@ -535,7 +535,7 @@
if (preg_match('/[*#+-o]/', $input->getPrefix())) {
return false;
}
-
+
$prefix = $m->match;
$indent = sprintf("\\ {%d}", strlen($prefix));
@@ -619,13 +619,13 @@
{
var $nrows;
var $ncols;
-
+
function Block_table_dl_defn ($term, $defn) {
$this->XmlContent();
if (!is_array($defn))
$defn = $defn->getContent();
- $this->_next_tight_top = false; // value irrelevant - gets fixed later
+ $this->_next_tight_top = false; // value irrelevant - gets fixed later
$this->_ncols = $this->_ComputeNcols($defn);
$this->_nrows = 0;
@@ -645,9 +645,9 @@
function setTightness($tight_top, $tight_bot) {
$this->_tight_top = $tight_top;
- $this->_tight_bot = $tight_bot;
+ $this->_tight_bot = $tight_bot;
}
-
+
function _addToRow ($item) {
if (empty($this->_accum)) {
$this->_accum = HTML::td();
@@ -663,7 +663,7 @@
$row->setTightness($this->_next_tight_top, $tight_bottom);
$this->_next_tight_top = $tight_bottom;
-
+
$this->pushContent($row);
$this->_accum = false;
$this->_nrows++;
@@ -675,7 +675,7 @@
return;
$this->_flushRow($table_rows[0]->_tight_top);
-
+
foreach ($table_rows as $subdef) {
$this->pushContent($subdef);
$this->_nrows += $subdef->nrows();
@@ -690,7 +690,7 @@
else
$first_row->unshiftContent($th);
}
-
+
function _ComputeNcols ($defn) {
$ncols = 2;
foreach ($defn as $item) {
@@ -722,17 +722,17 @@
}
function & firstTR() {
- $first = &$this->_content[0];
- if (isa($first, 'Block_table_dl_defn'))
- return $first->firstTR();
- return $first;
+ $first = &$this->_content[0];
+ if (isa($first, 'Block_table_dl_defn'))
+ return $first->firstTR();
+ return $first;
}
function & lastTR() {
- $last = &$this->_content[$this->_nrows - 1];
- if (isa($last, 'Block_table_dl_defn'))
- return $last->lastTR();
- return $last;
+ $last = &$this->_content[$this->_nrows - 1];
+ if (isa($last, 'Block_table_dl_defn'))
+ return $last->lastTR();
+ return $last;
}
function setWidth ($ncols) {
@@ -774,7 +774,7 @@
function _setTightness($top, $bot) {
$this->_content[0]->setTightness($top, $bot);
}
-
+
function finish () {
$defs = &$this->_content;
@@ -782,7 +782,7 @@
$ncols = 0;
foreach ($defs as $defn)
$ncols = max($ncols, $defn->ncols());
-
+
foreach ($defs as $key => $defn)
$defs[$key]->setWidth($ncols);
@@ -807,8 +807,8 @@
if (!preg_match('/[*#;]*$/A', $input->getPrefix())) {
return false;
}
-
+
$prefix = $m->match;
$oldindent = '[*#;](?=[#*]|;.*:.*\S)';
$newindent = sprintf('\\ {%d}', strlen($prefix));
@@ -873,7 +873,7 @@
*/
echo 'count($this->_content): ', count($this->_content),"\n";
echo "\$this->_content[0]: "; var_dump ($this->_content[0]);
-
+
for ($i=1; $i < min(5, count($this->_content)); $i++) {
$c =& $this->_content[$i];
echo '$this->_content[',$i,"]: \n";
@@ -918,26 +918,26 @@
}
}
$input->advance();
-
- if ($m->match == '<nowiki>')
- $text = join("<br>\n", $text);
- else
+
+ if ($m->match == '<nowiki>')
+ $text = join("<br>\n", $text);
+ else
$text = join("\n", $text);
-
+
// FIXME: no <img>, <big>, <small>, <sup>, or <sub>'s allowed
// in a <pre>.
if ($m->match == '<pre>') {
$text = TransformInline($text);
}
- if ($m->match == '<noinclude>') {
- $text = TransformText($text);
- $this->_element = new Block_HtmlElement('div', false, $text);
- } else if ($m->match == '<nowiki>') {
+ if ($m->match == '<noinclude>') {
+ $text = TransformText($text);
+ $this->_element = new Block_HtmlElement('div', false, $text);
+ } else if ($m->match == '<nowiki>') {
$text = TransformInlineNowiki($text);
- $this->_element = new Block_HtmlElement('p', false, $text);
- } else {
+ $this->_element = new Block_HtmlElement('p', false, $text);
+ } else {
$this->_element = new Block_HtmlElement('pre', false, $text);
- }
+ }
return true;
}
}
@@ -1019,7 +1019,7 @@
}
$input->advance();
- $this->_element = new Cached_PluginInvocation($pi);
+ $this->_element = new Cached_PluginInvocation($pi);
return true;
}
}
@@ -1207,7 +1207,7 @@
{
var $_attr = array('class' => 'mail-style-quote');
var $_re = '>\ ?';
-
+
function _match (&$input, $m) {
//$indent = str_replace(' ', '\\ ', $m->match) . '|>$';
$indent = $this->_re;
@@ -1244,14 +1244,14 @@
class Block_heading extends BlockMarkup
{
var $_re = '!{1,3}';
-
+
function _match (&$input, $m) {
$tag = "h" . (5 - strlen($m->match));
$text = TransformInline(trim($m->postmatch));
$input->advance();
$this->_element = new Block_HtmlElement($tag, false, $text);
-
+
return true;
}
}
@@ -1259,7 +1259,7 @@
class Block_heading_wikicreole extends BlockMarkup
{
var $_re = '={2,6}';
-
+
function _match (&$input, $m) {
$tag = "h" . strlen($m->match);
// Remove spaces
@@ -1270,7 +1270,7 @@
$input->advance();
$this->_element = new Block_HtmlElement($tag, false, $text);
-
+
return true;
}
}
@@ -1315,12 +1315,12 @@
var $_re = '<(?im)(?: div|span)(?:[^>]*)?>';
function _match (&$input, $m) {
- if (substr($m->match,1,4) == 'span') {
- $tag = 'span';
- } else {
- $tag = 'div';
- }
- // without last >
+ if (substr($m->match,1,4) == 'span') {
+ $tag = 'span';
+ } else {
+ $tag = 'div';
+ }
+ // without last >
$argstr = substr(trim(substr($m->match,strlen($tag)+1)),0,-1);
$pos = $input->getPos();
$pi = $content = $m->postmatch;
@@ -1339,22 +1339,22 @@
$input->advance();
if (strstr($content, "\n"))
$content = TransformText($content);
- else
+ else
$content = TransformInline($content);
if (!$argstr)
$args = false;
else {
$args = array();
while (preg_match("/(\w+)=(.+)/", $argstr, $m)) {
- $k = $m[1]; $v = $m[2];
- if (preg_match("/^\"(.+?)\"(.*)$/", $v, $m)) {
- $v = $m[1];
- $argstr = $m[2];
- } else {
- preg_match("/^(\s+)(.*)$/", $v, $m);
- $v = $m[1];
- $argstr = $m[2];
- }
+ $k = $m[1]; $v = $m[2];
+ if (preg_match("/^\"(.+?)\"(.*)$/", $v, $m)) {
+ $v = $m[1];
+ $argstr = $m[2];
+ } else {
+ preg_match("/^(\s+)(.*)$/", $v, $m);
+ $v = $m[1];
+ $argstr = $m[2];
+ }
if (trim($k) and trim($v)) $args[$k] = $v;
}
}
@@ -1382,7 +1382,7 @@
}
// WikiCreole
/*if (!empty($markup) && $markup == 3) {
- $text = ConvertFromCreole($text);
+ $text = ConvertFromCreole($text);
}*/
// Expand leading tabs.
$text = expand_tabs($text);
@@ -1413,5 +1413,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/CachedMarkup.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -27,12 +27,12 @@
function CacheableMarkup($content, $basepage) {
$this->_basepage = $basepage;
- $this->_buf = '';
- $this->_content = array();
- $this->_append($content);
- if ($this->_buf != '')
- $this->_content[] = $this->_buf;
- unset($this->_buf);
+ $this->_buf = '';
+ $this->_content = array();
+ $this->_append($content);
+ if ($this->_buf != '')
+ $this->_content[] = $this->_buf;
+ unset($this->_buf);
}
function pack() {
@@ -88,15 +88,15 @@
E_USER_WARNING);
return false;
}
-
+
/** Get names of wikipages linked to.
*
* @return array of hashes { linkto=>pagename, relation=>pagename }
*/
function getWikiPageLinks() {
- $links = array();
- foreach ($this->_content as $item) {
- if (!isa($item, 'Cached_DynamicContent'))
+ $links = array();
+ foreach ($this->_content as $item) {
+ if (!isa($item, 'Cached_DynamicContent'))
continue;
if (!($item_links = $item->getWikiPageLinks($this->_basepage)))
continue;
@@ -104,8 +104,8 @@
}
// array_unique has a bug with hashes!
// set_links checks for duplicates, array_merge does not
- //return array_unique($links);
- return $links;
+ //return array_unique($links);
+ return $links;
}
/** Get link info.
@@ -116,63 +116,63 @@
* Returns an array of hashes.
*/
function getLinkInfo() {
- $link = array();
- foreach ($this->_content as $link) {
- if (! isa($link, 'Cached_Link'))
- continue;
- $info = $link->getLinkInfo($this->_basepage);
- $links[$info->href] = $info;
- }
- return array_values($links);
+ $link = array();
+ foreach ($this->_content as $link) {
+ if (! isa($link, 'Cached_Link'))
+ continue;
+ $info = $link->getLinkInfo($this->_basepage);
+ $links[$info->href] = $info;
}
+ return array_values($links);
+ }
function _append($item) {
- if (is_array($item)) {
- foreach ($item as $subitem)
- $this->_append($subitem);
- }
- elseif (!is_object($item)) {
- $this->_buf .= $this->_quote((string) $item);
- }
- elseif (isa($item, 'Cached_DynamicContent')) {
- if ($this->_buf) {
- $this->_content[] = $this->_buf;
- $this->_buf = '';
- }
- $this->_content[] = $item;
- }
- elseif (isa($item, 'XmlElement')) {
- if ($item->isEmpty()) {
- $this->_buf .= $item->emptyTag();
- }
- else {
- $this->_buf .= $item->startTag();
- foreach ($item->getContent() as $subitem)
- $this->_append($subitem);
- $this->_buf .= "</$item->_tag>";
+ if (is_array($item)) {
+ foreach ($item as $subitem)
+ $this->_append($subitem);
+ }
+ elseif (!is_object($item)) {
+ $this->_buf .= $this->_quote((string) $item);
+ }
+ elseif (isa($item, 'Cached_DynamicContent')) {
+ if ($this->_buf) {
+ $this->_content[] = $this->_buf;
+ $this->_buf = '';
+ }
+ $this->_content[] = $item;
+ }
+ elseif (isa($item, 'XmlElement')) {
+ if ($item->isEmpty()) {
+ $this->_buf .= $item->emptyTag();
+ }
+ else {
+ $this->_buf .= $item->startTag();
+ foreach ($item->getContent() as $subitem)
+ $this->_append($subitem);
+ $this->_buf .= "</$item->_tag>";
if (!$this->getDescription() and $item->getTag() == 'p') {
// performance: when is this really needed?
$this->_glean_description($item->asString());
}
- }
- if (!$item->isInlineElement())
- $this->_buf .= "\n";
- }
- elseif (isa($item, 'XmlContent')) {
- foreach ($item->getContent() as $item)
- $this->_append($item);
- }
- elseif (method_exists($item, 'asXML')) {
- $this->_buf .= $item->asXML();
- }
- elseif (method_exists($item, 'asString')) {
- $this->_buf .= $this->_quote($item->asString());
- }
- else {
- $this->_buf .= sprintf("==Object(%s)==", get_class($item));
- }
+ }
+ if (!$item->isInlineElement())
+ $this->_buf .= "\n";
}
+ elseif (isa($item, 'XmlContent')) {
+ foreach ($item->getContent() as $item)
+ $this->_append($item);
+ }
+ elseif (method_exists($item, 'asXML')) {
+ $this->_buf .= $item->asXML();
+ }
+ elseif (method_exists($item, 'asString')) {
+ $this->_buf .= $this->_quote($item->asString());
+ }
+ else {
+ $this->_buf .= sprintf("==Object(%s)==", get_class($item));
+ }
+ }
function _glean_description($text) {
static $two_sentences;
@@ -181,7 +181,7 @@
. ".*"
. "[.?!][\")]*\s*[\"(]*([[:upper:])]|$)";
}
-
+
if (!isset($this->_description) and preg_match("/$two_sentences/sx", $text))
$this->_description = preg_replace("/\s*\n\s*/", " ", trim($text));
}
@@ -204,12 +204,12 @@
function getDescription () {
return isset($this->_description) ? $this->_description : '';
}
-
+
function asXML () {
- $xml = '';
+ $xml = '';
$basepage = $this->_basepage;
-
- foreach ($this->_content as $item) {
+
+ foreach ($this->_content as $item) {
if (is_string($item)) {
$xml .= $item;
}
@@ -224,15 +224,15 @@
else {
$xml .= $item->asXML();
}
- }
- return $xml;
}
+ return $xml;
+ }
function printXML () {
$basepage = $this->_basepage;
// _content might be changed from a plugin (CreateToc)
- for ($i=0; $i < count($this->_content); $i++) {
- $item = $this->_content[$i];
+ for ($i=0; $i < count($this->_content); $i++) {
+ $item = $this->_content[$i];
if (is_string($item)) {
print $item;
}
@@ -240,8 +240,8 @@
check_php_version(5)
? 'Cached_DynamicContent'
: 'cached_dynamiccontent'))
- { // give the content the chance to know about itself or even
- // to change itself
+ { // give the content the chance to know about itself or even
+ // to change itself
$val = $item->expand($basepage, $this);
if ($val) $val->printXML();
else trigger_error('empty item ' . print_r($item, true));
@@ -249,8 +249,8 @@
else {
$item->printXML();
}
- }
}
+ }
}
/**
@@ -262,7 +262,7 @@
class Cached_DynamicContent {
function cache(&$cache) {
- $cache[] = $this;
+ $cache[] = $this;
}
function expand($basepage, &$obj) {
@@ -276,18 +276,18 @@
class XmlRpc_LinkInfo {
function XmlRpc_LinkInfo($page, $type, $href, $relation = '') {
- $this->page = $page;
- $this->type = $type;
- $this->href = $href;
- $this->relation = $relation;
- //$this->pageref = str_replace("/RPC2.php", "/index.php", $href);
+ $this->page = $page;
+ $this->type = $type;
+ $this->href = $href;
+ $this->relation = $relation;
+ //$this->pageref = str_replace("/RPC2.php", "/index.php", $href);
}
}
class Cached_Link extends Cached_DynamicContent {
function isInlineElement() {
- return true;
+ return true;
}
/** Get link info (for XML-RPC support)
@@ -296,17 +296,17 @@
* (See http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=WikiRPCInterface)
*/
function getLinkInfo($basepage) {
- return new XmlRpc_LinkInfo($this->_getName($basepage),
+ return new XmlRpc_LinkInfo($this->_getName($basepage),
$this->_getType(),
$this->_getURL($basepage),
$this->_getRelation($basepage));
}
-
+
function _getURL($basepage) {
- return $this->_url;
+ return $this->_url;
}
function __getRelation($basepage) {
- return $this->_relation;
+ return $this->_relation;
}
}
/*
@@ -315,55 +315,55 @@
*/
class Cached_InlinedImage extends Cached_DynamicContent {
function isInlineElement() {
- return true;
+ return true;
}
function _getURL($basepage) {
- return $this->_url;
+ return $this->_url;
}
// TODO: fix interwiki inline links in case of static dumps
function expand($basepage, &$markup) {
- global $WikiTheme;
- $this->_basepage = $basepage;
- $label = isset($this->_label) ? $this->_label : false;
- if ($WikiTheme->DUMP_MODE) {
+ global $WikiTheme;
+ $this->_basepage = $basepage;
+ $label = isset($this->_label) ? $this->_label : false;
+ if ($WikiTheme->DUMP_MODE) {
// In case of static dumps we need to check if we should
// inline the image or not: external: keep link, internal: copy locally
- return LinkImage($label);
- } else {
- return LinkImage($label);
- }
+ return LinkImage($label);
+ } else {
+ return LinkImage($label);
}
+ }
}
class Cached_WikiLink extends Cached_Link {
function Cached_WikiLink ($page, $label = false, $anchor = false) {
- $this->_page = $page;
- /* ":DontStoreLink" */
- if (substr($this->_page,0,1) == ':') {
- $this->_page = substr($this->_page,1);
- $this->_nolink = true;
- }
+ $this->_page = $page;
+ /* ":DontStoreLink" */
+ if (substr($this->_page,0,1) == ':') {
+ $this->_page = substr($this->_page,1);
+ $this->_nolink = true;
+ }
if ($anchor)
$this->_anchor = $anchor;
if ($label and $label != $page)
$this->_label = $label;
- $this->_basepage = false;
+ $this->_basepage = false;
}
function _getType() {
return 'internal';
}
-
+
function getPagename($basepage) {
$page = new WikiPageName($this->_page, $basepage);
- if ($page->isValid()) return $page->name;
- else return false;
+ if ($page->isValid()) return $page->name;
+ else return false;
}
function getWikiPageLinks($basepage) {
if ($basepage == '') return false;
- if (isset($this->_nolink)) return false;
+ if (isset($this->_nolink)) return false;
if ($link = $this->getPagename($basepage))
return array(array('linkto' => $link));
else
@@ -371,41 +371,41 @@
}
function _getName($basepage) {
- return $this->getPagename($basepage);
+ return $this->getPagename($basepage);
}
function _getURL($basepage) {
- return WikiURL($this->getPagename($basepage));
- //return WikiURL($this->getPagename($basepage), false, 'abs_url');
+ return WikiURL($this->getPagename($basepage));
+ //return WikiURL($this->getPagename($basepage), false, 'abs_url');
}
function expand($basepage, &$markup) {
- global $WikiTheme;
- $this->_basepage = $basepage;
- $label = isset($this->_label) ? $this->_label : false;
- $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+ global $WikiTheme;
+ $this->_basepage = $basepage;
+ $label = isset($this->_label) ? $this->_label : false;
+ $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
$page = new WikiPageName($this->_page, $basepage, $anchor);
- if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
- if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : $page->getName());
- }
+ if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
+ if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : $page->getName());
+ }
if ($page->isValid()) return WikiLink($page, 'auto', $label);
- else return HTML($label);
+ else return HTML($label);
}
function asXML() {
- global $WikiTheme;
- $label = isset($this->_label) ? $this->_label : false;
- $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
- //TODO: need basepage for subpages like /Remove (within CreateTOC)
+ global $WikiTheme;
+ $label = isset($this->_label) ? $this->_label : false;
+ $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+ //TODO: need basepage for subpages like /Remove (within CreateTOC)
$page = new WikiPageName($this->_page, $this->_basepage, $anchor);
- if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
- if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
- return $label ? $label : $page->getName();
- }
- $link = WikiLink($page, 'auto', $label);
- return $link->asXML();
+ if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+ if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return $label ? $label : $page->getName();
}
+ $link = WikiLink($page, 'auto', $label);
+ return $link->asXML();
+ }
function asString() {
if (isset($this->_label))
@@ -417,54 +417,54 @@
class Cached_WikiLinkIfKnown extends Cached_WikiLink
{
function Cached_WikiLinkIfKnown ($moniker) {
- $this->_page = $moniker;
+ $this->_page = $moniker;
}
function expand($basepage, &$markup) {
- global $WikiTheme;
- if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
- if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : $page->getName());
- }
+ global $WikiTheme;
+ if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+ if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : $page->getName());
+ }
return WikiLink($this->_page, 'if_known');
}
-}
+}
class Cached_SpellCheck extends Cached_WikiLink
{
function Cached_SpellCheck ($word, $suggs) {
- $this->_page = $word;
- $this->suggestions = $suggs;
+ $this->_page = $word;
+ $this->suggestions = $suggs;
}
function expand($basepage, &$markup) {
$link = HTML::a(array('class' => 'spell-wrong',
- 'title' => 'SpellCheck: '.join(', ', $this->suggestions),
- 'name' => $this->_page),
- $this->_page);
+ 'title' => 'SpellCheck: '.join(', ', $this->suggestions),
+ 'name' => $this->_page),
+ $this->_page);
return $link;
}
-}
-
+}
+
class Cached_PhpwikiURL extends Cached_DynamicContent
{
function Cached_PhpwikiURL ($url, $label) {
- $this->_url = $url;
+ $this->_url = $url;
if ($label)
$this->_label = $label;
}
function isInlineElement() {
- return true;
+ return true;
}
function expand($basepage, &$markup) {
- global $WikiTheme;
+ global $WikiTheme;
$label = isset($this->_label) ? $this->_label : false;
- if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
- if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : $page->getName());
- }
+ if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+ if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : $page->getName());
+ }
return LinkPhpwikiURL($this->_url, $label, $basepage);
}
@@ -479,7 +479,7 @@
return $this->_label;
return $this->_url;
}
-}
+}
/*
* Relations (::) are named links to pages.
@@ -494,21 +494,21 @@
class Cached_SemanticLink extends Cached_WikiLink {
function Cached_SemanticLink ($url, $label=false) {
- $this->_url = $url;
+ $this->_url = $url;
if ($label && $label != $url)
$this->_label = $label;
$this->_expandurl($this->_url);
}
function isInlineElement() {
- return true;
+ return true;
}
function getPagename($basepage) {
- if (!isset($this->_page)) return false;
- $page = new WikiPageName($this->_page, $basepage);
- if ($page->isValid()) return $page->name;
- else return false;
+ if (!isset($this->_page)) return false;
+ $page = new WikiPageName($this->_page, $basepage);
+ if ($page->isValid()) return $page->name;
+ else return false;
}
/* Add relation to the link table.
@@ -516,14 +516,14 @@
*/
function getWikiPageLinks($basepage) {
if ($basepage == '') return false;
- if (!isset($this->_page) and isset($this->_attribute)) {
+ if (!isset($this->_page) and isset($this->_attribute)) {
// An attribute: we store it in the basepage now, to fill the cache for page->save
// TODO: side-effect free query
$page = $GLOBALS['request']->getPage($basepage);
$page->setAttribute($this->_relation, $this->_attribute);
$this->_page = $basepage;
return array(array('linkto' => '', 'relation' => $this->_relation));
- }
+ }
if ($link = $this->getPagename($basepage))
return array(array('linkto' => $link, 'relation' => $this->_relation));
else
@@ -535,67 +535,67 @@
if (!preg_match('/^ ([^:]+) (:[:=]) (.+) $/x', $url, $m)) {
return HTML::span(array('class' => 'error'), _("BAD semantic relation link"));
}
- $this->_relation = urldecode($m[1]);
+ $this->_relation = urldecode($m[1]);
$is_attribute = ($m[2] == ':=');
if ($is_attribute) {
$this->_attribute = urldecode($m[3]);
- // since this stored in the markup cache, we are extra sensible
- // not to store false empty stuff.
- $units = new Units();
+ // since this stored in the markup cache, we are extra sensible
+ // not to store false empty stuff.
+ $units = new Units();
if (!DISABLE_UNITS and !$units->errcode)
- {
- $this->_attribute_base = $units->Definition($this->_attribute);
- $this->_unit = $units->baseunit($this->_attribute);
- }
+ {
+ $this->_attribute_base = $units->Definition($this->_attribute);
+ $this->_unit = $units->baseunit($this->_attribute);
+ }
} else {
- $this->_page = urldecode($m[3]);
+ $this->_page = urldecode($m[3]);
}
- return $m;
+ return $m;
}
function _expand($url, $label = false) {
- global $WikiTheme;
- $m = $this->_expandurl($url);
+ global $WikiTheme;
+ $m = $this->_expandurl($url);
$class = 'wiki';
// do not link to the attribute value, but to the attribute
$is_attribute = ($m[2] == ':=');
- if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
- if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page));
- }
- if ($is_attribute)
- $title = isset($this->_attribute_base)
- ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base)
- : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute);
+ if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+ if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page));
+ }
+ if ($is_attribute)
+ $title = isset($this->_attribute_base)
+ ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base)
+ : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute);
if ($label) {
return HTML::span
- (
- HTML::a(array('href' => WikiURL($is_attribute ? $this->_relation : $this->_page),
- 'class' => "wiki ".($is_attribute ? "attribute" : "relation"),
- 'title' => $is_attribute
- ? $title
- : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)),
- $label)
- );
+ (
+ HTML::a(array('href' => WikiURL($is_attribute ? $this->_relation : $this->_page),
+ 'class' => "wiki ".($is_attribute ? "attribute" : "relation"),
+ 'title' => $is_attribute
+ ? $title
+ : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)),
+ $label)
+ );
} elseif ($is_attribute) {
return HTML::span
- (
- HTML::a(array('href' => WikiURL($this->_relation),
- 'class' => "wiki attribute",
- 'title' => $title),
- $url)
- );
+ (
+ HTML::a(array('href' => WikiURL($this->_relation),
+ 'class' => "wiki attribute",
+ 'title' => $title),
+ $url)
+ );
} else {
return HTML::span
- (
- HTML::a(array('href' => WikiURL($this->_relation),
- 'class' => "wiki relation"),
- $this->_relation),
- HTML::span(array('class'=>'relation-symbol'), $m[2]),
- HTML::a(array('href' => WikiURL($this->_page),
- 'class' => "wiki"),
- $this->_page)
- );
+ (
+ HTML::a(array('href' => WikiURL($this->_relation),
+ 'class' => "wiki relation"),
+ $this->_relation),
+ HTML::span(array('class'=>'relation-symbol'), $m[2]),
+ HTML::a(array('href' => WikiURL($this->_page),
+ 'class' => "wiki"),
+ $this->_page)
+ );
}
}
@@ -623,8 +623,8 @@
class Cached_SearchHighlight extends Cached_DynamicContent
{
function Cached_SearchHighlight ($word, $engine) {
- $this->_word = $word;
- $this->engine = $engine;
+ $this->_word = $word;
+ $this->engine = $engine;
}
function expand($basepage, &$markup) {
@@ -632,12 +632,12 @@
'title' => _("Found by ") . $this->engine),
$this->_word);
}
-}
-
+}
+
class Cached_ExternalLink extends Cached_Link {
function Cached_ExternalLink($url, $label=false) {
- $this->_url = $url;
+ $this->_url = $url;
if ($label && $label != $url)
$this->_label = $label;
}
@@ -645,17 +645,17 @@
function _getType() {
return 'external';
}
-
+
function _getName($basepage) {
- $label = isset($this->_label) ? $this->_label : false;
- return ($label and is_string($label)) ? $label : $this->_url;
+ $label = isset($this->_label) ? $this->_label : false;
+ return ($label and is_string($label)) ? $label : $this->_url;
}
function expand($basepage, &$markup) {
global $request;
- $label = isset($this->_label) ? $this->_label : false;
- $link = LinkURL($this->_url, $label);
+ $label = isset($this->_label) ? $this->_label : false;
+ $link = LinkURL($this->_url, $label);
if (GOOGLE_LINKS_NOFOLLOW) {
// Ignores nofollow when the user who saved the page was authenticated.
@@ -675,26 +675,26 @@
}
class Cached_InterwikiLink extends Cached_ExternalLink {
-
+
function Cached_InterwikiLink($link, $label=false) {
- $this->_link = $link;
+ $this->_link = $link;
if ($label)
$this->_label = $label;
}
function getPagename($basepage) {
list ($moniker, $page) = explode (":", $this->_link, 2);
- $page = new WikiPageName($page, $basepage);
- if ($page->isValid()) return $page->name;
- else return false;
+ $page = new WikiPageName($page, $basepage);
+ if ($page->isValid()) return $page->name;
+ else return false;
}
function getWikiPageLinks($basepage) {
if ($basepage == '') return false;
- /* ":DontStoreLink" */
- if (substr($this->_link,0,1) == ':') return false;
- /* store only links to valid pagenames */
- $dbi = $GLOBALS['request']->getDbh();
+ /* ":DontStoreLink" */
+ if (substr($this->_link,0,1) == ':') return false;
+ /* store only links to valid pagenames */
+ $dbi = $GLOBALS['request']->getDbh();
if ($link = $this->getPagename($basepage) and $dbi->isWikiPage($link)) {
return array(array('linkto' => $link));
} else {
@@ -703,31 +703,31 @@
}
function _getName($basepage) {
- $label = isset($this->_label) ? $this->_label : false;
- return ($label and is_string($label)) ? $label : $this->_link;
+ $label = isset($this->_label) ? $this->_label : false;
+ return ($label and is_string($label)) ? $label : $this->_link;
}
-
+
/* there may be internal interwiki links also */
function _getType() {
return $this->getPagename(false) ? 'internal' : 'external';
}
function _getURL($basepage) {
- $link = $this->expand($basepage, $this);
- return $link->getAttr('href');
+ $link = $this->expand($basepage, $this);
+ return $link->getAttr('href');
}
function expand($basepage, &$markup) {
- global $WikiTheme;
- $intermap = getInterwikiMap();
- $label = isset($this->_label) ? $this->_label : false;
- //FIXME: check Upload: inlined images
- if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
- if (!in_array($this->_link, $WikiTheme->VALID_LINKS))
- return HTML($label ? $label : $this->_link);
- }
- return $intermap->link($this->_link, $label);
+ global $WikiTheme;
+ $intermap = getInterwikiMap();
+ $label = isset($this->_label) ? $this->_label : false;
+ //FIXME: check Upload: inlined images
+ if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
+ if (!in_array($this->_link, $WikiTheme->VALID_LINKS))
+ return HTML($label ? $label : $this->_link);
}
+ return $intermap->link($this->_link, $label);
+ }
function asString() {
if (isset($this->_label))
@@ -742,9 +742,9 @@
class Cached_UserLink extends Cached_WikiLink {
function expand($basepage, &$markup) {
$label = isset($this->_label) ? $this->_label : false;
- $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+ $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
$page = new WikiPageName($this->_page, $basepage, $anchor);
- $link = WikiLink($page, 'auto', $label);
+ $link = WikiLink($page, 'auto', $label);
// $link = HTML::a(array('href' => $PageName));
$link->setContent(PossiblyGlueIconToText('wikiuser', $this->_page));
$link->setAttr('class', 'wikiuser');
@@ -760,8 +760,8 @@
class Cached_PluginInvocation extends Cached_DynamicContent {
function Cached_PluginInvocation ($pi) {
- $this->_pi = $pi;
- $loader = $this->_getLoader();
+ $this->_pi = $pi;
+ $loader = $this->_getLoader();
if (is_array($plugin_cmdline = $loader->parsePI($pi)) and $plugin_cmdline[1]) {
$this->pi_name = $plugin_cmdline[0]; // plugin, plugin-form, plugin-list
$this->name = $plugin_cmdline[1]->getName();
@@ -771,9 +771,9 @@
function setTightness($top, $bottom) {
}
-
+
function isInlineElement() {
- return false;
+ return false;
}
function expand($basepage, &$markup) {
@@ -795,9 +795,9 @@
function & _getLoader() {
static $loader = false;
- if (!$loader) {
+ if (!$loader) {
include_once('lib/WikiPlugin.php');
- $loader = new WikiPluginLoader;
+ $loader = new WikiPluginLoader;
}
return $loader;
}
@@ -809,5 +809,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/Captcha.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -11,7 +11,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This File is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -35,20 +35,20 @@
function captchaword() {
if ( ! $this->request->getSessionVar('captchaword')) {
- $this->request->setSessionVar('captchaword', $this->get_word());
- }
+ $this->request->setSessionVar('captchaword', $this->get_word());
+ }
return $this->request->getSessionVar('captchaword');
}
function Failed () {
if ($this->request->getSessionVar('captcha_ok') == true)
return false;
-
+
if ( ! array_key_exists ( 'captcha_input', $this->meta )
or ($this->request->getSessionVar('captchaword')
and ($this->request->getSessionVar('captchaword') != $this->meta['captcha_input'])))
return true;
-
+
$this->request->setSessionVar('captcha_ok', true);
return false;
}
@@ -70,9 +70,9 @@
return $el;
}
- function get_word () {
+ function get_word () {
if (USE_CAPTCHA_RANDOM_WORD)
- return get_dictionary_word();
+ return get_dictionary_word();
else
return rand_ascii_readable($this->length); // lib/stdlib.php
}
@@ -99,10 +99,10 @@
// Draw the Spiral
function spiral( &$im, $origin_x = 100, $origin_y = 100, $r = 0, $g = 0, $b = 0 ) {
$theta = 1;
- $thetac = 6;
- $radius = 15;
- $circles = 10;
- $points = 35;
+ $thetac = 6;
+ $radius = 15;
+ $circles = 10;
+ $points = 35;
$lcolor = imagecolorallocate( $im, $r, $g, $b );
for( $i = 0; $i < ( $circles * $points ) - 1; $i++ ) {
$theta = $theta + $thetac;
@@ -121,7 +121,7 @@
function image ( $word ) {
$width =& $this->width;
$height =& $this->height;
-
+
// Create the Image
$jpg = ImageCreate($width,$height);
$bg = ImageColorAllocate($jpg,255,255,255);
@@ -134,7 +134,7 @@
$x = rand(10, 30);
$y = rand(50, $height-20); //50-60
-
+
// randomize the chars
for ($i=0; $i < strlen($word); $i++) {
$angle += rand(-5, 5);
@@ -145,8 +145,8 @@
if ( $y < 10 ) $y = 11;
elseif ( $y > $height-10 ) $y = $height-11;
$x += rand($size, $size*2);
- imagettftext($jpg, $size, $angle, $x, $y, $tx,
- realpath(findfile("lib/captcha/Vera.ttf")),
+ imagettftext($jpg, $size, $angle, $x, $y, $tx,
+ realpath(findfile("lib/captcha/Vera.ttf")),
$word[$i]);
}
@@ -159,19 +159,19 @@
imageline($jpg, 0,$height-1,$width-1,$height-1,$tx);
imageline($jpg, $width-1,0,$width-1,$height-1,$tx);
- if (function_exists("ImageJpeg")) {
- header("Content-type: image/jpeg");
- ImageJpeg($jpg);
- } elseif (function_exists("ImagePNG")) {
- header("Content-type: image/png");
- ImagePNG($jpg);
- } elseif (function_exists("ImageGIF")) {
- header("Content-type: image/gif");
- ImageGIF($jpg);
- } else {
- trigger_error("missing GD bitmap support", E_USER_WARNING);
- }
+ if (function_exists("ImageJpeg")) {
+ header("Content-type: image/jpeg");
+ ImageJpeg($jpg);
+ } elseif (function_exists("ImagePNG")) {
+ header("Content-type: image/png");
+ ImagePNG($jpg);
+ } elseif (function_exists("ImageGIF")) {
+ header("Content-type: image/gif");
+ ImageGIF($jpg);
+ } else {
+ trigger_error("missing GD bitmap support", E_USER_WARNING);
}
+ }
}
@@ -181,5 +181,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/DbSession.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -29,7 +29,7 @@
$db_type = $dbh->getParam('dbtype');
if (isa($dbh, 'WikiDB')) {
@include_once("lib/DbSession/".$db_type.".php");
-
+
$class = "DbSession_".$db_type;
if (class_exists($class)) {
// dba has no ->_dbh, so this is used for the session link
@@ -43,7 +43,7 @@
$db_type), E_USER_WARNING);
return false;
}
-
+
function currentSessions() {
return $this->_backend->currentSessions();
}
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/DbaDatabase.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -18,9 +18,9 @@
if (!in_array($handler, dba_handlers()))
$this->_error(
sprintf(
- _("The DBA handler %s is unsupported!")."\n".
- _("Supported handlers are: %s"),
- $handler, join(",",dba_handlers())));
+ _("The DBA handler %s is unsupported!")."\n".
+ _("Supported handlers are: %s"),
+ $handler, join(",",dba_handlers())));
}
$this->readonly = false;
if ($mode)
@@ -30,11 +30,11 @@
function set_timeout($timeout) {
$this->_timeout = $timeout;
}
-
+
function open($mode = 'w') {
if ($this->_dbh)
return; // already open.
-
+
$watchdog = $this->_timeout;
global $ErrorManager;
@@ -53,9 +53,9 @@
if ((strlen($mode) == 1)) {
// PHP 4.3.x Windows lock bug workaround: http://bugs.php.net/bug.php?id=23975
if (isWindows()) {
- $mode .= "-"; // suppress locking, or
- } elseif ($this->_handler != 'gdbm') { // gdbm does it internally
- $mode .= "d"; // else use internal locking
+ $mode .= "-"; // suppress locking, or
+ } elseif ($this->_handler != 'gdbm') { // gdbm does it internally
+ $mode .= "d"; // else use internal locking
}
}
while (($dbh = dba_open($this->_file, $mode, $this->_handler)) < 1) {
@@ -96,7 +96,7 @@
$this->readonly = true;
if (!file_exists($this->_file)) {
$ErrorManager->handleError($error);
- flush();
+ flush();
}
}
else {
@@ -116,7 +116,7 @@
function exists($key) {
return dba_exists($key, $this->_dbh);
}
-
+
function fetch($key) {
$val = dba_fetch($key, $this->_dbh);
if ($val === false)
@@ -134,7 +134,7 @@
return $this->_error("replace($key)");
}
-
+
function firstkey() {
return dba_firstkey($this->_dbh);
}
@@ -182,7 +182,7 @@
return $this->_error("optimize()");
return 1;
}
-
+
function _error($mes) {
//trigger_error("DbaDatabase: $mes", E_USER_WARNING);
//return false;
@@ -207,5 +207,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/DbaListSet.php
===================================================================
--- trunk/lib/DbaListSet.php 2011-03-04 16:43:43 UTC (rev 7963)
+++ trunk/lib/DbaListSet.php 2011-03-05 17:05:30 UTC (rev 7964)
@@ -52,7 +52,7 @@
list( $prev , , ) = explode(':', $this->_dbh->fetch(intval($i)), 3);
return intval($prev);
}
-
+
function exists($i) {
$i = intval($i);
return $i && $this->_dbh->exists($i);
@@ -68,7 +68,7 @@
list($prev, $next,) = explode(':', $dbh->fetch(intval($i)), 3);
$dbh->replace($i, "$prev:$next:$data");
}
-
+
function insert_before($i, $data) {
assert(intval($i));
return $this->_insert_before_nc($i, $data);
@@ -78,7 +78,7 @@
assert(intval($i));
return $this->_insert_after_nc($i, $data);
}
-
+
function append($seq, $data) {
$key = "s" . urlencode($seq);
$this->_insert_before_nc($key, $data);
@@ -88,7 +88,7 @@
$key = "s" . urlencode($seq);
$this->_insert_after_nc($key, $data);
}
-
+
function _insert_before_nc($i, &$data) {
$newkey = $this->_new_key();...
[truncated message content] |
|
From: <var...@us...> - 2011-04-11 08:36:38
|
Revision: 8031
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8031&view=rev
Author: vargenau
Date: 2011-04-11 08:36:32 +0000 (Mon, 11 Apr 2011)
Log Message:
-----------
We assume PHP >= 4.3.9, so debug_backtrace exists
Modified Paths:
--------------
trunk/lib/ErrorManager.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB.php
trunk/lib/WikiTheme.php
trunk/tests/unit/test.php
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/lib/ErrorManager.php 2011-04-11 08:36:32 UTC (rev 8031)
@@ -274,8 +274,7 @@
if (defined('DEBUG') and (DEBUG & _DEBUG_TRACE)) {
echo "error_reporting=",error_reporting(),"\n<br />";
- if (function_exists("debug_backtrace")) // >= 4.3.0
- $error->printSimpleTrace(debug_backtrace());
+ $error->printSimpleTrace(debug_backtrace());
}
$this->_die($error);
}
@@ -299,8 +298,7 @@
$this->_noCacheHeaders();
if (defined('DEBUG') and (DEBUG & _DEBUG_TRACE)) {
echo "error_reporting=",error_reporting(),"\n";
- if (function_exists("debug_backtrace")) // >= 4.3.0
- $error->printSimpleTrace(debug_backtrace());
+ $error->printSimpleTrace(debug_backtrace());
}
$error->printXML();
}
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/lib/WikiDB/backend/PearDB.php 2011-04-11 08:36:32 UTC (rev 8031)
@@ -40,7 +40,7 @@
$ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_pear_notice_filter'));
$this->_pearerrhandler = true;
}
-
+
// Open connection to database
$this->_dsn = $dbparams['dsn'];
$this->_dbparams = $dbparams;
@@ -59,7 +59,7 @@
isset($dbparams['_tryroot_from_upgrade']) // hack!
? E_USER_WARNING : E_USER_ERROR);
if (isset($dbparams['_tryroot_from_upgrade']))
- return;
+ return;
}
$dbh->setErrorHandling(PEAR_ERROR_CALLBACK,
array($this, '_pear_error_callback'));
@@ -84,9 +84,9 @@
'maxversion' => "MAX(version)",
'notempty' => "<>''",
'iscontent' => "content<>''");
-
+
}
-
+
/**
* Close database connection.
*/
@@ -120,7 +120,7 @@
. " AND pagename='%s'",
$dbh->escapeSimple($pagename)));
}
-
+
function get_all_pagenames() {
$dbh = &$this->_dbh;
extract($this->_table_names);
@@ -136,7 +136,7 @@
. " FROM $nonempty_tbl, $page_tbl"
. " WHERE $nonempty_tbl.id=$page_tbl.id");
}
-
+
function increaseHitCount($pagename) {
$dbh = &$this->_dbh;
// Hits is the only thing we can update in a fast manner.
@@ -192,7 +192,7 @@
$data = array();
$this->_get_pageid($pagename, true); // Creates page record
}
-
+
$hits = !empty($data['hits']) ? (int)$data['hits'] : 0;
unset($data['hits']);
@@ -239,7 +239,7 @@
}
function _get_pageid($pagename, $create_if_missing = false) {
-
+
// check id_cache
global $request;
$cache =& $request->_dbi->_cache->_id_cache;
@@ -254,7 +254,7 @@
$dbh = &$this->_dbh;
$page_tbl = $this->_table_names['page_tbl'];
-
+
$query = sprintf("SELECT id FROM $page_tbl WHERE pagename='%s'",
$dbh->escapeSimple($pagename));
@@ -291,7 +291,7 @@
function get_previous_version($pagename, $version) {
$dbh = &$this->_dbh;
extract($this->_table_names);
-
+
return
(int)$dbh->getOne(sprintf("SELECT version"
. " FROM $version_tbl, $page_tbl"
@@ -305,7 +305,7 @@
$dbh->escapeSimple($pagename),
$version));
}
-
+
/**
* Get version data.
*
@@ -321,7 +321,7 @@
assert(is_string($pagename) and $pagename != "");
assert($version > 0);
-
+
//trigger_error("GET_REVISION $pagename $version $want_content", E_USER_NOTICE);
// FIXME: optimization: sometimes don't get page data?
if ($want_content) {
@@ -358,10 +358,10 @@
base64_decode($query_result['versiondata']);
}
$data = $this->_unserialize($query_result['versiondata']);
-
+
$data['mtime'] = $query_result['mtime'];
$data['is_minor_edit'] = !empty($query_result['minor_edit']);
-
+
if (isset($query_result['content']))
$data['%content'] = $query_result['content'];
elseif ($query_result['have_content'])
@@ -387,10 +387,10 @@
function set_versiondata($pagename, $version, $data) {
$dbh = &$this->_dbh;
$version_tbl = $this->_table_names['version_tbl'];
-
+
$minor_edit = (int) !empty($data['is_minor_edit']);
unset($data['is_minor_edit']);
-
+
$mtime = (int)$data['mtime'];
unset($data['mtime']);
assert(!empty($mtime));
@@ -399,7 +399,7 @@
unset($data['%content']);
unset($data['%pagedata']);
-
+
$this->lock();
$id = $this->_get_pageid($pagename, true);
@@ -415,10 +415,10 @@
$this->_update_recent_table($id);
$this->_update_nonempty_table($id);
-
+
$this->unlock();
}
-
+
/**
* Delete an old revision of a page.
*/
@@ -469,7 +469,7 @@
function purge_page($pagename) {
$dbh = &$this->_dbh;
extract($this->_table_names);
-
+
$this->lock();
if ( ($id = $this->_get_pageid($pagename, false)) ) {
$dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id");
@@ -532,7 +532,6 @@
$linkid = $this->_get_pageid($linkto, true);
if (!$linkid) {
echo("No link for $linkto on page $pagename");
- //printSimpleTrace(debug_backtrace());
trigger_error("No link for $linkto on page $pagename");
}
assert($linkid);
@@ -543,7 +542,7 @@
}
$this->unlock();
}
-
+
/**
* Find pages which link to or are linked from a page.
*
@@ -589,7 +588,7 @@
} else {
$result = $dbh->query($sql);
}
-
+
return new WikiDB_backend_PearDB_iter($this, $result);
}
@@ -672,7 +671,7 @@
}
return new WikiDB_backend_PearDB_iter($this, $result, $options);
}
-
+
/**
* Title search.
* Todo: exclude
@@ -691,7 +690,7 @@
if (!class_exists($searchclass))
$searchclass = "WikiDB_backend_PearDB_search";
$searchobj = new $searchclass($search, $dbh);
-
+
$table = "$nonempty_tbl, $page_tbl";
$join_clause = "$nonempty_tbl.id=$page_tbl.id";
$fields = $this->page_tbl_fields;
@@ -709,7 +708,7 @@
$callback = new WikiMethodCb($searchobj, "_pagename_match_clause");
}
$search_clause = $search->makeSqlClauseObj($callback);
-
+
$sql = "SELECT $fields FROM $table"
. " WHERE $join_clause"
. " AND ($search_clause)"
@@ -720,7 +719,7 @@
} else {
$result = $dbh->query($sql);
}
-
+
$iter = new WikiDB_backend_PearDB_iter($this, $result);
$iter->stoplisted = @$searchobj->stoplisted;
return $iter;
@@ -811,7 +810,6 @@
if ($since)
$pick[] = "mtime >= $since";
-
if ($include_all_revisions) {
// Include all revisions of each page.
$table = "$page_tbl, $version_tbl";
@@ -831,7 +829,7 @@
$join_clause = "$page_tbl.id=$recent_tbl.id";
$table .= ", $version_tbl";
$join_clause .= " AND $version_tbl.id=$page_tbl.id";
-
+
if ($exclude_major_revisions) {
// Include only most recent minor revision
$pick[] = 'version=latestminor';
@@ -916,7 +914,7 @@
function rename_page ($pagename, $to) {
$dbh = &$this->_dbh;
extract($this->_table_names);
-
+
$this->lock();
if (($id = $this->_get_pageid($pagename, false)) ) {
if ($new = $this->_get_pageid($to, false)) {
@@ -976,7 +974,7 @@
//. " AND content<>''"
. " AND content $notempty"
. ( $pageid ? " AND $recent_tbl.id=$pageid" : ""));
-
+
$this->unlock();
}
@@ -1000,7 +998,7 @@
function _lock_tables($write_lock) {
trigger_error("virtual", E_USER_ERROR);
}
-
+
/**
* Release a write lock on the tables in the SQL database.
*
@@ -1044,7 +1042,7 @@
function _unserialize($data) {
return empty($data) ? array() : unserialize($data);
}
-
+
/**
* Callback for PEAR (DB) errors.
*
@@ -1055,7 +1053,7 @@
function _pear_error_callback($error) {
if ($this->_is_false_error($error))
return;
-
+
$this->_dbh->setErrorHandling(PEAR_ERROR_PRINT); // prevent recursive loops.
$this->close();
trigger_error($this->_pear_error_message($error), E_USER_ERROR);
@@ -1084,13 +1082,13 @@
//" <--kludge for brain-dead syntax coloring
return false;
}
-
+
if (! in_array('ismanip', get_class_methods('DB'))) {
// Pear shipped with PHP 4.0.4pl1 (and before, presumably)
// does not have the DB::isManip method.
return true;
}
-
+
if (DB::isManip($query)) {
// If Pear thinks it's an isManip then it wouldn't have thrown
// the error we're testing for....
@@ -1187,7 +1185,7 @@
// This shouldn't happen, I thought.
$backend->_pear_error_callback($query_result);
}
-
+
$this->_backend = &$backend;
$this->_result = $query_result;
$this->_options = $field_list;
@@ -1198,7 +1196,7 @@
return false;
return $this->_result->numRows();
}
-
+
function next() {
if (!$this->_result)
return false;
@@ -1208,7 +1206,7 @@
$this->free();
return false;
}
-
+
return $record;
}
@@ -1247,7 +1245,7 @@
$this->free();
return false;
}
-
+
$pagedata = $backend->_extract_page_data($record);
$rec = array('pagename' => $record['pagename'],
'pagedata' => $pagedata);
@@ -1256,7 +1254,7 @@
$rec['versiondata'] = $backend->_extract_version_data($record);
$rec['version'] = $record['version'];
}
-
+
return $rec;
}
}
@@ -1273,5 +1271,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/lib/WikiDB.php 2011-04-11 08:36:32 UTC (rev 8031)
@@ -675,9 +675,7 @@
// SQL result: for simple select or create/update queries
// returns the database specific resource type
function genericSqlQuery($sql, $args=false) {
- if (function_exists('debug_backtrace')) { // >= 4.3.0
- echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
- }
+ echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
trigger_error("no SQL database", E_USER_ERROR);
return false;
}
@@ -685,9 +683,7 @@
// SQL iter: for simple select or create/update queries
// returns the generic iterator object (count,next)
function genericSqlIter($sql, $field_list = NULL) {
- if (function_exists('debug_backtrace')) { // >= 4.3.0
- echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
- }
+ echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
trigger_error("no SQL database", E_USER_ERROR);
return false;
}
@@ -738,7 +734,7 @@
if (!(is_string($pagename) and $pagename != '')) {
if (function_exists("xdebug_get_function_stack")) {
echo "xdebug_get_function_stack(): "; var_dump(xdebug_get_function_stack());
- } elseif (function_exists("debug_backtrace")) { // >= 4.3.0
+ } else {
printSimpleTrace(debug_backtrace());
}
trigger_error("empty pagename", E_USER_WARNING);
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/lib/WikiTheme.php 2011-04-11 08:36:32 UTC (rev 8031)
@@ -272,7 +272,7 @@
}
else if (!$missing_okay) {
trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
- if ((DEBUG & _DEBUG_TRACE) && function_exists('debug_backtrace')) { // >= 4.3.0
+ if ((DEBUG & _DEBUG_TRACE) {
echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
}
}
Modified: trunk/tests/unit/test.php
===================================================================
--- trunk/tests/unit/test.php 2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/tests/unit/test.php 2011-04-11 08:36:32 UTC (rev 8031)
@@ -98,7 +98,7 @@
array_push($database_backends, 'PDO_pqsql', 'PDO_sqlite', 'PDO_mysql');
//'PDO_oci', 'PDO_odbc'
-//TODO: convert cvs test
+//TODO: convert cvs test
// For "cvs" see the seperate tests/unit_test_backend_cvs.php (cvs is experimental)
//TODO: read some database values from config.ini, just use the "test_" prefix
// "flatfile" testing occurs in "tests/unit/.testbox/flatfile"
@@ -146,10 +146,8 @@
function assert_callback( $script, $line, $message ) {
echo "assert failed: script ", $script," line ", $line," :";
echo "$message";
- if (function_exists('debug_backtrace')) { // >= 4.3.0
- echo "Traceback:\n";
- printSimpleTrace(debug_backtrace());
- }
+ echo "Traceback:\n";
+ printSimpleTrace(debug_backtrace());
exit;
}
$foo = assert_options( ASSERT_CALLBACK, 'assert_callback');
@@ -386,7 +384,7 @@
elseif (!ini_get("register_argc_argv"))
echo "Could not read cmd args (register_argc_argv=Off?)\n";
// purge the testbox
-
+
$debug_level = 1; //was 9, _DEBUG_VERBOSE | _DEBUG_TRACE
//if (defined('E_STRICT')) $debug_level = 5; // add PARSER flag on php5
$user_level = 1; // BOGO (conflicts with RateIt)
@@ -417,7 +415,7 @@
}
} elseif (!empty($argv) and preg_match("/test\.php$/", $argv[0])) {
array_shift($argv);
-}
+}
if (!empty($argv)) {
$runtests = array();
$define = array();
@@ -635,7 +633,7 @@
$suite = new PHPUnit_TestSuite("phpwiki");
if (file_exists(dirname(__FILE__).'/lib/'.$test.'.php'))
require_once dirname(__FILE__).'/lib/'.$test.'.php';
- else
+ else
require_once dirname(__FILE__).'/lib/plugin/'.$test.'.php';
$suite->addTest( new PHPUnit_TestSuite($test) );
@@ -667,5 +665,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-04-11 09:22:39
|
Revision: 8034
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8034&view=rev
Author: vargenau
Date: 2011-04-11 09:22:33 +0000 (Mon, 11 Apr 2011)
Log Message:
-----------
We assume PHP >= 4.3.9, so dba_handlers exists
Modified Paths:
--------------
trunk/configurator.php
trunk/lib/DbaDatabase.php
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2011-04-11 08:56:56 UTC (rev 8033)
+++ trunk/configurator.php 2011-04-11 09:22:33 UTC (rev 8034)
@@ -723,7 +723,7 @@
'db3' => "DB3 - BerkeleyDB (Sleepycat) DB3. Default on Windows but not on every Linux",
'db4' => "DB4 - BerkeleyDB (Sleepycat) DB4."), "
Use 'gdbm', 'dbm', 'db2', 'db3' or 'db4' depending on your DBA handler methods supported: <br /> "
- . (function_exists("dba_handlers") ? join(", ",dba_handlers()) : "")
+ . join(", ",dba_handlers())
. "\n\nBetter not use other hacks such as inifile, flatfile or cdb");
$properties["dba timeout"] =
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2011-04-11 08:56:56 UTC (rev 8033)
+++ trunk/lib/DbaDatabase.php 2011-04-11 09:22:33 UTC (rev 8034)
@@ -14,14 +14,12 @@
$this->_handler = $handler;
$this->_timeout = DBA_DATABASE_DEFAULT_TIMEOUT;
$this->_dbh = false;
- if (function_exists("dba_handlers")) { // since php-4.3.0
- if (!in_array($handler, dba_handlers()))
- $this->_error(
- sprintf(
- _("The DBA handler %s is unsupported!")."\n".
- _("Supported handlers are: %s"),
- $handler, join(",",dba_handlers())));
- }
+ if (!in_array($handler, dba_handlers()))
+ $this->_error(
+ sprintf(
+ _("The DBA handler %s is unsupported!")."\n".
+ _("Supported handlers are: %s"),
+ $handler, join(",",dba_handlers())));
$this->readonly = false;
if ($mode)
$this->open($mode);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-05-18 14:56:25
|
Revision: 8071
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8071&view=rev
Author: vargenau
Date: 2011-05-18 14:56:14 +0000 (Wed, 18 May 2011)
Log Message:
-----------
New FSF address
Modified Paths:
--------------
trunk/LICENSE
trunk/admin/wiki2omega
trunk/config/migrate-phpwiki-config
trunk/configurator.php
trunk/g
trunk/index.php
trunk/lib/AccessLog.php
trunk/lib/ArchiveCleaner.php
trunk/lib/AtomParser.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/Captcha.php
trunk/lib/DbSession/ADODB.php
trunk/lib/EditToolbar.php
trunk/lib/Google.php
trunk/lib/HtmlParser.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/SemanticWeb.php
trunk/lib/SpamBlocklist.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/AdoDb.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/EMailConfirm.php
trunk/lib/WikiUser/Facebook.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/Forbidden.php
trunk/lib/WikiUser/FusionForge.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/IMAP.php
trunk/lib/WikiUser/LDAP.php
trunk/lib/WikiUser/LdapUpper.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/WikiUser/POP3.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser/PersonalPage.php
trunk/lib/WikiUser/Session.php
trunk/lib/WikiUserNew.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcServer.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/nusoap/nusoap.php
trunk/lib/pdf.php
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/AllUsers.php
trunk/lib/plugin/AnalyseAccessLogSql.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/AsciiMath.php
trunk/lib/plugin/AsciiSVG.php
trunk/lib/plugin/AtomFeed.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/BlogJournal.php
trunk/lib/plugin/BoxRight.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CategoryPage.php
trunk/lib/plugin/Chart.php
trunk/lib/plugin/Comment.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/CurrentTime.php
trunk/lib/plugin/DeadEndPages.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/DynamicIncludePage.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/ExternalSearch.php
trunk/lib/plugin/FacebookLike.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FoafViewer.php
trunk/lib/plugin/FrameInclude.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/FuzzyPages.php
trunk/lib/plugin/GoTo.php
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/GooglePlugin.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/HelloWorld.php
trunk/lib/plugin/HtmlConverter.php
trunk/lib/plugin/Imdb.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/IncludePages.php
trunk/lib/plugin/IncludeSiteMap.php
trunk/lib/plugin/IncludeTree.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/JabberPresence.php
trunk/lib/plugin/LdapSearch.php
trunk/lib/plugin/LikePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/ListRelations.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/NewPagesPerUser.php
trunk/lib/plugin/NoCache.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/OrphanedPages.php
trunk/lib/plugin/PageDump.php
trunk/lib/plugin/PageGroup.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PageInfo.php
trunk/lib/plugin/PageTrail.php
trunk/lib/plugin/PasswordReset.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PhpHighlight.php
trunk/lib/plugin/PhpWeather.php
trunk/lib/plugin/Ploticus.php
trunk/lib/plugin/PluginManager.php
trunk/lib/plugin/PopUp.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/PopularTags.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/PrevNext.php
trunk/lib/plugin/Processing.php
trunk/lib/plugin/RandomPage.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RawHtml.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/RecentComments.php
trunk/lib/plugin/RecentEdits.php
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/RedirectTo.php
trunk/lib/plugin/RelatedChanges.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/RssFeed.php
trunk/lib/plugin/SearchHighlight.php
trunk/lib/plugin/SemanticRelations.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/SqlResult.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/SyntaxHighlighter.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/TeX2png.php
trunk/lib/plugin/Template.php
trunk/lib/plugin/TexToPng.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/Transclude.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UnfoldSubpages.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/UriResolver.php
trunk/lib/plugin/UserPreferences.php
trunk/lib/plugin/UserRatings.php
trunk/lib/plugin/Video.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/plugin/WatchPage.php
trunk/lib/plugin/WhoIsOnline.php
trunk/lib/plugin/WikiAdminChmod.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminMarkup.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikiForm.php
trunk/lib/plugin/WikiFormRich.php
trunk/lib/plugin/WikiForum.php
trunk/lib/plugin/WikiPoll.php
trunk/lib/plugin/WikicreoleTable.php
trunk/lib/plugin/YouTube.php
trunk/lib/plugin/_AuthInfo.php
trunk/lib/plugin/_BackendInfo.php
trunk/lib/plugin/_GroupInfo.php
trunk/lib/plugin/_PreferencesInfo.php
trunk/lib/plugin/_Retransform.php
trunk/lib/plugin/_WikiTranslation.php
trunk/lib/plugin/text2png.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/wikilens/PageListColumns.php
trunk/lib/wikilens/RatingsUser.php
trunk/lib/wikilens/Utils.php
trunk/passencrypt.php
trunk/tests/CompatInfo.php
trunk/tests/unit/lib/AtomParserTest.php
trunk/tests/unit/lib/plugin/AtomFeedTest.php
trunk/tests/unit/test.php
trunk/themes/fusionforge/fusionforge-autonumbering.css
trunk/themes/fusionforge/fusionforge-fullscreen.css
trunk/themes/fusionforge/fusionforge-print.css
trunk/themes/fusionforge/fusionforge-rereading.css
trunk/themes/fusionforge/fusionforge.css
trunk/wikiadmin.php
Modified: trunk/LICENSE
===================================================================
--- trunk/LICENSE 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/LICENSE 2011-05-18 14:56:14 UTC (rev 8071)
@@ -303,9 +303,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
Modified: trunk/admin/wiki2omega
===================================================================
--- trunk/admin/wiki2omega 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/admin/wiki2omega 2011-05-18 14:56:14 UTC (rev 8071)
@@ -11,8 +11,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
=pod
Modified: trunk/config/migrate-phpwiki-config
===================================================================
--- trunk/config/migrate-phpwiki-config 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/config/migrate-phpwiki-config 2011-05-18 14:56:14 UTC (rev 8071)
@@ -19,9 +19,9 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with PhpWiki; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# 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.
# Store the values
# In the form $values{$varname} = (value, comment_state)
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/configurator.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -18,9 +18,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/g
===================================================================
--- trunk/g 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/g 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/*
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/index.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -25,9 +25,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
require_once (dirname(__FILE__).'/lib/prepend.php');
Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/AccessLog.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/ArchiveCleaner.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -14,9 +14,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
class ArchiveCleaner
Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/AtomParser.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
* This class is a poor-man Atom parser, it does no validation of the feed.
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/BlockParser.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
//require_once('lib/HtmlElement.php');
require_once('lib/CachedMarkup.php');
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/CachedMarkup.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
require_once("lib/Units.php");
Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/Captcha.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with This File; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License along
+ * with This File; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
class Captcha {
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/DbSession/ADODB.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -14,9 +14,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/EditToolbar.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/Google.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -19,8 +19,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ License along with this library; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
If you have any questions or comments, please email:
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/HtmlParser.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -20,9 +20,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/IniConfig.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -28,9 +28,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/InlineParser.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
* This is the code which deals with the inline part of the (new-style)
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/MailNotify.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/PageList.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/PagePerm.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/PageType.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
require_once('lib/CachedMarkup.php');
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/Request.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
class Request {
Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/RssParser.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -24,9 +24,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/SemanticWeb.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -98,9 +98,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
require_once('lib/RssWriter.php');
Modified: trunk/lib/SpamBlocklist.php
===================================================================
--- trunk/lib/SpamBlocklist.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/SpamBlocklist.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -14,9 +14,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*
*/
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/ADODB.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PDO.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_pgsql.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/*
Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/file.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend/flatfile.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/backend.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,8 +15,8 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/file.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
Modified: trunk/lib/WikiDB/flatfile.php
===================================================================
--- trunk/lib/WikiDB/flatfile.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiDB/flatfile.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
require_once( 'lib/WikiDB.php' );
Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiGroup.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
if (!defined('GROUP_METHOD') or
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiPluginCached.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiTheme.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -13,9 +13,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/AdoDb.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
include_once("lib/WikiUser/Db.php");
Modified: trunk/lib/WikiUser/BogoLogin.php
===================================================================
--- trunk/lib/WikiUser/BogoLogin.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/BogoLogin.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/** Without stored password. A _BogoLoginPassUser with password
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/Db.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiUser/EMailConfirm.php
===================================================================
--- trunk/lib/WikiUser/EMailConfirm.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/EMailConfirm.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
class _EMailConfirmPassUser
Modified: trunk/lib/WikiUser/Facebook.php
===================================================================
--- trunk/lib/WikiUser/Facebook.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/Facebook.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*
* From http://developeronline.blogspot.com/2008/10/using-perl-against-facebook-part-i.html:
* GET 'http://www.facebook.com/login.php', and rest our virtual browser there to collect the cookies
Modified: trunk/lib/WikiUser/File.php
===================================================================
--- trunk/lib/WikiUser/File.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/File.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
class _FilePassUser
Modified: trunk/lib/WikiUser/Forbidden.php
===================================================================
--- trunk/lib/WikiUser/Forbidden.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/Forbidden.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/FusionForge.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/** Call the FusionForge functions to get the username
Modified: trunk/lib/WikiUser/HttpAuth.php
===================================================================
--- trunk/lib/WikiUser/HttpAuth.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/HttpAuth.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiUser/HttpAuthUpper.php
===================================================================
--- trunk/lib/WikiUser/HttpAuthUpper.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/HttpAuthUpper.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiUser/IMAP.php
===================================================================
--- trunk/lib/WikiUser/IMAP.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/IMAP.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
class _IMAPPassUser
Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/LDAP.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
class _LDAPPassUser
Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/LdapUpper.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
include_once("lib/WikiUser/LDAP.php");
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/OpenID.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*
* This is not yet finished. We do not want to use zend extensions.
*
Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/POP3.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
require_once("lib/WikiUser/IMAP.php");
Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/PdoDb.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
include_once("lib/WikiUser/Db.php");
Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/PearDb.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
include_once("lib/WikiUser/Db.php");
Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/PersonalPage.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiUser/Session.php
===================================================================
--- trunk/lib/WikiUser/Session.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUser/Session.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -15,9 +15,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/WikiUserNew.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
-* You should have received a copy of the GNU General Public License
-* along with PhpWiki; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+* 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.
*/
/**
* This is a complete OOP rewrite of the old WikiUser code with various
Modified: trunk/lib/XmlParser.php
===================================================================
--- trunk/lib/XmlParser.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/XmlParser.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -33,9 +33,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*/
/**
Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php 2011-05-04 19:12:16 UTC (rev 8070)
+++ trunk/lib/XmlRpcServer.php 2011-05-18 14:56:14 UTC (rev 8071)
@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with PhpWiki; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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.
*
* LIBRARY USED - POSSIBLE PROBLEMS
* ================================
Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php 2011-05-04 19:12:16 UTC...
[truncated message content] |
|
From: <var...@us...> - 2011-06-01 12:33:32
|
Revision: 8090
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8090&view=rev
Author: vargenau
Date: 2011-06-01 12:33:26 +0000 (Wed, 01 Jun 2011)
Log Message:
-----------
In AllPages, include_empty is false by default
Modified Paths:
--------------
trunk/lib/plugin/AllPages.php
trunk/pgsrc/Help%2FAllPagesPlugin
Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php 2011-06-01 12:21:26 UTC (rev 8089)
+++ trunk/lib/plugin/AllPages.php 2011-06-01 12:33:26 UTC (rev 8090)
@@ -44,8 +44,7 @@
PageList::supportedArgs(),
array(
'noheader' => false,
- 'include_empty' => true, // is faster
- //'pages' => false, // DONT, this would be ListPages then.
+ 'include_empty' => false,
'info' => '',
'debug' => false,
'userpages' => false
Modified: trunk/pgsrc/Help%2FAllPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllPagesPlugin 2011-06-01 12:21:26 UTC (rev 8089)
+++ trunk/pgsrc/Help%2FAllPagesPlugin 2011-06-01 12:33:26 UTC (rev 8090)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Wed, 1 Jun 2011 14:29:50 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -26,11 +26,11 @@
! Default value
|-
| **noheader**
-| Boolean header should be omitted.
+| Boolean. If true, header should be omitted.
| false
|-
| **include_empty**
-| Boolean
+| Boolean. If true, pages that are referenced but not yet created are included in the list.
| false
|-
| **info**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-07-01 08:10:32
|
Revision: 8099
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8099&view=rev
Author: vargenau
Date: 2011-07-01 08:10:26 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
Add InterWikiMap to SpecialPages
Modified Paths:
--------------
trunk/pgsrc/SpecialPages
trunk/themes/fusionforge/pgsrc/SpecialPages
Modified: trunk/pgsrc/SpecialPages
===================================================================
--- trunk/pgsrc/SpecialPages 2011-06-09 10:04:10 UTC (rev 8098)
+++ trunk/pgsrc/SpecialPages 2011-07-01 08:10:26 UTC (rev 8099)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Fri, 1 Jul 2011 10:08:20 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,8 +8,8 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-{| cellpadding=5
-|- valign=top
+{| cellpadding="5"
+|- valign="top"
|
== Help ==
* [[Help:Help|Help]]
@@ -35,6 +35,9 @@
== Categories ==
* [[CategoryCategory]]
+
+== Interwikis ==
+* [[InterWikiMap]]
|
== Changes ==
* [[RecentChanges]]
Modified: trunk/themes/fusionforge/pgsrc/SpecialPages
===================================================================
--- trunk/themes/fusionforge/pgsrc/SpecialPages 2011-06-09 10:04:10 UTC (rev 8098)
+++ trunk/themes/fusionforge/pgsrc/SpecialPages 2011-07-01 08:10:26 UTC (rev 8099)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:47:11 +0000
+Date: Fri, 1 Jul 2011 10:08:24 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -8,8 +8,8 @@
charset=UTF-8
Content-Transfer-Encoding: binary
-{| cellpadding=5
-|- valign=top
+{| cellpadding="5"
+|- valign="top"
|
== Help ==
* [[Help:../Help|Help]]
@@ -37,6 +37,9 @@
== Categories ==
* [[CategoryCategory]]
+
+== Interwikis ==
+* [[InterWikiMap]]
|
== Changes ==
* [[RecentChanges]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-10-03 14:49:25
|
Revision: 8166
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8166&view=rev
Author: vargenau
Date: 2011-10-03 14:49:15 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Fix case to be consistent
Modified Paths:
--------------
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/WhoIsOnline.php
trunk/lib/plugin/WikiAdminRename.php
trunk/themes/MonoBook/templates/info.tmpl
trunk/themes/MonoBook/templates/navbar.tmpl
trunk/themes/Sidebar/templates/navbar.tmpl
trunk/themes/default/templates/info.tmpl
trunk/themes/fusionforge/templates/navbar.tmpl
Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php 2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/lib/plugin/GoogleMaps.php 2011-10-03 14:49:15 UTC (rev 8166)
@@ -100,7 +100,7 @@
case "Satellite": $type = "_SATELLITE_TYPE"; break;
case "Map": $type = "_MAP_TYPE"; break;
case "Hybrid": $type = "_HYBRID_TYPE"; break;
- default: return $this->error(sprintf(_("invalid argument %s"), $MapType));
+ default: return $this->error(sprintf(_("Invalid argument %s"), $MapType));
}
$div = HTML::div(array('id'=>$id,'style'=>'width: '.$width.'; height: '.$height));
Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php 2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/lib/plugin/WhoIsOnline.php 2011-10-03 14:49:15 UTC (rev 8166)
@@ -72,7 +72,7 @@
function box($args=false, $request=false, $basepage=false) {
if (!$request) $request =& $GLOBALS['request'];
$stats = $this->getStats($request->_dbi,$request,'summary');
- return $this->makeBox(_("Who is online"),
+ return $this->makeBox(_("Who is Online"),
HTML(HTML::Raw('· '),
WikiLink(_("WhoIsOnline"),'auto',
fmt("%d online users", $stats['NUM_USERS']))));
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/lib/plugin/WikiAdminRename.php 2011-10-03 14:49:15 UTC (rev 8166)
@@ -89,7 +89,7 @@
$version = $current->getVersion();
$meta = $current->_data;
$text = $current->getPackedContent();
- $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'"), $name, $newname);
+ $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'."), $name, $newname);
$meta['is_minor_edit'] = 1;
$meta['author'] = $request->_user->UserName();
unset($meta['mtime']); // force new date
@@ -104,7 +104,7 @@
$meta['author'] = $request->_user->UserName();
$page->save($text, 1, $meta);
}
- $ul->pushContent(HTML::li(fmt("Renamed page '%s' to '%s'.",
+ $ul->pushContent(HTML::li(fmt("Renamed page from '%s' to '%s'.",
$name, WikiLink($newname))));
$count++;
} else {
@@ -212,7 +212,7 @@
$header = $this->renameForm($header, $post_args, $singlepage);
} else {
if ($singlepage === true) {
- $button_label = _("Rename page");
+ $button_label = _("Rename Page");
} else {
$button_label = _("Rename selected pages");
}
@@ -238,7 +238,7 @@
return HTML::form(array('action' => $request->getPostURL(),
'method' => 'post'),
HTML::fieldset(
- HTML::legend(_("Rename page")),
+ HTML::legend(_("Rename Page")),
$header,
$buttons,
$list,
Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl 2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/MonoBook/templates/info.tmpl 2011-10-03 14:49:15 UTC (rev 8166)
@@ -156,7 +156,7 @@
$pagetype []= _("User page");
}
if (isActionPage($page->getName())) {
- $pagetype []= _("Action page");
+ $pagetype []= _("Action Page");
}
if ($page->get('pagetype') == 'wikiblog') {
$pagetype []= _("Blog page");
Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl 2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/MonoBook/templates/navbar.tmpl 2011-10-03 14:49:15 UTC (rev 8166)
@@ -58,7 +58,7 @@
<li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
<?php } ?>
<?php if ($user->isSignedIn()) { ?>
- <li><? $link = WikiLink(_("UpLoad"),"",_("Upload file")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
+ <li><? $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
<?php } ?>
<li>
<?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl 2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/Sidebar/templates/navbar.tmpl 2011-10-03 14:49:15 UTC (rev 8166)
@@ -48,7 +48,7 @@
<li id="t-whatlinkshere"><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
- <li><? $link = WikiLink(_("UpLoad"),"",_("Upload file")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
+ <li><? $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
<li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
<?php } ?>
<li>
Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl 2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/default/templates/info.tmpl 2011-10-03 14:49:15 UTC (rev 8166)
@@ -150,7 +150,7 @@
$pagetype []= _("User page");
}
if (isActionPage($page->getName())) {
- $pagetype []= _("Action page");
+ $pagetype []= _("Action Page");
}
if ($page->get('pagetype') == 'wikiblog') {
$pagetype []= _("Blog page");
Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl 2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/fusionforge/templates/navbar.tmpl 2011-10-03 14:49:15 UTC (rev 8166)
@@ -24,5 +24,5 @@
<?php if ($dbh->isWikiPage($username)) { ?>
<tr><td class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></td></tr>
<?php } ?>
- <tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("User Preferences")) ?></td></tr>
+ <tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("My Preferences")) ?></td></tr>
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-11-29 11:13:51
|
Revision: 8196
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8196&view=rev
Author: vargenau
Date: 2011-11-29 11:13:40 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
We have to use a smaller value for MAX_PAGENAME_LENGTH in Fusionforge than Phpwiki due to page prefix
Modified Paths:
--------------
trunk/g
trunk/lib/stdlib.php
Modified: trunk/g
===================================================================
--- trunk/g 2011-11-29 10:10:49 UTC (rev 8195)
+++ trunk/g 2011-11-29 11:13:40 UTC (rev 8196)
@@ -76,6 +76,9 @@
define('VIRTUAL_PATH', '/wiki/g/'.$group_name);
define('PAGE_PREFIX', '_g'.$group_id.'_');
+ // We have to use a smaller value than Phpwiki due to page prefix
+ define('MAX_PAGENAME_LENGTH', 92);
+
define('THEME', 'fusionforge');
// For FusionForge, we create some specific pages, located in the theme
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2011-11-29 10:10:49 UTC (rev 8195)
+++ trunk/lib/stdlib.php 2011-11-29 11:13:40 UTC (rev 8196)
@@ -108,7 +108,9 @@
if (defined('_PHPWIKI_STDLIB_LOADED')) return;
else define('_PHPWIKI_STDLIB_LOADED', true);
-define('MAX_PAGENAME_LENGTH', 100);
+if (!defined('MAX_PAGENAME_LENGTH')) {
+ define('MAX_PAGENAME_LENGTH', 100);
+}
/**
* Convert string to a valid XML identifier.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2011-12-15 16:27:27
|
Revision: 8206
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8206&view=rev
Author: vargenau
Date: 2011-12-15 16:27:16 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
Check mandatory 'data' argument is provided.
Modified Paths:
--------------
trunk/lib/plugin/Chart.php
trunk/pgsrc/Help%2FChartPlugin
Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php 2011-11-30 17:04:01 UTC (rev 8205)
+++ trunk/lib/plugin/Chart.php 2011-12-15 16:27:16 UTC (rev 8206)
@@ -73,7 +73,11 @@
global $WikiTheme;
$args = $this->getArgs($argstr, $request);
+ if (!$args['data']) {
+ return $this->error(_("No mandatory 'data' argument provided."));
+ }
extract($args);
+
$html = HTML();
$js = JavaScript('', array ('src' => $WikiTheme->_findData('ASCIIsvg.js')));
$html->pushContent($js);
Modified: trunk/pgsrc/Help%2FChartPlugin
===================================================================
--- trunk/pgsrc/Help%2FChartPlugin 2011-11-30 17:04:01 UTC (rev 8205)
+++ trunk/pgsrc/Help%2FChartPlugin 2011-12-15 16:27:16 UTC (rev 8206)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Thu, 15 Dec 2011 17:25:35 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -44,7 +44,7 @@
|-
| **data**
| Graph data: a list of numbers separated by comma
-| //none//
+| //none (mandatory argument)//
|}
== Examples ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-03-15 14:38:53
|
Revision: 8251
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8251&view=rev
Author: vargenau
Date: 2012-03-15 14:38:39 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
Add page PhpWikiAdministration/SetExternal for Fusionforge
Modified Paths:
--------------
trunk/lib/IniConfig.php
Added Paths:
-----------
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2012-03-15 14:37:36 UTC (rev 8250)
+++ trunk/lib/IniConfig.php 2012-03-15 14:38:39 UTC (rev 8251)
@@ -788,6 +788,7 @@
if (FUSIONFORGE) {
if (ENABLE_EXTERNAL_PAGES) {
$AllAllowedPlugins[] = 'WikiAdminSetExternal';
+ $AllActionPages[] = 'PhpWikiAdministration/SetExternal';
$AllActionPages[] = 'ExternalPages';
}
}
Added: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal (rev 0)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal 2012-03-15 14:38:39 UTC (rev 8251)
@@ -0,0 +1,14 @@
+Date: Thu, 15 Mar 2012 15:31:39 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+ pagename=PhpWikiAdministration%2FSetExternal;
+ flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+ markup=2;
+ charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<<WikiAdminSetExternal>>
+
+----
+[[CategoryActionPage]]
Property changes on: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
___________________________________________________________________
Added: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-04-06 13:14:44
|
Revision: 8257
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8257&view=rev
Author: vargenau
Date: 2012-04-06 13:14:38 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
Update WikiFormPlugin documentation
Modified Paths:
--------------
trunk/lib/plugin/WikiForm.php
trunk/pgsrc/Help%2FWikiFormPlugin
trunk/pgsrc/Help%2FWikiFormRichPlugin
Modified: trunk/lib/plugin/WikiForm.php
===================================================================
--- trunk/lib/plugin/WikiForm.php 2012-04-06 12:40:29 UTC (rev 8256)
+++ trunk/lib/plugin/WikiForm.php 2012-04-06 13:14:38 UTC (rev 8257)
@@ -37,8 +37,8 @@
}
function getDefaultArguments() {
- return array('action' => 'upload', // 'upload', 'loadfile', or
- // 'dumpserial'
+ return array('action' => 'upload', // 'upload', 'loadfile',
+ // 'dumphtml' or 'dumpserial'
'default' => false,
'buttontext' => false,
'overwrite' => false,
Modified: trunk/pgsrc/Help%2FWikiFormPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiFormPlugin 2012-04-06 12:40:29 UTC (rev 8256)
+++ trunk/pgsrc/Help%2FWikiFormPlugin 2012-04-06 13:14:38 UTC (rev 8257)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Fri, 6 Apr 2012 15:12:47 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -24,23 +24,26 @@
! Default value
|-
| **action**
-| upload, loadfile or dumpserial
+| upload, loadfile, dumphtml or dumpserial
| upload
|-
| **default**
-|
-| false
+| Default value in the input box
+| //empty//
|-
| **buttontext**
-|
-| false
+| Text displayed on the button
+| if action=upload, Upload \\
+if action=loadfile, Load File \\
+if action=dumphtml, Dump Pages as XHTML \\
+if action=dumpserial, Dump Pages
|-
| **overwrite**
-|
+| When loading pages, force overwrite or not
| false
|-
| **size**
-|
+| Size of the input box
| 50
|}
@@ -56,6 +59,7 @@
* [[PhpWiki:ReiniUrban|Reini Urban]]
== See Also ==
+* [[Help:WikiFormRichPlugin]]
<noinclude>
----
Modified: trunk/pgsrc/Help%2FWikiFormRichPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiFormRichPlugin 2012-04-06 12:40:29 UTC (rev 8256)
+++ trunk/pgsrc/Help%2FWikiFormRichPlugin 2012-04-06 13:14:38 UTC (rev 8257)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Fri, 6 Apr 2012 15:12:47 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -219,6 +219,9 @@
== Author ==
* [[PhpWiki:ReiniUrban|Reini Urban]]
+== See Also ==
+* [[Help:WikiFormRichPlugin]]
+
<noinclude>
----
[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-04-12 14:27:01
|
Revision: 8264
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8264&view=rev
Author: vargenau
Date: 2012-04-12 14:26:50 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Viewing wiki documents on FusionForge private projects
Modified Paths:
--------------
trunk/g
Added Paths:
-----------
trunk/view.php
Modified: trunk/g
===================================================================
--- trunk/g 2012-04-10 12:37:58 UTC (rev 8263)
+++ trunk/g 2012-04-12 14:26:50 UTC (rev 8264)
@@ -104,7 +104,11 @@
define('UPLOAD_FILE_PATH', '/opt/groups/'.WIKI_NAME.'/www/uploads/');
// define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
- define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
+ if ($project->isPublic()) {
+ define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
+ } else {
+ define('UPLOAD_DATA_PATH', '/wiki/view.php/'.WIKI_NAME.'/uploads/');
+ }
// Do not use a directory per user but only one (per project)
define('UPLOAD_USERDIR', false);
Added: trunk/view.php
===================================================================
--- trunk/view.php (rev 0)
+++ trunk/view.php 2012-04-12 14:26:50 UTC (rev 8264)
@@ -0,0 +1,111 @@
+<?php
+/*
+ * Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Configuration File ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+$no_gz_buffer = true;
+
+require_once('../../env.inc.php');
+require_once $gfcommon.'include/pre.php';
+
+$sysdebug_enable = false;
+
+if (!$group_id || !$project) {
+ exit_no_group();
+} else if (!($project->usesPlugin("wiki"))) {
+ exit_disabled('home');
+}
+
+// If project is private, check membership.
+if (!$project->isPublic()) {
+ session_require_perm('project_read', $project->getID());
+}
+
+$arr = explode('/', urldecode(getStringFromServer('REQUEST_URI')));
+array_shift($arr);
+array_shift($arr);
+array_shift($arr);
+array_shift($arr);
+array_shift($arr);
+$path = join('/', $arr);
+
+$basepath = realpath('/opt/groups/'.$project->getUnixName().'/www/uploads/');
+$filepath = realpath($basepath.'/'.$path);
+$filename = basename($filepath);
+
+if (strncmp($basepath, $filepath, strlen($basepath)) !== 0) {
+ error_log("DEBUG: basepath=$basepath, filepath=$filepath");
+ exit_error('Invalid path: No access');
+}
+
+if ($filepath && is_file($filepath)) {
+ if (strstr($_SERVER['HTTP_USER_AGENT'], "MSIE")) {
+ # workaround for IE filename bug with multiple periods/ multiple dots in filename
+ # that adds square brackets to filename - eg. setup.abc.exe becomes setup[1].abc.exe
+ $filename = preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1);
+ }
+ $filename = str_replace('"', '', $filename);
+ header('Content-disposition: filename="'.$filename.'"');
+
+ if (function_exists('finfo_open')) {
+ $finfo = finfo_open(FILEINFO_MIME_TYPE);
+ $mimetype = finfo_file($finfo, $filepath);
+ } else {
+ $mimetype = 'application/octet-stream';
+ }
+ header("Content-type: $mimetype");
+
+ $length = filesize($filepath);
+ header("Content-length: $length");
+
+ readfile_chunked($filepath);
+
+} else {
+ header("HTTP/1.0 404 Not Found");
+ require_once $gfwww.'404.php';
+}
+
+// Local Variables:
+// mode: php
+// c-file-style: "bsd"
+// End:
+
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-08-31 11:29:30
|
Revision: 8276
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8276&view=rev
Author: vargenau
Date: 2012-08-31 11:29:16 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
trailing_spaces
Modified Paths:
--------------
trunk/ImageTile.php
trunk/RPC2.php
trunk/getimg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession/dba.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-error.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-php4.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
trunk/lib/WikiDB/backend/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/cvs.php
trunk/lib/WikiDB/dba.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/htmlarea3.php
trunk/lib/WysiwygEdit/spaw.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/XMLRPC/utils.php
trunk/lib/fpdf/japanese.php
trunk/lib/nusoap/nusoap.php
trunk/lib/pear/Cache/Container/file.php
trunk/lib/pear/Cache/Container/imgfile.php
trunk/lib/pear/Cache/Container/trifile.php
trunk/lib/pear/Cache/Container.php
trunk/lib/pear/Cache/Error.php
trunk/lib/pear/Cache/Graphics.php
trunk/lib/pear/Cache.php
trunk/lib/pear/DB/Pager.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/ldap.php
trunk/lib/pear/File_Passwd.php
trunk/lib/pear/JSON.php
trunk/lib/plugin/AtomFeed.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/FacebookLike.php
trunk/lib/removepage.php
trunk/passencrypt.php
trunk/tests/unit/lib/AtomParserTest.php
trunk/tests/unit/lib/DumpHtml.php
trunk/tests/unit/lib/HtmlParserTest.php
trunk/tests/unit/lib/InlineParserTest.php
trunk/tests/unit/lib/SetupWiki.php
trunk/tests/unit/lib/TextSearchTest.php
trunk/tests/unit/lib/XmlRpcTest.php
trunk/tests/unit/lib/plugin/AllPagesTest.php
trunk/tests/unit/lib/plugin/AtomFeedTest.php
trunk/tests/unit/lib/plugin/IncludePageTest.php
trunk/tests/unit/lib/plugin/atom-example.xml
trunk/tests/unit/pcre-crash.php
trunk/tests/xmlrpc/interop-client.php
trunk/tests/xmlrpc/interop-server.php
trunk/tests/xmlrpc/validate-form.php
trunk/tests/xmlrpc/validate.php
trunk/tests/xmlrpc/xmlrpc-client.php
trunk/tests/xmlrpc/xmlrpc-introspect.php
trunk/tests/xmlrpc/xmlrpc-servers.php
trunk/themes/Hawaiian/lib/random.php
trunk/themes/MacOSX/images/index.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/Wordpress/lib/RecentChanges.php
trunk/themes/blog/lib/RecentChanges.php
Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php 2012-08-31 11:22:38 UTC (rev 8275)
+++ trunk/ImageTile.php 2012-08-31 11:29:16 UTC (rev 8276)
@@ -4,10 +4,10 @@
$remove = 0;
if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) {
-
+
$data_path = '';
list($usec, $sec) = explode(" ", microtime());
-
+
$fp = fopen('config/config.ini','r');
while ($config = fgetcsv($fp,1024,';')) {
if (preg_match('/DATA_PATH/',$config[0])) {
@@ -28,12 +28,12 @@
}
fwrite($fp,$source);
$remove = 1;
-
+
} else {
@$fp = fopen($_REQUEST['url'],"r");
-
+
if (!$fp) {
-
+
header ("Content-type: text/html");
echo "<html><head></head><body>Not an image</body></html>";
exit();
@@ -106,14 +106,14 @@
echo "<html><head></head><body>Not an image</body></html>";
exit();
break;
-}
+}
$width = @imagesx($img);
$height = @imagesy($img);
$newwidth = $_REQUEST['width'];
if (empty($newidth)) $newidth = 50;
-
+
$newheight = $_REQUEST['height'];
if (empty($newheight)) $newheight = round($newwidth * ($height / $width)) ;
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php 2012-08-31 11:22:38 UTC (rev 8275)
+++ trunk/RPC2.php 2012-08-31 11:29:16 UTC (rev 8276)
@@ -36,5 +36,5 @@
// c-basic-offset: 4
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
-// End:
+// End:
?>
Modified: trunk/getimg.php
===================================================================
--- trunk/getimg.php 2012-08-31 11:22:38 UTC (rev 8275)
+++ trunk/getimg.php 2012-08-31 11:29:16 UTC (rev 8276)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id$
+<?php // -*-php-*- $Id$
include ("index.php");
include "lib/imagecache.php";
?>
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2012-08-31 11:22:38 UTC (rev 8275)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2012-08-31 11:29:16 UTC (rev 8276)
@@ -68,7 +68,7 @@
'<=' => array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
'lt=' => array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
'le' => array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), /* 2005-06-05 wes */
-'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'>'),
+'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'>'),
'>=' => array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
'qeq' => array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
'-<' => array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-08-31 11:22:38 UTC (rev 8275)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-08-31 11:29:16 UTC (rev 8276)
@@ -5,7 +5,7 @@
* -- XMLNode
* -- MathMLNode extends XMLNode
*
- * These classes are a PHP port of ASCIIMath
+ * These classes are a PHP port of ASCIIMath
* Version 1.3 Feb 19 2004, (c) Peter Jipsen http://www.chapman.edu/~jipsen
*
* ASCIIMathPHP Version 1.11, 26 April 2006, (c) Kee-Lin Steven Chan (kc...@co...)
@@ -15,10 +15,10 @@
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License (at http://www.gnu.org/copyleft/gpl.html)
+ * General Public License (at http://www.gnu.org/copyleft/gpl.html)
* for more details.
*
* ChangeLog
@@ -30,7 +30,7 @@
* -- Included the missing setCurrExpr() method
*
* Ver 1.12
- * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to
+ * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to
* ASCIIMath 1.4.7 functionality.
* -- Added parseIntExpr, for intermediate expression parsing rule, allowing x^2/x^3 to render as (x^2)/(x^3)
* -- Added quotes as another way of designating text; "hello" is equivalent to text(hello)
@@ -68,7 +68,7 @@
var $_nmspc_alias;
var $_parent_id;
var $_parent_node;
-
+
function XMLNode($id = NULL)
{
$this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
@@ -82,31 +82,31 @@
$this->_parent_id = FALSE;
$this->_parent_node = NULL;
}
-
+
function addChild(&$node)
{
$this->_child_arr[$node->getId()] = $node;
$node->setParentId($this->_id);
$node->setParentNode($this);
}
-
+
function addChildArr(&$node_arr)
{
$key_arr = array_keys($node_arr);
$num_key = count($key_arr);
-
+
for ($i = 0; $i < $num_key; $i++) {
$node = $node_arr[$key_arr[$i]];
$this->addChild($node);
}
}
-
+
function insertChildBefore($idx,&$node)
{
$key_arr = array_keys($this->_child_arr);
$num_key = count($key_arr);
$tmp_arr = arry();
-
+
for ($i = 0;$i < $num_key;$i++) {
if ($i == $idx) {
$tmp_arr[$node->getId()] = $node;
@@ -115,13 +115,13 @@
}
$this->_child_arr = $tmp_arr;
}
-
+
function insertChildAfter($idx,&$node)
{
$key_arr = array_keys($this->_child_arr);
$num_key = count($key_arr);
$tmp_arr = arry();
-
+
for ($i = 0;$i < $num_key;$i++) {
$tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
if ($i == $idx) {
@@ -130,82 +130,82 @@
}
$this->_child_arr = $tmp_arr;
}
-
+
function setId($id)
{
$this->_id = $id;
}
-
+
function setName($name)
{
$this->_name = $name;
}
-
+
function setNamepace($nmspc)
{
$this->_nmspc = $nmspc;
}
-
+
function setNamespaceAlias($nmspc_alias)
{
$this->_nmspc_alias = $nmspc_alias;
}
-
+
function setContent($content)
{
$this->_content = $content;
}
-
+
function setEmptyElem($mt_elem_flg)
{
$this->_mt_elem_flg = $mt_elem_flg;
}
-
+
function setAttr($attr_nm,$attr_val)
{
$this->_attr_arr[$attr_nm] = $attr_val;
}
-
+
function setAttrArr($attr_arr)
{
$this->_attr_arr = $attr_arr;
}
-
+
function setParentId($id)
{
$this->_parent_id = $id;
}
-
+
function setParentNode(&$node)
{
$this->_parent_node = $node;
}
-
+
function getId()
{
return($this->_id);
}
-
+
function getName()
{
return($this->_name);
}
-
+
function getNamespace()
{
return($this->_nmspc);
}
-
+
function getNamespaceAlias()
{
return($this->_nmspc_alias);
}
-
+
function getContent()
{
return($this->_content);
}
-
+
function getAttr($attr_nm)
{
if (isset($this->_attr_arr[$attr_nm])) {
@@ -214,22 +214,22 @@
return(NULL);
}
}
-
+
function getAttrArr()
{
return($this->_attr_arr);
}
-
+
function getParentId()
{
return($this->parent_id);
}
-
+
function getParentNode()
{
return($this->_parent_node);
}
-
+
function getChild($id)
{
if (isset($this->_child_arr[$id])) {
@@ -238,70 +238,70 @@
return(FALSE);
}
}
-
+
function getFirstChild()
{
$id_arr = array_keys($this->_child_arr);
$num_child = count($id_arr);
-
+
if ($num_child > 0) {
return($this->_child_arr[$id_arr[0]]);
} else {
return(FALSE);
}
}
-
+
function getLastChild()
{
$id_arr = array_keys($this->_child_arr);
$num_child = count($id_arr);
-
+
if ($num_child > 0) {
return($this->_child_arr[$id_arr[$num_child - 1]]);
} else {
return(FALSE);
}
}
-
+
function getChildByIdx($idx)
{
$id_arr = array_keys($this->_child_arr);
-
+
if (isset($this->_child_arr[$id_arr[$idx]])) {
return($this->_child_arr[$id_arr[$idx]]);
} else {
return(FALSE);
}
}
-
+
function getNumChild()
{
return(count($this->_child_arr));
}
-
+
function removeChild($id)
{
unset($this->_child_arr[$id]);
}
-
+
function removeChildByIdx($idx)
{
$key_arr = array_keys($this->_child_arr);
unset($this->_child_arr[$key_arr[$idx]]);
}
-
+
function removeFirstChild()
{
$key_arr = array_keys($this->_child_arr);
unset($this->_child_arr[$key_arr[0]]);
}
-
+
function removeLastChild()
{
$key_arr = array_keys($this->_child_arr);
unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
}
-
+
function dumpXML($indent_str = "\t")
{
$attr_txt = $this->_dumpAttr();
@@ -309,42 +309,42 @@
$xmlns = $this->_dumpXmlns();
$lvl = $this->_getCurrentLevel();
$indent = str_pad('',$lvl,$indent_str);
-
+
if ($this->_mt_elem_flg) {
$tag = "$indent<$name$xmlns$attr_txt />";
return($tag);
} else {
$key_arr = array_keys($this->_child_arr);
$num_child = count($key_arr);
-
+
$tag = "$indent<$name$xmlns$attr_txt>$this->_content";
-
+
for ($i = 0;$i < $num_child;$i++) {
$node = $this->_child_arr[$key_arr[$i]];
-
+
$child_txt = $node->dumpXML($indent_str);
$tag .= "\n$child_txt";
}
-
+
$tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
return($tag);
}
}
-
+
function _dumpAttr()
{
$id_arr = array_keys($this->_attr_arr);
$id_arr_cnt = count($id_arr);
$attr_txt = '';
-
+
for($i = 0;$i < $id_arr_cnt;$i++) {
$key = $id_arr[$i];
$attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
}
-
+
return($attr_txt);
}
-
+
function _dumpName()
{
$alias = $this->getNamespaceAlias();
@@ -354,12 +354,12 @@
return("$alias:" . $this->getName());
}
}
-
+
function _dumpXmlns()
{
$nmspc = $this->getNamespace();
$alias = $this->getNamespaceAlias();
-
+
if ($nmspc != '') {
if ($alias == '') {
return(" xmlns=\"" . $nmspc . "\"");
@@ -370,7 +370,7 @@
return('');
}
}
-
+
function _getCurrentLevel()
{
if ($this->_parent_id === FALSE) {
@@ -390,20 +390,20 @@
{
parent::XMLNode($id);
}
-
+
function removeBrackets()
{
if ($this->_name == 'mrow') {
if ($c_node_0 = $this->getFirstChild()) {
$c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
}
-
+
if ($c_node_0 = $this->getLastChild()) {
$c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
}
}
}
-
+
function isLeftBracket()
{
switch ($this->_content) {
@@ -415,7 +415,7 @@
}
return(FALSE);
}
-
+
function isRightBracket()
{
switch ($this->_content) {
@@ -437,7 +437,7 @@
var $_symbol_arr;
var $_node_arr;
var $_node_cntr;
-
+
function ASCIIMathPHP($symbol_arr,$expr = NULL)
{
$this->_symbol_arr = $symbol_arr;
@@ -445,10 +445,10 @@
$this->setExpr($expr);
}
}
-
+
/**
* Returns an empty node (containing a non-breaking space) 26-Apr-2006
- *
+ *
* Used when an expression is incomplete
*
* @return object
@@ -462,7 +462,7 @@
$tmp_node->setContent('&#' . hexdec('200B') . ';');
return $tmp_node;
}
-
+
function pushExpr($prefix) // 2005-06-11 wes
{
$this->_curr_expr = $prefix . $this->_curr_expr;
@@ -473,59 +473,59 @@
$this->_expr = $expr;
$this->_curr_expr = $expr;
$this->_prev_expr = $expr;
-
+
$this->_node_arr = array();
$this->_node_cntr = 0;
}
-
+
function genMathML($attr_arr = NULL)
{
// <math> node
$node_0 = $this->createNode();
$node_0->setName('math');
$node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
-
+
// <mstyle> node
if (isset($attr_arr)) {
$node_1 = $this->createNode();
$node_1->setName('mstyle');
$node_1->setAttrArr($attr_arr);
-
+
$node_arr = $this->parseExpr();
-
+
$node_1->addChildArr($node_arr);
$node_0->addChild($node_1);
} else {
$node_arr = $this->parseExpr();
$node_0->addChildArr($node_arr);
}
-
+
return TRUE;
}
-
+
/*
function mergeNodeArr(&$node_arr_0,&$node_arr_1)
{
$key_arr_0 = array_keys($node_arr_0);
$key_arr_1 = array_keys($node_arr_1);
-
+
$num_key_0 = count($key_arr_0);
$num_key_1 = count($key_arr_1);
-
+
$merge_arr = array();
-
+
for ($i = 0;$i < $num_key_0;$i++) {
$merge_arr[$key_arr_0[$i]] = $node_arr_0[$key_arr_0[$i]];
}
-
+
for ($j = 0;$j < $num_key_1;$i++) {
$merge_arr[$key_arr_1[$i]] = $node_arr_1[$key_arr_1[$i]];
}
-
+
return($merge_arr);
}
*/
-
+
//Broken out of parseExpr Sept 7, 2006 David Lippman for
//ASCIIMathML 1.4.7 compatibility
function parseIntExpr()
@@ -533,45 +533,45 @@
$sym_0 = $this->getSymbol();
$node_0 = $this->parseSmplExpr();
$sym = $this->getSymbol();
-
+
if (isset($sym['infix']) && $sym['input'] != '/') {
$this->chopExpr($sym['symlen']);
$node_1 = $this->parseSmplExpr();
-
+
if ($node_1 === FALSE) { //show box in place of missing argument
$node_1 = $this->emptyNode();//??
} else {
$node_1->removeBrackets();
}
-
+
// If 'sub' -- subscript
if ($sym['input'] == '_') {
-
+
$sym_1 = $this->getSymbol();
-
+
// If 'sup' -- superscript
- if ($sym_1['input'] == '^') {
+ if ($sym_1['input'] == '^') {
$this->chopExpr($sym_1['symlen']);
$node_2 = $this->parseSmplExpr();
$node_2->removeBrackets();
-
+
$node_3 = $this->createNode();
$node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
$node_3->addChild($node_0);
$node_3->addChild($node_1);
$node_3->addChild($node_2);
-
+
$node_4 = $this->createNode();
$node_4->setName('mrow');
$node_4->addChild($node_3);
-
+
return $node_4;
} else {
$node_2 = $this->createNode();
$node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
$node_2->addChild($node_0);
$node_2->addChild($node_1);
-
+
return $node_2;
}
} else {
@@ -579,7 +579,7 @@
$node_2->setName($sym['tag']);
$node_2->addChild($node_0);
$node_2->addChild($node_1);
-
+
return($node_2);
}
} elseif ($node_0 !== FALSE) {
@@ -587,32 +587,32 @@
} else {
return $this->emptyNode();
}
-
+
}
-
+
function parseExpr()
{
// Child/Fragment array
$node_arr = array();
-
+
// Deal whole expressions like 'ax + by + c = 0' etc.
do {
$sym_0 = $this->getSymbol();
$node_0 = $this->parseIntExpr();
$sym = $this->getSymbol();
// var_dump($sym);
-
+
if (isset($sym['infix']) && $sym['input'] == '/') {
$this->chopExpr($sym['symlen']);
$node_1 = $this->parseIntExpr();
-
+
if ($node_1 === FALSE) { //should show box in place of missing argument
$node_1 = $this->emptyNode();
continue;
}
$node_1->removeBrackets();
-
+
// If 'div' -- divide
$node_0->removeBrackets();
$node_2 = $this->createNode();
@@ -620,18 +620,18 @@
$node_2->addChild($node_0);
$node_2->addChild($node_1);
$node_arr[$node_2->getId()] = $node_2;
-
+
} elseif ($node_0 !== FALSE) {
$node_arr[$node_0->getId()] = $node_0;
}
} while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
-
+
//var_dump($sym);
// Possibly to deal with matrices
if (isset($sym['right_bracket'])) {
$node_cnt = count($node_arr);
$key_node_arr = array_keys($node_arr);
-
+
if ($node_cnt > 1) {
$node_5 = $node_arr[$key_node_arr[$node_cnt-1]];
$node_6 = $node_arr[$key_node_arr[$node_cnt-2]];
@@ -639,56 +639,56 @@
$node_5 = FALSE;
$node_6 = FALSE;
}
-
+
// Dealing with matrices
if ($node_5 !== FALSE && $node_6 !== FALSE &&
- $node_cnt > 1 &&
- $node_5->getName() == 'mrow' &&
+ $node_cnt > 1 &&
+ $node_5->getName() == 'mrow' &&
$node_6->getName() == 'mo' &&
$node_6->getContent() == ',') {
-
+
// Checking if Node 5 has a LastChild
if ($node_7 = $node_5->getLastChild()) {
$node_7_cntnt = $node_7->getContent();
} else {
$node_7_cntnt = FALSE;
}
-
+
// If there is a right bracket
if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
-
+
// Checking if Node 5 has a firstChild
if ($node_8 = $node_5->getFirstChild()) {
$node_8_cntnt = $node_8->getContent();
} else {
$node_8_cntnt = FALSE;
}
-
+
// If there is a matching left bracket
- if ($node_8 !== FALSE &&
+ if ($node_8 !== FALSE &&
(($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
-
+
$is_mtrx_flg = TRUE;
$comma_pos_arr = array();
-
+
$i = 0;
-
+
while ($i < $node_cnt && $is_mtrx_flg) {
$tmp_node = $node_arr[$key_node_arr[$i]];
-
+
if($tmp_node_first = $tmp_node->getFirstChild()) {
$tnfc = $tmp_node_first->getContent();
} else {
$tnfc = FALSE;
}
-
+
if($tmp_node_last = $tmp_node->getLastChild()) {
$tnlc = $tmp_node_last->getContent();
} else {
$tnlc = FALSE;
}
-
+
if (isset($key_node_arr[$i+1])) {
$next_tmp_node = $node_arr[$key_node_arr[$i+1]];
$ntnn = $next_tmp_node->getName();
@@ -697,7 +697,7 @@
$ntnn = FALSE;
$ntnc = FALSE;
}
-
+
// Checking each node in node array for matrix criteria
if ($is_mtrx_flg) {
$is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
@@ -708,27 +708,27 @@
if ($is_mtrx_flg) {
for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
$tmp_c_node = $tmp_node->getChildByIdx($j);
-
+
if ($tmp_c_node->getContent() == ',') {
$comma_pos_arr[$i][] = $j;
}
}
- }
-
+ }
+
if ($is_mtrx_flg && $i > 1) {
-
+
$cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
$cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
$is_mtrx_flg = $cnt_cpan == $cnt_cpap;
}
-
+
$i += 2;
}
-
+
// If the node passes the matrix tests
if ($is_mtrx_flg) {
$tab_node_arr = array();
-
+
for ($i = 0;$i < $node_cnt;$i += 2) {
$tmp_key_node_arr = array_keys($node_arr);
if (!($tmp_node = $node_arr[$tmp_key_node_arr[0]])) {
@@ -736,71 +736,71 @@
}
$num_child = $tmp_node->getNumChild();
$k = 0;
-
+
$tmp_node->removeFirstChild();
-
+
$row_node_arr = array();
$row_frag_node_arr = array();
-
+
for ($j = 1;$j < ($num_child-1);$j++) {
- if (isset($comma_pos_arr[$i][$k]) &&
+ if (isset($comma_pos_arr[$i][$k]) &&
$j == $comma_pos_arr[$i][$k]) {
-
+
$tmp_node->removeFirstChild();
-
+
$tmp_c_node = $this->createNode();
$tmp_c_node->setName('mtd');
$tmp_c_node->addChildArr($row_frag_node_arr);
$row_frag_node_arr = array();
-
+
$row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-
+
$k++;
} else {
-
+
if ($tmp_c_node = $tmp_node->getFirstChild()) {
$row_frag_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
$tmp_node->removeFirstChild();
}
}
}
-
+
$tmp_c_node = $this->createNode();
$tmp_c_node->setName('mtd');
$tmp_c_node->addChildArr($row_frag_node_arr);
-
+
$row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
-
+
if (count($node_arr) > 2) {
$tmp_key_node_arr = array_keys($node_arr);
unset($node_arr[$tmp_key_node_arr[0]]);
unset($node_arr[$tmp_key_node_arr[1]]);
}
-
+
$tmp_c_node = $this->createNode();
$tmp_c_node->setName('mtr');
$tmp_c_node->addChildArr($row_node_arr);
-
+
$tab_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
}
-
+
$tmp_c_node = $this->createNode();
$tmp_c_node->setName('mtable');
$tmp_c_node->addChildArr($tab_node_arr);
-
+
if (isset($sym['invisible'])) {
$tmp_c_node->setAttr('columnalign','left');
}
-
+
$key_node_arr = array_keys($node_arr);
$tmp_c_node->setId($key_node_arr[0]);
-
+
$node_arr[$tmp_c_node->getId()] = $tmp_c_node;
}
}
}
}
-
+
$this->chopExpr($sym['symlen']);
if (!isset($sym['invisible'])) {
$node_7 = $this->createNode();
@@ -809,19 +809,19 @@
$node_arr[$node_7->getId()] = $node_7;
}
}
-
+
return($node_arr);
}
-
+
function parseSmplExpr()
{
$sym = $this->getSymbol();
-
- if (!$sym || isset($sym['right_bracket'])) //return FALSE;
+
+ if (!$sym || isset($sym['right_bracket'])) //return FALSE;
return $this->emptyNode();
-
+
$this->chopExpr($sym['symlen']);
-
+
// 2005-06-11 wes: add definition type support
if(isset($sym['definition'])) {
$this->pushExpr($sym['output']);
@@ -831,35 +831,35 @@
if (isset($sym['left_bracket'])) {
$node_arr = $this->parseExpr();
-
+
if (isset($sym['invisible'])) {
$node_0 = $this->createNode();
$node_0->setName('mrow');
$node_0->addChildArr($node_arr);
-
+
return($node_0);
} else {
$node_0 = $this->createNode();
$node_0->setName('mo');
$node_0->setContent($sym['output']);
-
+
$node_1 = $this->createNode();
$node_1->setName('mrow');
$node_1->addChild($node_0);
$node_1->addChildArr($node_arr);
-
+
return($node_1);
}
} elseif (isset($sym['unary'])) {
-
+
if ($sym['input'] == 'sqrt') {
$node_0 = $this->parseSmplExpr();
$node_0->removeBrackets();
-
+
$node_1 = $this->createNode();
$node_1->setName($sym['tag']);
$node_1->addChild($node_0);
-
+
return($node_1);
} elseif (isset($sym['func'])) { //added 2006-9-7 David Lippman
$expr = ltrim($this->getCurrExpr());
@@ -904,52 +904,52 @@
}
$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
}
-
+
//$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
$len = strlen($txt);
-
+
$node_0 = $this->createNode();
$node_0->setName('mrow');
-
+
if ($len > 0) {
if ($txt{0} == " ") {
$node_1 = $this->createNode();
$node_1->setName('mspace');
$node_1->setAttr('width','1ex');
-
+
$node_0->addChild($node_1);
}
-
+
$node_3 = $this->createNode();
$node_3->setName($sym['tag']);
$node_3->setContent(trim($txt));
-
+
$node_0->addChild($node_3);
-
+
if ($len > 1 && $txt{$len-1} == " ") {
$node_2 = $this->createNode();
$node_2->setName('mspace');
$node_2->setAttr('width','1ex');
-
+
$node_0->addChild($node_2);
}
-
+
$this->chopExpr($len+2);
}
return($node_0);
-
+
} elseif (isset($sym['acc'])) {
$node_0 = $this->parseSmplExpr();
$node_0->removeBrackets();
-
+
$node_1 = $this->createNode();
$node_1->setName($sym['tag']);
$node_1->addChild($node_0);
-
+
$node_2 = $this->createNode();
$node_2->setName('mo');
$node_2->setContent($sym['output']);
-
+
$node_1->addChild($node_2);
return($node_1);
} else {
@@ -957,13 +957,13 @@
}
} elseif (isset($sym['binary'])) {
$node_arr = array();
-
+
$node_0 = $this->parseSmplExpr();
$node_0->removeBrackets();
-
+
$node_1 = $this->parseSmplExpr();
$node_1->removeBrackets();
-
+
/* 2005-06-05 wes: added stackrel */
if ($sym['input'] == 'root' || $sym['input'] == 'stackrel') {
$node_arr[$node_1->getId()] = $node_1;
@@ -972,78 +972,78 @@
$node_arr[$node_0->getId()] = $node_0;
$node_arr[$node_1->getId()] = $node_1;
}
-
+
$node_2 = $this->createNode();
$node_2->setName($sym['tag']);
$node_2->addChildArr($node_arr);
-
+
return($node_2);
} elseif (isset($sym['infix'])) {
$node_0 = $this->createNode();
$node_0->setName('mo');
$node_0->setContent($sym['output']);
-
+
return($node_0);
} elseif (isset($sym['space'])) {
$node_0 = $this->createNode();
$node_0->setName('mrow');
-
+
$node_1 = $this->createNode();
$node_1->setName('mspace');
$node_1->setAttr('width',$sym['space']);
-
+
$node_2 = $this->createNode();
$node_2->setName($sym['tag']);
$node_2->setContent($sym['output']);
-
+
$node_3 = $this->createNode();
$node_3->setName('mspace');
$node_3->setAttr('width',$sym['space']);
-
+
$node_0->addChild($node_1);
$node_0->addChild($node_2);
$node_0->addChild($node_3);
-
+
return($node_0);
} else {
-
+
// A constant
$node_0 = $this->createNode();
$node_0->setName($sym['tag']);
$node_0->setContent($sym['output']);
return($node_0);
}
-
+
// Return an empty node
return $this->emptyNode();
}
-
+
function getMathML()
{
$root = $this->_node_arr[0];
return($root->dumpXML());
}
-
+
function getCurrExpr()
{
return($this->_curr_expr);
}
-
+
function setCurrExpr($str)
{
$this->_curr_expr = $str;
}
-
+
function getExpr()
{
return($this->_expr);
}
-
+
function getPrevExpr()
{
return($this->_prev_expr);
}
-
+
function createNode()
{
$node = new MathMLNode($this->_node_cntr);
@@ -1052,46 +1052,46 @@
$this->_node_cntr++;
return($node);
}
-
+
/**
* Gets the largest symbol in the expression (greedy). Changed from non-greedy 26-Apr-2006
- *
+ *
* @parameter boolean[optional] Chop original string?
*
* @return mixed
- *
+ *
* @access private
*/
function getSymbol($chop_flg = FALSE)
{
- // Implemented a reverse symbol matcher.
+ // Implemented a reverse symbol matcher.
// Instead of going front to back, it goes back to front. Steven 26-Apr-2006
$chr_cnt = strlen($this->_curr_expr);
-
+
if ($chr_cnt == 0) return FALSE;
-
+
for ($i = $chr_cnt; $i > 0; $i--) {
$sym_0 = substr($this->_curr_expr,0,$i);
-
+
// Reading string for numeric values
if (is_numeric($sym_0)) {
-
+
if ($chop_flg) $this->chopExpr($i);
return array('input'=>$sym_0, 'tag'=>'mn', 'output'=>$sym_0, 'symlen'=>$i);
-
+
} elseif (isset($this->_symbol_arr[$sym_0])) {
-
+
if ($chop_flg) $this->chopExpr($i);
$sym_arr = $this->_symbol_arr[$sym_0];
$sym_arr['symlen'] = $i;
return $sym_arr;
}
}
-
+
// Reading string for alphabetic constants and the minus sign
$char = $this->_curr_expr{0};
$len_left = $chop_flg ? $this->chopExpr(1) : strlen($this->_curr_expr)-1;
-
+
// Deals with expressions of length 1
if ($len_left == 0 && isset($this->_symbol_arr[$char])) {
$sym_arr = $this->_symbol_arr[$char];
@@ -1102,11 +1102,11 @@
return array('input'=>$char, 'tag'=>$tag, 'output'=>$char, 'symlen'=>1);
}
}
-
+
function chopExpr($strlen)
{
$this->_prev_expr = $this->_curr_expr;
-
+
if ($strlen == strlen($this->_curr_expr)) {
$this->_curr_expr = '';
return(0);
@@ -1114,6 +1114,6 @@
$this->_curr_expr = ltrim(substr($this->_curr_expr,$strlen));
return(strlen($this->_curr_expr));
}
- }
+ }
}
?>
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2012-08-31 11:22:38 UTC (rev 8275)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2012-08-31 11:29:16 UTC (rev 8276)
@@ -68,7 +68,7 @@
'<=' => array( 'input'=>'<=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
'lt=' => array( 'input'=>'lt=','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'),
'le' => array( 'input'=>'le','tag'=>'mo', 'output'=>'&#' . hexdec('2264') . ';'), /* 2005-06-05 wes */
-'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'>'),
+'>' => array( 'input'=>'>','tag'=>'mo', 'output'=>'>'),
'>=' => array( 'input'=>'>=','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
'qeq' => array( 'input'=>'geq','tag'=>'mo', 'output'=>'&#' . hexdec('2265') . ';'),
'-<' => array( 'input'=>'-<','tag'=>'mo', 'output'=>'&#' . hexdec('227A') . ';'),
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php 2012-08-31 11:22:38 UTC (rev 8275)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php 2012-08-31 11:29:16 UTC (rev 8276)
@@ -14,10 +14,10 @@
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License (at http://www.gnu.org/copyleft/gpl.html)
+ * General Public License (at http://www.gnu.org/copyleft/gpl.html)
* for more details.
*
* ChangeLog
@@ -26,7 +26,7 @@
* -- Included the missing setCurrExpr() method
*
* Ver 1.12
- * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to
+ * -- Added changes that David Lippman <DLi...@pi...> made to bring ASCIIMathPHP up to
* ASCIIMath 1.4.7 functionality.
* -- Added parseIntExpr, for intermediate expression parsing rule, allowing x^2/x^3 to render as (x^2)/(x^3)
* -- Added quotes as another way of designating text; "hello" is equivalent to text(hello)
@@ -64,7 +64,7 @@
var $_nmspc_alias;
var $_parent_id;
var $_parent_node;
-
+
function & XMLNode($id = NULL)
{
$this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
@@ -79,31 +79,31 @@
$this->_parent_node = NULL;
return $this;
}
-
+
function addChild(&$node)
{
$this->_child_arr[$node->getId()] =& $node;
$node->setParentId($this->_id);
$node->setParentNode($this);
}
-
+
function addChildArr(&$node_arr)
{
$key_arr = array_keys($node_arr);
$num_key = count($key_arr);
-
+
for ($i = 0; $i < $num_key; $i++) {
$node =& $node_arr[$key_arr[$i]];
$this->addChild($node);
}
}
-
+
function insertChildBefore($idx,&$node)
{
$key_arr = array_keys($this->_child_arr);
$num_key = count($key_arr);
$tmp_arr = arry();
-
+
for ($i = 0;$i < $num_key;$i++) {
if ($i == $idx) {
$tmp_arr[$node->getId()] =& $node;
@@ -112,13 +112,13 @@
}
$this->_child_arr =& $tmp_arr;
}
-
+
function insertChildAfter($idx,&$node)
{
$key_arr = array_keys($this->_child_arr);
$num_key = count($key_arr);
$tmp_arr = arry();
-
+
for ($i = 0;$i < $num_key;$i++) {
$tmp_arr[$key_arr[$i]] =& $this->_child_arr[$key_arr[$i]];
if ($i == $idx) {
@@ -127,82 +127,82 @@
}
$this->_child_arr =& $tmp_arr;
}
-
+
function setId($id)
{
$this->_id = $id;
}
-
+
function setName($name)
{
$this->_name = $name;
}
-
+
function setNamepace($nmspc)
{
$this->_nmspc = $nmspc;
}
-
+
function setNamespaceAlias($nmspc_alias)
{
$this->_nmspc_alias = $nmspc_alias;
}
-
+
function setContent($content)
{
$this->_content = $content;
}
-
+
function setEmptyElem($mt_elem_flg)
{
$this->_mt_elem_flg = $mt_elem_flg;
}
-
+
function setAttr($attr_nm,$attr_val)
{
$this->_attr_arr[$attr_nm] = $attr_val;
}
-
+
function setAttrArr($attr_arr)
{
$this->_attr_arr = $attr_arr;
}
-
+
function setParentId($id)
{
$this->_parent_id = $id;
}
-
+
function setParentNode(&$node)
{
$this->_parent_node =& $node;
}
-
+
function getId()
{
return($this->_id);
}
-
+
function getName()
{
return($this->_name);
}
-
+
function getNamespace()
{
return($this->_nmspc);
}
-
+
function getNamespaceAlias()
{
return($this->_nmspc_alias);
}
-
+
function getContent()
{
return($this->_content);
}
-
+
function getAttr($attr_nm)
{
if (isset($this->_attr_arr[$attr_nm])) {
@@ -211,22 +211,22 @@
return(NULL);
}
}
-
+
function getAttrArr()
{
return($this->_attr_arr);
}
-
+
function getParentId()
{
return($this->parent_id);
}
-
+
function & getParentNode()
{
return($this->_parent_node);
}
-
+
function & getChild($id)
{
if (isset($this->_child_arr[$id])) {
@@ -235,70 +235,70 @@
return(FALSE);
}
}
-
+
function & getFirstChild()
{
$id_arr = array_keys($this->_child_arr);
$num_child = count($id_arr);
-
+
if ($num_child > 0) {
return($this->_child_arr[$id_arr[0]]);
} else {
return(FALSE);
}
}
-
+
function & getLastChild()
{
$id_arr = array_keys($this->_child_arr);
$num_child = count($id_arr);
-
+
if ($num_child > 0) {
return($this->_child_arr[$id_arr[$num_child - 1]]);
} else {
return(FALSE);
}
}
-
+
function & getChildByIdx($idx)
{
$id_arr = array_keys($this->_child_arr);
-
+
if (isset($this->_child_arr[$id_arr[$idx]])) {
return($this->_child_arr[$id_arr[$idx]]);
} else {
return(FALSE);
}
}
-
+
function getNumChild()
{
return(count($this->_child_arr));
}
-
+
function removeChild($id)
{
unset($this->_child_arr[$id]);
}
-
+
function removeChildByIdx($idx)
{
$key_arr = array_keys($this->_child_arr);
unset($this->_child_arr[$key_arr[$idx]]);
}
-
+
function removeFirstChild()
{
$key_arr = array_keys($this->_child_arr);
unset($this->_child_arr[$key_arr[0]]);
}
-
+
function removeLastChild()
{
$key_arr = array_keys($this->_child_arr);
unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
}
-
+
function dumpXML($indent_str = "\t")
{
$attr_txt = $this->_dumpAttr();
@@ -306,42 +306,42 @@
$xmlns = $this->_dumpXmlns();
$lvl = $this->_getCurrentLevel();
$indent = str_pad('',$lvl,$indent_str);
-
+
if ($this->_mt_elem_flg) {
$tag = "$indent<$name$xmlns$attr_txt />";
return($tag);
} else {
$key_arr = array_keys($this->_child_arr);
$num_child = count($key_arr);
-
+
$tag = "$indent<$name$xmlns$attr_txt>$this->_content";
-
+
for ($i = 0;$i < $num_child;$i++) {
$node =& $this->_child_arr[$key_arr[$i]];
-
+
$child_txt = $node->dumpXML($indent_str);
$tag .= "\n$child_txt";
}
-
+
$tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
return($tag);
}
}
-
+
function _dumpAttr()
{
$id_arr = array_keys($this->_attr_arr);
$id_arr_cnt = count($id_arr);
$attr_txt = '';
-
+
for($i = 0;$i < $id_arr_cnt;$i++) {
$key = $id_arr[$i];
$attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
}
-
+
return($attr_txt);
}
-
+
function _dumpName()
{
$alias = $this->getNamespaceAlias();
@@ -351,12 +351,12 @@
return("$alias:" . $this->getName());
}
}
-
+
function _dumpXmlns()
{
$nmspc = $this->getNamespace();
$alias = $this->getNamespaceAlias();
-
+
if ($nmspc != '') {
if ($alias == '') {
return(" xmlns=\"" . $nmspc . "\"");
@@ -367,7 +367,7 @@
return('');
}
}
-
+
function _getCurrentLevel()
{
if ($this->_parent_id === FALSE) {
@@ -387,20 +387,20 @@
{
return parent::XMLNode($id);
}
-
+
function removeBrackets()
{
if ($this->_name == 'mrow') {
if ($c_node_0 =& $this->getFirstChild()) {
$c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
}
-
+
if ($c_node_0 =& $this->getLastChild()) {
$c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
}
}
}
-
+
function isLeftBracket()
{
switch ($this->_content) {
@@ -412,7 +412,7 @@
}
return(FALSE);
}
-
+
function isRightBracket()
{
switch ($this->_content) {
@@ -434,7 +434,7 @@
var $_symbol_arr;
var $_node_arr;
var $_node_cntr;
-
+
function ASCIIMathPHP($symbol_arr,$expr = NULL)
{
$this->_symbol_arr = $symbol_arr;
@@ -442,10 +442,10 @@
$this->setExpr($expr);
}
}
-
+
/**
* Returns an empty node (containing a non-breaking space) 26-Apr-2006
- *
+ *
* Used when an expression is incomplete
*
* @return object
@@ -459,7 +459,7 @@
$tmp_node->setContent('&#' . hexdec('200B') . ';');
return $tmp_node;
}
-
+
function pushExpr($prefix) // 2005-06-11 wes
{
$this->_curr_expr = $prefix . $this->_curr_expr;
@@ -470,59 +470,59 @@
$this->_expr = $expr;
$this->_curr_expr = $expr;
$this->_prev_expr = $expr;
-
+
$this->_node_arr = array();
$this->_node_cntr = 0;
}
-
+
function genMathML($attr_arr = NULL)
{
// <math> node
$node_0 =& $this->createNode();
$node_0->setName('math');
$node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
-
+
// <mstyle> node
if (isset($attr_arr)) {
$node_1 =& $this->createNode();
$node_1->setName('mstyle');
$node_1->setAttrArr($attr_arr);
-
+
$node_arr = $this->parseExpr();
-
+
$node_1->addChildArr($node_arr);
$node_0->addChild($node_1);
} else {
$node_arr = $this->parseExpr();
$node_0->addChildArr($node_arr);
}
-
+
return TRUE;
}
-
+
/*
function & mergeNodeArr(&$node_arr_0,&$node_arr_1)
{
$key_arr_0 = array_keys($node_arr_0);
$key_arr_1 = array_keys($node_arr_1);
-
+
$num_key_0 = count($key_arr_0);
$num_key_1 = count($key_arr_1);
-
+
$merge_arr = array();
-
+
for ($i = 0;$i < $num_key_0;$i++) {
$merge_arr[$key_arr_0[$i]] =& $node_arr_0[$key_arr_0[$i]];
}
-
+
for ($j = 0;$j < $num_key_1;$i++) {
$merge_arr[$key_arr_1[$i]] =& $node_arr_1[$key_arr_1[$i]];
}
-
+
return($merge_arr);
}
*/
-
+
//Broken out of parseExpr Sept 7, 2006 David Lippman for
//ASCIIMathML 1.4.7 compatibility
function & parseIntExpr()
@@ -530,45 +530,45 @@
$sym_0 = $this->getSymbol();
$node_0 =& $this->parseSmplExpr();
$sym = $this->getSymbol();
-
+
if (isset($sym['infix']) && $sym['input'] != '/') {
$this->chopExpr($sym['symlen']);
$node_1 =& $this->parseSmplExpr();
-
+
if ($node_1 === FALSE) { //show box in place of missing argument
$node_1 =& $this->emptyNode();//??
} else {
$node_1->removeBrackets();
}
-
+
// If 'sub' -- subscript
if ($sym['input'] == '_') {
-
+
$sym_1 = $this->getSymbol();
-
+
// If 'sup' -- superscript
- if ($sym_1['input'] == '^') {
+ if ($sym_1['input'] == '^') {
$this->chopExpr($sym_1['symlen']);
$node_2 =& $this->parseSmplExpr();
$node_2->removeBrackets();
-
+
$node_3 =& $this->createNode();
$node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
$node_3->addChild($node_0);
$node_3->addChild($node_1);
$node_3->addChild($node_2);
-
+
$node_4 =& $this->createNode();
$node_4->setName('mrow');
$node_4->addChild($node_3);
-
+
return $node_4;
} else {
$node_2 =& $this->createNode();
$node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
$node_2->addChild($node_0);
$node_2->addChild($node_1);
-
+
return $node_2;
}
} else {
@@ -576,7 +576,7 @@
$node_2->setName($sym['tag']);
$node_2->addChild($node_0);
$node_2->addChild($node_1);
-
+
return($node_2);
}
} elseif ($node_0 !== FALSE) {
@@ -584,32 +584,32 @@
} else {
return $this->emptyNode();
}
-
+
}
-
+
function parseExpr()
{
// Child/Fragment array
$node_arr = array();
-
+
// Deal whole expressions like 'ax + by + c = 0' etc.
do {
$sym_0 = $this->getSymbol();
$node_0 =& $this->parseIntExpr();
$sym = $this->getSymbol();
// var_dump($sym);
-
+
if (isset($sym['infix']) && $sym['input'] == '/') {
$this->chopExpr($sym['symlen']);
$node_1 =& $this->parseIntExpr();
-
+
if ($node_1 === FALSE) { //should show box in place of missing argument
$node_1 =& $this->emptyNode();
continue;
}
$node_1->removeBrackets();
-
+
// If 'div' -- divide
$node_0->removeBrackets();
$node_2 =& $this->createNode();
@@ -617,18 +617,18 @@
$node_2->addChild($node_0);
$node_2->addChild($node_1);
$node_arr[$node_2->getId()] =& $node_2;
-
+
} elseif ($node_0 !== FALSE) {
$node_arr[$node_0->getId()] =& $node_0;
}
} while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
-
+
//var_dump($sym);
// Possibly to deal with matrices
if (isset($sym['right_bracket'])) {
$node_cnt = count($node_arr);
$key_node_arr = array_keys($node_arr);
-
+
if ($node_cnt > 1) {
$node_5 =& $node_arr[$key_node_arr[$node_cnt-1]];
$node_6 =& $node_arr[$key_node_arr[$node_cnt-2]];
@@ -636,56 +636,56 @@
$node_5 = FALSE;
$node_6 = FALSE;
}
-
+
// Dealing with matrices
if ($node_5 !== FALSE && $node_6 !== FALSE &&
- $node_cnt > 1 &&
- $node_5->getName() == 'mrow' &&
+ $node_cnt > 1 &&
+ $node_5->getName() == 'mrow' &&
$node_6->getName() == 'mo' &&
$node_6->getContent() == ',') {
-
+
// Checking if Node 5 has a LastChild
if ($node_7 =& $node_5->getLastChild()) {
$node_7_cntnt = $node_7->getContent();
} else {
$node_7_cntnt = FALSE;
}
-
+
// If there is a right bracket
if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
-
+
// Checking if Node 5 has a firstChild
if ($node_8 =& $node_5->getFirstChild()) {
$node_8_cntnt = $node_8->getContent();
} else {
$node_8_cntnt = FALSE;
}
-
+
// If there is a matching left bracket
- if ($node_8 !== FALSE &&
+ if ($node_8 !== FALSE &&
(($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
-
+
$is_mtrx_flg = TRUE;
$comma_pos_arr = array();
-
+
$i = 0;
-
+
while ($i < $node_cnt && $is_mtrx_flg) {
$tmp_node =& $node_arr[$key_node_arr[$i]];
-
+
if($tmp_node_first =& $tmp_node->getFirstChild()) {
$tnfc = $tmp_node_first->getContent();
} else {
$tnfc = FALSE;
}
-
+
if($tmp_node_last =& $tmp_node->getLastChild()) {
$tnlc = $tmp_node_last->getContent();
} else {
$tnlc = FALSE;
}
-
+
if (isset($key_node_arr[$i+1])) {
$next_tmp_node =& $node_arr[$key_node_arr[$i+1]];
$ntnn = $next_tmp_node->getName();
@@ -694,7 +694,7 @@
$ntnn = FALSE;
$ntnc = FALSE;
}
-
+
// Checking each node in node array for matrix criteria
if ($is_mtrx_flg) {
$is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
@@ -705,27 +705,27 @@
if ($is_mtrx_flg) {
for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
$tmp_c_node =& $tmp_node->getChildByIdx($j);
-
+
if ($tmp_c_node->getContent() == ',') {
$comma_pos_arr[$i][] = $j;
}
}
- }
-
+ }
+
if ($is_mtrx_flg && $i > 1) {
-
+
$cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
$cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
$is_mtrx_flg = $cnt_cpan == $cnt_cpap;
}
-
+
$i += 2;
}
-
+
// If the node passes the matrix tests
if ($is_mtrx_flg) {
$tab_node_arr = array();
-
+
for ($i = 0;$i < $node_cnt;$i += 2) {
$tmp_key_node_arr = array_keys($node_arr);
if (!($tmp_node =& $node_arr[$tmp_key_node_arr[0]])) {
@@ -733,71 +733,71 @@
}
$num_child = $tmp_node->getNumChild();
$k = 0;
-
+
$tmp_node->removeFirstChild();
-
+
$row_node_arr = array();
$row_frag_node_arr = array();
-
+
for ($j = 1;$j < ($num_child-1);$j++) {
- if (isset($comma_pos_arr[$i][$k]) &&
+ if (isset($comma_pos_arr[$i][$k]) &&
$j == $comma_pos_arr[$i][$k]) {
-
+
$tmp_node->removeFirstChild();
-
+
$tmp_c_node =& $this->createNode();
$tmp_c_node->setName('mtd');
$tmp_c_node->addChildArr($row_frag_node_arr);
$row_frag_node_arr = array();
-
+
$row_node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
-
+
$k++;
} else {
-
+
if ($tmp_c_node =& $tmp_node->getFirstChild()) {
$row_frag_node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
$tmp_node->removeFirstChild();
}
}
}
-
+
$tmp_c_node =& $this->createNode();
$tmp_c_node->setName('mtd');
$tmp_c_node->addChildArr($row_frag_node_arr);
-
+
$row_node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
-
+
if (count($node_arr) > 2) {
$tmp_key_node_arr = array_keys($node_arr);
unset($node_arr[$tmp_key_node_arr[0]]);
unset($node_arr[$tmp_key_node_arr[1]]);
}
-
+
$tmp_c_node =& $this->createNode();
$tmp_c_node->setName('mtr');
$tmp_c_node->addChildArr($row_node_arr);
-
+
$tab_node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
}
-
+
$tmp_c_node =& $this->createNode();
$tmp_c_node->setName('mtable');
$tmp_c_node->addChildArr($tab_node_arr);
-
+
if (isset($sym['invisible'])) {
$tmp_c_node->setAttr('columnalign','left');
}
-
+
$key_node_arr = array_keys($node_arr);
$tmp_c_node->setId($key_node_arr[0]);
-
+
$node_arr[$tmp_c_node->getId()] =& $tmp_c_node;
}
}
}
}
-
+
$this->chopExpr($sym['symlen']);
if (!isset($sym['invisible'])) {
$node_7 =& $this->createNode();
@@ -806,19 +806,19 @@
$node_arr[$node_7->getId()] =& $node_7;
}
}
-
+
return($node_arr);
}
-
+
function & parseSmplExpr()
{
$sym = $this->getSymbol();
-
- if (!$sym || isset($sym['right_bracket'])) //return FALSE;
+
+ if (!$sym || isset($sym['right_bracket'])) //return FALSE;
return $this->emptyNode();
-
+
$this->chopExpr($sym['symlen']);
-
+
// 2005-06-11 wes: add definition type support
if(isset($sym['definition'])) {
$this->pushExpr($sym['output']);
@@ -828,35 +828,35 @@
if (isset($sym['left_bracket'])) {
$node_arr = $this->parseExpr();
-
+
if (isset($sym['invisible'])) {
$node_0 =& $this->createNode();
$node_0->setName('mrow');
$node_0->addChildArr($node_arr);
-
+
return($node_0);
} else {
$node_0 =& $this->createNode();
$node_0->setName('mo');
$node_0->setContent($sym['output']);
- ...
[truncated message content] |
|
From: <var...@us...> - 2012-08-31 11:43:49
|
Revision: 8278
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8278&view=rev
Author: vargenau
Date: 2012-08-31 11:43:40 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
No tabs
Modified Paths:
--------------
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
trunk/lib/DbSession/SQL.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-error.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/backend.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/XMLRPC/utils.php
trunk/lib/fpdf/chinese.php
trunk/lib/fpdf/courier.php
trunk/lib/fpdf/helvetica.php
trunk/lib/fpdf/helveticab.php
trunk/lib/fpdf/helveticabi.php
trunk/lib/fpdf/helveticai.php
trunk/lib/fpdf/japanese.php
trunk/lib/fpdf/symbol.php
trunk/lib/fpdf/times.php
trunk/lib/fpdf/timesb.php
trunk/lib/fpdf/timesbi.php
trunk/lib/fpdf/timesi.php
trunk/lib/fpdf/zapfdingbats.php
trunk/lib/nusoap/nusoap.php
trunk/lib/pear/Cache/Container/file.php
trunk/lib/pear/Cache/Container/imgfile.php
trunk/lib/pear/File_Passwd.php
trunk/tests/unit/lib/InlineParserTest.php
trunk/tests/unit/lib/SetupWiki.php
trunk/tests/unit/lib/TextSearchTest.php
trunk/tests/unit/lib/XmlRpcTest.php
trunk/tests/unit/lib/plugin/IncludePageTest.php
trunk/tests/unit/pcre-crash.php
trunk/tests/unit/test.php
trunk/tests/xmlrpc/interop-server.php
trunk/tests/xmlrpc/validate-form.php
trunk/tests/xmlrpc/validate.php
trunk/tests/xmlrpc/xmlrpc-servers.php
trunk/wikilist.php
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-08-31 11:38:22 UTC (rev 8277)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-08-31 11:43:40 UTC (rev 8278)
@@ -57,1063 +57,1063 @@
class XMLNode
{
- // Private variables
- var $_id;
- var $_name;
- var $_content;
- var $_mt_elem_flg;
- var $_attr_arr;
- var $_child_arr;
- var $_nmspc;
- var $_nmspc_alias;
- var $_parent_id;
- var $_parent_node;
+ // Private variables
+ var $_id;
+ var $_name;
+ var $_content;
+ var $_mt_elem_flg;
+ var $_attr_arr;
+ var $_child_arr;
+ var $_nmspc;
+ var $_nmspc_alias;
+ var $_parent_id;
+ var $_parent_node;
- function XMLNode($id = NULL)
- {
- $this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
- $this->_name = '';
- $this->_content = '';
- $this->_mt_elem_flg = FALSE;
- $this->_attr_arr = array();
- $this->_child_arr = array();
- $this->_nmspc = '';
- $this->_nmspc_alias = '';
- $this->_parent_id = FALSE;
- $this->_parent_node = NULL;
- }
+ function XMLNode($id = NULL)
+ {
+ $this->_id = isset($id) ? $id : md5(uniqid(rand(),1));
+ $this->_name = '';
+ $this->_content = '';
+ $this->_mt_elem_flg = FALSE;
+ $this->_attr_arr = array();
+ $this->_child_arr = array();
+ $this->_nmspc = '';
+ $this->_nmspc_alias = '';
+ $this->_parent_id = FALSE;
+ $this->_parent_node = NULL;
+ }
- function addChild(&$node)
- {
- $this->_child_arr[$node->getId()] = $node;
- $node->setParentId($this->_id);
- $node->setParentNode($this);
- }
+ function addChild(&$node)
+ {
+ $this->_child_arr[$node->getId()] = $node;
+ $node->setParentId($this->_id);
+ $node->setParentNode($this);
+ }
- function addChildArr(&$node_arr)
- {
- $key_arr = array_keys($node_arr);
- $num_key = count($key_arr);
+ function addChildArr(&$node_arr)
+ {
+ $key_arr = array_keys($node_arr);
+ $num_key = count($key_arr);
- for ($i = 0; $i < $num_key; $i++) {
- $node = $node_arr[$key_arr[$i]];
- $this->addChild($node);
- }
- }
+ for ($i = 0; $i < $num_key; $i++) {
+ $node = $node_arr[$key_arr[$i]];
+ $this->addChild($node);
+ }
+ }
- function insertChildBefore($idx,&$node)
- {
- $key_arr = array_keys($this->_child_arr);
- $num_key = count($key_arr);
- $tmp_arr = arry();
+ function insertChildBefore($idx,&$node)
+ {
+ $key_arr = array_keys($this->_child_arr);
+ $num_key = count($key_arr);
+ $tmp_arr = arry();
- for ($i = 0;$i < $num_key;$i++) {
- if ($i == $idx) {
- $tmp_arr[$node->getId()] = $node;
- }
- $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
- }
- $this->_child_arr = $tmp_arr;
- }
+ for ($i = 0;$i < $num_key;$i++) {
+ if ($i == $idx) {
+ $tmp_arr[$node->getId()] = $node;
+ }
+ $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
+ }
+ $this->_child_arr = $tmp_arr;
+ }
- function insertChildAfter($idx,&$node)
- {
- $key_arr = array_keys($this->_child_arr);
- $num_key = count($key_arr);
- $tmp_arr = arry();
+ function insertChildAfter($idx,&$node)
+ {
+ $key_arr = array_keys($this->_child_arr);
+ $num_key = count($key_arr);
+ $tmp_arr = arry();
- for ($i = 0;$i < $num_key;$i++) {
- $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
- if ($i == $idx) {
- $tmp_arr[$node->getId()] = $node;
- }
- }
- $this->_child_arr = $tmp_arr;
- }
+ for ($i = 0;$i < $num_key;$i++) {
+ $tmp_arr[$key_arr[$i]] = $this->_child_arr[$key_arr[$i]];
+ if ($i == $idx) {
+ $tmp_arr[$node->getId()] = $node;
+ }
+ }
+ $this->_child_arr = $tmp_arr;
+ }
- function setId($id)
- {
- $this->_id = $id;
- }
+ function setId($id)
+ {
+ $this->_id = $id;
+ }
- function setName($name)
- {
- $this->_name = $name;
- }
+ function setName($name)
+ {
+ $this->_name = $name;
+ }
- function setNamepace($nmspc)
- {
- $this->_nmspc = $nmspc;
- }
+ function setNamepace($nmspc)
+ {
+ $this->_nmspc = $nmspc;
+ }
- function setNamespaceAlias($nmspc_alias)
- {
- $this->_nmspc_alias = $nmspc_alias;
- }
+ function setNamespaceAlias($nmspc_alias)
+ {
+ $this->_nmspc_alias = $nmspc_alias;
+ }
- function setContent($content)
- {
- $this->_content = $content;
- }
+ function setContent($content)
+ {
+ $this->_content = $content;
+ }
- function setEmptyElem($mt_elem_flg)
- {
- $this->_mt_elem_flg = $mt_elem_flg;
- }
+ function setEmptyElem($mt_elem_flg)
+ {
+ $this->_mt_elem_flg = $mt_elem_flg;
+ }
- function setAttr($attr_nm,$attr_val)
- {
- $this->_attr_arr[$attr_nm] = $attr_val;
- }
+ function setAttr($attr_nm,$attr_val)
+ {
+ $this->_attr_arr[$attr_nm] = $attr_val;
+ }
- function setAttrArr($attr_arr)
- {
- $this->_attr_arr = $attr_arr;
- }
+ function setAttrArr($attr_arr)
+ {
+ $this->_attr_arr = $attr_arr;
+ }
- function setParentId($id)
- {
- $this->_parent_id = $id;
- }
+ function setParentId($id)
+ {
+ $this->_parent_id = $id;
+ }
- function setParentNode(&$node)
- {
- $this->_parent_node = $node;
- }
+ function setParentNode(&$node)
+ {
+ $this->_parent_node = $node;
+ }
- function getId()
- {
- return($this->_id);
- }
+ function getId()
+ {
+ return($this->_id);
+ }
- function getName()
- {
- return($this->_name);
- }
+ function getName()
+ {
+ return($this->_name);
+ }
- function getNamespace()
- {
- return($this->_nmspc);
- }
+ function getNamespace()
+ {
+ return($this->_nmspc);
+ }
- function getNamespaceAlias()
- {
- return($this->_nmspc_alias);
- }
+ function getNamespaceAlias()
+ {
+ return($this->_nmspc_alias);
+ }
- function getContent()
- {
- return($this->_content);
- }
+ function getContent()
+ {
+ return($this->_content);
+ }
- function getAttr($attr_nm)
- {
- if (isset($this->_attr_arr[$attr_nm])) {
- return($this->_attr_arr[$attr_nm]);
- } else {
- return(NULL);
- }
- }
+ function getAttr($attr_nm)
+ {
+ if (isset($this->_attr_arr[$attr_nm])) {
+ return($this->_attr_arr[$attr_nm]);
+ } else {
+ return(NULL);
+ }
+ }
- function getAttrArr()
- {
- return($this->_attr_arr);
- }
+ function getAttrArr()
+ {
+ return($this->_attr_arr);
+ }
- function getParentId()
- {
- return($this->parent_id);
- }
+ function getParentId()
+ {
+ return($this->parent_id);
+ }
- function getParentNode()
- {
- return($this->_parent_node);
- }
+ function getParentNode()
+ {
+ return($this->_parent_node);
+ }
- function getChild($id)
- {
- if (isset($this->_child_arr[$id])) {
- return($this->_child_arr[$id]);
- } else {
- return(FALSE);
- }
- }
+ function getChild($id)
+ {
+ if (isset($this->_child_arr[$id])) {
+ return($this->_child_arr[$id]);
+ } else {
+ return(FALSE);
+ }
+ }
- function getFirstChild()
- {
- $id_arr = array_keys($this->_child_arr);
- $num_child = count($id_arr);
+ function getFirstChild()
+ {
+ $id_arr = array_keys($this->_child_arr);
+ $num_child = count($id_arr);
- if ($num_child > 0) {
- return($this->_child_arr[$id_arr[0]]);
- } else {
- return(FALSE);
- }
- }
+ if ($num_child > 0) {
+ return($this->_child_arr[$id_arr[0]]);
+ } else {
+ return(FALSE);
+ }
+ }
- function getLastChild()
- {
- $id_arr = array_keys($this->_child_arr);
- $num_child = count($id_arr);
+ function getLastChild()
+ {
+ $id_arr = array_keys($this->_child_arr);
+ $num_child = count($id_arr);
- if ($num_child > 0) {
- return($this->_child_arr[$id_arr[$num_child - 1]]);
- } else {
- return(FALSE);
- }
- }
+ if ($num_child > 0) {
+ return($this->_child_arr[$id_arr[$num_child - 1]]);
+ } else {
+ return(FALSE);
+ }
+ }
- function getChildByIdx($idx)
- {
- $id_arr = array_keys($this->_child_arr);
+ function getChildByIdx($idx)
+ {
+ $id_arr = array_keys($this->_child_arr);
- if (isset($this->_child_arr[$id_arr[$idx]])) {
- return($this->_child_arr[$id_arr[$idx]]);
- } else {
- return(FALSE);
- }
- }
+ if (isset($this->_child_arr[$id_arr[$idx]])) {
+ return($this->_child_arr[$id_arr[$idx]]);
+ } else {
+ return(FALSE);
+ }
+ }
- function getNumChild()
- {
- return(count($this->_child_arr));
- }
+ function getNumChild()
+ {
+ return(count($this->_child_arr));
+ }
- function removeChild($id)
- {
- unset($this->_child_arr[$id]);
- }
+ function removeChild($id)
+ {
+ unset($this->_child_arr[$id]);
+ }
- function removeChildByIdx($idx)
- {
- $key_arr = array_keys($this->_child_arr);
- unset($this->_child_arr[$key_arr[$idx]]);
- }
+ function removeChildByIdx($idx)
+ {
+ $key_arr = array_keys($this->_child_arr);
+ unset($this->_child_arr[$key_arr[$idx]]);
+ }
- function removeFirstChild()
- {
- $key_arr = array_keys($this->_child_arr);
- unset($this->_child_arr[$key_arr[0]]);
- }
+ function removeFirstChild()
+ {
+ $key_arr = array_keys($this->_child_arr);
+ unset($this->_child_arr[$key_arr[0]]);
+ }
- function removeLastChild()
- {
- $key_arr = array_keys($this->_child_arr);
- unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
- }
+ function removeLastChild()
+ {
+ $key_arr = array_keys($this->_child_arr);
+ unset($this->_child_arr[$key_arr[count($key_arr)-1]]);
+ }
- function dumpXML($indent_str = "\t")
- {
- $attr_txt = $this->_dumpAttr();
- $name = $this->_dumpName();
- $xmlns = $this->_dumpXmlns();
- $lvl = $this->_getCurrentLevel();
- $indent = str_pad('',$lvl,$indent_str);
+ function dumpXML($indent_str = "\t")
+ {
+ $attr_txt = $this->_dumpAttr();
+ $name = $this->_dumpName();
+ $xmlns = $this->_dumpXmlns();
+ $lvl = $this->_getCurrentLevel();
+ $indent = str_pad('',$lvl,$indent_str);
- if ($this->_mt_elem_flg) {
- $tag = "$indent<$name$xmlns$attr_txt />";
- return($tag);
- } else {
- $key_arr = array_keys($this->_child_arr);
- $num_child = count($key_arr);
+ if ($this->_mt_elem_flg) {
+ $tag = "$indent<$name$xmlns$attr_txt />";
+ return($tag);
+ } else {
+ $key_arr = array_keys($this->_child_arr);
+ $num_child = count($key_arr);
- $tag = "$indent<$name$xmlns$attr_txt>$this->_content";
+ $tag = "$indent<$name$xmlns$attr_txt>$this->_content";
- for ($i = 0;$i < $num_child;$i++) {
- $node = $this->_child_arr[$key_arr[$i]];
+ for ($i = 0;$i < $num_child;$i++) {
+ $node = $this->_child_arr[$key_arr[$i]];
- $child_txt = $node->dumpXML($indent_str);
- $tag .= "\n$child_txt";
- }
+ $child_txt = $node->dumpXML($indent_str);
+ $tag .= "\n$child_txt";
+ }
- $tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
- return($tag);
- }
- }
+ $tag .= ($num_child > 0 ? "\n$indent</$name>" : "</$name>");
+ return($tag);
+ }
+ }
- function _dumpAttr()
- {
- $id_arr = array_keys($this->_attr_arr);
- $id_arr_cnt = count($id_arr);
- $attr_txt = '';
+ function _dumpAttr()
+ {
+ $id_arr = array_keys($this->_attr_arr);
+ $id_arr_cnt = count($id_arr);
+ $attr_txt = '';
- for($i = 0;$i < $id_arr_cnt;$i++) {
- $key = $id_arr[$i];
- $attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
- }
+ for($i = 0;$i < $id_arr_cnt;$i++) {
+ $key = $id_arr[$i];
+ $attr_txt .= " $key=\"{$this->_attr_arr[$key]}\"";
+ }
- return($attr_txt);
- }
+ return($attr_txt);
+ }
- function _dumpName()
- {
- $alias = $this->getNamespaceAlias();
- if ($alias == '') {
- return($this->getName());
- } else {
- return("$alias:" . $this->getName());
- }
- }
+ function _dumpName()
+ {
+ $alias = $this->getNamespaceAlias();
+ if ($alias == '') {
+ return($this->getName());
+ } else {
+ return("$alias:" . $this->getName());
+ }
+ }
- function _dumpXmlns()
- {
- $nmspc = $this->getNamespace();
- $alias = $this->getNamespaceAlias();
+ function _dumpXmlns()
+ {
+ $nmspc = $this->getNamespace();
+ $alias = $this->getNamespaceAlias();
- if ($nmspc != '') {
- if ($alias == '') {
- return(" xmlns=\"" . $nmspc . "\"");
- } else {
- return(" xmlns:$alias=\"" . $nmspc . "\"");
- }
- } else {
- return('');
- }
- }
+ if ($nmspc != '') {
+ if ($alias == '') {
+ return(" xmlns=\"" . $nmspc . "\"");
+ } else {
+ return(" xmlns:$alias=\"" . $nmspc . "\"");
+ }
+ } else {
+ return('');
+ }
+ }
- function _getCurrentLevel()
- {
- if ($this->_parent_id === FALSE) {
- return(0);
- } else {
- $node = $this->getParentNode();
- $lvl = $node->_getCurrentLevel();
- $lvl++;
- return($lvl);
- }
- }
+ function _getCurrentLevel()
+ {
+ if ($this->_parent_id === FALSE) {
+ return(0);
+ } else {
+ $node = $this->getParentNode();
+ $lvl = $node->_getCurrentLevel();
+ $lvl++;
+ return($lvl);
+ }
+ }
}
class MathMLNode extends XMLNode
{
- function MathMLNode($id = NULL)
- {
- parent::XMLNode($id);
- }
+ function MathMLNode($id = NULL)
+ {
+ parent::XMLNode($id);
+ }
- function removeBrackets()
- {
- if ($this->_name == 'mrow') {
- if ($c_node_0 = $this->getFirstChild()) {
- $c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
- }
+ function removeBrackets()
+ {
+ if ($this->_name == 'mrow') {
+ if ($c_node_0 = $this->getFirstChild()) {
+ $c_node_0->isLeftBracket() ? $this->removeFirstChild() : 0;
+ }
- if ($c_node_0 = $this->getLastChild()) {
- $c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
- }
- }
- }
+ if ($c_node_0 = $this->getLastChild()) {
+ $c_node_0->isRightBracket() ? $this->removeLastChild() : 0;
+ }
+ }
+ }
- function isLeftBracket()
- {
- switch ($this->_content) {
- case '{':
- case '[':
- case '(':
- return(TRUE);
- break;
- }
- return(FALSE);
- }
+ function isLeftBracket()
+ {
+ switch ($this->_content) {
+ case '{':
+ case '[':
+ case '(':
+ return(TRUE);
+ break;
+ }
+ return(FALSE);
+ }
- function isRightBracket()
- {
- switch ($this->_content) {
- case '}':
- case ']':
- case ')':
- return(TRUE);
- break;
- }
- return(FALSE);
- }
+ function isRightBracket()
+ {
+ switch ($this->_content) {
+ case '}':
+ case ']':
+ case ')':
+ return(TRUE);
+ break;
+ }
+ return(FALSE);
+ }
}
class ASCIIMathPHP
{
- var $_expr;
- var $_curr_expr;
- var $_prev_expr;
- var $_symbol_arr;
- var $_node_arr;
- var $_node_cntr;
+ var $_expr;
+ var $_curr_expr;
+ var $_prev_expr;
+ var $_symbol_arr;
+ var $_node_arr;
+ var $_node_cntr;
- function ASCIIMathPHP($symbol_arr,$expr = NULL)
- {
- $this->_symbol_arr = $symbol_arr;
- if (isset($expr)) {
- $this->setExpr($expr);
- }
- }
+ function ASCIIMathPHP($symbol_arr,$expr = NULL)
+ {
+ $this->_symbol_arr = $symbol_arr;
+ if (isset($expr)) {
+ $this->setExpr($expr);
+ }
+ }
- /**
- * Returns an empty node (containing a non-breaking space) 26-Apr-2006
- *
- * Used when an expression is incomplete
- *
- * @return object
- *
- * @access private
- */
- function emptyNode()
- {
- $tmp_node = $this->createNode();
- $tmp_node->setName('mn');
- $tmp_node->setContent('&#' . hexdec('200B') . ';');
- return $tmp_node;
- }
+ /**
+ * Returns an empty node (containing a non-breaking space) 26-Apr-2006
+ *
+ * Used when an expression is incomplete
+ *
+ * @return object
+ *
+ * @access private
+ */
+ function emptyNode()
+ {
+ $tmp_node = $this->createNode();
+ $tmp_node->setName('mn');
+ $tmp_node->setContent('&#' . hexdec('200B') . ';');
+ return $tmp_node;
+ }
- function pushExpr($prefix) // 2005-06-11 wes
- {
- $this->_curr_expr = $prefix . $this->_curr_expr;
- }
+ function pushExpr($prefix) // 2005-06-11 wes
+ {
+ $this->_curr_expr = $prefix . $this->_curr_expr;
+ }
- function setExpr($expr)
- {
- $this->_expr = $expr;
- $this->_curr_expr = $expr;
- $this->_prev_expr = $expr;
+ function setExpr($expr)
+ {
+ $this->_expr = $expr;
+ $this->_curr_expr = $expr;
+ $this->_prev_expr = $expr;
- $this->_node_arr = array();
- $this->_node_cntr = 0;
- }
+ $this->_node_arr = array();
+ $this->_node_cntr = 0;
+ }
- function genMathML($attr_arr = NULL)
- {
- // <math> node
- $node_0 = $this->createNode();
- $node_0->setName('math');
- $node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
+ function genMathML($attr_arr = NULL)
+ {
+ // <math> node
+ $node_0 = $this->createNode();
+ $node_0->setName('math');
+ $node_0->setNamepace('http://www.w3.org/1998/Math/MathML');
- // <mstyle> node
- if (isset($attr_arr)) {
- $node_1 = $this->createNode();
- $node_1->setName('mstyle');
- $node_1->setAttrArr($attr_arr);
+ // <mstyle> node
+ if (isset($attr_arr)) {
+ $node_1 = $this->createNode();
+ $node_1->setName('mstyle');
+ $node_1->setAttrArr($attr_arr);
- $node_arr = $this->parseExpr();
+ $node_arr = $this->parseExpr();
- $node_1->addChildArr($node_arr);
- $node_0->addChild($node_1);
- } else {
- $node_arr = $this->parseExpr();
- $node_0->addChildArr($node_arr);
- }
+ $node_1->addChildArr($node_arr);
+ $node_0->addChild($node_1);
+ } else {
+ $node_arr = $this->parseExpr();
+ $node_0->addChildArr($node_arr);
+ }
- return TRUE;
- }
+ return TRUE;
+ }
- /*
- function mergeNodeArr(&$node_arr_0,&$node_arr_1)
- {
- $key_arr_0 = array_keys($node_arr_0);
- $key_arr_1 = array_keys($node_arr_1);
+ /*
+ function mergeNodeArr(&$node_arr_0,&$node_arr_1)
+ {
+ $key_arr_0 = array_keys($node_arr_0);
+ $key_arr_1 = array_keys($node_arr_1);
- $num_key_0 = count($key_arr_0);
- $num_key_1 = count($key_arr_1);
+ $num_key_0 = count($key_arr_0);
+ $num_key_1 = count($key_arr_1);
- $merge_arr = array();
+ $merge_arr = array();
- for ($i = 0;$i < $num_key_0;$i++) {
- $merge_arr[$key_arr_0[$i]] = $node_arr_0[$key_arr_0[$i]];
- }
+ for ($i = 0;$i < $num_key_0;$i++) {
+ $merge_arr[$key_arr_0[$i]] = $node_arr_0[$key_arr_0[$i]];
+ }
- for ($j = 0;$j < $num_key_1;$i++) {
- $merge_arr[$key_arr_1[$i]] = $node_arr_1[$key_arr_1[$i]];
- }
+ for ($j = 0;$j < $num_key_1;$i++) {
+ $merge_arr[$key_arr_1[$i]] = $node_arr_1[$key_arr_1[$i]];
+ }
- return($merge_arr);
- }
- */
+ return($merge_arr);
+ }
+ */
- //Broken out of parseExpr Sept 7, 2006 David Lippman for
- //ASCIIMathML 1.4.7 compatibility
- function parseIntExpr()
- {
- $sym_0 = $this->getSymbol();
- $node_0 = $this->parseSmplExpr();
- $sym = $this->getSymbol();
+ //Broken out of parseExpr Sept 7, 2006 David Lippman for
+ //ASCIIMathML 1.4.7 compatibility
+ function parseIntExpr()
+ {
+ $sym_0 = $this->getSymbol();
+ $node_0 = $this->parseSmplExpr();
+ $sym = $this->getSymbol();
- if (isset($sym['infix']) && $sym['input'] != '/') {
- $this->chopExpr($sym['symlen']);
- $node_1 = $this->parseSmplExpr();
+ if (isset($sym['infix']) && $sym['input'] != '/') {
+ $this->chopExpr($sym['symlen']);
+ $node_1 = $this->parseSmplExpr();
- if ($node_1 === FALSE) { //show box in place of missing argument
- $node_1 = $this->emptyNode();//??
- } else {
- $node_1->removeBrackets();
- }
+ if ($node_1 === FALSE) { //show box in place of missing argument
+ $node_1 = $this->emptyNode();//??
+ } else {
+ $node_1->removeBrackets();
+ }
- // If 'sub' -- subscript
- if ($sym['input'] == '_') {
+ // If 'sub' -- subscript
+ if ($sym['input'] == '_') {
- $sym_1 = $this->getSymbol();
+ $sym_1 = $this->getSymbol();
- // If 'sup' -- superscript
- if ($sym_1['input'] == '^') {
- $this->chopExpr($sym_1['symlen']);
- $node_2 = $this->parseSmplExpr();
- $node_2->removeBrackets();
+ // If 'sup' -- superscript
+ if ($sym_1['input'] == '^') {
+ $this->chopExpr($sym_1['symlen']);
+ $node_2 = $this->parseSmplExpr();
+ $node_2->removeBrackets();
- $node_3 = $this->createNode();
- $node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
- $node_3->addChild($node_0);
- $node_3->addChild($node_1);
- $node_3->addChild($node_2);
+ $node_3 = $this->createNode();
+ $node_3->setName(isset($sym_0['underover']) ? 'munderover' : 'msubsup');
+ $node_3->addChild($node_0);
+ $node_3->addChild($node_1);
+ $node_3->addChild($node_2);
- $node_4 = $this->createNode();
- $node_4->setName('mrow');
- $node_4->addChild($node_3);
+ $node_4 = $this->createNode();
+ $node_4->setName('mrow');
+ $node_4->addChild($node_3);
- return $node_4;
- } else {
- $node_2 = $this->createNode();
- $node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
- $node_2->addChild($node_0);
- $node_2->addChild($node_1);
+ return $node_4;
+ } else {
+ $node_2 = $this->createNode();
+ $node_2->setName(isset($sym_0['underover']) ? 'munder' : 'msub');
+ $node_2->addChild($node_0);
+ $node_2->addChild($node_1);
- return $node_2;
- }
- } else {
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->addChild($node_0);
- $node_2->addChild($node_1);
+ return $node_2;
+ }
+ } else {
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->addChild($node_0);
+ $node_2->addChild($node_1);
- return($node_2);
- }
- } elseif ($node_0 !== FALSE) {
- return($node_0);
- } else {
- return $this->emptyNode();
- }
+ return($node_2);
+ }
+ } elseif ($node_0 !== FALSE) {
+ return($node_0);
+ } else {
+ return $this->emptyNode();
+ }
- }
+ }
- function parseExpr()
- {
- // Child/Fragment array
- $node_arr = array();
+ function parseExpr()
+ {
+ // Child/Fragment array
+ $node_arr = array();
- // Deal whole expressions like 'ax + by + c = 0' etc.
- do {
- $sym_0 = $this->getSymbol();
- $node_0 = $this->parseIntExpr();
- $sym = $this->getSymbol();
- // var_dump($sym);
+ // Deal whole expressions like 'ax + by + c = 0' etc.
+ do {
+ $sym_0 = $this->getSymbol();
+ $node_0 = $this->parseIntExpr();
+ $sym = $this->getSymbol();
+ // var_dump($sym);
- if (isset($sym['infix']) && $sym['input'] == '/') {
- $this->chopExpr($sym['symlen']);
- $node_1 = $this->parseIntExpr();
+ if (isset($sym['infix']) && $sym['input'] == '/') {
+ $this->chopExpr($sym['symlen']);
+ $node_1 = $this->parseIntExpr();
- if ($node_1 === FALSE) { //should show box in place of missing argument
- $node_1 = $this->emptyNode();
- continue;
- }
+ if ($node_1 === FALSE) { //should show box in place of missing argument
+ $node_1 = $this->emptyNode();
+ continue;
+ }
- $node_1->removeBrackets();
+ $node_1->removeBrackets();
- // If 'div' -- divide
- $node_0->removeBrackets();
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->addChild($node_0);
- $node_2->addChild($node_1);
- $node_arr[$node_2->getId()] = $node_2;
+ // If 'div' -- divide
+ $node_0->removeBrackets();
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->addChild($node_0);
+ $node_2->addChild($node_1);
+ $node_arr[$node_2->getId()] = $node_2;
- } elseif ($node_0 !== FALSE) {
- $node_arr[$node_0->getId()] = $node_0;
- }
- } while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
+ } elseif ($node_0 !== FALSE) {
+ $node_arr[$node_0->getId()] = $node_0;
+ }
+ } while (!isset($sym['right_bracket']) && $sym !== FALSE && $sym['output'] != '');
- //var_dump($sym);
- // Possibly to deal with matrices
- if (isset($sym['right_bracket'])) {
- $node_cnt = count($node_arr);
- $key_node_arr = array_keys($node_arr);
+ //var_dump($sym);
+ // Possibly to deal with matrices
+ if (isset($sym['right_bracket'])) {
+ $node_cnt = count($node_arr);
+ $key_node_arr = array_keys($node_arr);
- if ($node_cnt > 1) {
- $node_5 = $node_arr[$key_node_arr[$node_cnt-1]];
- $node_6 = $node_arr[$key_node_arr[$node_cnt-2]];
- } else {
- $node_5 = FALSE;
- $node_6 = FALSE;
- }
+ if ($node_cnt > 1) {
+ $node_5 = $node_arr[$key_node_arr[$node_cnt-1]];
+ $node_6 = $node_arr[$key_node_arr[$node_cnt-2]];
+ } else {
+ $node_5 = FALSE;
+ $node_6 = FALSE;
+ }
- // Dealing with matrices
- if ($node_5 !== FALSE && $node_6 !== FALSE &&
- $node_cnt > 1 &&
- $node_5->getName() == 'mrow' &&
- $node_6->getName() == 'mo' &&
- $node_6->getContent() == ',') {
+ // Dealing with matrices
+ if ($node_5 !== FALSE && $node_6 !== FALSE &&
+ $node_cnt > 1 &&
+ $node_5->getName() == 'mrow' &&
+ $node_6->getName() == 'mo' &&
+ $node_6->getContent() == ',') {
- // Checking if Node 5 has a LastChild
- if ($node_7 = $node_5->getLastChild()) {
- $node_7_cntnt = $node_7->getContent();
- } else {
- $node_7_cntnt = FALSE;
- }
+ // Checking if Node 5 has a LastChild
+ if ($node_7 = $node_5->getLastChild()) {
+ $node_7_cntnt = $node_7->getContent();
+ } else {
+ $node_7_cntnt = FALSE;
+ }
- // If there is a right bracket
- if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
+ // If there is a right bracket
+ if ($node_7 !== FALSE && ($node_7_cntnt == ']' || $node_7_cntnt == ')')) {
- // Checking if Node 5 has a firstChild
- if ($node_8 = $node_5->getFirstChild()) {
- $node_8_cntnt = $node_8->getContent();
- } else {
- $node_8_cntnt = FALSE;
- }
+ // Checking if Node 5 has a firstChild
+ if ($node_8 = $node_5->getFirstChild()) {
+ $node_8_cntnt = $node_8->getContent();
+ } else {
+ $node_8_cntnt = FALSE;
+ }
- // If there is a matching left bracket
- if ($node_8 !== FALSE &&
- (($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
- ($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
+ // If there is a matching left bracket
+ if ($node_8 !== FALSE &&
+ (($node_8_cntnt == '(' && $node_7_cntnt == ')' && $sym['output'] != '}') ||
+ ($node_8_cntnt == '[' && $node_7_cntnt == ']'))) {
- $is_mtrx_flg = TRUE;
- $comma_pos_arr = array();
+ $is_mtrx_flg = TRUE;
+ $comma_pos_arr = array();
- $i = 0;
+ $i = 0;
- while ($i < $node_cnt && $is_mtrx_flg) {
- $tmp_node = $node_arr[$key_node_arr[$i]];
+ while ($i < $node_cnt && $is_mtrx_flg) {
+ $tmp_node = $node_arr[$key_node_arr[$i]];
- if($tmp_node_first = $tmp_node->getFirstChild()) {
- $tnfc = $tmp_node_first->getContent();
- } else {
- $tnfc = FALSE;
- }
+ if($tmp_node_first = $tmp_node->getFirstChild()) {
+ $tnfc = $tmp_node_first->getContent();
+ } else {
+ $tnfc = FALSE;
+ }
- if($tmp_node_last = $tmp_node->getLastChild()) {
- $tnlc = $tmp_node_last->getContent();
- } else {
- $tnlc = FALSE;
- }
+ if($tmp_node_last = $tmp_node->getLastChild()) {
+ $tnlc = $tmp_node_last->getContent();
+ } else {
+ $tnlc = FALSE;
+ }
- if (isset($key_node_arr[$i+1])) {
- $next_tmp_node = $node_arr[$key_node_arr[$i+1]];
- $ntnn = $next_tmp_node->getName();
- $ntnc = $next_tmp_node->getContent();
- } else {
- $ntnn = FALSE;
- $ntnc = FALSE;
- }
+ if (isset($key_node_arr[$i+1])) {
+ $next_tmp_node = $node_arr[$key_node_arr[$i+1]];
+ $ntnn = $next_tmp_node->getName();
+ $ntnc = $next_tmp_node->getContent();
+ } else {
+ $ntnn = FALSE;
+ $ntnc = FALSE;
+ }
- // Checking each node in node array for matrix criteria
- if ($is_mtrx_flg) {
- $is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
- ($i == $node_cnt-1 || $ntnn == 'mo' && $ntnc == ',') &&
- $tnfc == $node_8_cntnt && $tnlc == $node_7_cntnt;
- }
+ // Checking each node in node array for matrix criteria
+ if ($is_mtrx_flg) {
+ $is_mtrx_flg = $tmp_node->getName() == 'mrow' &&
+ ($i == $node_cnt-1 || $ntnn == 'mo' && $ntnc == ',') &&
+ $tnfc == $node_8_cntnt && $tnlc == $node_7_cntnt;
+ }
- if ($is_mtrx_flg) {
- for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
- $tmp_c_node = $tmp_node->getChildByIdx($j);
+ if ($is_mtrx_flg) {
+ for ($j = 0;$j < $tmp_node->getNumChild();$j++) {
+ $tmp_c_node = $tmp_node->getChildByIdx($j);
- if ($tmp_c_node->getContent() == ',') {
- $comma_pos_arr[$i][] = $j;
- }
- }
- }
+ if ($tmp_c_node->getContent() == ',') {
+ $comma_pos_arr[$i][] = $j;
+ }
+ }
+ }
- if ($is_mtrx_flg && $i > 1) {
+ if ($is_mtrx_flg && $i > 1) {
- $cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
- $cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
- $is_mtrx_flg = $cnt_cpan == $cnt_cpap;
- }
+ $cnt_cpan = isset($comma_pos_arr[$i]) ? count($comma_pos_arr[$i]) : NULL;
+ $cnt_cpap = isset($comma_pos_arr[$i-2]) ? count($comma_pos_arr[$i-2]) : NULL;
+ $is_mtrx_flg = $cnt_cpan == $cnt_cpap;
+ }
- $i += 2;
- }
+ $i += 2;
+ }
- // If the node passes the matrix tests
- if ($is_mtrx_flg) {
- $tab_node_arr = array();
+ // If the node passes the matrix tests
+ if ($is_mtrx_flg) {
+ $tab_node_arr = array();
- for ($i = 0;$i < $node_cnt;$i += 2) {
- $tmp_key_node_arr = array_keys($node_arr);
- if (!($tmp_node = $node_arr[$tmp_key_node_arr[0]])) {
- break;
- }
- $num_child = $tmp_node->getNumChild();
- $k = 0;
+ for ($i = 0;$i < $node_cnt;$i += 2) {
+ $tmp_key_node_arr = array_keys($node_arr);
+ if (!($tmp_node = $node_arr[$tmp_key_node_arr[0]])) {
+ break;
+ }
+ $num_child = $tmp_node->getNumChild();
+ $k = 0;
- $tmp_node->removeFirstChild();
+ $tmp_node->removeFirstChild();
- $row_node_arr = array();
- $row_frag_node_arr = array();
+ $row_node_arr = array();
+ $row_frag_node_arr = array();
- for ($j = 1;$j < ($num_child-1);$j++) {
- if (isset($comma_pos_arr[$i][$k]) &&
- $j == $comma_pos_arr[$i][$k]) {
+ for ($j = 1;$j < ($num_child-1);$j++) {
+ if (isset($comma_pos_arr[$i][$k]) &&
+ $j == $comma_pos_arr[$i][$k]) {
- $tmp_node->removeFirstChild();
+ $tmp_node->removeFirstChild();
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtd');
- $tmp_c_node->addChildArr($row_frag_node_arr);
- $row_frag_node_arr = array();
+ $tmp_c_node = $this->createNode();
+ $tmp_c_node->setName('mtd');
+ $tmp_c_node->addChildArr($row_frag_node_arr);
+ $row_frag_node_arr = array();
- $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- $k++;
- } else {
+ $k++;
+ } else {
- if ($tmp_c_node = $tmp_node->getFirstChild()) {
- $row_frag_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- $tmp_node->removeFirstChild();
- }
- }
- }
+ if ($tmp_c_node = $tmp_node->getFirstChild()) {
+ $row_frag_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ $tmp_node->removeFirstChild();
+ }
+ }
+ }
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtd');
- $tmp_c_node->addChildArr($row_frag_node_arr);
+ $tmp_c_node = $this->createNode();
+ $tmp_c_node->setName('mtd');
+ $tmp_c_node->addChildArr($row_frag_node_arr);
- $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ $row_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- if (count($node_arr) > 2) {
- $tmp_key_node_arr = array_keys($node_arr);
- unset($node_arr[$tmp_key_node_arr[0]]);
- unset($node_arr[$tmp_key_node_arr[1]]);
- }
+ if (count($node_arr) > 2) {
+ $tmp_key_node_arr = array_keys($node_arr);
+ unset($node_arr[$tmp_key_node_arr[0]]);
+ unset($node_arr[$tmp_key_node_arr[1]]);
+ }
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtr');
- $tmp_c_node->addChildArr($row_node_arr);
+ $tmp_c_node = $this->createNode();
+ $tmp_c_node->setName('mtr');
+ $tmp_c_node->addChildArr($row_node_arr);
- $tab_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- }
+ $tab_node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ }
- $tmp_c_node = $this->createNode();
- $tmp_c_node->setName('mtable');
- $tmp_c_node->addChildArr($tab_node_arr);
+ $tmp_c_node = $this->createNode();
+ $tmp_c_node->setName('mtable');
+ $tmp_c_node->addChildArr($tab_node_arr);
- if (isset($sym['invisible'])) {
- $tmp_c_node->setAttr('columnalign','left');
- }
+ if (isset($sym['invisible'])) {
+ $tmp_c_node->setAttr('columnalign','left');
+ }
- $key_node_arr = array_keys($node_arr);
- $tmp_c_node->setId($key_node_arr[0]);
+ $key_node_arr = array_keys($node_arr);
+ $tmp_c_node->setId($key_node_arr[0]);
- $node_arr[$tmp_c_node->getId()] = $tmp_c_node;
- }
- }
- }
- }
+ $node_arr[$tmp_c_node->getId()] = $tmp_c_node;
+ }
+ }
+ }
+ }
- $this->chopExpr($sym['symlen']);
- if (!isset($sym['invisible'])) {
- $node_7 = $this->createNode();
- $node_7->setName('mo');
- $node_7->setContent($sym['output']);
- $node_arr[$node_7->getId()] = $node_7;
- }
- }
+ $this->chopExpr($sym['symlen']);
+ if (!isset($sym['invisible'])) {
+ $node_7 = $this->createNode();
+ $node_7->setName('mo');
+ $node_7->setContent($sym['output']);
+ $node_arr[$node_7->getId()] = $node_7;
+ }
+ }
- return($node_arr);
- }
+ return($node_arr);
+ }
- function parseSmplExpr()
- {
- $sym = $this->getSymbol();
+ function parseSmplExpr()
+ {
+ $sym = $this->getSymbol();
- if (!$sym || isset($sym['right_bracket'])) //return FALSE;
- return $this->emptyNode();
+ if (!$sym || isset($sym['right_bracket'])) //return FALSE;
+ return $this->emptyNode();
- $this->chopExpr($sym['symlen']);
+ $this->chopExpr($sym['symlen']);
- // 2005-06-11 wes: add definition type support
- if(isset($sym['definition'])) {
- $this->pushExpr($sym['output']);
- $sym = $this->getSymbol();
- $this->chopExpr($sym['symlen']);
- }
+ // 2005-06-11 wes: add definition type support
+ if(isset($sym['definition'])) {
+ $this->pushExpr($sym['output']);
+ $sym = $this->getSymbol();
+ $this->chopExpr($sym['symlen']);
+ }
- if (isset($sym['left_bracket'])) {
- $node_arr = $this->parseExpr();
+ if (isset($sym['left_bracket'])) {
+ $node_arr = $this->parseExpr();
- if (isset($sym['invisible'])) {
- $node_0 = $this->createNode();
- $node_0->setName('mrow');
- $node_0->addChildArr($node_arr);
+ if (isset($sym['invisible'])) {
+ $node_0 = $this->createNode();
+ $node_0->setName('mrow');
+ $node_0->addChildArr($node_arr);
- return($node_0);
- } else {
- $node_0 = $this->createNode();
- $node_0->setName('mo');
- $node_0->setContent($sym['output']);
+ return($node_0);
+ } else {
+ $node_0 = $this->createNode();
+ $node_0->setName('mo');
+ $node_0->setContent($sym['output']);
- $node_1 = $this->createNode();
- $node_1->setName('mrow');
- $node_1->addChild($node_0);
- $node_1->addChildArr($node_arr);
+ $node_1 = $this->createNode();
+ $node_1->setName('mrow');
+ $node_1->addChild($node_0);
+ $node_1->addChildArr($node_arr);
- return($node_1);
- }
- } elseif (isset($sym['unary'])) {
+ return($node_1);
+ }
+ } elseif (isset($sym['unary'])) {
- if ($sym['input'] == 'sqrt') {
- $node_0 = $this->parseSmplExpr();
- $node_0->removeBrackets();
+ if ($sym['input'] == 'sqrt') {
+ $node_0 = $this->parseSmplExpr();
+ $node_0->removeBrackets();
- $node_1 = $this->createNode();
- $node_1->setName($sym['tag']);
- $node_1->addChild($node_0);
+ $node_1 = $this->createNode();
+ $node_1->setName($sym['tag']);
+ $node_1->addChild($node_0);
- return($node_1);
- } elseif (isset($sym['func'])) { //added 2006-9-7 David Lippman
- $expr = ltrim($this->getCurrExpr());
- $st = $expr{0};
- $node_0 = $this->parseSmplExpr();
- //$node_0->removeBrackets();
- if ($st=='^' || $st == '_' || $st=='/' || $st=='|' || $st==',') {
- $node_1 = $this->createNode();
- $node_1->setName($sym['tag']);
- $node_1->setContent($sym['output']);
- $this->setCurrExpr($expr);
- return($node_1);
- } else {
- $node_1 = $this->createNode();
- $node_1->setName('mrow');
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->setContent($sym['output']);
- $node_1->addChild($node_2);
- $node_1->addChild($node_0);
- return($node_1);
- }
- } elseif ($sym['input'] == 'text' || $sym['input'] == 'mbox' || $sym['input'] == '"') {
- $expr = ltrim($this->getCurrExpr());
- if ($sym['input']=='"') {
- $end_brckt = '"';
- $txt = substr($expr,0,strpos($expr,$end_brckt));
- } else {
- switch($expr{0}) {
- case '(':
- $end_brckt = ')';
- break;
- case '[':
- $end_brckt = ']';
- break;
- case '{':
- $end_brckt = '}';
- break;
- default:
- $end_brckt = chr(11); // A character that will never be matched.
- break;
- }
- $txt = substr($expr,1,strpos($expr,$end_brckt)-1);
- }
+ return($node_1);
+ } elseif (isset($sym['func'])) { //added 2006-9-7 David Lippman
+ $expr = ltrim($this->getCurrExpr());
+ $st = $expr{0};
+ $node_0 = $this->parseSmplExpr();
+ //$node_0->removeBrackets();
+ if ($st=='^' || $st == '_' || $st=='/' || $st=='|' || $st==',') {
+ $node_1 = $this->createNode();
+ $node_1->setName($sym['tag']);
+ $node_1->setContent($sym['output']);
+ $this->setCurrExpr($expr);
+ return($node_1);
+ } else {
+ $node_1 = $this->createNode();
+ $node_1->setName('mrow');
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->setContent($sym['output']);
+ $node_1->addChild($node_2);
+ $node_1->addChild($node_0);
+ return($node_1);
+ }
+ } elseif ($sym['input'] == 'text' || $sym['input'] == 'mbox' || $sym['input'] == '"') {
+ $expr = ltrim($this->getCurrExpr());
+ if ($sym['input']=='"') {
+ $end_brckt = '"';
+ $txt = substr($expr,0,strpos($expr,$end_brckt));
+ } else {
+ switch($expr{0}) {
+ case '(':
+ $end_brckt = ')';
+ break;
+ case '[':
+ $end_brckt = ']';
+ break;
+ case '{':
+ $end_brckt = '}';
+ break;
+ default:
+ $end_brckt = chr(11); // A character that will never be matched.
+ break;
+ }
+ $txt = substr($expr,1,strpos($expr,$end_brckt)-1);
+ }
- //$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
- $len = strlen($txt);
+ //$txt = substr($expr,1,strpos($expr,$end_brckt)-1);
+ $len = strlen($txt);
- $node_0 = $this->createNode();
- $node_0->setName('mrow');
+ $node_0 = $this->createNode();
+ $node_0->setName('mrow');
- if ($len > 0) {
- if ($txt{0} == " ") {
- $node_1 = $this->createNode();
- $node_1->setName('mspace');
- $node_1->setAttr('width','1ex');
+ if ($len > 0) {
+ if ($txt{0} == " ") {
+ $node_1 = $this->createNode();
+ $node_1->setName('mspace');
+ $node_1->setAttr('width','1ex');
- $node_0->addChild($node_1);
- }
+ $node_0->addChild($node_1);
+ }
- $node_3 = $this->createNode();
- $node_3->setName($sym['tag']);
- $node_3->setContent(trim($txt));
+ $node_3 = $this->createNode();
+ $node_3->setName($sym['tag']);
+ $node_3->setContent(trim($txt));
- $node_0->addChild($node_3);
+ $node_0->addChild($node_3);
- if ($len > 1 && $txt{$len-1} == " ") {
- $node_2 = $this->createNode();
- $node_2->setName('mspace');
- $node_2->setAttr('width','1ex');
+ if ($len > 1 && $txt{$len-1} == " ") {
+ $node_2 = $this->createNode();
+ $node_2->setName('mspace');
+ $node_2->setAttr('width','1ex');
- $node_0->addChild($node_2);
- }
+ $node_0->addChild($node_2);
+ }
- $this->chopExpr($len+2);
- }
- return($node_0);
+ $this->chopExpr($len+2);
+ }
+ return($node_0);
- } elseif (isset($sym['acc'])) {
- $node_0 = $this->parseSmplExpr();
- $node_0->removeBrackets();
+ } elseif (isset($sym['acc'])) {
+ $node_0 = $this->parseSmplExpr();
+ $node_0->removeBrackets();
- $node_1 = $this->createNode();
- $node_1->setName($sym['tag']);
- $node_1->addChild($node_0);
+ $node_1 = $this->createNode();
+ $node_1->setName($sym['tag']);
+ $node_1->addChild($node_0);
- $node_2 = $this->createNode();
- $node_2->setName('mo');
- $node_2->setContent($sym['output']);
+ $node_2 = $this->createNode();
+ $node_2->setName('mo');
+ $node_2->setContent($sym['output']);
- $node_1->addChild($node_2);
- return($node_1);
- } else {
- // Font change commands -- to complete
- }
- } elseif (isset($sym['binary'])) {
- $node_arr = array();
+ $node_1->addChild($node_2);
+ return($node_1);
+ } else {
+ // Font change commands -- to complete
+ }
+ } elseif (isset($sym['binary'])) {
+ $node_arr = array();
- $node_0 = $this->parseSmplExpr();
- $node_0->removeBrackets();
+ $node_0 = $this->parseSmplExpr();
+ $node_0->removeBrackets();
- $node_1 = $this->parseSmplExpr();
- $node_1->removeBrackets();
+ $node_1 = $this->parseSmplExpr();
+ $node_1->removeBrackets();
/* 2005-06-05 wes: added stackrel */
- if ($sym['input'] == 'root' || $sym['input'] == 'stackrel') {
- $node_arr[$node_1->getId()] = $node_1;
- $node_arr[$node_0->getId()] = $node_0;
- } elseif ($sym['input'] == 'frac') {
- $node_arr[$node_0->getId()] = $node_0;
- $node_arr[$node_1->getId()] = $node_1;
- }
+ if ($sym['input'] == 'root' || $sym['input'] == 'stackrel') {
+ $node_arr[$node_1->getId()] = $node_1;
+ $node_arr[$node_0->getId()] = $node_0;
+ } elseif ($sym['input'] == 'frac') {
+ $node_arr[$node_0->getId()] = $node_0;
+ $node_arr[$node_1->getId()] = $node_1;
+ }
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->addChildArr($node_arr);
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->addChildArr($node_arr);
- return($node_2);
- } elseif (isset($sym['infix'])) {
- $node_0 = $this->createNode();
- $node_0->setName('mo');
- $node_0->setContent($sym['output']);
+ return($node_2);
+ } elseif (isset($sym['infix'])) {
+ $node_0 = $this->createNode();
+ $node_0->setName('mo');
+ $node_0->setContent($sym['output']);
- return($node_0);
- } elseif (isset($sym['space'])) {
- $node_0 = $this->createNode();
- $node_0->setName('mrow');
+ return($node_0);
+ } elseif (isset($sym['space'])) {
+ $node_0 = $this->createNode();
+ $node_0->setName('mrow');
- $node_1 = $this->createNode();
- $node_1->setName('mspace');
- $node_1->setAttr('width',$sym['space']);
+ $node_1 = $this->createNode();
+ $node_1->setName('mspace');
+ $node_1->setAttr('width',$sym['space']);
- $node_2 = $this->createNode();
- $node_2->setName($sym['tag']);
- $node_2->setContent($sym['output']);
+ $node_2 = $this->createNode();
+ $node_2->setName($sym['tag']);
+ $node_2->setContent($sym['output']);
- $node_3 = $this->createNode();
- $node_3->setName('mspace');
- $node_3->setAttr('width',$sym['space']);
+ $node_3 = $this->createNode();
+ $node_3->setName('mspace');
+ $node_3->setAttr('width',$sym['space']);
- $node_0->addChild($node_1);
- $node_0->addChild($node_2);
- $node_0->addChild($node_3);
+ $node_0->addChild($node_1);
+ $node_0->addChild($node_2);
+ $node_0->addChild($node_3);
- return($node_0);
- } else {
+ return($node_0);
+ } else {
- // A constant
- $node_0 = $this->createNode();
- $node_0->setName($sym['tag']);
- $node_0->setContent($sym['output']);
- return($node_0);
- }
+ // A constant
+ $node_0 = $this->createNode();
+ $node_0->setName($sym['tag']);
+ $node_0->setContent($sym['output']);
+ return($node_0);
+ }
- // Return an empty node
- return $this->emptyNode();
- }
+ // Return an empty node
+ return $this->emptyNode();
+ }
- function getMathML()
- {
- $root = $this->_node_arr[0];
- return($root->dumpXML());
- }
+ function getMathML()
+ {
+ $root = $this->_node_arr[0];
+ return($root->dumpXML());
+ }
- function getCurrExpr()
- {
- return($this->_curr_expr);
- }
+ function getCurrExpr()
+ {
+ return($this->_curr_expr);
+ }
- function setCurrExpr($str)
- {
- $this->_curr_expr = $str;
- }
+ function setCurrExpr($str)
+ {
+ $this->_curr_expr = $str;
+ }
- function getExpr()
- {
- return($this->_expr);
- }
+ function getExpr()
+ {
+ return($this->_expr);
+ }
- function getPrevExpr()
- {
- return($this->_prev_expr);
- }
+ function getPrevExpr()
+ {
+ return($this->_prev_expr);
+ }
- function createNode()
- {
- $node = new MathMLNode($this->_node_cntr);
- // $node->setNamespaceAlias('m');
- $this->_node_arr[$this->_node_cntr] = $node;
- $this->_node_cntr++;
- return($node);
- }
+ function createNode()
+ {
+ $node = new MathMLNode($this->_node_cntr);
+ // $node->setNamespaceAlias('m');
+ $this->_node_arr[$this->_node_cntr] = $node;
+ $this->_node_cntr++;
+ return($node);
+ }
- /**
- * Gets the largest symbol in the expression (greedy). Changed from non-greedy 26-Apr-2006
- *
- * @parameter boolean[optional] Chop original string?
- *
- * @return mixed
- *
- * @access private
- */
- function getSymbol($chop_flg = FALSE)
- {
- // Implemented a reverse symbol matcher.
- // Instead of going front to back, it goes back to front. Steven 26-Apr-2006
- $chr_cnt = strlen($this->_curr_expr);
+ /**
+ * Gets the largest symbol in the expression (greedy). Changed from non-greedy 26-Apr-2006
+ *
+ * @parameter boolean[optional] Chop original string?
+ *
+ * @return mixed
+ *
+ * @access private
+ */
+ function getSymbol($chop_flg = FALSE)
+ {
+ // Implemented a reverse symbol matcher.
+ // Instead of going front to back, it goes back to front. Steven 26-Apr-2006
+ $chr_cnt = strlen($this->_curr_expr);
- if ($chr_cnt == 0) return FALSE;
+ if ($chr_cnt == 0) return FALSE;
- for ($i = $chr_cnt; $i > 0; $i--) {
- $sym_0 = substr($this->_curr_expr,0,$i);
+ for ($i = $chr_cnt; $i > 0; $i--) {
+ $sym_0 = substr($this->_curr_expr,0,$i);
- // Reading string for numeric values
- if (is_numeric($sym_0)) {
+ // Reading string for numeric values
+ if (is_numeric($sym_0)) {
- if ($chop_flg) $this->chopExpr($i);
- return array('input'=>$sym_0, 'tag'=>'mn', 'output'=>$sym_0, 'symlen'=>$i);
+ if ($chop_flg) $this->chopExpr($i);
+ return array('input'=>$sym_0, 'tag'=>'mn', 'output'=>$sym_0, 'symlen'=>$i);
- } elseif (isset($this->_symbol_arr[$sym_0])) {
+ } elseif (isset($this->_symbol_arr[$sym_0])) {
- if ($chop_flg) $this->chopExpr($i);
- $sym_arr = $this->_symbol_arr[$sym_0];
- $sym_arr['symlen'] = $i;
- return $sym_arr;
- }
- }
+ if ($chop_flg) $this->chopExpr($i);
+ $sym_arr = $this->_symbol_arr[$sym_0];
+ $sym_arr['symlen'] = $i;
+ ...
[truncated message content] |
|
From: <var...@us...> - 2012-08-31 11:49:30
|
Revision: 8279
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8279&view=rev
Author: vargenau
Date: 2012-08-31 11:49:19 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
phpdoc_params
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/Google.php
trunk/lib/InlineParser.php
trunk/lib/PageList.php
trunk/lib/PageType.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/WikiUser.php
trunk/lib/main.php
trunk/lib/nusoap/nusoap.php
trunk/lib/pear/Cache/Container/trifile.php
trunk/lib/pear/Cache.php
trunk/lib/pear/DB/common.php
trunk/lib/pear/DB/dbase.php
trunk/lib/pear/DB/fbsql.php
trunk/lib/pear/DB/ibase.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/ldap.php
trunk/lib/pear/DB/msql.php
trunk/lib/pear/DB/mssql.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/odbc.php
trunk/lib/pear/DB/pgsql.php
trunk/lib/pear/DB/sqlite.php
trunk/lib/pear/DB/sybase.php
trunk/lib/pear/DB.php
trunk/lib/pear/PEAR.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/prepend.php
trunk/lib/stdlib.php
trunk/themes/Sidebar/themeinfo.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/BlockParser.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -90,7 +90,7 @@
*
* @param $text string The text to search.
*
- * @return object A RegexpSet_match object, or false if no match.
+ * @return object A RegexpSet_match object, or false if no match.
*/
function match ($text) {
if (!is_string($text)) return false;
@@ -122,7 +122,7 @@
* $prevMatch should be a match object obtained by a previous
* match upon the same value of $text.
*
- * @return object A RegexpSet_match object, or false if no match.
+ * @return object A RegexpSet_match object, or false if no match.
*/
function nextMatch ($text, $prevMatch) {
// Try to find match at same position.
Modified: trunk/lib/DbSession/ADODB.php
===================================================================
--- trunk/lib/DbSession/ADODB.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/DbSession/ADODB.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -76,8 +76,8 @@
* Opens a session.
*
* Actually this function is a fake for session_set_save_handle.
- * @param string $save_path a path to stored files
- * @param string $session_name a name of the concrete file
+ * @param string $save_path a path to stored files
+ * @param string $session_name a name of the concrete file
* @return boolean true just a variable to notify PHP that everything
* is good.
* @access private
@@ -140,8 +140,8 @@
* is necessary, it is suggested that the debug output be
* written to a file instead.
*
- * @param string $id
- * @param string $sess_data
+ * @param string $id
+ * @param string $sess_data
* @return boolean true if data saved successfully and false
* otherwise.
* @access private
@@ -191,7 +191,7 @@
*
* Removes a session from the table.
*
- * @param string $id
+ * @param string $id
* @return boolean true
* @access private
*/
@@ -209,7 +209,7 @@
/**
* Cleans out all expired sessions.
*
- * @param int $maxlifetime session's time to live.
+ * @param int $maxlifetime session's time to live.
* @return boolean true
* @access private
*/
Modified: trunk/lib/DbSession/PDO.php
===================================================================
--- trunk/lib/DbSession/PDO.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/DbSession/PDO.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -54,8 +54,8 @@
* Opens a session.
*
* Actually this function is a fake for session_set_save_handle.
- * @param string $save_path a path to stored files
- * @param string $session_name a name of the concrete file
+ * @param string $save_path a path to stored files
+ * @param string $session_name a name of the concrete file
* @return boolean true just a variable to notify PHP that everything
* is good.
* @access private
@@ -117,8 +117,8 @@
* is necessary, it is suggested that the debug output be
* written to a file instead.
*
- * @param string $id
- * @param string $sess_data
+ * @param string $id
+ * @param string $sess_data
* @return boolean true if data saved successfully and false
* otherwise.
* @access private
@@ -182,7 +182,7 @@
*
* Removes a session from the table.
*
- * @param string $id
+ * @param string $id
* @return boolean true
* @access private
*/
@@ -199,7 +199,7 @@
/**
* Cleans out all expired sessions.
*
- * @param int $maxlifetime session's time to live.
+ * @param int $maxlifetime session's time to live.
* @return boolean true
* @access private
*/
Modified: trunk/lib/DbSession/SQL.php
===================================================================
--- trunk/lib/DbSession/SQL.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/DbSession/SQL.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -60,8 +60,8 @@
* Opens a session.
*
* Actually this function is a fake for session_set_save_handle.
- * @param string $save_path a path to stored files
- * @param string $session_name a name of the concrete file
+ * @param string $save_path a path to stored files
+ * @param string $session_name a name of the concrete file
* @return boolean true just a variable to notify PHP that everything
* is good.
* @access private
@@ -125,8 +125,8 @@
* is necessary, it is suggested that the debug output be
* written to a file instead.
*
- * @param string $id
- * @param string $sess_data
+ * @param string $id
+ * @param string $sess_data
* @return boolean true if data saved successfully and false
* otherwise.
* @access private
@@ -177,7 +177,7 @@
*
* Removes a session from the table.
*
- * @param string $id
+ * @param string $id
* @return boolean true
* @access private
*/
@@ -195,7 +195,7 @@
/**
* Cleans out all expired sessions.
*
- * @param int $maxlifetime session's time to live.
+ * @param int $maxlifetime session's time to live.
* @return boolean true
* @access private
*/
Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/Google.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -264,7 +264,7 @@
* Get spelling suggestions from Google
*
* @param string phrase word or phrase to spell-check
- * @return string text of any suggested replacement, or None
+ * @return string text of any suggested replacement, or None
*/
function doSpellingSuggestion($phrase) {
if (!$this->license_key)
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/InlineParser.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -95,7 +95,7 @@
*
* @param string $text The text to search.
*
- * @return RegexpSet_match A RegexpSet_match object, or false if no match.
+ * @return RegexpSet_match A RegexpSet_match object, or false if no match.
*/
function match ($text) {
return $this->_match($text, $this->_regexps, '*?');
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/PageList.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -1258,7 +1258,7 @@
* If you wish to add multiple columns of the same type, use addColumnObject().
*
* @param column name
- * @return true if column is added, false otherwise
+ * @return true if column is added, false otherwise
*/
function _addColumn ($column) {
if (isset($this->_columns_seen[$column]))
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/PageType.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -28,9 +28,9 @@
/** Constructor.
*
* @param WikiDB_Page $page
- * @param string $text The packed page revision content.
- * @param hash $meta The version meta-data.
- * @param string $type_override For markup of page using a different
+ * @param string $text The packed page revision content.
+ * @param hash $meta The version meta-data.
+ * @param string $type_override For markup of page using a different
* pagetype than that specified in its version meta-data.
*/
function TransformedText($page, $text, $meta, $type_override=false) {
@@ -70,8 +70,8 @@
*
* This is a static member function.
*
- * @param string $pagetype Name of the page type.
- * @return PageType An object which is a subclass of PageType.
+ * @param string $pagetype Name of the page type.
+ * @return PageType An object which is a subclass of PageType.
*/
function GetPageType ($name=false) {
if (!$name)
@@ -87,7 +87,7 @@
/**
* Get the name of this page type.
*
- * @return string Page type name.
+ * @return string Page type name.
*/
function getName() {
if (!preg_match('/^PageType_(.+)$/i', get_class($this), $m))
@@ -98,10 +98,10 @@
/**
* Transform page text.
*
- * @param WikiDB_Page $page
- * @param string $text
- * @param hash $meta Version meta-data
- * @return XmlContent The transformed page text.
+ * @param WikiDB_Page $page
+ * @param string $text
+ * @param hash $meta Version meta-data
+ * @return XmlContent The transformed page text.
*/
function transform(&$page, &$text, $meta) {
$fmt_class = 'PageFormatter_' . $this->getName();
@@ -327,7 +327,7 @@
/** Constructor.
*
* @param WikiDB_Page $page
- * @param hash $meta Version meta-data.
+ * @param hash $meta Version meta-data.
*/
function PageFormatter(&$page, $meta) {
$this->_page = $page;
@@ -347,8 +347,8 @@
/** Transform the page text.
*
- * @param string $text The raw page content (e.g. wiki-text).
- * @return XmlContent Transformed content.
+ * @param string $text The raw page content (e.g. wiki-text).
+ * @return XmlContent Transformed content.
*/
function format($text) {
trigger_error("pure virtual", E_USER_ERROR);
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -24,7 +24,7 @@
*
* @param rs the recordset
*
- * @return the CSV formated data
+ * @return the CSV formated data
*/
function _rs2serialize(&$rs,$conn=false,$sql='')
{
Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -738,7 +738,7 @@
*
* @param sql SQL statement to execute, or possibly an array holding prepared statement ($sql[0] will hold sql text)
* @param [inputarr] holds the input data to bind to. Null elements will be set to null.
- * @return RecordSet or false
+ * @return RecordSet or false
*/
function &Execute($sql,$inputarr=false)
{
@@ -904,7 +904,7 @@
*
* @param seqname name of sequence to use
* @param startID if sequence does not exist, start at this ID
- * @return 0 if not supported, otherwise a sequence id
+ * @return 0 if not supported, otherwise a sequence id
*/
function GenID($seqname='adodbseq',$startID=1)
{
@@ -930,7 +930,7 @@
}
/**
- * @return the last inserted ID. Not all databases support this.
+ * @return the last inserted ID. Not all databases support this.
*/
function Insert_ID()
{
@@ -947,7 +947,7 @@
/**
* Portable Insert ID. Pablo Roca <pab...@mv...>
*
- * @return the last inserted ID. All databases support this. But aware possible
+ * @return the last inserted ID. All databases support this. But aware possible
* problems in multiuser environments. Heavy test this before deploying.
*/
function PO_Insert_ID($table="", $id="")
@@ -978,7 +978,7 @@
/**
- * @return the last error message
+ * @return the last error message
*/
function ErrorMsg()
{
@@ -1038,7 +1038,7 @@
* Choose a database to connect to. Many databases do not support this.
*
* @param dbName is the name of the database to select
- * @return true or false
+ * @return true or false
*/
function SelectDB($dbName)
{return false;}
@@ -1509,7 +1509,7 @@
* This is an optional parameter.
* @param sql SQL statement to execute
* @param [inputarr] holds the input data to bind to
- * @return RecordSet or false
+ * @return RecordSet or false
*/
function &CacheExecute($secs2cache,$sql=false,$inputarr=false)
{
@@ -1858,7 +1858,7 @@
* @param showSchema returns the schema/user with the table name, eg. USER.TABLE
* @param mask is the input mask - only supported by oci8 and postgresql
*
- * @return array of tables for current database.
+ * @return array of tables for current database.
*/
function &MetaTables($ttype=false,$showSchema=false,$mask=false)
{
@@ -1918,7 +1918,7 @@
* @param upper uppercase table name (required by some databases)
* @schema is optional database schema to use - not supported by all databases.
*
- * @return array of ADOFieldObjects for current table.
+ * @return array of ADOFieldObjects for current table.
*/
function &MetaColumns($table,$upper=true)
{
@@ -1975,7 +1975,7 @@
* List columns names in a table as an array.
* @param table table name to query
*
- * @return array of column names for current table.
+ * @return array of column names for current table.
*/
function &MetaColumnNames($table)
{
@@ -2011,7 +2011,7 @@
*
* @param d a date in Unix date time format.
*
- * @return date string in database date format
+ * @return date string in database date format
*/
function DBDate($d)
{
@@ -2032,7 +2032,7 @@
*
* @param ts a timestamp in Unix date time format.
*
- * @return timestamp string in database timestamp format
+ * @return timestamp string in database timestamp format
*/
function DBTimeStamp($ts)
{
@@ -2162,7 +2162,7 @@
* @param [magic_quotes] if $s is GET/POST var, set to get_magic_quotes_gpc().
* This undoes the stupidity of magic quotes for GPC.
*
- * @return quoted string to be sent back to database
+ * @return quoted string to be sent back to database
*/
function qstr($s,$magic_quotes=false)
{
@@ -2874,7 +2874,7 @@
/**
* Portable RecordCount. Pablo Roca <pab...@mv...>
*
- * @return the number of records from a previous SELECT. All databases support this.
+ * @return the number of records from a previous SELECT. All databases support this.
*
* But aware possible problems in multiuser environments. For better speed the table
* must be indexed by the condition. Heavy test this before deploying.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -938,7 +938,7 @@
* @param [magic_quotes] if $s is GET/POST var, set to get_magic_quotes_gpc().
* This undoes the stupidity of magic quotes for GPC.
*
- * @return quoted string to be sent back to database
+ * @return quoted string to be sent back to database
*/
function qstr($s,$magic_quotes=false)
{
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB/backend.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -388,8 +388,8 @@
* be returned in reverse order by hit count.
*
* @access protected
- * @param integer $limit No more than this many pages
- * @return object A WikiDB_backend_iterator.
+ * @param integer $limit No more than this many pages
+ * @return object A WikiDB_backend_iterator.
*/
function most_popular($limit, $sortby='-hits') {
// This is method fetches all pages, then
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiDB.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -155,7 +155,7 @@
* therefore this method never fails.
*
* @access public
- * @param string $pagename Which page to get.
+ * @param string $pagename Which page to get.
* @return WikiDB_Page The requested WikiDB_Page.
*/
function getPage($pagename) {
@@ -192,7 +192,7 @@
* manner in certain back-ends.
*
* @access public
- * @param string $pagename string Which page to check.
+ * @param string $pagename string Which page to check.
* @return boolean True if the page actually exists with
* non-default contents in the WikiDataBase.
*/
@@ -288,7 +288,7 @@
* @access public
*
* @param boolean $include_empty If true include also empty pages
- * @param string $exclude: comma-seperated list of pagenames.
+ * @param string $exclude: comma-seperated list of pagenames.
* TBD: array of pagenames
* @return integer
*
@@ -322,7 +322,7 @@
* If false the result is faster in natural order.
* @param string or false $limit Optional. Encoded as "$offset,$count".
* $offset defaults to 0.
- * @param string $exclude: Optional comma-seperated list of pagenames.
+ * @param string $exclude: Optional comma-seperated list of pagenames.
* @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages.
* @see TextSearchQuery
*/
@@ -352,7 +352,7 @@
* If false the result is faster in natural order.
* @param string or false $limit Optional. Encoded as "$offset,$count".
* $offset defaults to 0.
- * @param string $exclude: Optional comma-seperated list of pagenames.
+ * @param string $exclude: Optional comma-seperated list of pagenames.
* @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages.
* @see TextSearchQuery
*/
@@ -501,10 +501,10 @@
* Call the appropriate backend method.
*
* @access public
- * @param string $from Page to rename
- * @param string $to New name
- * @param boolean $updateWikiLinks If the text in all pages should be replaced.
- * @return boolean true or false
+ * @param string $from Page to rename
+ * @param string $to New name
+ * @param boolean $updateWikiLinks If the text in all pages should be replaced.
+ * @return boolean true or false
*/
function renamePage($from, $to, $updateWikiLinks = false) {
if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
@@ -649,8 +649,8 @@
* @see get
* @access public
*
- * @param string $key Meta-data key to set.
- * @param string $newval New value.
+ * @param string $key Meta-data key to set.
+ * @param string $newval New value.
*/
function set($key, $newval) {
if (!empty($this->readonly)) { trigger_error("readonly database", E_USER_WARNING); return; }
@@ -891,7 +891,7 @@
*
* @param hash $links List of linkto=>pagename, relation=>pagename which this page links to.
*
- * @return WikiDB_PageRevision Returns the new WikiDB_PageRevision object. If
+ * @return WikiDB_PageRevision Returns the new WikiDB_PageRevision object. If
* $version was incorrect, returns false
*/
function createRevision($version, &$content, $metadata, $links) {
@@ -963,7 +963,7 @@
* This takes care of computing the links, and storing
* a cached version of the transformed wiki-text.
*
- * @param string $wikitext The page content.
+ * @param string $wikitext The page content.
*
* @param int $version Version number for new revision.
* To ensure proper serialization of edits, $version must be
@@ -971,7 +971,7 @@
* (You can defeat this check by setting $version to
* {@link WIKIDB_FORCE_CREATE} --- not usually recommended.)
*
- * @param hash $meta Meta-data for new revision.
+ * @param hash $meta Meta-data for new revision.
*/
function save($wikitext, $version, $meta, $formatted = null) {
if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
@@ -1067,7 +1067,7 @@
*
* @access public
*
- * @param integer $version Which revision to get.
+ * @param integer $version Which revision to get.
*
* @return WikiDB_PageRevision The requested WikiDB_PageRevision object, or
* false if the requested revision does not exist in the {@link WikiDB}.
@@ -1098,7 +1098,7 @@
*
* @access public
*
- * @param integer $version Find most recent revision before this version.
+ * @param integer $version Find most recent revision before this version.
* You can also use a WikiDB_PageRevision object to specify the $version.
*
* @return WikiDB_PageRevision The requested WikiDB_PageRevision object, or false if the
@@ -1295,8 +1295,8 @@
* @see get
* @access public
*
- * @param string $key Meta-data key to set.
- * @param string $newval New value.
+ * @param string $key Meta-data key to set.
+ * @param string $newval New value.
*/
function set($key, $newval) {
$cache = &$this->_wikidb->_cache;
@@ -1561,7 +1561,7 @@
/**
* Get the transformed content of a page.
*
- * @param string $pagetype Override the page-type of the revision.
+ * @param string $pagetype Override the page-type of the revision.
*
* @return object An XmlContent-like object containing the page transformed
* contents.
Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiGroup.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -99,7 +99,7 @@
/**
* Static method to return the WikiGroup subclass used in this wiki. Controlled
* by the constant GROUP_METHOD.
- * @param object $request The global WikiRequest object.
+ * @param object $request The global WikiRequest object.
* @return object Subclass of WikiGroup selected via GROUP_METHOD.
*/
function getGroup($not_current = false){
@@ -173,7 +173,7 @@
*
* This method is an abstraction. The group is ignored, an error is sent, and
* false (not a member of the group) is returned.
- * @param string $group Name of the group to check for membership (ignored).
+ * @param string $group Name of the group to check for membership (ignored).
* @return boolean True if user is a member, else false (always false).
*/
function isMember($group){
@@ -304,8 +304,8 @@
*
* This method is an abstraction. The group is ignored, an error is sent,
* and an empty array is returned
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group (always empty).
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group (always empty).
*/
function getMembersOf($group){
if ($this->specialGroup($group)) {
@@ -365,9 +365,9 @@
*
* This method is an abstraction. The group and user are ignored, an error
* is sent, and false (not added) is always returned.
- * @param string $group User added to this group.
- * @param string $user Username to add to the group (default = current user).
- * @return bool On true user was added, false if not.
+ * @param string $group User added to this group.
+ * @param string $user Username to add to the group (default = current user).
+ * @return bool On true user was added, false if not.
*/
function setMemberOf($group, $user = false){
trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
@@ -381,9 +381,9 @@
*
* This method is an abstraction. The group and user are ignored, and error
* is sent, and false (not removed) is always returned.
- * @param string $group User removed from this group.
- * @param string $user Username to remove from the group (default = current user).
- * @return bool On true user was removed, false if not.
+ * @param string $group User removed from this group.
+ * @param string $user Username to remove from the group (default = current user).
+ * @return bool On true user was removed, false if not.
*/
function removeMemberOf($group, $user = false){
trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
@@ -417,7 +417,7 @@
* Determines if the current user is a member of a group.
*
* The group is ignored and false (not a member of the group) is returned.
- * @param string $group Name of the group to check for membership (ignored).
+ * @param string $group Name of the group to check for membership (ignored).
* @return boolean True if user is a member, else false (always false).
*/
function isMember($group){
@@ -432,8 +432,8 @@
* Determines all of the groups of which the current user is a member.
*
* The group is ignored and an empty array (a member of no groups) is returned.
- * @param string $group Name of the group to check for membership (ignored).
- * @return array Array of groups to which the user belongs (always empty).
+ * @param string $group Name of the group to check for membership (ignored).
+ * @return array Array of groups to which the user belongs (always empty).
*/
function getAllGroupsIn(){
return array();
@@ -443,8 +443,8 @@
* Determines all of the members of a particular group.
*
* The group is ignored and an empty array (a member of no groups) is returned.
- * @param string $group Name of the group to check for membership (ignored).
- * @return array Array of groups user belongs to (always empty).
+ * @param string $group Name of the group to check for membership (ignored).
+ * @return array Array of groups user belongs to (always empty).
*/
function getMembersOf($group){
return array();
@@ -482,7 +482,7 @@
* superclass instance variable $membership to see if membership has
* already been determined. If not, then the group page is parsed to
* determine membership.
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
* @return boolean True if user is a member, else false.
*/
function isMember($group){
@@ -533,8 +533,8 @@
*
* Checks the root Group page ('CategoryGroup') for the list of all groups,
* then checks each group to see if the current user is a member.
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
*/
function getAllGroupsIn(){
$membership = array();
@@ -563,8 +563,8 @@
*
* Checks a group's page to return all the current members. Currently this
* method is disabled and triggers an error and returns an empty array.
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group (always empty).
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group (always empty).
*/
function getMembersOf($group){
if ($this->specialGroup($group))
@@ -649,7 +649,7 @@
/**
* Determines if the current user is a member of a database group.
*
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
* @return boolean True if user is a member, else false.
*/
function isMember($group) {
@@ -675,8 +675,8 @@
* Determines all of the groups of which the current user is a member.
*
* then checks each group to see if the current user is a member.
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
*/
function getAllGroupsIn(){
$membership = array();
@@ -704,8 +704,8 @@
*
* Checks a group's page to return all the current members. Currently this
* method is disabled and triggers an error and returns an empty array.
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group.
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group.
*/
function getMembersOf($group){
@@ -734,7 +734,7 @@
/**
* Determines if the current user is a member of a database group.
*
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
* @return boolean True if user is a member, else false.
*/
function isMember($group) {
@@ -764,8 +764,8 @@
* Determines all of the groups of which the current user is a member.
* then checks each group to see if the current user is a member.
*
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
*/
function getAllGroupsIn(){
$membership = array();
@@ -794,8 +794,8 @@
/**
* Determines all of the members of a particular group.
*
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group.
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group.
*/
function getMembersOf($group){
$members = array();
@@ -855,7 +855,7 @@
* superclass instance variable $membership to see if membership has
* already been determined. If not, then the group file is parsed to
* determine membership.
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
* @return boolean True if user is a member, else false.
*/
function isMember($group) {
@@ -884,8 +884,8 @@
* Determines all of the groups of which the current user is a member.
*
* then checks each group to see if the current user is a member.
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
*/
function getAllGroupsIn(){
//$username = $this->_getUserName();
@@ -915,8 +915,8 @@
* Determines all of the members of a particular group.
*
* Return all the current members.
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group.
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group.
*/
function getMembersOf($group){
$members = array();
@@ -982,7 +982,7 @@
* Determines if the current user is a member of a group.
* Not ready yet!
*
- * @param string $group Name of the group to check for membership.
+ * @param string $group Name of the group to check for membership.
* @return boolean True if user is a member, else false.
*/
function isMember($group) {
@@ -1001,8 +1001,8 @@
/**
* Determines all of the groups of which the current user is a member.
*
- * @param string $group Name of the group to check for membership.
- * @return array Array of groups to which the user belongs.
+ * @param string $group Name of the group to check for membership.
+ * @return array Array of groups to which the user belongs.
*/
function getAllGroupsIn(){
//$request = &$this->request;
@@ -1060,8 +1060,8 @@
* Determines all of the members of a particular group.
*
* Return all the members of the given group. LDAP just returns the gid of each user
- * @param string $group Name of the group to get the full membership list of.
- * @return array Array of usernames that have joined the group.
+ * @param string $group Name of the group to get the full membership list of.
+ * @return array Array of usernames that have joined the group.
*/
function getMembersOf($group){
$members = array();
Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiPlugin.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -52,9 +52,9 @@
* args, not the rest of the wikidb state or any request query args)
* will work correctly here.
*
- * @param string $argstr The plugin argument string.
- * @param string $basepage The pagename the plugin is invoked from.
- * @return array List of pagenames linked to (or false).
+ * @param string $argstr The plugin argument string.
+ * @param string $basepage The pagename the plugin is invoked from.
+ * @return array List of pagenames linked to (or false).
*/
function getWikiPageLinks ($argstr, $basepage) {
return false;
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiPluginCached.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -128,7 +128,7 @@
* @param argstr string plugin arguments in the call from PhpWiki
* @param request Request ???
* @param string basepage Pagename to use to interpret links [/relative] page names.
- * @return string HTML output to be printed to browser
+ * @return string HTML output to be printed to browser
*
* @see #getHtml
* @see #getImage
@@ -286,7 +286,7 @@
* image. It is not necessary to call
* WikiPlugin->getArgs anymore.
* @param request Request ???
- * @return imagehandle image handle if successful
+ * @return imagehandle image handle if successful
* false if an error occured
*/
function getImage($dbi,$argarray,$request) {
@@ -309,7 +309,7 @@
* not necessary to call
* WikiPlugin->getArgs anymore.
* @param request Request ???
- * @return string format: '+seconds'
+ * @return string format: '+seconds'
* '0' never expires
*/
function getExpire($dbi,$argarray,$request) {
@@ -326,7 +326,7 @@
* not necessary to call
* WikiPlugin->getArgs anymore.
* @param request Request ???
- * @return string 'png', 'jpeg' or 'gif'
+ * @return string 'png', 'jpeg' or 'gif'
*/
function getImageType(&$dbi, $argarray, &$request) {
if (in_array($argarray['imgtype'], preg_split('/\s*:\s*/', PLUGIN_CACHED_IMGTYPES)))
@@ -345,7 +345,7 @@
* not necessary to call
* WikiPlugin->getArgs anymore.
* @param request Request ???
- * @return string "alt" description of the image
+ * @return string "alt" description of the image
*/
function getAlt($dbi,$argarray,$request) {
return '<?plugin '.$this->getName().' '.$this->glueArgs($argarray).'?>';
@@ -362,8 +362,8 @@
* image. It is not necessary to call
* WikiPlugin->getArgs anymore.
* @param request Request ???
- * @param string $basepage Pagename to use to interpret links [/relative] page names.
- * @return string html to be printed in place of the plugin command
+ * @param string $basepage Pagename to use to interpret links [/relative] page names.
+ * @return string html to be printed in place of the plugin command
* false if an error occured
*/
function getHtml($dbi, $argarray, $request, $basepage) {
@@ -382,7 +382,7 @@
* image. It is not necessary to call
* WikiPlugin->getArgs anymore.
* @param request Request ???
- * @return array(html,handle) html for the map interior (to be specific,
+ * @return array(html,handle) html for the map interior (to be specific,
* only <area;> tags defining hot spots)
* handle is an imagehandle to the corresponding
* image.
@@ -409,7 +409,7 @@
* image. It is not necessary to call
* WikiPlugin->getArgs anymore.
* @param request Request ???
- * @return string html output
+ * @return string html output
*/
function embedMap($id,$url,$map,&$dbi,$argarray,&$request) {
// id is not unique if the same map is produced twice
@@ -436,7 +436,7 @@
* image. It is not necessary to call
* WikiPlugin->getArgs anymore.
* @param request Request ???
- * @return string html output
+ * @return string html output
*/
function embedImg($url, $dbi, $argarray, $request) {
return HTML::img( array(
@@ -479,7 +479,7 @@
* FIXME: There should be references returned
*
* @access static protected
- * @return Cache copy of the cache object
+ * @return Cache copy of the cache object
*/
function newCache() {
static $staticcache;
@@ -516,7 +516,7 @@
*
* @access public static
* @param wish string one of 'png', 'gif', 'jpeg', 'jpg'
- * @return string the image type to be used ('png', 'gif', 'jpeg')
+ * @return string the image type to be used ('png', 'gif', 'jpeg')
* 'html' in case of an error
*/
@@ -567,7 +567,7 @@
* @param imgtype string 'png', 'gif' or 'jpeg'
* @param imghandle string image handle containing the image
* @param imgfile string file name of the image to be produced
- * @return void
+ * @return void
* @see decideImageType
*/
function writeImage($imgtype, $imghandle, $imgfile=false) {
@@ -588,7 +588,7 @@
*
* @access public static
* @param doctype string 'gif', 'png', 'jpeg', 'html'
- * @return void
+ * @return void
*/
function writeHeader($doctype) {
static $IMAGEHEADER = array(
@@ -613,7 +613,7 @@
*
* @access public static
* @param argarray array contains all arguments to be converted
- * @return string concated arguments
+ * @return string concated arguments
*/
function glueArgs($argarray) {
if (!empty($argarray)) {
@@ -643,7 +643,7 @@
* @param request Request ???
* @param errorformat string format which should be used to
* output errors ('html', 'png', 'gif', 'jpeg')
- * @return boolean false if an error occurs, true otherwise.
+ * @return boolean false if an error occurs, true otherwise.
* Param id and param plugincall are
* also return values.
*/
@@ -673,7 +673,7 @@
* @param plugincall string reference to serialized array containing both
* name and parameters of the plugin call
* @param request Request ???
- * @return boolean false if an error occurs, true otherwise.
+ * @return boolean false if an error occurs, true otherwise.
*
*/
function checkCall2(&$plugincall, $request) {
@@ -705,7 +705,7 @@
* @param argarray array Contains all arguments needed by plugin
* @param request Request ????
* @param errorformat string outputs errors in 'png', 'gif', 'jpg' or 'html'
- * @return boolean error status; true=ok; false=error
+ * @return boolean error status; true=ok; false=error
*/
function produceImage(&$content, $plugin, $dbi, $argarray, $request, $errorformat) {
$plugin->resetError();
@@ -955,7 +955,7 @@
* I recommend font 2 for errors and 4 for help texts.
* @param textcol array text color as a list of the rgb components; array(red,green,blue)
* @param bgcol array background color; array(red,green,blue)
- * @return string image handle for gd routines
+ * @return string image handle for gd routines
*/
function text2img($txt,$fontnr,$textcol,$bgcol) {
// basic (!) output for error handling
@@ -1080,7 +1080,7 @@
*
* @param cmd string command to be invoked
* @param until string expected output filename
- * @return boolean error status; true=ok; false=error
+ * @return boolean error status; true=ok; false=error
*/
function execute($cmd, $until = false) {
// cmd must redirect stderr to stdout though!
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiTheme.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -1148,7 +1148,7 @@
/** Set alternate CSS source for this theme.
*
- * @param string $title Name of style.
+ * @param string $title Name of style.
* @param string $css_files Name of CSS file.
*/
function addAlternateCSS ($title, $css_files) {
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiUser/OpenID.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -45,7 +45,7 @@
* @param array $params HTTP query data from OpenID server
* @param string &$identity this argument is set to end-user's claimed
* identifier or OpenID provider local identifier.
- * @param mixed $extensions extension object or array of extensions objects
+ * @param mixed $extensions extension object or array of extensions objects
* @return bool
*/
function verify($params, &$identity = "", $extensions = null) {
@@ -106,12 +106,12 @@
* On success the function does not return (it does HTTP redirection to
* server and exits). On failure it returns false.
*
- * @param bool $immediate enables or disables interaction with user
- * @param string $id OpenID identity
- * @param string $returnTo HTTP URL to redirect response from server to
- * @param string $root HTTP URL to identify consumer on server
- * @param mixed $extensions extension object or array of extensions objects
- * @param Zend_Controller_Response_Abstract $response an optional response
+ * @param bool $immediate enables or disables interaction with user
+ * @param string $id OpenID identity
+ * @param string $returnTo HTTP URL to redirect response from server to
+ * @param string $root HTTP URL to identify consumer on server
+ * @param mixed $extensions extension object or array of extensions objects
+ * @param Zend_Controller_Response_Abstract $response an optional response
* object to perform HTTP or HTML form redirection
* @return bool
*/
Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/WikiUser.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -74,7 +74,7 @@
*
* Populates the instance variables and calls $this->_ok()
* to ensure that the parameters are valid.
- * @param mixed $userid String of username or WikiUser object.
+ * @param mixed $userid String of username or WikiUser object.
* @param integer $authlevel Authorization level.
*/
function WikiUser (&$request, $userid = false, $authlevel = false) {
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/main.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -334,7 +334,7 @@
* By default it will grab the page requested via the URL
*
* This is a convenience function.
- * @param string $pagename Name of page to get.
+ * @param string $pagename Name of page to get.
* @return WikiDB_Page Object with methods to pull data from
* database for the page requested.
*/
Modified: trunk/lib/nusoap/nusoap.php
===================================================================
--- trunk/lib/nusoap/nusoap.php 2012-08-31 11:43:40 UTC (rev 8278)
+++ trunk/lib/nusoap/nusoap.php 2012-08-31 11:49:19 UTC (rev 8279)
@@ -138,7 +138,7 @@
/**
* adds debug data to the class level debug string
*
- * @param string $string debug data
+ * @param string $string debug data
* @access private
*/
function debug($string){
@@ -148,7 +148,7 @@
/**
* returns error string if present
*
- * @return boolean $string error string
+ * @return boolean $string error string
* @access public
*/
function getError(){
@@ -161,7 +161,7 @@
/**
* sets error string
*
- * @return boolean $string error string
+ * @return boolean $string error string
* @access private
*/
function setError($str){
@@ -172,7 +172,7 @@
* serializes PHP values in accordance w/ section 5. Type information is
* not serialized if $use == 'literal'.
*
- * @return string
+ * @return string
* @access public
*/
function serialize_val($val,$name=false,$type=false,$name_ns=false,
@@ -516,8 +516,8 @@
/**
* constructor
*
- * @param string $faultcode (client | server)
- * @param string $faultactor only used when msg routed between multiple actors
+ * @param string $faultcode (client | server)
+ * @param string $faultactor only used when msg routed between multiple actors
* @param string $faultstring human readable error message
* @param string $faultdetail
*/
@@ -1233,12 +1233,12 @@
/**
* constructor
*
- * @param string $name optional name
- * @param string $type optional type name
- * @param mixed $value optional value
- * @param string $namespace optional namespace of value
- * @param string $type_namespace optional namespace of type
- * @param array $attributes associative array of attributes to add to element serialization
+ * @param string $name optional name
+ * @param string $type optional type name
+ * @param mixed $value optional value
+ * @param string $namespace optional namespace of value
+ * @param string $type_namespace optional namespace of type
+ * @param array $attributes associative array of attributes to add to element serialization
* @access public
*/
function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
@@ -1253,7 +1253,7 @@
/**
* return serialized value
*
- * @return string XML data
+ * @return string XML data
* @access private
*/
function serialize($use='encoded') {
@@ -1263,8 +1263,8 @@
/**
* decodes a soapval object into a PHP native type
*
- * @param object $soapval optional SOAPx4 soapval object, else uses self
- * @return mixed
+ * @param object $soapval optional SOAPx4 soapval object, else uses self
+ * @return mixed
* @access public
*/
function decode(){
@@ -1354,9 +1354,9 @@
/**
* send the SOAP message via HTTP
*
- * @param string $data message data
- * @param integer $timeout set timeout in seconds
- * @return string data
+ * @param string $data message data
+ * @param integer $timeout set timeout in seconds
+ * @return string data
* @access public
*/
function send($data, $timeout=0) {
@@ -1509,9 +1509,9 @@
/**
* send the SOAP message via HTTPS 1.0 using CURL
*
- * @param string $msg message data
- * @param integer $timeout set timeout in seconds
- * @return string data
+ * @param string $msg message data
+ * @param integer $timeout set timeout in seconds
+ * @return string data
* @access public
*/
function sendHTTPS($data, $timeout=0) {
@@ -1673,8 +1673,8 @@
/**
* if authenticating, set user credentials here
*
- * @param string $user
- * @param string $pass
+ * @param string $user
+ * @param string $pass
* @access public
*/
function setCredentials($username, $password) {
@@ -1685,7 +1685,7 @@
/**
* set the soapaction value
*
- * @param string $soapaction
+ * @param string $soapaction
* @access public
*/
function setSOAPAction($soapaction) {
@@ -1695,7 +1695,7 @@
/**
* use http encoding
*
- * @param string $enc encoding style. supported values: gzip, deflate, or both
+ * @param string $enc encoding style. supported values: gzip, deflate, or both
* @access public
*/
function setEncoding($enc='gzip, deflate'){
@@ -1706,8 +1706,8 @@
/**
* set proxy info here
*
- * @param string $proxyhost
- * @param string $proxyport
+ * @param string $proxyhost
+ * @param string $proxyport
* @access public
*/
function setProxy($proxyhost, $proxyport) {
@@ -1719,7 +1719,7 @@
* decode a string that is encoded w/ "chunked' transfer encoding
* as defined in RFC2068 19.4.6
*
- * @param string $buffer
+ * @param string $buffer
* @returns string
* @access public
*/
@@ -1828,7 +1828,7 @@
/**
* processes request and returns response
*
- * @param string $data usually is the value of $HTTP_RAW_POST_DATA
+ * @param string $data usually is the value of $HTTP_RAW_POST_DATA
* @access public
*/
function service($data){
@@ -1889,8 +1889,8 @@
/**
* parses request and posts response
*
- * @param string $data XML string
- * @return string XML response msg
+ * @param string $data XML string
+ * @return string XML response msg
* @access private
*/
function parse_request($data='') {
@@ -2048,7 +2048,7 @@
* and compares to the method's signature, if available.
*
* @param mixed
- * @return boolean
+ * @return boolean
* @access private
*/
function verify_method($operation,$request){
@@ -2065,9 +2065,9 @@
/**
* add a method to the dispatch map
*
- * @param string $methodname
- * @param string $in array of input values
- * @param string $out array of output values
+ * @param string $methodname
+ * @param string $in array of input values
+ * @param string $out array of output values
* @access public
*/
function add_to_map($methodname,$in,$out){
@@ -2077,12 +2077,12 @@
/**
* register a service with the server
*
- * @param string $methodname
- * @param string $in assoc array of input values: key = param name, value = param type
- * @param string $out assoc array of output values: key = param name, value = param type
- * @param string $namespace
- * @param string $soapaction
- * @param string $style (rpc|literal)
+ * @param string $methodname
+ * @param string $in assoc array of input values: key = param name, value = param type
+ * @param string $out assoc array of output values: key = param name, value = param type
+ * @param string $namespace
+ * @param string $soapaction
+ * @param string $style (rpc|literal)
* @access public
*/
function register($name,$in=false,$out=false,$namespace=false,$soapaction=false,$style=false,$use=false){
@@ -2525,8 +2525,8 @@
* start-element handler
*
* @param string $parser XML parser object
- * @param string $name element name
- * @param string $attrs associative array of attributes
+ * @param string $name element name
+ * @param string $attrs associative array of attributes
* @access private
*/
function start_element($parser, $name, $attrs)
@@ -2719,7 +2719,7 @@
* end-element handler
*
* @param string $parser XML parser object
- * @param string $name element name
+ * @param string $name element name
* @access private
*/
function end_element($parser, $name){
@@ -2744,7 +2744,7 @@
* element content handler
*
* @param string $parser XML parser object
- * @param string $data element content
+ * @param string $data element content
* @access private
*/
function character_data($parser, $data)
@@ -2770,7 +2770,7 @@
* NOTE: currently only supports multiple services of differing binding types
* This method needs some work
*
- * @param string $bindingType eg: soap, smtp, dime (only soap is currently supported)
+ * @param string $bindingType eg: soap, smtp, dime (only soap is currently supported)
* @return array
* @access public
*/
@@ -2793,8 +2793,8 @@
/**
* returns an associative array of data necessary for calling an operation
*
- * @param string $operation , name of operation
- * @param string $bindingType , type of binding eg: soap
+ * @param string $operation , name of operation
+ * @param string $bindingType , type of binding eg: soap
* @return array
* @access public
*/
@@ -2972,10 +2972,10 @@
/**
* serializes a PHP value according a given type definition
*
- * @param string $name , name of type (part)
- * @param string $type , type of type, heh (type or element)
- * @param mixed $value , a native PHP value (parameter value)
- * @param string $use , use for part (encoded|literal)
+ * @param string $name , name of type (part)
+ * @param string $type , type of type, heh (type or element)
+ * @param mixed $value , a native PHP value (parameter value)
+ * @param string $use , use for part (encoded|literal)
* @return string serialization
* @access public
*/
@@ -3115,11 +3115,11 @@
* register a service with the server
*
* @param string $methodname
- * @param string $in assoc array of input values: key = param name, value = param type
- * @param string $out assoc array of output values: key = param name, value = param type
+ * @param string $in assoc array of input values: key = param name, value = param type
+ * @param string $out assoc array of output values: key = param name, value = param type
* @param string $namespace
* @param string $soapaction
- * @param string $style (rpc|literal)
+ * @param string $style (rpc|literal)
* @access public
*/
function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '')
@@ -3224,8 +3224,8 @@
/**
* constructor
*
- * @param string $xml SOAP message
- * @param string $encoding character encoding scheme of message
+ * @param string $xml SOAP message
+ * @param string $encoding character encoding scheme of message
* @access public
*/
function soap_parser($xml,$encoding='UTF-8',$method=''){
@@ -3663,9 +3663,9 @@
/**
* constructor
*
- * @param string $endpoint SOAP server or WSDL URL
- * @param bool $wsdl optional, set to true if using WSDL
- * @param int $portN...
[truncated message content] |
|
From: <var...@us...> - 2012-08-31 11:56:19
|
Revision: 8280
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8280&view=rev
Author: vargenau
Date: 2012-08-31 11:56:08 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
No newline at end of file
Modified Paths:
--------------
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-error.inc.php
trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-php4.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
trunk/lib/WikiDB/cvs.php
trunk/lib/pear/Cache/Container/trifile.php
trunk/lib/pear/Cache/Error.php
trunk/lib/plugin/AtomFeed.php
trunk/tests/unit/lib/plugin/AtomFeedTest.php
trunk/tests/unit/lib/plugin/atom-example.xml
trunk/themes/MacOSX/buttons/de/index.php
trunk/themes/MacOSX/buttons/en/index.php
trunk/themes/MacOSX/buttons/index.php
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -241,4 +241,4 @@
$rs->InitArrayFields($arr,$flds);
return $rs;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-error.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-error.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-error.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -250,4 +250,4 @@
return $MAP;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -85,4 +85,4 @@
return $ADODB_Last_PEAR_Error;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -75,4 +75,4 @@
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -72,4 +72,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -672,4 +672,4 @@
return $sql;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -356,4 +356,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -13,4 +13,4 @@
class ADODB_BASE_RS {
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -909,4 +909,4 @@
return $ret;
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -81,4 +81,4 @@
}
}// class
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -612,4 +612,4 @@
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -43,4 +43,4 @@
return $this->ADORecordSet_ado($id,$mode);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -59,4 +59,4 @@
return $this->ADORecordSet_ado($id,$mode);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -76,4 +76,4 @@
$this->ADORecordSet_ibase($id,$mode);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -197,4 +197,4 @@
} // define
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -310,4 +310,4 @@
}
} //define
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -259,4 +259,4 @@
} //class
} // defined
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -66,4 +66,4 @@
$this->ADORecordSet_ibase($id,$mode);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -811,4 +811,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -27,4 +27,4 @@
$this->ADORecordset_informix72($id,$mode);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -925,4 +925,4 @@
http://www.databasejournal.com/scripts/article.php/1440551
*/
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -918,4 +918,4 @@
http://www.databasejournal.com/scripts/article.php/1440551
*/
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -56,4 +56,4 @@
$this->ADORecordset_mssql($id,$mode);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -825,4 +825,4 @@
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -73,4 +73,4 @@
return false;
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -53,4 +53,4 @@
$this->ADORecordset_oci8($id,$mode);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -187,4 +187,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -236,4 +236,4 @@
return $this->ADORecordSet_odbc($id,$mode);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -112,4 +112,4 @@
return $this->ADORecordSet_odbc($id,$mode);
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -625,4 +625,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -56,4 +56,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -11,4 +11,4 @@
job, so hopefully this will ensure greater consistency and fewer bugs.
*/
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -186,4 +186,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -27,4 +27,4 @@
};
} // define
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -60,4 +60,4 @@
}
} //define
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -316,4 +316,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -102,4 +102,4 @@
}
} //define
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/WikiDB/cvs.php
===================================================================
--- trunk/lib/WikiDB/cvs.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/WikiDB/cvs.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -29,4 +29,4 @@
$this->_backend = new WikiDB_backend_cvs( $dbparams );
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/pear/Cache/Container/trifile.php
===================================================================
--- trunk/lib/pear/Cache/Container/trifile.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/pear/Cache/Container/trifile.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -144,4 +144,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/pear/Cache/Error.php
===================================================================
--- trunk/lib/pear/Cache/Error.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/pear/Cache/Error.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -48,4 +48,4 @@
} // end func Cache_Error
} // end class Cache_Error
-?>
\ No newline at end of file
+?>
Modified: trunk/lib/plugin/AtomFeed.php
===================================================================
--- trunk/lib/plugin/AtomFeed.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/lib/plugin/AtomFeed.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -82,4 +82,4 @@
return $html;
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/tests/unit/lib/plugin/AtomFeedTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/AtomFeedTest.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/tests/unit/lib/plugin/AtomFeedTest.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -77,4 +77,4 @@
$this->assertEquals($expected_html, trim(html_entity_decode($html->asXML())));
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/tests/unit/lib/plugin/atom-example.xml
===================================================================
--- trunk/tests/unit/lib/plugin/atom-example.xml 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/tests/unit/lib/plugin/atom-example.xml 2012-08-31 11:56:08 UTC (rev 8280)
@@ -91,4 +91,4 @@
<georss:box>53.349441 -6.26234 53.35078 -6.260282</georss:box>
<id>tag:www.phpwiki.org,2010-05-15:/fakeurl/20100515223625</id>
</entry>
-</feed>
\ No newline at end of file
+</feed>
Modified: trunk/themes/MacOSX/buttons/de/index.php
===================================================================
--- trunk/themes/MacOSX/buttons/de/index.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/themes/MacOSX/buttons/de/index.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -1 +1 @@
-<?php include("../../images/index.php")?>
\ No newline at end of file
+<?php include("../../images/index.php")?>
Modified: trunk/themes/MacOSX/buttons/en/index.php
===================================================================
--- trunk/themes/MacOSX/buttons/en/index.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/themes/MacOSX/buttons/en/index.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -1 +1 @@
-<?php include("../../images/index.php")?>
\ No newline at end of file
+<?php include("../../images/index.php")?>
Modified: trunk/themes/MacOSX/buttons/index.php
===================================================================
--- trunk/themes/MacOSX/buttons/index.php 2012-08-31 11:49:19 UTC (rev 8279)
+++ trunk/themes/MacOSX/buttons/index.php 2012-08-31 11:56:08 UTC (rev 8280)
@@ -1 +1 @@
-<?php include("../images/index.php")?>
\ No newline at end of file
+<?php include("../images/index.php")?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-08-31 12:01:14
|
Revision: 8281
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8281&view=rev
Author: vargenau
Date: 2012-08-31 12:01:01 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
extra_empty_lines
Modified Paths:
--------------
trunk/configurator.php
trunk/lib/BlockParser.php
trunk/lib/DbaPartition.php
trunk/lib/ErrorManager.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/PageList.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/RssWriter.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-php4.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUserNew.php
trunk/lib/XMLRPC/utils.php
trunk/lib/XmlElement.php
trunk/lib/XmlRpcServer.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/gif.php
trunk/lib/imagecache.php
trunk/lib/loadsave.php
trunk/lib/pear/Cache/Container/file.php
trunk/lib/pear/Cache/Container/imgfile.php
trunk/lib/pear/Cache/Container.php
trunk/lib/pear/Cache/Error.php
trunk/lib/pear/Cache/Graphics.php
trunk/lib/pear/DB/dbase.php
trunk/lib/pear/DB/fbsql.php
trunk/lib/pear/DB/ibase.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/odbc.php
trunk/lib/pear/DB/sybase.php
trunk/lib/pear/DB.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/Calendar.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/RawHtml.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/TexToPng.php
trunk/lib/plugin/UserRatings.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/stdlib.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/ziplib.php
trunk/tests/unit/lib/AtomParserTest.php
trunk/tests/unit/lib/PageListTest.php
trunk/tests/unit/lib/TextSearchTest.php
trunk/tests/unit/lib/plugin/AllPagesTest.php
trunk/tests/unit/lib/plugin/AllUsersTest.php
trunk/tests/unit/lib/plugin/OrphanedPagesTest.php
trunk/tests/unit/lib/plugin/WantedPagesTest.php
trunk/tests/unit/pcre-crash.php
trunk/tests/xmlrpc/interop-client.php
trunk/tests/xmlrpc/interop-server.php
trunk/tests/xmlrpc/validate-form.php
trunk/tests/xmlrpc/validate.php
trunk/tests/xmlrpc/xmlrpc-client.php
trunk/tests/xmlrpc/xmlrpc-introspect.php
trunk/tests/xmlrpc/xmlrpc-servers.php
trunk/themes/Hawaiian/lib/random.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/Wordpress/lib/RecentChanges.php
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/configurator.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -1627,7 +1627,6 @@
$properties["HIGHLIGHT_DATA_DIR"] =
new _define_commented_optional('HIGHLIGHT_DATA_DIR'); // /usr/share/highlight
-
$properties["Part Eight"] =
new part('_part8', $SEPARATOR."\n", "
@@ -1868,7 +1867,6 @@
}
}
-
class _define
extends _variable {
function _config_format($value) {
@@ -2464,7 +2462,6 @@
}
}
-
if (!empty($HTTP_POST_VARS['action'])
and $HTTP_POST_VARS['action'] == 'make_config'
and !empty($HTTP_POST_VARS['ADMIN_USER'])
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/BlockParser.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -145,8 +145,6 @@
}
}
-
-
class BlockParser_Input {
function BlockParser_Input ($text) {
@@ -323,7 +321,6 @@
}
}
-
class Block_HtmlElement extends HtmlElement
{
function Block_HtmlElement($tag /*, ... */) {
@@ -613,8 +610,6 @@
}
}
-
-
class Block_table_dl_defn extends XmlContent
{
var $nrows;
@@ -808,7 +803,6 @@
return false;
}
-
$prefix = $m->match;
$oldindent = '[*#;](?=[#*]|;.*:.*\S)';
$newindent = sprintf('\\ {%d}', strlen($prefix));
Modified: trunk/lib/DbaPartition.php
===================================================================
--- trunk/lib/DbaPartition.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/DbaPartition.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -74,7 +74,6 @@
}
}
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/ErrorManager.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -385,7 +385,6 @@
$GLOBALS['ErrorManager']->handleError($error);
}
-
/**
* A class representing a PHP error report.
*
Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/HtmlElement.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -422,7 +422,6 @@
define('HTMLTAG_INLINE', 2);
define('HTMLTAG_ACCEPTS_INLINE', 4);
-
HTML::_setTagProperty(HTMLTAG_EMPTY,
'area base basefont br col frame hr img input isindex link meta param');
HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
@@ -491,7 +490,6 @@
return $inputs;
}
-
/** Generate a <script> tag containing javascript.
*
* @param string $js The javascript.
Modified: trunk/lib/HtmlElement5.php
===================================================================
--- trunk/lib/HtmlElement5.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/HtmlElement5.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -422,7 +422,6 @@
define('HTMLTAG_INLINE', 2);
define('HTMLTAG_ACCEPTS_INLINE', 4);
-
HTML::_setTagProperty(HTMLTAG_EMPTY,
'area base basefont br col embed frame hr img input isindex link meta param');
HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
@@ -491,7 +490,6 @@
return $inputs;
}
-
/** Generate a <script> tag containing javascript.
*
* @param string $js The javascript.
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/IniConfig.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -997,7 +997,6 @@
if (!defined('HOME_PAGE'))
define('HOME_PAGE', _("HomePage"));
-
//////////////////////////////////////////////////////////////////
// Autodetect URL settings:
//
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/InlineParser.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -37,7 +37,6 @@
require_once('lib/CachedMarkup.php');
require_once(dirname(__FILE__).'/stdlib.php');
-
function WikiEscape($text) {
return str_replace('#', ESCAPE_CHAR . '#', $text);
}
@@ -220,8 +219,6 @@
}
}
-
-
/**
* A simple markup rule (i.e. terminal token).
*
@@ -771,7 +768,6 @@
$start[] = "(?<= _) (?: ${b}|${tt}) (?! _)";
$start[] = "(?<= \\*) (?: ${i}|${tt}) (?! \\*)";
-
// any delimiter okay after an opening brace ( [{<(] )
// as long as it's not immediately followed by the matching closing
// brace.
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/PageList.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -253,7 +253,6 @@
}
}
-
class _PageList_Column_bool extends _PageList_Column {
function _PageList_Column_bool ($field, $default_heading, $text = 'yes') {
$this->_PageList_Column($field, $default_heading, 'center');
@@ -749,7 +748,6 @@
$this->_messageIfEmpty = $msg;
}
-
function getTotal () {
return !empty($this->_options['count'])
? (integer) $this->_options['count'] : count($this->_pages);
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/PageType.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -545,7 +545,6 @@
}
}
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/RSSWriter091.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -71,7 +71,6 @@
$this->printXML();
}
-
}
class _RecentChanges_RssFormatter091
@@ -101,7 +100,6 @@
$request->finish(); // NORETURN!!!!
}
-
function channel_properties ()
{
global $request;
@@ -123,7 +121,6 @@
*/
}
-
function item_properties ($rev)
{
$page = $rev->getPage();
Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/RssWriter.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -122,7 +122,6 @@
$this->printXML();
}
-
/**
* Create a new RDF <em>typedNode</em>.
*/
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/Template.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -3,7 +3,6 @@
require_once("lib/ErrorManager.php");
-
/** An HTML template.
*/
class Template
Modified: trunk/lib/TextSearchQuery.php
===================================================================
--- trunk/lib/TextSearchQuery.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/TextSearchQuery.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -605,7 +605,6 @@
}
}
-
////////////////////////////////////////////////////////////////
//
// Remaining classes are private.
@@ -910,7 +909,6 @@
}
}
-
////////////////////////////////////////////////////////////////
//
// Parser:
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/SQL.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -40,7 +40,6 @@
);
}
-
/**
* Determine whether page exists (in non-default form).
* @see WikiDB::isWikiPage for the slow generic version
Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -68,7 +68,6 @@
return $line.serialize($rs);
}
-
/**
* Open CSV file and convert it into Data.
*
Modified: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -71,7 +71,6 @@
error_log("($t) $s", ADODB_ERROR_LOG_TYPE);
}
-
//print "<p>$s</p>";
trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
}
Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -74,5 +74,4 @@
throw new $errfn($dbms, $fn, $errno, $errmsg, $p1, $p2, $thisConnection);
}
-
?>
Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -15,7 +15,6 @@
echo $k; print_r($v); echo "<br>";
}
-
Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
*/
@@ -62,10 +61,8 @@
return 'ADODB Iterator';
}
-
}
-
class ADODB_BASE_RS implements IteratorAggregate {
function getIterator() {
return new ADODB_Iterator($this);
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -13,7 +13,6 @@
Less commonly used functions are placed here to reduce size of adodb.inc.php.
*/
-
// Force key to upper.
// See also http://www.php.net/manual/en/function.array-change-key-case.php
function _array_change_key_case($an_array)
@@ -283,7 +282,6 @@
else
$rsreturn = &$zthis->SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache);
-
// Before returning the RecordSet, we set the pagination properties we need
if ($rsreturn) {
$rsreturn->_maxRecordCount = $qryRecs;
@@ -381,7 +379,6 @@
else if (isset($rs->fields[strtolower($upperfname)])) $val = $rs->fields[strtolower($upperfname)];
else $val = '';
-
if ($forceUpdate || strcmp($val, $arrFields[$upperfname])) {
// Set the counter for the number of fields that will be updated.
$fieldUpdatedCount++;
Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -203,7 +203,6 @@
is_subclass_of($value, 'db_error')));
}
-
/**
* Tell whether a result code from a DB method is a warning.
* Warnings differ from errors in that they are generated by DB,
Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -9,7 +9,6 @@
Set tabs to 4.
*/
-
class ADODB_BASE_RS {
}
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -71,13 +71,11 @@
FUNCTION DESCRIPTIONS
-
FUNCTION adodb_getdate($date=false)
Returns an array containing date information, as getdate(), but supports
dates greater than 1901 to 2038.
-
FUNCTION adodb_date($fmt, $timestamp = false)
Convert a timestamp to a formatted local date. If $timestamp is not defined, the
@@ -140,7 +138,6 @@
current timestamp is used. Unlike the function date(), it supports dates
outside the 1901 to 2038 range.
-
FUNCTION adodb_mktime($hr, $min, $sec, $month, $day, $year)
Converts a local date to a unix timestamp. Unlike the function mktime(), it supports
@@ -172,7 +169,6 @@
c. Implement daylight savings, which looks awfully complicated, see
http://webexhibits.org/daylightsaving/
-
CHANGELOG
- 20 Mar 2004 0.12
Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
@@ -842,7 +838,6 @@
$day = intval($day);
$year = intval($year);
-
$year = adodb_year_digit_check($year);
if ($mon > 12) {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -70,7 +70,6 @@
}*/
}
-
class ADORecordSet_access extends ADORecordSet_odbc {
var $databaseType = "access";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -176,7 +176,6 @@
$t = $adors->Fields(2);//table/view name
while (!$adors->EOF){
-
if (strtoupper($t->Value) == $table) {
$fld = new ADOFieldObject();
@@ -195,9 +194,6 @@
return $arr;
}
-
-
-
/* returns queryID or false */
function &_query($sql,$inputarr=false)
{
@@ -243,7 +239,6 @@
return $rs;
}
-
function BeginTrans()
{
if ($this->transOff) return true;
@@ -301,7 +296,6 @@
return true;
}
-
}
/*--------------------------------------------------------------------------------------
@@ -328,7 +322,6 @@
return $this->ADORecordSet($id,$mode);
}
-
// returns the field object
function FetchField($fieldOffset = -1) {
$off=$fieldOffset+1; // offsets begin at 1
@@ -342,7 +335,6 @@
$o->max_length = $f->DefinedSize;
$o->ado_type = $t;
-
//print "off=$off name=$o->name type=$o->type len=$o->max_length<br>";
return $o;
}
@@ -362,7 +354,6 @@
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
function _initrs()
{
$rs = $this->_queryID;
@@ -372,7 +363,6 @@
$this->_numOfFields = $f->Count;
}
-
// should only be used to move forward as we normally use forward-only cursors
function _seek($row)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -33,7 +33,6 @@
}
-
class ADORecordSet_ado_access extends ADORecordSet_ado {
var $databaseType = "ado_access";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -66,7 +66,6 @@
};
-
class ADORecordSet_borland_ibase extends ADORecordSet_ibase {
var $databaseType = "borland_ibase";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -48,7 +48,6 @@
return false;
}
-
// returns true or false
function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
@@ -70,7 +69,6 @@
return false;
}
-
// parameters use PostgreSQL convention, not MySQL
function &SelectLimit($sql,$nrows=-1,$offset=-1)
{
@@ -137,7 +135,6 @@
(($this->fetchMode !== false)?$this->fetchMode : $ADODB_FETCH_MODE);
$err = false;
-
$rs = csv2rs($url,$err,false);
if ($this->debug) print urldecode($url)."<br><i>$err</i><br>";
$at = strpos($err,'::::');
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -64,8 +64,6 @@
$db->curMode = SQL_CUR_USE_ODBC;
$db->Connect($dsn, $userid, $pwd);
-
-
USING CLI INTERFACE
===================
@@ -79,7 +77,6 @@
>
> In case of DB2 I had to swap the first and last arguments in order to connect properly.
-
*/
if (!defined('_ADODB_ODBC_LAYER')) {
@@ -101,7 +98,6 @@
var $_bindInputArray = false;
var $upperCase = 'upper';
-
function ADODB_DB2()
{
if (strncmp(PHP_OS,'WIN',3) === 0) $this->curmode = SQL_CUR_USE_ODBC;
@@ -228,7 +224,6 @@
return $s;
}
-
function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputArr=false)
{
if ($offset <= 0) {
@@ -249,7 +244,6 @@
};
-
class ADORecordSet_db2 extends ADORecordSet_odbc {
var $databaseType = "db2";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -122,7 +122,6 @@
else return false;
}
-
// returns queryID or false
function _query($sql,$inputarr)
{
@@ -181,8 +180,6 @@
$this->_numOfFields = @fbsql_num_fields($this->_queryID);
}
-
-
function &FetchField($fieldOffset = -1) {
if ($fieldOffset != -1) {
$o = @fbsql_fetch_field($this->_queryID, $fieldOffset);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -10,7 +10,6 @@
*/
-
include_once(ADODB_DIR."/drivers/adodb-ibase.inc.php");
class ADODB_firebird extends ADODB_ibase {
@@ -53,10 +52,8 @@
return $rs;
}
-
};
-
class ADORecordSet_firebird extends ADORecordSet_ibase {
var $databaseType = "firebird";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -23,7 +23,6 @@
$conn->Execute("insert into table (id, col1,...) values ($id, $val1,...)");
*/
-
class ADODB_ibase extends ADOConnection {
var $databaseType = "ibase";
var $dataProvider = "ibase";
@@ -175,7 +174,6 @@
return $indexes;
}
-
// See http://community.borland.com/article/0,1410,25844,00.html
function RowLock($tables,$where,$col)
{
@@ -184,7 +182,6 @@
return 1;
}
-
function CreateSequence($seqname,$startID=1)
{
$ok = $this->Execute(("INSERT INTO RDB\$GENERATORS (RDB\$GENERATOR_NAME) VALUES (UPPER('$seqname'))" ));
@@ -598,7 +595,6 @@
}
-
function OldUpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
{
$blob_id = ibase_blob_create($this->_connectionID);
@@ -714,8 +710,6 @@
return false;
}
-
-
function _fetch()
{
$f = @ibase_fetch_row($this->_queryID);
@@ -772,7 +766,6 @@
}
-
function _close()
{
return @ibase_free_result($this->_queryID);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -69,8 +69,6 @@
return $arr;
}
-
-
function _insertid()
{
$sqlca =ifx_getsqlca($this->lastQuery);
@@ -136,7 +134,6 @@
return 0;
}
-
function &MetaColumns($table)
{
global $ADODB_FETCH_MODE;
@@ -278,7 +275,6 @@
}
}
-
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
@@ -299,8 +295,6 @@
return $this->ADORecordSet($id);
}
-
-
/* Returns: an object containing field information.
Get column information in the Recordset object. fetchField() can be used in order to obtain information about
fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -6,11 +6,9 @@
the BSD license will take precedence.
Set tabs to 8.
-
Joshua Eldridge (joshuae74#hotmail.com)
*/
-
class ADODB_ldap extends ADOConnection {
var $databaseType = 'ldap';
var $dataProvider = 'ldap';
@@ -23,7 +21,6 @@
var $filter;
var $dn;
-
function ADODB_ldap()
{
@@ -54,7 +51,6 @@
return $this->_connectionID;
}
-
/* returns _queryID or false */
function _query($sql,$inputarr)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -32,7 +32,6 @@
// CONVERT(char(12),datecol,120)
//----------------------------------------------------------------
-
// has datetime converstion to YYYY-MM-DD format, and also mssql_fetch_assoc
if (ADODB_PHPVER >= 0x4300) {
// docs say 4.2.0, but testing shows only since 4.3.0 does it work!
@@ -40,7 +39,6 @@
} else {
global $ADODB_mssql_mths; // array, months must be upper-case
-
$ADODB_mssql_date_order = 'mdy';
$ADODB_mssql_mths = array(
'JAN'=>1,'FEB'=>2,'MAR'=>3,'APR'=>4,'MAY'=>5,'JUN'=>6,
@@ -101,7 +99,6 @@
var $uniqueOrderBy = true;
var $_bindInputArray = true;
-
function ADODB_mssql()
{
$this->_has_mssql_init = (strnatcmp(PHP_VERSION,'4.1.0')>=0);
@@ -119,7 +116,6 @@
} else
$savem = $this->SetFetchMode(ADODB_FETCH_NUM);
-
$this->Parameter($stmt,$val,'attribute_id');
$row = $this->GetRow($stmt);
@@ -193,7 +189,6 @@
//return $this->GetOne("SELECT CONVERT(varchar(255), NEWID()) AS 'Char'");
}
-
function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
{
if ($nrows > 0 && $offset <= 0) {
@@ -206,7 +201,6 @@
return $rs;
}
-
// Format date column in sql string given an input format that understands Y M D
function SQLDate($fmt, $col=false)
{
@@ -267,7 +261,6 @@
return $s;
}
-
function BeginTrans()
{
if ($this->transOff) return true;
@@ -385,7 +378,6 @@
return false;
}
-
function &MetaTables($ttype=false,$showSchema=false,$mask=false)
{
if ($mask) {
@@ -442,7 +434,6 @@
return true;
}
-
// returns true or false
function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -40,7 +40,6 @@
}
}
-
//----------------------------------------------------------------
// MSSQL returns dates with the format Oct 13 2002 or 13 Oct 2002
// and this causes tons of problems because localized versions of
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -13,7 +13,6 @@
*
*/
-
/*
The big difference between mssqlpo and it's parent mssql is that mssqlpo supports
the more standard || string concatenation operator.
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -68,7 +68,6 @@
return $ret;
}
-
function &MetaIndexes ($table, $primary = FALSE, $owner=false)
{
// save old fetch mode
@@ -120,7 +119,6 @@
return $indexes;
}
-
// if magic quotes disabled, use mysql_real_escape_string()
function qstr($s,$magic_quotes=false)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -59,7 +59,6 @@
return $arr;
}
-
function BeginTrans()
{
if ($this->transOff) return true;
@@ -820,7 +819,6 @@
}
}
-
}
}
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -13,10 +13,8 @@
Requires mysql client. Works on Windows and Unix.
*/
-
include_once(ADODB_DIR."/drivers/adodb-mysql.inc.php");
-
class ADODB_mysqlt extends ADODB_mysql {
var $databaseType = 'mysqlt';
var $ansiOuter = true; // for Version 3.23.17 or later
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -47,7 +47,6 @@
var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
// http://bugs.php.net/bug.php?id=25404
-
function ADODB_netezza()
{
@@ -127,7 +126,6 @@
}
-
}
/*--------------------------------------------------------------------------------------
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -138,7 +138,6 @@
$conn->connectSID = true;
$conn->Connect($serveraddress,'scott,'tiger',$SID);
-
Example TNSName:
---------------
NATSOFT.DOMAIN =
@@ -158,7 +157,6 @@
{
if (!function_exists('OCIPLogon')) return false;
-
$this->_errorMsg = false;
$this->_errorCode = false;
@@ -216,8 +214,6 @@
return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename,1);
}
-
-
// returns true or false
function _nconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
@@ -244,7 +240,6 @@
return "TO_DATE(".adodb_date($this->fmtDate,$d).",'".$this->NLS_DATE_FORMAT."')";
}
-
// format and return date string in database timestamp format
function DBTimeStamp($ts)
{
@@ -305,7 +300,6 @@
return $ret;
}
-
function SelectDB($dbName)
{
return false;
@@ -409,7 +403,6 @@
return $s. "')";
}
-
/*
This algorithm makes use of
@@ -597,7 +590,6 @@
return $rez;
}
-
/*
Example of usage:
@@ -919,7 +911,6 @@
return $arr;
}
-
function CharMax()
{
return 4000;
@@ -1064,7 +1055,6 @@
return $this->_fieldobjs[$fieldOffset];
}
-
// 10% speedup to move MoveNext to child class
function MoveNext()
{
@@ -1101,7 +1091,6 @@
return $results;
}
-
/* Use associative array to get fields array */
function Fields($colname)
{
@@ -1116,8 +1105,6 @@
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
-
function _seek($row)
{
return false;
@@ -1171,7 +1158,6 @@
case 'DATE':
return ($this->connection->datetime) ? 'T' : 'D';
-
case 'TIMESTAMP': return 'T';
case 'INT':
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -15,7 +15,6 @@
/*--------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------*/
-
class ADODB_odbc extends ADOConnection {
var $databaseType = "odbc";
var $fmtDate = "'Y-m-d'";
@@ -70,7 +69,6 @@
}
}
-
function CreateSequence($seqname='adodbseq',$start=1)
{
if (empty($this->_genSeqSQL)) return false;
@@ -586,7 +584,6 @@
//$this->ADORecordSet($id);
}
-
// returns the field object
function &FetchField($fieldOffset = -1)
{
@@ -617,7 +614,6 @@
return $this->fields[$this->bind[strtoupper($colname)]];
}
-
function _initrs()
{
global $ADODB_COUNTRECS;
@@ -660,7 +656,6 @@
return $results;
}
-
function MoveNext()
{
if ($this->_numOfRows != 0 && !$this->EOF) {
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -16,7 +16,6 @@
include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
}
-
class ADODB_odbc_mssql extends ADODB_odbc {
var $databaseType = 'odbc_mssql';
var $fmtDate = "'Y-m-d'";
@@ -73,7 +72,6 @@
return $this->GetOne($this->identitySQL);
}
-
function MetaForeignKeys($table, $owner=false, $upper=false)
{
global $ADODB_FETCH_MODE;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -15,7 +15,6 @@
include(ADODB_DIR."/drivers/adodb-odbc.inc.php");
}
-
class ADODB_odbc_oracle extends ADODB_odbc {
var $databaseType = 'odbc_oracle';
var $replaceQuote = "''"; // string to use to replace quotes
@@ -64,7 +63,6 @@
$fld->type = $rs->fields[1];
$fld->max_length = $rs->fields[2];
-
if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld;
else $retarr[strtoupper($fld->name)] = $fld;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -43,7 +43,6 @@
return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
}
-
function BeginTrans()
{
$this->autoCommit = false;
@@ -51,7 +50,6 @@
return true;
}
-
function CommitTrans($ok=true)
{
if (!$ok) return $this->RollbackTrans();
@@ -60,7 +58,6 @@
return $ret;
}
-
function RollbackTrans()
{
$ret = ora_rollback($this->_connectionID);
@@ -68,7 +65,6 @@
return $ret;
}
-
/* there seems to be a bug in the oracle extension -- always returns ORA-00000 - no error */
function ErrorMsg()
{
@@ -77,15 +73,12 @@
return $this->_errorMsg;
}
-
function ErrorNo()
{
$err = @ora_errorcode($this->_curs);
if (!$err) return @ora_errorcode($this->_connectionID);
}
-
-
// returns true or false
function _connect($argHostname, $argUsername, $argPassword, $argDatabasename, $mode=0)
{
@@ -104,7 +97,6 @@
$argHostport="1521";
}
-
if ($this->connectSID) {
$argDatabasename="(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=".$argHostname
.")(PORT=$argHostport))(CONNECT_DATA=(SID=$argDatabasename)))";
@@ -132,14 +124,12 @@
return true;
}
-
// returns true or false
function _pconnect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
return $this->_connect($argHostname, $argUsername, $argPassword, $argDatabasename, 1);
}
-
// returns query ID if successful, otherwise false
function _query($sql,$inputarr=false)
{
@@ -154,18 +144,14 @@
return false;
}
-
// returns true or false
function _close()
{
return @ora_logoff($this->_connectionID);
}
-
-
}
-
/*--------------------------------------------------------------------------------------
Class Name: Recordset
--------------------------------------------------------------------------------------*/
@@ -201,8 +187,6 @@
return $this->_queryID;
}
-
-
/* Returns: an object containing field information.
Get column information in the Recordset object. fetchField() can be used in order to obtain information about
fields in a certain query result. If the field offset isn't specified, the next field that wasn't yet retrieved by
@@ -237,7 +221,6 @@
$this->_numOfFields = @ora_numcols($this->_queryID);
}
-
function _seek($row)
{
return false;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -158,7 +158,6 @@
return pg_cmdtuples($this->_resultid);
}
-
// returns true/false
function BeginTrans()
{
@@ -616,7 +615,6 @@
return $this->_connect($str,$user,$pwd,$db,1);
}
-
// returns queryID or false
function _query($sql,$inputarr)
{
@@ -632,8 +630,6 @@
with plan = 1.51861286163 secs
no plan = 1.26903700829 secs
-
-
*/
$plan = 'P'.md5($sql);
@@ -696,7 +692,6 @@
return $rez;
}
-
/* Returns: the last error message from previous database operation */
function ErrorMsg()
{
@@ -736,7 +731,6 @@
return true;
}
-
/*
* Maximum size of C field
*/
@@ -753,7 +747,6 @@
return 1000000000; // should be 1 Gb?
}
-
}
/*--------------------------------------------------------------------------------------
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -24,7 +24,6 @@
$this->ADODB_postgres64();
}
-
// the following should be compat with postgresql 7.2,
// which makes obsolete the LIMIT limit,offset syntax
function &SelectLimit($sql,$nrows=-1,$offset=-1,$inputarr=false,$secs2cache=0)
@@ -83,8 +82,6 @@
return false;
}
-
-
function xMetaForeignKeys($table, $owner=false, $upper=false)
{
@@ -160,7 +157,6 @@
var $databaseType = "postgres7";
-
function ADORecordSet_postgres7($queryID,$mode=false)
{
$this->ADORecordSet_postgres64($queryID,$mode);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -48,7 +48,6 @@
};
-
class ADORecordSet_sapdb extends ADORecordSet_odbc {
var $databaseType = "sapdb";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -158,9 +158,7 @@
$this->ADORecordSet_odbc($id,$mode);
}
-
}; //class
-
} //define
?>
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -123,7 +123,6 @@
@sqlite_create_function($this->_connectionID, 'adodb_date2', 'adodb_date2', 2);
}
-
// returns true or false
function _connect($argHostname, $argUsername, $argPassword, $argDatabasename)
{
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -52,7 +52,6 @@
return $this->GetOne('select @@rowcount');
}
-
function BeginTrans()
{
@@ -174,8 +173,6 @@
return ADORecordSet_array_sybase::UnixTimeStamp($v);
}
-
-
# Added 2003-10-05 by Chris Phillipson
# Used ASA SQL Reference Manual -- http://sybooks.sybase.com/onlinebooks/group-aw/awg0800e/dbrfen8/@ebt-link;pt=16756?target=%25N%15_12018_START_RESTART_N%25
# to convert similar Microsoft SQL*Server (mssql) API into Sybase compatible version
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -42,7 +42,6 @@
return time();
}
-
function BeginTrans() { return false;}
// quote string to be sent back to database
@@ -52,7 +51,6 @@
return "'".$s."'";
}
-
// TOP requires ORDER BY for VFP
function &SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0)
{
@@ -60,16 +58,12 @@
return ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache);
}
-
-
};
-
class ADORecordSet_vfp extends ADORecordSet_odbc {
var $databaseType = "vfp";
-
function ADORecordSet_vfp($id,$mode=false)
{
return $this->ADORecordSet_odbc($id,$mode);
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/ADODB.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -566,7 +566,6 @@
return $result;
}
-
// The only thing we might be interested in updating which we can
// do fast in the flags (minor_edit). I think the default
// update_versiondata will work fine...
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/PDO.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -664,7 +664,6 @@
return $result;
}
-
// The only thing we might be interested in updating which we can
// do fast in the flags (minor_edit). I think the default
// update_versiondata will work fine...
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/PearDB.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -107,7 +107,6 @@
}
}
-
/*
* Test fast wikipage.
*/
@@ -811,7 +810,6 @@
if ($since)
$pick[] = "mtime >= $since";
-
if ($include_all_revisions) {
// Include all revisions of each page.
$table = "$page_tbl, $version_tbl";
@@ -980,7 +978,6 @@
$this->unlock();
}
-
/**
* Grab a write lock on the tables in the SQL database.
*
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -44,7 +44,6 @@
* ALONE BASIS."
*/
-
require_once('lib/ErrorManager.php');
require_once('lib/WikiDB/backend/PearDB_pgsql.php');
@@ -430,7 +429,6 @@
if ($since)
$pick[] = "mtime >= $since";
-
if ($include_all_revisions) {
// Include all revisions of each page.
$table = "$page_tbl, $version_tbl";
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/cvs.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -583,7 +583,6 @@
serialize( $mp ) );
}
-
/**
* Returns an array containing the most popular information. This
* creates the most popular file if it does not exist.
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -3,7 +3,6 @@
require_once('lib/WikiDB/backend.php');
-
/**
* An inefficient but general most_popular iterator.
*
Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -3,7 +3,6 @@
require_once('lib/WikiDB/backend.php');
-
/**
* An inefficient but general most_recent iterator.
*
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend/file.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -80,7 +80,6 @@
$this->_page_version_data = NULL;
$this->_latest_versions = NULL;
-
}
// *********************************************************************
@@ -178,7 +177,6 @@
}
}
-
// *********************************************************************
// Load/Save Page-Data
function _loadPageData($pagename) {
@@ -243,7 +241,6 @@
return $this->_latest_versions[$pagename];
}
-
// *********************************************************************
// Load/Save Page-Links
function _loadPageLinks($pagename) {
@@ -257,8 +254,6 @@
$this->_savePage('links', $pagename, 0, $links);
}
-
-
/**
* Get page meta-data from database.
*
@@ -321,7 +316,6 @@
$this->_savePageData($pagename, $data); // write new pagedata-file
}
-
/**
* Get the current version number for a page.
*
@@ -623,7 +617,6 @@
//trigger_error("unlock: Not Implemented", E_USER_WARNING);
}
-
/**
* Close database.
*/
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/backend.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -117,7 +117,6 @@
trigger_error("virtual", E_USER_ERROR);
}
-
/**
* Get the current version number for a page.
*
@@ -362,7 +361,6 @@
'exclude' => $exclude));
}
-
/**
*
* @access protected
Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB/file.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -22,7 +22,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
require_once( 'lib/WikiDB.php' );
require_once( 'lib/WikiDB/backend/file.php' );
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiDB.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -105,7 +105,6 @@
return new $class ($dbparams);
}
-
/**
* Constructor.
*
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiPluginCached.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -252,7 +252,6 @@
return HTML();
} // run
-
/* --------------------- virtual or abstract functions ----------- */
/**
@@ -469,7 +468,6 @@
return $object;
}
-
// --------------------------------------------------------------------------
// ---------------------- static member functions ---------------------------
// --------------------------------------------------------------------------
@@ -557,7 +555,6 @@
} // decideImgType
-
/**
* Writes an image into a file or to the browser.
* Note that there is no check if the image can
@@ -581,7 +578,6 @@
}
} // writeImage
-
/**
* Sends HTTP Header for some predefined file types.
* There is no parameter check.
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiTheme.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -146,8 +146,6 @@
}
}
-
-
/**
* Make a button.
*
@@ -1053,7 +1051,6 @@
return $this->_buttonSeparator;
}
-
////////////////////////////////////////////////////////////////
//
// CSS
@@ -1378,7 +1375,6 @@
*/
//$this->setDateFormat("%B %d, %Y", false);
-
/**
* Custom UserPreferences:
* A list of name => _UserPreference class pairs.
@@ -1635,7 +1631,6 @@
};
-
/**
* A class representing a clickable "button".
*
@@ -1732,7 +1727,6 @@
};
-
/**
* A class representing an image form <samp>submit</samp> button.
*/
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/WikiUserNew.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -298,7 +298,6 @@
return '_WikiUser';
}
-
/**
* Upgrade olduser by copying properties from user to olduser.
* We are not sure yet, for which php's a simple $this = $user works reliably,
Modified: trunk/lib/XMLRPC/utils.php
===================================================================
--- trunk/lib/XMLRPC/utils.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/XMLRPC/utils.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -32,7 +32,6 @@
*/
-
/* xmlrpc utilities (xu)
* author: Dan Libby (da...@li...)
*/
@@ -131,7 +130,6 @@
'faultString' => $string);
}
-
function find_and_decode_xml($buf, $debug) {
if (strlen($buf)) {
$xml_begin = substr($buf, strpos($buf, "<?xml"));
@@ -236,8 +234,6 @@
));
}
-
-
function xu_is_fault($arg) {
// xmlrpc extension finally supports this.
return is_array($arg) ? xmlrpc_is_fault($arg) : false;
Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/XmlElement.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -172,7 +172,6 @@
return trim($val);
}
-
/**
* See if element is empty.
*
Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/XmlRpcServer.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -85,7 +85,6 @@
require_once("lib/XMLRPC/xmlrpcs.inc");
}
-
/**
* Helper function: Looks up a page revision (most recent by default) in the wiki database
*
@@ -123,7 +122,6 @@
return new xmlrpcresp(0, $xmlrpcerruser + 1, "No such page ".$pagename);
}
-
// ****************************************************************************
// Main API functions follow
// ****************************************************************************
@@ -190,7 +188,6 @@
return new xmlrpcresp(new xmlrpcval($pages, "array"));
}
-
/**
* base64 getPage( String pagename ): Get the raw Wiki text of page, latest version.
* Page name must be UTF-8, with URL encoding. Returned value is a binary object,
@@ -214,7 +211,6 @@
return new xmlrpcresp(long_string($revision->getPackedContent()));
}
-
/**
* base64 getPageVersion( String pagename, int version ): Get the raw Wiki text of page.
* Returns UTF-8, expects UTF-8 with URL encoding.
@@ -336,7 +332,6 @@
return getPageInfo($params);
}
-
/* array listLinks( string pagename ): Lists all links for a given page. The
* returned array contains structs, with the following elements:
* name (string) : The page name or URL the link is to.
Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/diff.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -68,7 +68,6 @@
list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
list ($final_words, $final_stripped) = $this->_split($final_lines);
-
$this->MappedDiff($orig_words, $final_words,
$orig_stripped, $final_stripped);
}
@@ -108,7 +107,6 @@
}
}
-
/**
* HTML unified diff formatter.
*
Modified: trunk/lib/diff3.php
===================================================================
--- trunk/lib/diff3.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/diff3.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -38,7 +38,6 @@
}
}
-
class _Diff3_CopyBlock extends _Diff3_Block {
var $type = 'copy';
@@ -66,7 +65,6 @@
$this->orig = $this->final1 = $this->final2 = array();
}
-
function _append (&$array, $lines) {
array_splice($array, sizeof($array), 0, $lines);
}
@@ -101,7 +99,6 @@
}
};
-
class Diff3 {
function Diff3 ($orig, $final1, $final2) {
$eng = new _DiffEngine;
@@ -179,7 +176,6 @@
return $blocks;
}
-
function merged_output($label1 = false, $label2 = false) {
$lines = array();
foreach ($this->blocks as $block) {
Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php 2012-08-31 11:56:08 UTC (rev 8280)
+++ trunk/lib/difflib.php 2012-08-31 12:01:01 UTC (rev 8281)
@@ -81,7 +81,6 @@
}
}
-
/**
* Class used internally by Diff to actually compute the diffs.
*
@@ -191,7 +190,6 @@
return $edits;
}
-
/* Divide the Largest Common Subsequence (LCS) of the sequences
* [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
* sized segments.
@@ -605,7 +603,6 @@
if (serialize(...
[truncated message content] |
|
From: <var...@us...> - 2012-08-31 13:15:59
|
Revision: 8282
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8282&view=rev
Author: vargenau
Date: 2012-08-31 13:15:51 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
elseif
Modified Paths:
--------------
trunk/lib/BlockParser.php
trunk/lib/EditToolbar.php
trunk/lib/InlineParser.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/display.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/plugin/Chart.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/PageGroup.php
trunk/lib/plugin/PhotoAlbum.php
trunk/lib/plugin/PrevNext.php
trunk/lib/plugin/WantedPagesOld.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikicreoleTable.php
trunk/view.php
trunk/wikiadmin.php
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/BlockParser.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -926,7 +926,7 @@
if ($m->match == '<noinclude>') {
$text = TransformText($text);
$this->_element = new Block_HtmlElement('div', false, $text);
- } else if ($m->match == '<nowiki>') {
+ } elseif ($m->match == '<nowiki>') {
$text = TransformInlineNowiki($text);
$this->_element = new Block_HtmlElement('p', false, $text);
} else {
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/EditToolbar.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -302,7 +302,7 @@
$page = $p->getName();
if (FUSIONFORGE) {
$categories[] = "['$page', '%0A----%0A%5B%5B".$page."%5D%5D']";
- } else if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
+ } elseif (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
$categories[] = "['$page', '%0A%5B".$page."%5D']";
} else {
$categories[] = "['$page', '%0A".$page."']";
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/InlineParser.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -355,15 +355,15 @@
// Remove spaces before and after ":", if any
if (string_starts_with($rawlink, "Upload")) {
$rawlink = preg_replace("/^Upload\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "upload")) {
+ } elseif (string_starts_with($rawlink, "upload")) {
$rawlink = preg_replace("/^upload\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "Image")) {
+ } elseif (string_starts_with($rawlink, "Image")) {
$rawlink = preg_replace("/^Image\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "image")) {
+ } elseif (string_starts_with($rawlink, "image")) {
$rawlink = preg_replace("/^image\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "File")) {
+ } elseif (string_starts_with($rawlink, "File")) {
$rawlink = preg_replace("/^File\\s*:\\s*/", "Upload:", $rawlink);
- } else if (string_starts_with($rawlink, "file")) {
+ } elseif (string_starts_with($rawlink, "file")) {
$rawlink = preg_replace("/^file\\s*:\\s*/", "Upload:", $rawlink);
}
@@ -410,7 +410,7 @@
if (preg_match('/^\.\.\//', $link)) {
return new Cached_ExternalLink($link, $label);
}
- } else if (preg_match('/^(\.\.\/|\/)/', $link)) {
+ } elseif (preg_match('/^(\.\.\/|\/)/', $link)) {
return new Cached_ExternalLink($link, $label);
}
@@ -1095,7 +1095,7 @@
if (is_image($imagename)) {
if ((strpos($imagename, "http://") === 0) || (strpos($imagename, "https://") === 0)) {
return LinkImage($imagename, $alt);
- } else if ($imagename[0] == '/') {
+ } elseif ($imagename[0] == '/') {
return LinkImage(DATA_PATH . '/' . $imagename, $alt);
} else {
return LinkImage(getUploadDataPath() . $imagename, $alt);
Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -106,7 +106,7 @@
if ($size==0) $size=5;
$attr = " multiple size=$size";
if (!strpos($name,'[]')) $name .= '[]';
- } else if ($size) $attr = " size=$size";
+ } elseif ($size) $attr = " size=$size";
else $attr ='';
$s = "<select name=\"$name\"$attr $selectAttr>";
@@ -175,7 +175,7 @@
$rewritesql = preg_replace('/(\sORDER\s+BY\s.*)/is','',$sql);
$rewritesql = "SELECT COUNT(*) FROM ($rewritesql)";
- } else if ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7') {
+ } elseif ( $zthis->databaseType == 'postgres' || $zthis->databaseType == 'postgres7') {
$info = $zthis->ServerInfo();
if (substr($info['version'],0,3) >= 7.1) { // good till version 999
@@ -478,7 +478,7 @@
$recordSet->connection = &$zthis;
$columns = $zthis->MetaColumns( $tableName );
- } else if (is_subclass_of($rs, 'adorecordset')) {
+ } elseif (is_subclass_of($rs, 'adorecordset')) {
for ($i=0, $max=$rs->FieldCount(); $i < $max; $i++)
$columns[] = $rs->FetchField($i);
$recordSet =& $rs;
Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -460,7 +460,7 @@
if ($year % 400 == 0) {
return true;
// if gregorian calendar (>1582), century not-divisible by 400 is not leap
- } else if ($year > 1582 && $year % 100 == 0 ) {
+ } elseif ($year > 1582 && $year % 100 == 0 ) {
return false;
}
Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -92,9 +92,9 @@
if (strnatcmp(PHP_VERSION,'4.3.0')>=0) {
define('ADODB_PHPVER',0x4300);
- } else if (strnatcmp(PHP_VERSION,'4.2.0')>=0) {
+ } elseif (strnatcmp(PHP_VERSION,'4.2.0')>=0) {
define('ADODB_PHPVER',0x4200);
- } else if (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
+ } elseif (strnatcmp(PHP_VERSION,'4.0.5')>=0) {
define('ADODB_PHPVER',0x4050);
} else {
define('ADODB_PHPVER',0x4000);
@@ -328,7 +328,7 @@
$fn = ADODB_OUTP;
$fn($msg,$newline);
return;
- } else if (isset($ADODB_OUTP)) {
+ } elseif (isset($ADODB_OUTP)) {
$fn = $ADODB_OUTP;
$fn($msg,$newline);
return;
@@ -832,7 +832,7 @@
if($emsg = $this->ErrorMsg()) {
if ($err = $this->ErrorNo()) ADOConnection::outp($err.': '.$emsg);
}
- } else if (!$this->_queryID) {
+ } elseif (!$this->_queryID) {
ADOConnection::outp($this->ErrorNo() .': '. $this->ErrorMsg());
}
} else {
@@ -1085,7 +1085,7 @@
$ret =& $this->Execute($sql,$inputarr);
}
return $ret; // PHP5 fix
- } else if ($ismssql){
+ } elseif ($ismssql){
$sql = preg_replace(
'/(^\s*select\s+(distinctrow|distinct)?)/i','\\1 '.$this->hasTop.' '.$nrows.' ',$sql);
} else {
@@ -3145,7 +3145,7 @@
// is the char field is too long, return as text field...
if ($this->blobSize >= 0) {
if ($len > $this->blobSize) return 'X';
- } else if ($len > 250) {
+ } elseif ($len > 250) {
return 'X';
}
return 'C';
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -76,7 +76,7 @@
//use trusted conection for SQL if username not specified
if (!$argUsername) $argHostname .= ";Trusted_Connection=Yes";
- } else if ($argProvider=='access')
+ } elseif ($argProvider=='access')
$argProvider = "Microsoft.Jet.OLEDB.4.0"; // Microsoft Jet Provider
if ($argProvider) $dbc->Provider = $argProvider;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -164,8 +164,8 @@
if ($ttype) {
if ($isview) {
if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
+ } elseif (strncmp($type,'T',1) === 0) $arr2[] = $arr[$i][2];
+ } elseif (strncmp($type,'S',1) !== 0) $arr2[] = $arr[$i][2];
}
return $arr2;
}
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -734,7 +734,7 @@
} else {
if (!isset($f[$i])) {
$f[$i] = null;
- } else if ($rtrim && is_string($f[$i])) {
+ } elseif ($rtrim && is_string($f[$i])) {
$f[$i] = rtrim($f[$i]);
}
}
@@ -744,7 +744,7 @@
$this->fields = $f;
if ($this->fetchMode == ADODB_FETCH_ASSOC) {
$this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
- } else if ($this->fetchMode == ADODB_FETCH_BOTH) {
+ } elseif ($this->fetchMode == ADODB_FETCH_BOTH) {
$this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
}
return true;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -574,7 +574,7 @@
}
$params .= "@P$i=N". (strncmp($v,"'",1)==0? $v : $this->qstr($v));
- } else if (is_integer($v)) {
+ } elseif (is_integer($v)) {
$decl .= "@P$i INT";
$params .= "@P$i=".$v;
} else {
@@ -587,7 +587,7 @@
if ($this->debug) ADOConnection::outp("<font size=-1>sp_executesql N{$sql[1]},N$decl,$params</font>");
$rez = mssql_query("sp_executesql N{$sql[1]},N$decl,$params");
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
# PrepareSP()
$rez = mssql_execute($sql[1]);
@@ -733,7 +733,7 @@
foreach($this->fields as $k=>$v) {
$this->fields[strtolower($k)] = $v;
}
- } else if (ADODB_ASSOC_CASE == 1) {
+ } elseif (ADODB_ASSOC_CASE == 1) {
foreach($this->fields as $k=>$v) {
$this->fields[strtoupper($k)] = $v;
}
@@ -774,11 +774,11 @@
}
if (!$this->fields) {
- } else if (ADODB_ASSOC_CASE == 0) {
+ } elseif (ADODB_ASSOC_CASE == 0) {
foreach($this->fields as $k=>$v) {
$this->fields[strtolower($k)] = $v;
}
- } else if (ADODB_ASSOC_CASE == 1) {
+ } elseif (ADODB_ASSOC_CASE == 1) {
foreach($this->fields as $k=>$v) {
$this->fields[strtoupper($k)] = $v;
}
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -453,7 +453,7 @@
$this->_errorMsg = false;
if (is_array($inputarr)) {
$rez = sqlsrv_query($this->_connectionID,$sql,$inputarr);
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
$rez = sqlsrv_query($this->_connectionID,$sql[1],$inputarr);
} else {
$rez = sqlsrv_query($this->_connectionID,$sql);
@@ -758,7 +758,7 @@
foreach($this->fields as $k=>$v) {
$this->fields[strtolower($k)] = $v;
}
- } else if (ADODB_ASSOC_CASE == 1) {
+ } elseif (ADODB_ASSOC_CASE == 1) {
foreach($this->fields as $k=>$v) {
$this->fields[strtoupper($k)] = $v;
}
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -184,7 +184,7 @@
if ($mode==1) {
$this->_connectionID = OCIPLogon($argUsername,$argPassword, $argDatabasename);
if ($this->_connectionID && $this->autoRollback) OCIrollback($this->_connectionID);
- } else if ($mode==2) {
+ } elseif ($mode==2) {
$this->_connectionID = OCINLogon($argUsername,$argPassword, $argDatabasename);
} else {
$this->_connectionID = OCILogon($argUsername,$argPassword, $argDatabasename);
@@ -684,7 +684,7 @@
if ($type !== false) $rez = OCIBindByName($stmt[1],":".$name,$var,$size,$type);
else $rez = OCIBindByName($stmt[1],":".$stmt[2],$var,$size); // +1 byte for null terminator
$stmt[2] += 1;
- } else if ($type == OCI_B_BLOB){
+ } elseif ($type == OCI_B_BLOB){
//we have to create a new Descriptor here
$_blob = OCINewDescriptor($this->_connectionID, OCI_D_LOB);
$rez = OCIBindByName($stmt[1], ":".$name, $_blob, -1, OCI_B_BLOB);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -282,8 +282,8 @@
if ($ttype) {
if ($isview) {
if (strncmp($type,'V',1) === 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
- } else if (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+ } elseif (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
+ } elseif (strncmp($type,'SYS',3) !== 0) $arr2[] = $arr[$i][2];
}
return $arr2;
}
@@ -440,7 +440,7 @@
$fld->not_null = !empty($rs->fields[10]);
$fld->scale = $rs->fields[8];
$retarr[strtoupper($fld->name)] = $fld;
- } else if (sizeof($retarr)>0)
+ } elseif (sizeof($retarr)>0)
break;
$rs->MoveNext();
}
@@ -488,7 +488,7 @@
return false;
}
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
$stmtid = $sql[1];
if (!odbc_execute($stmtid)) {
//@odbc_free_result($stmtid);
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -295,7 +295,7 @@
$fld->default_value = $rs->fields[12];
}
$retarr[strtoupper($fld->name)] = $fld;
- } else if (sizeof($retarr)>0)
+ } elseif (sizeof($retarr)>0)
break;
$rs->MoveNext();
}
@@ -497,7 +497,7 @@
if (! odbtp_execute($stmtid) ) {
return false;
}
- } else if (is_array($sql)) {
+ } elseif (is_array($sql)) {
$stmtid = $sql[1];
if (!odbtp_execute($stmtid)) {
return false;
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -654,7 +654,7 @@
if ($params) $params .= ',';
if (is_string($v)) {
$params .= 'VARCHAR';
- } else if (is_integer($v)) {
+ } elseif (is_integer($v)) {
$params .= 'INTEGER';
} else {
$params .= "REAL";
Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -313,7 +313,7 @@
{
if ($this->fetchMode == ADODB_FETCH_NUM) {
$this->fields = @sybase_fetch_row($this->_queryID);
- } else if ($this->fetchMode == ADODB_FETCH_ASSOC) {
+ } elseif ($this->fetchMode == ADODB_FETCH_ASSOC) {
$this->fields = @sybase_fetch_row($this->_queryID);
if (is_array($this->fields)) {
$this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiDB/backend/cvs.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -472,7 +472,7 @@
$returnVal[] = $key;
$limit--;
}
- } else if ( isset( $params['since'] ) ) {
+ } elseif ( isset( $params['since'] ) ) {
while ( (list($key, $val) = each($a)) ) {
if ( $val > $params['since'] ) {
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/WikiUser/OpenID.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -57,7 +57,7 @@
}
if (isset($params["openid_claimed_id"])) {
$identity = $params["openid_claimed_id"];
- } else if (isset($params["openid_identity"])){
+ } elseif (isset($params["openid_identity"])){
$identity = $params["openid_identity"];
} else {
$identity = "";
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/display.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -367,10 +367,10 @@
if ($pagename == _("SandBox")) {
$robots = "noindex,nofollow";
$toks['ROBOTS_META'] = $robots;
- } else if (isActionPage($pagename)) {
+ } elseif (isActionPage($pagename)) {
$robots = "noindex,nofollow";
$toks['ROBOTS_META'] = $robots;
- } else if (!isset($toks['ROBOTS_META'])) {
+ } elseif (!isset($toks['ROBOTS_META'])) {
$robots = "index,follow";
$toks['ROBOTS_META'] = $robots;
}
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/loadsave.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -118,21 +118,21 @@
echo "</div>\n";
echo "</article>\n";
echo "</div>\n";
- } else if (isa($WikiTheme, 'WikiTheme_Sidebar')
+ } elseif (isa($WikiTheme, 'WikiTheme_Sidebar')
or isa($WikiTheme, 'WikiTheme_MonoBook')) {
echo "</div>\n";
echo "</div>\n";
echo "</div>\n";
echo "</div>\n";
- } else if (isa($WikiTheme, 'WikiTheme_wikilens')) {
+ } elseif (isa($WikiTheme, 'WikiTheme_wikilens')) {
echo "</div>\n";
echo "</td>\n";
echo "</tr>\n";
echo "</table>\n";
- } else if (isa($WikiTheme, 'WikiTheme_blog')) {
+ } elseif (isa($WikiTheme, 'WikiTheme_blog')) {
echo "</div>\n";
echo "</div>\n";
- } else if (isa($WikiTheme, 'WikiTheme_Crao')
+ } elseif (isa($WikiTheme, 'WikiTheme_Crao')
or isa($WikiTheme, 'WikiTheme_Hawaiian')
or isa($WikiTheme, 'WikiTheme_MacOSX')
or isa($WikiTheme, 'WikiTheme_shamino_com')
@@ -1521,7 +1521,7 @@
if (!FUSIONFORGE) {
$mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
- } else if (WIKI_NAME == "help") {
+ } elseif (WIKI_NAME == "help") {
$mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');
} else {
$mandatory = explode(':','SandBox:Template/UserPage:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:TextFormattingRules:PhpWikiAdministration');
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/main.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -964,7 +964,7 @@
if (empty($HTTP_SERVER_VARS['PHP_AUTH_USER'])) {
return false;
}
- } else if (isa($user, WikiUserClassname())) {
+ } elseif (isa($user, WikiUserClassname())) {
$this->_user = $user;
$this->_user->_authhow = 'session';
return ENABLE_USER_NEW ? $user->UserName() : $this->_user;
Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/Chart.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -114,7 +114,7 @@
. 'line(point1, point2);';
$abscisse += 1;
}
- } else if ($type == "line") {
+ } elseif ($type == "line") {
$abscisse = 0;
$source .= 'strokewidth = 3; p = []; ';
foreach ($values as $value) {
@@ -126,7 +126,7 @@
$abscisse += 1;
}
$source .= 'path(p);';
- } else if ($type == "pie") {
+ } elseif ($type == "pie") {
$source = 'initPicture(-1.1,1.1,-1.1,1.1); stroke = "'.$color.'"; strokewidth = 1;'
. 'center = [0, 0]; circle(center, 1);'
. 'point = [1, 0]; line(center, point);';
Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/CreateToc.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -110,7 +110,7 @@
function _getCounter(&$counter, $level, $firstlevelstyle) {
if ($firstlevelstyle == 'roman') {
$str= $this->_roman_counter($counter[1]);
- } else if ($firstlevelstyle == 'letter') {
+ } elseif ($firstlevelstyle == 'letter') {
$str= $this->_letter_counter($counter[1]);
} else {
$str=$counter[1];
@@ -252,15 +252,15 @@
if (preg_match('/^\s*{\|/', $content[$i])) {
$insidetable = true;
continue;
- } else if (preg_match('/^\s*{{{/', $content[$i])
+ } elseif (preg_match('/^\s*{{{/', $content[$i])
|| preg_match('/^\s*<pre>/', $content[$i])
|| preg_match('/^\s*<verbatim>/', $content[$i])) {
$insideverbatim = true;
continue;
- } else if (preg_match('/^\s*\|}/', $content[$i])) {
+ } elseif (preg_match('/^\s*\|}/', $content[$i])) {
$insidetable = false;
continue;
- } else if (preg_match('/^\s*}}}/', $content[$i])
+ } elseif (preg_match('/^\s*}}}/', $content[$i])
|| preg_match('/^\s*<\/pre>/', $content[$i])
|| preg_match('/^\s*<\/verbatim>/', $content[$i])) {
$insideverbatim = false;
Modified: trunk/lib/plugin/MostPopular.php
===================================================================
--- trunk/lib/plugin/MostPopular.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/MostPopular.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -87,7 +87,7 @@
if (! $noheader) {
if ($limit > 0) {
$pagelist->setCaption(fmt("The %d most popular pages of this wiki:", $limit));
- } else if ($limit < 0) {
+ } elseif ($limit < 0) {
$pagelist->setCaption(fmt("The %d least popular pages of this wiki:", -$limit));
} else {
$pagelist->setCaption(_("Visited pages on this wiki, ordered by popularity:"));
Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/PageGroup.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -171,7 +171,7 @@
//previous,next
}
}
- } else if ($go_item == 'next') {
+ } elseif ($go_item == 'next') {
if ($loop) {
if ($thispage == $lastindex) {
$linkpage = $c[1];
Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/PhotoAlbum.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -308,7 +308,7 @@
if ($cellwidth != 'auto') {
if ($cellwidth == 'equal') {
$newcellwidth = round(100/$numcols)."%";
- } else if ($cellwidth == 'image') {
+ } elseif ($cellwidth == 'image') {
$newcellwidth = $newwidth;
} else {
$newcellwidth = $cellwidth;
Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/PrevNext.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -79,7 +79,7 @@
if ($align == 'center') {
$tr = HTML::tr();
$links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), $tr);
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td = HTML::td(array('align' => $align));
$links = HTML::table(array('cellpadding' => 0, 'cellspacing' => 0, 'width' => '100%'), HTML::tr($td));
} else {
@@ -92,7 +92,7 @@
}
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), " [ "));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushcontent(" [ ");
} else {
$links->pushcontent(" [ ");
@@ -110,7 +110,7 @@
if ($last_is_text) {
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), $sep));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushcontent($sep);
} else {
$links->pushcontent($sep);
@@ -118,7 +118,7 @@
}
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushContent(new ImageButton($label, $url, false, $imgurl));
} else {
$links->pushcontent(new ImageButton($label, $url, false, $imgurl));
@@ -129,7 +129,7 @@
if ($last_is_text) {
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), $sep));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushcontent($sep);
} else {
$links->pushcontent($sep);
@@ -137,7 +137,7 @@
}
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushContent(new ImageButton($label, $url, false, $imgurl));
} else {
$links->pushcontent(new ImageButton($label, $url, false, $imgurl));
@@ -147,7 +147,7 @@
if (! $this_is_first) {
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), $sep));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushcontent($sep);
} else {
$links->pushcontent($sep);
@@ -155,7 +155,7 @@
}
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushContent(new Button($label, $url, $class));
} else {
$links->pushcontent(new Button($label, $url, $class));
@@ -166,7 +166,7 @@
if (! $this_is_first) {
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), $sep));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushcontent($sep);
} else {
$links->pushcontent($sep);
@@ -174,7 +174,7 @@
}
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushContent(new Button($label, $url, $class));
} else {
$links->pushcontent(new Button($label, $url, $class));
@@ -187,7 +187,7 @@
if ($style == 'text') {
if ($align == 'center') {
$tr->pushContent(HTML::td(array('align' => $align), " ] "));
- } else if ($align == 'right') {
+ } elseif ($align == 'right') {
$td->pushcontent(" ] ");
} else {
$links->pushcontent(" ] ");
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/WantedPagesOld.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -74,7 +74,7 @@
if (! in_array($name, $exclude))
$this->_iterateLinks($page_handle, $dbi);
}
- } else if ($page && $pageisWikiPage = $dbi->isWikiPage($page)) {
+ } elseif ($page && $pageisWikiPage = $dbi->isWikiPage($page)) {
//only get WantedPages links for one page
$page_handle = $dbi->getPage($page);
$this->_iterateLinks($page_handle, $dbi);
Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -73,7 +73,7 @@
}
if (!empty($post_args['aclliberal'])) {
return $this->setaclPages($request, array_keys($p), $this->liberalPerms());
- } else if (!empty($post_args['aclrestricted'])) {
+ } elseif (!empty($post_args['aclrestricted'])) {
return $this->setaclPages($request, array_keys($p), $this->restrictedPerms());
}
}
Modified: trunk/lib/plugin/WikicreoleTable.php
===================================================================
--- trunk/lib/plugin/WikicreoleTable.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/lib/plugin/WikicreoleTable.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -104,7 +104,7 @@
for ($j=0; $j<$nbcols; $j++) {
if (!isset($table[$i][$j])) {
$table[$i][$j] = '';
- } else if (preg_match('/@@/', $table[$i][$j])) {
+ } elseif (preg_match('/@@/', $table[$i][$j])) {
$table[$i][$j] = $this->_compute_tablecell($table, $i, $j, $nbrows, $nbcols);
}
}
@@ -180,7 +180,7 @@
}
return str_replace("@@=SUM(C)@@", $result, $table[$i][$j]);
- } else if (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=SUM(R)@@") !== false) {
for ($index=0; $index<$jmax; $index++) {
if (is_numeric($table[$i][$index])) {
$result += $table[$i][$index];
@@ -188,7 +188,7 @@
}
return str_replace("@@=SUM(R)@@", $result, $table[$i][$j]);
- } else if (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=AVERAGE(C)@@") !== false) {
for ($index=0; $index<$imax; $index++) {
if (is_numeric($table[$index][$j])) {
$result += $table[$index][$j];
@@ -198,7 +198,7 @@
$result=$result/$counter;
return str_replace("@@=AVERAGE(C)@@", $result, $table[$i][$j]);
- } else if (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=AVERAGE(R)@@") !== false) {
for ($index=0; $index<$jmax; $index++) {
if (is_numeric($table[$i][$index])) {
$result += $table[$i][$index];
@@ -208,7 +208,7 @@
$result=$result/$counter;
return str_replace("@@=AVERAGE(R)@@", $result, $table[$i][$j]);
- } else if (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=MAX(C)@@") !== false) {
for ($index=0; $index<$imax; $index++) {
if (is_numeric($table[$index][$j])) {
if (!$found) {
@@ -224,7 +224,7 @@
}
return str_replace("@@=MAX(C)@@", $result, $table[$i][$j]);
- } else if (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=MAX(R)@@") !== false) {
for ($index=0; $index<$jmax; $index++) {
if (is_numeric($table[$i][$index])) {
if (!$found) {
@@ -240,7 +240,7 @@
}
return str_replace("@@=MAX(R)@@", $result, $table[$i][$j]);
- } else if (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=MIN(C)@@") !== false) {
for ($index=0; $index<$imax; $index++) {
if (is_numeric($table[$index][$j])) {
if (!$found) {
@@ -256,7 +256,7 @@
}
return str_replace("@@=MIN(C)@@", $result, $table[$i][$j]);
- } else if (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=MIN(R)@@") !== false) {
for ($index=0; $index<$jmax; $index++) {
if (is_numeric($table[$i][$index])) {
if (!$found) {
@@ -272,7 +272,7 @@
}
return str_replace("@@=MIN(R)@@", $result, $table[$i][$j]);
- } else if (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=COUNT(C)@@") !== false) {
for ($index=0; $index<$imax; $index++) {
// exclude header
if (!string_starts_with(trim($table[$index][$j]), "=")) {
@@ -282,7 +282,7 @@
$result = $counter-1; // exclude self
return str_replace("@@=COUNT(C)@@", $result, $table[$i][$j]);
- } else if (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) {
+ } elseif (strpos($table[$i][$j], "@@=COUNT(R)@@") !== false) {
for ($index=0; $index<$jmax; $index++) {
// exclude header
if (!string_starts_with(trim($table[$i][$index]), "=")) {
Modified: trunk/view.php
===================================================================
--- trunk/view.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/view.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -50,7 +50,7 @@
if (!$group_id || !$project) {
exit_no_group();
-} else if (!($project->usesPlugin("wiki"))) {
+} elseif (!($project->usesPlugin("wiki"))) {
exit_disabled('home');
}
Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php 2012-08-31 12:01:01 UTC (rev 8281)
+++ trunk/wikiadmin.php 2012-08-31 13:15:51 UTC (rev 8282)
@@ -51,9 +51,9 @@
if (!$user || !is_object($user)) {
exit_error(_('Invalid User'),'home');
-} else if ( $user->isError()) {
+} elseif ( $user->isError()) {
exit_error($user->getErrorMessage(),'home');
-} else if ( !$user->isActive()) {
+} elseif ( !$user->isActive()) {
exit_error(_('User not active'),'home');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-09-28 11:27:09
|
Revision: 8287
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8287&view=rev
Author: vargenau
Date: 2012-09-28 11:26:58 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
php_closing_tag [PSR-2] The closing ?> tag MUST be omitted from files containing only PHP.
Modified Paths:
--------------
trunk/ImageTile.php
trunk/RPC2.php
trunk/SOAP.php
trunk/configurator.php
trunk/getimg.php
trunk/index.php
trunk/passencrypt.php
trunk/view.php
trunk/wikiadmin.php
trunk/wikilist.php
Property Changed:
----------------
trunk/ImageTile.php
trunk/RPC2.php
trunk/SOAP.php
trunk/configurator.php
trunk/getimg.php
trunk/index.php
trunk/passencrypt.php
Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/ImageTile.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id$
+<?php
// FIXME! This is a mess. Everything.
require_once('lib/stdlib.php');
@@ -148,4 +148,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/ImageTile.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/RPC2.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
* The guts of this code have been moved to lib/XmlRpcServer.php.
*
@@ -37,4 +36,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/RPC2.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/SOAP.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id$
+<?php
/**
* SOAP server
* Taken from http://www.wlug.org.nz/archive/
@@ -358,4 +358,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/SOAP.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/configurator.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id$
+<?php
/*
* Copyright 2002,2003,2005,2008-2010 $ThePhpWikiProgrammingTeam
* Copyright 2002 Martin Geisler <gim...@gi...>
@@ -163,7 +163,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<!-- $Id$ -->
+<!-- $Id: configurator.php 8281 2012-08-31 12:01:01Z vargenau $ -->
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
<style type="text/css" media="screen">
Property changes on: trunk/configurator.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/getimg.php
===================================================================
--- trunk/getimg.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/getimg.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -1,4 +1,3 @@
-<?php // -*-php-*- $Id$
+<?php
include ("index.php");
include "lib/imagecache.php";
-?>
Property changes on: trunk/getimg.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/index.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -1,6 +1,4 @@
-<?php // -*-php-*-
-// $Id$
-
+<?php
/*
* Copyright 1999-2010 $ThePhpWikiProgrammingTeam
* = array(
@@ -61,4 +59,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-?>
Property changes on: trunk/index.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/passencrypt.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -4,7 +4,6 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<!-- $Id$ -->
<title>Password Encryption Tool</title>
<!--
Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
Property changes on: trunk/passencrypt.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/view.php
===================================================================
--- trunk/view.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/view.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -107,5 +107,3 @@
// mode: php
// c-file-style: "bsd"
// End:
-
-?>
Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/wikiadmin.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id$
+<?php
/*
* Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
* Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -168,4 +168,3 @@
site_project_footer(array());
-?>
Modified: trunk/wikilist.php
===================================================================
--- trunk/wikilist.php 2012-09-28 11:20:42 UTC (rev 8286)
+++ trunk/wikilist.php 2012-09-28 11:26:58 UTC (rev 8287)
@@ -91,4 +91,3 @@
site_admin_footer(array());
-?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-09-28 12:11:47
|
Revision: 8290
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8290&view=rev
Author: vargenau
Date: 2012-09-28 12:11:35 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
include [all] Include and file path should be devided with single space. File path should not be placed under brackets.
Modified Paths:
--------------
trunk/ImageTile.php
trunk/RPC2.php
trunk/SOAP.php
trunk/configurator.php
trunk/getimg.php
trunk/lib/AtomParser.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/DbaDatabase.php
trunk/lib/EditToolbar.php
trunk/lib/ExternalReferrer.php
trunk/lib/Google.php
trunk/lib/HtmlParser.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/Template.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/cvs.php
trunk/lib/WikiDB/dba.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WikiDB.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/AdoDb.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/Facebook.php
trunk/lib/WikiUser/LdapUpper.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/WikiUser/POP3.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/htmlarea3.php
trunk/lib/WysiwygEdit/spaw.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/WysiwygEdit.php
trunk/lib/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fpdf/chinese.php
trunk/lib/fpdf/japanese.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/nusoap/nusoap.php
trunk/lib/pdf.php
trunk/lib/plugin/AddComment.php
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/AllUsers.php
trunk/lib/plugin/AppendText.php
trunk/lib/plugin/AsciiMath.php
trunk/lib/plugin/AtomFeed.php
trunk/lib/plugin/AuthorHistory.php
trunk/lib/plugin/BackLinks.php
trunk/lib/plugin/BlogArchives.php
trunk/lib/plugin/BlogJournal.php
trunk/lib/plugin/BoxRight.php
trunk/lib/plugin/CacheTest.php
trunk/lib/plugin/CalendarList.php
trunk/lib/plugin/CategoryPage.php
trunk/lib/plugin/CreateBib.php
trunk/lib/plugin/CreatePage.php
trunk/lib/plugin/CreateToc.php
trunk/lib/plugin/DeadEndPages.php
trunk/lib/plugin/Diff.php
trunk/lib/plugin/DynamicIncludePage.php
trunk/lib/plugin/EditMetaData.php
trunk/lib/plugin/FileInfo.php
trunk/lib/plugin/FullTextSearch.php
trunk/lib/plugin/GoogleMaps.php
trunk/lib/plugin/GooglePlugin.php
trunk/lib/plugin/GraphViz.php
trunk/lib/plugin/Imdb.php
trunk/lib/plugin/IncludePage.php
trunk/lib/plugin/IncludePages.php
trunk/lib/plugin/IncludeSiteMap.php
trunk/lib/plugin/IncludeTree.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/LikePages.php
trunk/lib/plugin/LinkDatabase.php
trunk/lib/plugin/LinkSearch.php
trunk/lib/plugin/ListPages.php
trunk/lib/plugin/ListRelations.php
trunk/lib/plugin/ListSubpages.php
trunk/lib/plugin/MediawikiTable.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/MostPopular.php
trunk/lib/plugin/OldStyleTable.php
trunk/lib/plugin/OrphanedPages.php
trunk/lib/plugin/PageDump.php
trunk/lib/plugin/PageHistory.php
trunk/lib/plugin/Ploticus.php
trunk/lib/plugin/PopularNearby.php
trunk/lib/plugin/PopularTags.php
trunk/lib/plugin/PreferenceApp.php
trunk/lib/plugin/RandomPage.php
trunk/lib/plugin/RateIt.php
trunk/lib/plugin/RecentChanges.php
trunk/lib/plugin/RecentChangesCached.php
trunk/lib/plugin/RecentComments.php
trunk/lib/plugin/RecentEdits.php
trunk/lib/plugin/RecentReferrers.php
trunk/lib/plugin/RelatedChanges.php
trunk/lib/plugin/RichTable.php
trunk/lib/plugin/RssFeed.php
trunk/lib/plugin/SearchHighlight.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SemanticSearchAdvanced.php
trunk/lib/plugin/SiteMap.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/SqlResult.php
trunk/lib/plugin/SyncWiki.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/Template.php
trunk/lib/plugin/TexToPng.php
trunk/lib/plugin/TitleSearch.php
trunk/lib/plugin/TranslateText.php
trunk/lib/plugin/UnfoldSubpages.php
trunk/lib/plugin/UpLoad.php
trunk/lib/plugin/UriResolver.php
trunk/lib/plugin/UserRatings.php
trunk/lib/plugin/VisualWiki.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WikiAdminChmod.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminMarkup.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSelect.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetAclSimple.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiAdminUtils.php
trunk/lib/plugin/WikiBlog.php
trunk/lib/plugin/WikiFormRich.php
trunk/lib/plugin/WikiForum.php
trunk/lib/plugin/WikicreoleTable.php
trunk/lib/plugin/_AuthInfo.php
trunk/lib/plugin/_BackendInfo.php
trunk/lib/plugin/_Retransform.php
trunk/lib/plugin/_WikiTranslation.php
trunk/lib/purgepage.php
trunk/lib/removepage.php
trunk/lib/stdlib.php
trunk/lib/upgrade.php
trunk/lib/wikilens/PageListColumns.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/wikilens/RatingsUser.php
trunk/tests/unit/lib/AtomParserTest.php
trunk/tests/unit/lib/plugin/AtomFeedTest.php
trunk/tests/unit/test.php
trunk/tests/unit_test_backend_cvs.php
trunk/tests/xmlrpc/interop-client.php
trunk/tests/xmlrpc/interop-server.php
trunk/tests/xmlrpc/validate-form.php
trunk/tests/xmlrpc/validate.php
trunk/tests/xmlrpc/xmlrpc-client.php
trunk/tests/xmlrpc/xmlrpc_utils.php
trunk/themes/Crao/themeinfo.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/Portland/themeinfo.php
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/lib/RecentChanges.php
trunk/themes/Wordpress/themeinfo.php
trunk/themes/blog/lib/RecentChanges.php
trunk/themes/blog/themeinfo.php
trunk/themes/default/themeinfo.php
trunk/themes/fusionforge/themeinfo.php
trunk/themes/shamino_com/themeinfo.php
trunk/themes/smaller/themeinfo.php
trunk/themes/wikilens/themeinfo.php
trunk/view.php
Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/ImageTile.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,6 +1,6 @@
<?php
// FIXME! This is a mess. Everything.
-require_once('lib/stdlib.php');
+require_once 'lib/stdlib.php';
$remove = 0;
if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) {
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/RPC2.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -21,10 +21,10 @@
define ("WIKI_XMLRPC", true);
// Start up the main code
-include_once("index.php");
-include_once("lib/main.php");
+include_once 'index.php';
+include_once 'lib/main.php';
-include_once("lib/XmlRpcServer.php");
+include_once 'lib/XmlRpcServer.php';
$server = new XmlRpcServer;
$server->service();
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/SOAP.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -17,24 +17,24 @@
*/
define ("WIKI_SOAP", true);
-include_once("./index.php");
-include_once("lib/main.php");
+include_once './index.php';
+include_once 'lib/main.php';
if (!loadExtension('soap'))
- require_once('lib/nusoap/nusoap.php');
+ require_once 'lib/nusoap/nusoap.php';
/*
// bypass auth and request loop for now.
// require_once('lib/prepend.php');
-include_once("index.php");
+include_once 'index.php';
//require_once('lib/stdlib.php');
-require_once('lib/WikiDB.php');
-require_once('lib/config.php');
+require_once 'lib/WikiDB.php';
+require_once 'lib/config.php';
class WikiRequest extends Request {}
$request = new WikiRequest();
-require_once('lib/PagePerm.php');
-require_once('lib/WikiUserNew.php');
-require_once('lib/WikiGroup.php');
+require_once 'lib/PagePerm.php';
+require_once 'lib/WikiUserNew.php';
+require_once 'lib/WikiGroup.php';
*/
function checkCredentials(&$server, &$credentials, $access, $pagename) {
@@ -253,7 +253,7 @@
sort($plugins);
$RetArray = array();
if (!empty($plugins)) {
- require_once("lib/WikiPlugin.php");
+ require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader;
foreach ($plugins as $plugin) {
$pluginName = str_replace(".php", "", $plugin);
@@ -269,7 +269,7 @@
function getPluginSynopsis($pluginname, $credentials=false) {
global $server;
checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin");
- require_once("lib/WikiPlugin.php");
+ require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader;
$synopsis = '';
$p = $w->getPlugin($pluginName, false); // second arg?
@@ -292,7 +292,7 @@
checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin");
$basepage = '';;
- require_once("lib/WikiPlugin.php");
+ require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader;
$p = $w->getPlugin($pluginName, false); // second arg?
$pagelist = $p->run($dbi, $pluginargs, $request, $basepage);
@@ -330,7 +330,7 @@
global $server;
checkCredentials($server,$credentials,'view',_("HomePage"));
$dbi = WikiDB::open($GLOBALS['DBParams']);
- require_once("lib/TextSearchQuery.php");
+ require_once 'lib/TextSearchQuery.php';
$pagequery = new TextSearchQuery($pages);
$linkquery = new TextSearchQuery($search);
if ($linktype == 'relation') {
@@ -338,7 +338,7 @@
$links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
} elseif ($linktype == 'attribute') { // only numeric search withh attributes!
$relquery = new TextSearchQuery($relation);
- require_once("lib/SemanticWeb.php");
+ require_once 'lib/SemanticWeb.php';
// search: "population > 1 million and area < 200 km^2" relation="*" pages="*"
$linkquery = new SemanticAttributeSearchQuery($search, $relation);
$links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery);
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/configurator.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -123,8 +123,8 @@
// Require admin user
if (!defined('ADMIN_USER') or !defined('ADMIN_PASSWD')) {
if (!function_exists("IniConfig")) {
- include_once("lib/prepend.php");
- include_once("lib/IniConfig.php");
+ include_once 'lib/prepend.php';
+ include_once 'lib/IniConfig.php';
}
IniConfig($fs_config_file);
}
@@ -149,8 +149,8 @@
}
} else {
if (!function_exists("IniConfig")) {
- include_once("lib/prepend.php");
- include_once("lib/IniConfig.php");
+ include_once 'lib/prepend.php';
+ include_once 'lib/IniConfig.php';
}
$def_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
$fs_def_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $def_file;
Modified: trunk/getimg.php
===================================================================
--- trunk/getimg.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/getimg.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,3 +1,3 @@
<?php
-include ("index.php");
-include "lib/imagecache.php";
+include 'index.php';
+include 'lib/imagecache.php';
Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/AtomParser.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -26,7 +26,7 @@
*
* @author: Sébastien Le Callonnec
*/
-require_once('lib/XmlParser.php');
+require_once 'lib/XmlParser.php';
class AtomParser
extends XmlParser
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/BlockParser.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -20,8 +20,8 @@
* 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');
+require_once 'lib/CachedMarkup.php';
+require_once 'lib/InlineParser.php';
/**
* Deal with paragraphs and proper, recursive block indents
Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/CachedMarkup.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once("lib/Units.php");
+require_once 'lib/Units.php';
class CacheableMarkup extends XmlContent {
@@ -70,7 +70,7 @@
return unserialize($data);
} else {
// user our php lib. TESTME
- include_once("ziplib.php");
+ include_once 'ziplib.php';
$zip = new ZipReader($packed);
list(,$data,$attrib) = $zip->readFile();
return unserialize($data);
@@ -793,7 +793,7 @@
static $loader = false;
if (!$loader) {
- include_once('lib/WikiPlugin.php');
+ include_once 'lib/WikiPlugin.php';
$loader = new WikiPluginLoader;
}
return $loader;
Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/DbaDatabase.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,6 +1,6 @@
<?php
-require_once('lib/ErrorManager.php');
+require_once 'lib/ErrorManager.php';
if (isWindows())
define('DBA_DATABASE_DEFAULT_TIMEOUT', 60);
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/EditToolbar.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -77,7 +77,7 @@
}
}
- require_once("lib/WikiPluginCached.php");
+ require_once 'lib/WikiPluginCached.php';
$cache = WikiPluginCached::newCache();
$dbi = $GLOBALS['request']->getDbh();
// regenerate if number of pages changes (categories, pages, templates)
@@ -292,7 +292,7 @@
function categoriesPulldown() {
global $WikiTheme;
- require_once('lib/TextSearchQuery.php');
+ require_once 'lib/TextSearchQuery.php';
$dbi =& $GLOBALS['request']->_dbi;
// KEYWORDS formerly known as $KeywordLinkRegexp
$pages = $dbi->titleSearch(new TextSearchQuery(KEYWORDS, true));
@@ -339,7 +339,7 @@
sort($plugins);
if (!empty($plugins)) {
$plugin_js = '';
- require_once("lib/WikiPlugin.php");
+ require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader;
foreach ($plugins as $plugin) {
$pluginName = str_replace(".php", "", $plugin);
@@ -377,7 +377,7 @@
// result is cached. Esp. the args are expensive
function pagesPulldown($query, $case_exact=false, $regex='auto') {
- require_once('lib/TextSearchQuery.php');
+ require_once 'lib/TextSearchQuery.php';
$dbi =& $GLOBALS['request']->_dbi;
$page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex));
if ($page_iter->count() > 0) {
@@ -447,7 +447,7 @@
// FIXME!
function templatePulldown($query, $case_exact=false, $regex='auto') {
global $request;
- require_once('lib/TextSearchQuery.php');
+ require_once 'lib/TextSearchQuery.php';
$dbi =& $request->_dbi;
$page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex));
$count = 0;
Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/ExternalReferrer.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -13,7 +13,7 @@
if ($referrer = $request->get('HTTP_REFERER')) {
$home = SCRIPT_NAME; // was SERVER_URL, check sister wiki's: same host but other other script url
if (substr(strtolower($referrer),0,strlen($home)) == strtolower($home)) return false;
- require_once("lib/ExternalReferrer.php");
+ require_once 'lib/ExternalReferrer.php';
$se = new SearchEngines();
return $se->parseSearchQuery($referrer);
}
Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/Google.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -164,7 +164,7 @@
}
else
$this->license_key = GOOGLE_LICENSE_KEY;
- require_once("lib/nusoap/nusoap.php");
+ require_once 'lib/nusoap/nusoap.php';
$this->soapclient = new soapclient(SERVER_URL . NormalizeWebFileName("GoogleSearch.wsdl"), "wsdl");
$this->proxy = $this->soapclient->getProxy();
Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/HtmlParser.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -38,7 +38,7 @@
*/
// RssParser contains the XML (expat) and url-grabber methods
-require_once('lib/XmlParser.php');
+require_once 'lib/XmlParser.php';
class HtmlParser
extends XmlParser
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/InlineParser.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -34,7 +34,7 @@
*/
define('ESCAPE_CHAR', '~');
-require_once('lib/CachedMarkup.php');
+require_once 'lib/CachedMarkup.php';
require_once(dirname(__FILE__).'/stdlib.php');
function WikiEscape($text) {
@@ -555,7 +555,7 @@
{
function Markup_searchhighlight () {
$result = $GLOBALS['request']->_searchhighlight;
- require_once("lib/TextSearchQuery.php");
+ require_once 'lib/TextSearchQuery.php';
$query = new TextSearchQuery($result['query']);
$this->hilight_re = $query->getHighlightRegexp();
$this->engine = $result['engine'];
Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/MailNotify.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -284,7 +284,7 @@
}
$other_content = explode("\n", $prevdata['%content']);
- include_once("lib/difflib.php");
+ include_once 'lib/difflib.php';
$diff2 = new Diff($other_content, $this_content);
//$context_lines = max(4, count($other_content) + 1,
// count($this_content) + 1);
Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/PageList.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -415,7 +415,7 @@
} elseif (($len = strlen($c)) > $this->bytes) {
$c = substr($c, 0, $this->bytes);
}
- include_once('lib/BlockParser.php');
+ include_once 'lib/BlockParser.php';
// false --> don't bother processing hrefs for embedded WikiLinks
$ct = TransformText($c, $revision_handle->get('markup'), false);
if (empty($pagelist->_sortby[$this->_field]))
@@ -1037,7 +1037,7 @@
if (is_array($input)) return $input;
// expand wildcards from list of all pages
if (preg_match('/[\?\*]/', $input) or substr($input,0,1) == "^") {
- include_once("lib/TextSearchQuery.php");
+ include_once 'lib/TextSearchQuery.php';
$search = new TextSearchQuery(str_replace(",", " or ", $input), true,
(substr($input,0,1) == "^") ? 'posix' : 'glob');
$dbi = $GLOBALS['request']->getDbh();
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/PageType.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once('lib/CachedMarkup.php');
+require_once 'lib/CachedMarkup.php';
/** A cacheable formatted wiki page.
*/
@@ -181,7 +181,7 @@
// localize Upload:links for WIKIDUMP
if (!empty($WikiTheme->DUMP_MODE) and $moniker == 'Upload') {
global $request;
- include_once("lib/config.php");
+ include_once 'lib/config.php';
$url = getUploadFilePath();
// calculate to a relative local path to /uploads for pdf images.
$doc_root = $request->get("DOCUMENT_ROOT");
@@ -341,7 +341,7 @@
}
function _transform($text) {
- include_once('lib/BlockParser.php');
+ include_once 'lib/BlockParser.php';
return TransformText($text, $this->_markup);
}
@@ -427,7 +427,7 @@
function format($text) {
if (empty($this->type))
trigger_error('PageFormatter_attach->format: $type missing');
- include_once('lib/Template.php');
+ include_once 'lib/Template.php';
global $request;
$tokens['CONTENT'] = $this->_transform($text);
$tokens['page'] = $this->_page;
@@ -480,14 +480,14 @@
{
function _transform($text) {
- include_once('lib/BlockParser.php');
+ include_once 'lib/BlockParser.php';
return TransformText($text, $this->_markup);
}
// one page or set of pages?
// here we try to format only a single page
function format($text) {
- include_once('lib/Template.php');
+ include_once 'lib/Template.php';
global $request;
$tokens['page'] = $this->_page;
$tokens['CONTENT'] = $this->_transform($text);
@@ -502,8 +502,8 @@
// binary.
// We use a custom HTML->PDF class converter from PHPWebthings
// to be able to use templates for PDF.
- require_once('lib/fpdf.php');
- require_once('lib/pdf.php');
+ require_once 'lib/fpdf.php';
+ require_once 'lib/pdf.php';
$pdf = new PDF();
$pdf->SetTitle($pagename);
@@ -530,7 +530,7 @@
class PageFormatter_MediaWiki extends PageFormatter
{
function _transform($text) {
- include_once('lib/BlockParser.php');
+ include_once 'lib/BlockParser.php';
// Expand leading tabs.
$text = expand_tabs($text);
Modified: trunk/lib/RSSWriter091.php
===================================================================
--- trunk/lib/RSSWriter091.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/RSSWriter091.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -23,7 +23,7 @@
-include_once("lib/RssWriter.php");
+include_once 'lib/RssWriter.php';
class RSSWriter091 extends RSSWriter
{
function RSSWriter091()
Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/Request.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -176,7 +176,7 @@
$this->discardOutput(); // This might print the gzip headers. Not good.
$this->buffer_output(false);
- include_once('lib/Template.php');
+ include_once 'lib/Template.php';
$tmpl = new Template('redirect', $this, array('REDIRECT_URL' => $url));
$tmpl->printXML();
$this->finish();
Modified: trunk/lib/RssParser.php
===================================================================
--- trunk/lib/RssParser.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/RssParser.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -39,7 +39,7 @@
* http://ws.audioscrobbler.com/rdf/ for example
*/
-require_once('lib/XmlParser.php');
+require_once 'lib/XmlParser.php';
class RSSParser
extends XmlParser {
Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/RssWriter2.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -5,7 +5,7 @@
*/
// Encoding for RSS output.
-include_once("lib/RssWriter.php");
+include_once 'lib/RssWriter.php';
/**
* A class for writing RSS 2.0 with xml-rpc notifier
Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/SemanticWeb.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -103,9 +103,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once('lib/RssWriter.php');
-require_once('lib/TextSearchQuery.php');
-require_once('lib/Units.php');
+require_once 'lib/RssWriter.php';
+require_once 'lib/TextSearchQuery.php';
+require_once 'lib/Units.php';
/**
Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/Template.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php //-*-php-*-
-require_once("lib/ErrorManager.php");
+require_once 'lib/ErrorManager.php';
/** An HTML template.
*/
@@ -78,7 +78,7 @@
}
function _printPlugin ($pi) {
- include_once("lib/WikiPlugin.php");
+ include_once 'lib/WikiPlugin.php';
static $loader;
if (empty($loader))
Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/ADODB.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
-require_once('lib/WikiDB.php');
+require_once 'lib/WikiDB.php';
/**
* WikiDB layer for ADODB, which does nothing more than calling the
@@ -31,7 +31,7 @@
} else {
$backend = 'ADODB';
}
- include_once("lib/WikiDB/backend/".$backend.".php");
+ include_once 'lib/WikiDB/backend/'.$backend.'.php';
$backend_class = "WikiDB_backend_".$backend;
$backend = new $backend_class($dbparams);
if (!$backend->_dbh->_connectionID) return false;
Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/PDO.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
-require_once('lib/WikiDB.php');
+require_once 'lib/WikiDB.php';
/**
* WikiDB layer for PDO, the new php5 abstraction layer, with support for
Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/SQL.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,6 +1,6 @@
<?php
-require_once('lib/WikiDB.php');
+require_once 'lib/WikiDB.php';
//require_once('lib/WikiDB/backend/PearDB.php');
//require_once('DB.php'); // Always favor use our local pear copy
@@ -20,7 +20,7 @@
if (is_string($dbparams['dsn']))
$dbparams['dsn'] = $backend . ':' . substr($dbparams['dsn'], 10);
}
- include_once ("lib/WikiDB/backend/PearDB_".$backend.".php");
+ include_once 'lib/WikiDB/backend/PearDB_'.$backend.'.php';
$backend_class = "WikiDB_backend_PearDB_".$backend;
$backend = new $backend_class($dbparams);
if (DB::isError($backend->_dbh)) return;
Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -10,7 +10,7 @@
* Latest version is available at http://php.weblogs.com
*
*/
-include_once('PEAR.php');
+include_once 'PEAR.php';
define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR');
Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -38,7 +38,7 @@
*/
define('ADODB_PEAR',dirname(__FILE__));
-include_once "PEAR.php";
+include_once 'PEAR.php';
include_once ADODB_PEAR."/adodb-errorpear.inc.php";
include_once ADODB_PEAR."/adodb.inc.php";
Modified: trunk/lib/WikiDB/backend/ADODB.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/ADODB.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -63,11 +63,11 @@
* performance is comparable.
*/
-require_once('lib/WikiDB/backend.php');
+require_once 'lib/WikiDB/backend.php';
// Error handling - calls trigger_error. NB - does not close the connection. Does it need to?
-include_once('lib/WikiDB/adodb/adodb-errorhandler.inc.php');
+include_once 'lib/WikiDB/adodb/adodb-errorhandler.inc.php';
// include the main adodb file
-require_once('lib/WikiDB/adodb/adodb.inc.php');
+require_once 'lib/WikiDB/adodb/adodb.inc.php';
class WikiDB_backend_ADODB
extends WikiDB_backend
Modified: trunk/lib/WikiDB/backend/ADODB_mssql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssql.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/ADODB_mssql.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -5,7 +5,7 @@
* MS SQL extensions for the ADODB DB backend.
*/
-require_once('lib/WikiDB/backend/ADODB.php');
+require_once 'lib/WikiDB/backend/ADODB.php';
class WikiDB_backend_ADODB_mssql
extends WikiDB_backend_ADODB
Modified: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/ADODB_mssqlnative.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -4,7 +4,7 @@
/**
* MS SQL extensions for the ADODB DB backend.
*/
-require_once('lib/WikiDB/backend/ADODB.php');
+require_once 'lib/WikiDB/backend/ADODB.php';
class WikiDB_backend_ADODB_mssqlnative
extends WikiDB_backend_ADODB
Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_mysql.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
-require_once('lib/WikiDB/backend/ADODB.php');
+require_once 'lib/WikiDB/backend/ADODB.php';
/*
* PROBLEM: mysql seems to be the simpliest (or most stupid) db on earth.
Modified: trunk/lib/WikiDB/backend/ADODB_oci8po.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_oci8po.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/ADODB_oci8po.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -6,7 +6,7 @@
* @author: Phi...@to...
*/
-require_once('lib/WikiDB/backend/ADODB.php');
+require_once 'lib/WikiDB/backend/ADODB.php';
class WikiDB_backend_ADODB_oci8po
extends WikiDB_backend_ADODB
Modified: trunk/lib/WikiDB/backend/ADODB_postgres7.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_postgres7.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/ADODB_postgres7.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
-require_once('lib/WikiDB/backend/ADODB.php');
+require_once 'lib/WikiDB/backend/ADODB.php';
if (!defined("USE_BYTEA")) // see schemas/psql-initialize.sql
define("USE_BYTEA", true); // only BYTEA is binary safe
Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
-require_once('lib/WikiDB/backend/ADODB.php');
+require_once 'lib/WikiDB/backend/ADODB.php';
/**
* WikiDB layer for ADODB-sqlite, called by lib/WikiDB/ADODB.php.
Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PDO.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -25,7 +25,7 @@
* @author: Reini Urban
*/
-require_once('lib/WikiDB/backend.php');
+require_once 'lib/WikiDB/backend.php';
class WikiDB_backend_PDO
extends WikiDB_backend
Modified: trunk/lib/WikiDB/backend/PDO_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_mysql.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PDO_mysql.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -24,7 +24,7 @@
/**
* @author: Reini Urban
*/
-require_once('lib/WikiDB/backend/PDO.php');
+require_once 'lib/WikiDB/backend/PDO.php';
class WikiDB_backend_PDO_mysql
extends WikiDB_backend_PDO
Modified: trunk/lib/WikiDB/backend/PDO_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_oci8.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PDO_oci8.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -24,7 +24,7 @@
/**
* @author: Reini Urban
*/
-require_once('lib/WikiDB/backend/PDO.php');
+require_once 'lib/WikiDB/backend/PDO.php';
class WikiDB_backend_PDO_oci8
extends WikiDB_backend_PDO
Modified: trunk/lib/WikiDB/backend/PDO_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO_pgsql.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PDO_pgsql.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -24,7 +24,7 @@
/**
* @author: Reini Urban
*/
-require_once('lib/WikiDB/backend/PDO.php');
+require_once 'lib/WikiDB/backend/PDO.php';
class WikiDB_backend_PDO_pgsql
extends WikiDB_backend_PDO
Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PearDB.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
-require_once('lib/WikiDB/backend.php');
+require_once 'lib/WikiDB/backend.php';
//require_once('lib/FileFinder.php');
//require_once('lib/ErrorManager.php');
@@ -30,7 +30,7 @@
include_once("$dir/DB.php");
}
} else {
- include_once("DB.php");
+ include_once 'DB.php';
}
// Install filter to handle bogus error notices from buggy DB.php's.
Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -44,8 +44,8 @@
* ALONE BASIS."
*/
-require_once('lib/ErrorManager.php');
-require_once('lib/WikiDB/backend/PearDB_pgsql.php');
+require_once 'lib/ErrorManager.php';
+require_once 'lib/WikiDB/backend/PearDB_pgsql.php';
class WikiDB_backend_PearDB_ffpgsql
extends WikiDB_backend_PearDB_pgsql
Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysql.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PearDB_mysql.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
-require_once('lib/WikiDB/backend/PearDB.php');
+require_once 'lib/WikiDB/backend/PearDB.php';
// See http://sql-info.de/mysql/gotchas.html for mysql specific quirks.
Modified: trunk/lib/WikiDB/backend/PearDB_oci8.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_oci8.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PearDB_oci8.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -6,7 +6,7 @@
* @author: Phi...@to...
*/
-require_once('lib/WikiDB/backend/PearDB_pgsql.php');
+require_once 'lib/WikiDB/backend/PearDB_pgsql.php';
class WikiDB_backend_PearDB_oci8
extends WikiDB_backend_PearDB_pgsql
Modified: trunk/lib/WikiDB/backend/PearDB_pgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_pgsql.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PearDB_pgsql.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,8 +1,8 @@
<?php // -*-php-*-
-require_once('lib/ErrorManager.php');
-require_once('lib/WikiDB/backend/PearDB.php');
+require_once 'lib/ErrorManager.php';
+require_once 'lib/WikiDB/backend/PearDB.php';
if (!defined("USE_BYTEA")) // see schemas/psql-initialize.sql
define("USE_BYTEA", true);
Modified: trunk/lib/WikiDB/backend/PearDB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_sqlite.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/PearDB_sqlite.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -10,7 +10,7 @@
*/
-require_once('lib/WikiDB/backend/PearDB.php');
+require_once 'lib/WikiDB/backend/PearDB.php';
//TODO: create tables on virgin wiki
/*
Modified: trunk/lib/WikiDB/backend/cvs.php
===================================================================
--- trunk/lib/WikiDB/backend/cvs.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/cvs.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -9,8 +9,8 @@
* Author: Gerrit Riessen, ger...@op...
*/
-require_once('lib/WikiDB/backend.php');
-require_once('lib/ErrorManager.php');
+require_once 'lib/WikiDB/backend.php';
+require_once 'lib/ErrorManager.php';
/**
* Constants used by the CVS backend
@@ -402,7 +402,7 @@
/* function get_all_revisions($pagename) {
// TODO: should replace this with something more efficient
- include_once('lib/WikiDB/backend/dumb/AllRevisionsIter.php');
+ include_once 'lib/WikiDB/backend/dumb/AllRevisionsIter.php';
return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename);
} */
Modified: trunk/lib/WikiDB/backend/dba.php
===================================================================
--- trunk/lib/WikiDB/backend/dba.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/dba.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php
-require_once('lib/WikiDB/backend/dbaBase.php');
-require_once('lib/DbaDatabase.php');
+require_once 'lib/WikiDB/backend/dbaBase.php';
+require_once 'lib/DbaDatabase.php';
class WikiDB_backend_dba
extends WikiDB_backend_dbaBase
Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/dbaBase.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
-require_once('lib/WikiDB/backend.php');
+require_once 'lib/WikiDB/backend.php';
// FIXME:padding of data? Is it needed? dba_optimize() seems to do a good
// job at packing 'gdbm' (and 'db2') databases.
@@ -40,7 +40,7 @@
* each time we get a hit. Maybe not so important though.
*/
-require_once('lib/DbaPartition.php');
+require_once 'lib/DbaPartition.php';
class WikiDB_backend_dbaBase
extends WikiDB_backend
Modified: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
// $Id$
-require_once('lib/WikiDB/backend.php');
+require_once 'lib/WikiDB/backend.php';
/**
* This backlink iterator will work with any WikiDB_backend
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
// $Id$
-require_once('lib/WikiDB/backend.php');
+require_once 'lib/WikiDB/backend.php';
/**
* An inefficient but general most_popular iterator.
Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php // -*-php-*-
// $Id$
-require_once('lib/WikiDB/backend.php');
+require_once 'lib/WikiDB/backend.php';
/**
* An inefficient but general most_recent iterator.
Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/file.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -41,8 +41,8 @@
*
*/
-require_once('lib/WikiDB/backend.php');
-require_once('lib/ErrorManager.php');
+require_once 'lib/WikiDB/backend.php';
+require_once 'lib/ErrorManager.php';
class WikiDB_backend_file
extends WikiDB_backend
@@ -542,7 +542,7 @@
*/
/*
function get_all_revisions($pagename) {
- include_once('lib/WikiDB/backend/dumb/AllRevisionsIter.php');
+ include_once 'lib/WikiDB/backend/dumb/AllRevisionsIter.php';
return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename);
}
*/
@@ -567,7 +567,7 @@
* @return object A WikiDB_backend_iterator.
*/
function get_all_pages($include_empty=false, $sortby='', $limit='', $exclude='') {
- require_once("lib/PageList.php");
+ require_once 'lib/PageList.php';
$this->_loadLatestVersions();
$a = array_keys($this->_latest_versions);
if (empty($a))
Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend/flatfile.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -32,8 +32,8 @@
* Author: Reini Urban, based on the file backend by Jochen Kalmbach
*/
-require_once('lib/WikiDB/backend/file.php');
-require_once('lib/loadsave.php');
+require_once 'lib/WikiDB/backend/file.php';
+require_once 'lib/loadsave.php';
class WikiDB_backend_flatfile
extends WikiDB_backend_file
Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/backend.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -300,7 +300,7 @@
* @return object A WikiDB_backend_iterator.
*/
function get_all_revisions($pagename) {
- include_once('lib/WikiDB/backend/dumb/AllRevisionsIter.php');
+ include_once 'lib/WikiDB/backend/dumb/AllRevisionsIter.php';
return new WikiDB_backend_dumb_AllRevisionsIter($this, $pagename);
}
@@ -353,7 +353,7 @@
//
// It is expected that most backends will overload
// this method with something more efficient.
- include_once('lib/WikiDB/backend/dumb/TextSearchIter.php');
+ include_once 'lib/WikiDB/backend/dumb/TextSearchIter.php';
// ignore $limit
$pages = $this->get_all_pages(false, $sortby, false, $exclude);
return new WikiDB_backend_dumb_TextSearchIter($this, $pages, $search, $fulltext,
@@ -374,7 +374,7 @@
* @see WikiDB::linkSearch
*/
function link_search( $pages, $linkvalue, $linktype, $relation=false, $options=array() ) {
- include_once('lib/WikiDB/backend/dumb/LinkSearchIter.php');
+ include_once 'lib/WikiDB/backend/dumb/LinkSearchIter.php';
$pageiter = $this->text_search($pages);
return new WikiDB_backend_dumb_LinkSearchIter($this, $pageiter, $linkvalue, $linktype, $relation, $options);
}
@@ -396,7 +396,7 @@
//
// It is expected that most backends will overload
// method with something more efficient.
- include_once('lib/WikiDB/backend/dumb/MostPopularIter.php');
+ include_once 'lib/WikiDB/backend/dumb/MostPopularIter.php';
$pages = $this->get_all_pages(false, $sortby, false);
return new WikiDB_backend_dumb_MostPopularIter($this, $pages, $limit);
}
@@ -416,13 +416,13 @@
//
// It is expected that most backends will overload
// method with something more efficient.
- include_once('lib/WikiDB/backend/dumb/MostRecentIter.php');
+ include_once 'lib/WikiDB/backend/dumb/MostRecentIter.php';
$pages = $this->get_all_pages(true, '-mtime');
return new WikiDB_backend_dumb_MostRecentIter($this, $pages, $params);
}
function wanted_pages($exclude_from='', $exclude='', $sortby='', $limit='') {
- include_once('lib/WikiDB/backend/dumb/WantedPagesIter.php');
+ include_once 'lib/WikiDB/backend/dumb/WantedPagesIter.php';
$allpages = $this->get_all_pages(true,false,false,$exclude_from);
return new WikiDB_backend_dumb_WantedPagesIter($this, $allpages, $exclude, $sortby, $limit);
}
Modified: trunk/lib/WikiDB/cvs.php
===================================================================
--- trunk/lib/WikiDB/cvs.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/cvs.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -2,8 +2,8 @@
-require_once( 'lib/WikiDB.php' );
-require_once( 'lib/WikiDB/backend/cvs.php' );
+require_once 'lib/WikiDB.php';
+require_once 'lib/WikiDB/backend/cvs.php';
/**
* Wrapper class for the cvs backend.
Modified: trunk/lib/WikiDB/dba.php
===================================================================
--- trunk/lib/WikiDB/dba.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/dba.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,7 +1,7 @@
<?php
-require_once('lib/WikiDB.php');
-require_once('lib/WikiDB/backend/dba.php');
+require_once 'lib/WikiDB.php';
+require_once 'lib/WikiDB/backend/dba.php';
/**
*
*/
Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/file.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once( 'lib/WikiDB.php' );
-require_once( 'lib/WikiDB/backend/file.php' );
+require_once 'lib/WikiDB.php';
+require_once 'lib/WikiDB/backend/file.php';
/**
* Wrapper class for the file backend.
Modified: trunk/lib/WikiDB/flatfile.php
===================================================================
--- trunk/lib/WikiDB/flatfile.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB/flatfile.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -21,8 +21,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once( 'lib/WikiDB.php' );
-require_once( 'lib/WikiDB/backend/flatfile.php' );
+require_once 'lib/WikiDB.php';
+require_once 'lib/WikiDB/backend/flatfile.php';
/**
* Wrapper class for the flatfile backend.
Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiDB.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1,5 +1,5 @@
<?php
-require_once('lib/PageType.php');
+require_once 'lib/PageType.php';
/**
* The classes in the file define the interface to the
@@ -222,7 +222,7 @@
/* Generate notification emails */
if (ENABLE_MAILNOTIFY) {
- include_once("lib/MailNotify.php");
+ include_once 'lib/MailNotify.php';
$MailNotify = new MailNotify($pagename);
$MailNotify->onDeletePage ($this, $pagename);
}
@@ -518,7 +518,7 @@
if ($updateWikiLinks) {
$lookbehind = "/(?<=[\W:])\Q";
$lookahead = "\E(?=[\W:])/";
- require_once('lib/plugin/WikiAdminSearchReplace.php');
+ require_once 'lib/plugin/WikiAdminSearchReplace.php';
$links = $oldpage->getBackLinks();
while ($linked_page = $links->next()) {
WikiPlugin_WikiAdminSearchReplace::replaceHelper
@@ -563,7 +563,7 @@
if ($result and ENABLE_MAILNOTIFY and !isa($GLOBALS['request'], 'MockRequest')) {
$notify = $this->get('notify');
if (!empty($notify) and is_array($notify)) {
- include_once("lib/MailNotify.php");
+ include_once 'lib/MailNotify.php';
$MailNotify = new MailNotify($from);
$MailNotify->onRenamePage ($this, $from, $to);
}
@@ -1014,7 +1014,7 @@
and is_array($notify)
and !isa($GLOBALS['request'],'MockRequest'))
{
- include_once("lib/MailNotify.php");
+ include_once 'lib/MailNotify.php';
$MailNotify = new MailNotify($newrevision->getName());
$MailNotify->onChangePage ($this->_wikidb, $wikitext, $version, $meta);
}
@@ -1026,7 +1026,7 @@
and !in_array($GLOBALS['request']->getArg('action'),
array('loadfile','upgrade')))
{
- require_once("lib/WikiPlugin.php");
+ require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader;
$p = $w->getPlugin("RecentChangesCached", false);
$p->box_update(false, $GLOBALS['request'], $this->_pagename);
@@ -1638,7 +1638,7 @@
if (empty($data['%content'])
|| (!$this->_wikidb->isWikiPage($this->_pagename)
&& $this->isCurrent())) {
- include_once('lib/InlineParser.php');
+ include_once 'lib/InlineParser.php';
// A feature similar to taglines at http://www.wlug.org.nz/
// Lib from http://www.aasted.org/quote/
@@ -1647,7 +1647,7 @@
and in_array($GLOBALS['request']->getArg('action'),
array('create','edit')))
{
- include_once("lib/fortune.php");
+ include_once 'lib/fortune.php';
$fortune = new Fortune();
$quote = $fortune->quoteFromDir(FORTUNE_DIR);
if ($quote != -1)
Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiGroup.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -844,7 +844,7 @@
E_USER_WARNING);
return false;
}
- require_once('lib/pear/File_Passwd.php');
+ require_once 'lib/pear/File_Passwd.php';
$this->_file = new File_Passwd(AUTH_GROUP_FILE,false,AUTH_GROUP_FILE.".lock");
}
Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiPluginCached.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -26,7 +26,7 @@
* This file belongs to WikiPluginCached.
*/
-require_once "lib/WikiPlugin.php";
+require_once 'lib/WikiPlugin.php';
// require_once "lib/plugincache-config.php"; // replaced by config.ini settings!
// types:
@@ -490,7 +490,7 @@
if ($lib = $pearFinder->findFile('Cache.php', 'missing_ok'))
require_once($lib);
else // fall back to our own copy
- require_once('lib/pear/Cache.php');
+ require_once 'lib/pear/Cache.php';
}
$cacheparams = array();
foreach (explode(':','database:cache_dir:filename_prefix:highwater:lowwater'
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiTheme.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -1548,7 +1548,7 @@
$this->_findData('jscalendar/calendar-setup'.(DEBUG?'':'_stripped').'.js'))));
// Get existing date entries for the current user
- require_once("lib/TextSearchQuery.php");
+ require_once 'lib/TextSearchQuery.php';
$iter = $dbi->titleSearch(new TextSearchQuery("^".$this->calendarBase().SUBPAGE_SEPARATOR, true, "auto"));
$existing = array();
while ($page = $iter->next()) {
@@ -1772,7 +1772,7 @@
class SidebarBox {
function SidebarBox($title, $body) {
- require_once('lib/WikiPlugin.php');
+ require_once 'lib/WikiPlugin.php';
$this->title = $title;
$this->body = $body;
}
@@ -1791,7 +1791,7 @@
var $_plugin, $_args = false, $_basepage = false;
function PluginSidebarBox($name, $args = false, $basepage = false) {
- require_once("lib/WikiPlugin.php");
+ require_once 'lib/WikiPlugin.php';
$loader = new WikiPluginLoader();
$plugin = $loader->getPlugin($name);
Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiUser/AdoDb.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-include_once("lib/WikiUser/Db.php");
+include_once 'lib/WikiUser/Db.php';
class _AdoDbPassUser
extends _DbPassUser
Modified: trunk/lib/WikiUser/Db.php
===================================================================
--- trunk/lib/WikiUser/Db.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiUser/Db.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -65,7 +65,7 @@
$dbi =& $GLOBALS['request']->_dbi;
$dbtype = $dbi->getParam('dbtype');
if ($dbtype == 'ADODB') {
- include_once("lib/WikiUser/AdoDb.php");
+ include_once 'lib/WikiUser/AdoDb.php';
if (check_php_version(5))
return new _AdoDbPassUser($UserName,$this->_prefs);
else {
@@ -75,7 +75,7 @@
}
}
elseif ($dbtype == 'SQL') {
- include_once("lib/WikiUser/PearDb.php");
+ include_once 'lib/WikiUser/PearDb.php';
if (check_php_version(5))
return new _PearDbPassUser($UserName,$this->_prefs);
else {
@@ -85,7 +85,7 @@
}
}
elseif ($dbtype == 'PDO') {
- include_once("lib/WikiUser/PdoDb.php");
+ include_once 'lib/WikiUser/PdoDb.php';
if (check_php_version(5))
return new _PdoDbPassUser($UserName,$this->_prefs);
else {
Modified: trunk/lib/WikiUser/Facebook.php
===================================================================
--- trunk/lib/WikiUser/Facebook.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiUser/Facebook.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -25,7 +25,7 @@
*/
// requires the openssl extension
-require_once("lib/HttpClient.php");
+require_once 'lib/HttpClient.php';
class _FacebookPassUser
extends _PassUser {
Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiUser/LdapUpper.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -19,7 +19,7 @@
* with PhpWiki; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-include_once("lib/WikiUser/LDAP.php");
+include_once 'lib/WikiUser/LDAP.php';
/**
* Overrides for LDAP (Windows domain) usernames:
Modified: trunk/lib/WikiUser/OpenID.php
===================================================================
--- trunk/lib/WikiUser/OpenID.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiUser/OpenID.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -27,7 +27,7 @@
*/
// requires the openssl extension
-require_once("lib/HttpClient.php");
+require_once 'lib/HttpClient.php';
class _OpenIDPassUser
extends _PassUser
Modified: trunk/lib/WikiUser/POP3.php
===================================================================
--- trunk/lib/WikiUser/POP3.php 2012-09-28 11:33:02 UTC (rev 8289)
+++ trunk/lib/WikiUser/POP3.php 2012-09-28 12:11:35 UTC (rev 8290)
@@ -20,7 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-require_once("lib/WikiUser/IMAP.php");
+require_once 'lib/WikiUser/IMAP.php';
class _POP3PassUser
extends _IMAPPassUser {
Modified: trunk/lib/WikiUser/PdoDb.php
==================...
[truncated message content] |
|
From: <var...@us...> - 2012-09-28 13:31:21
|
Revision: 8291
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8291&view=rev
Author: vargenau
Date: 2012-09-28 13:31:15 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Whitespace only
Modified Paths:
--------------
trunk/lib/AtomParser.php
trunk/wikilist.php
Modified: trunk/lib/AtomParser.php
===================================================================
--- trunk/lib/AtomParser.php 2012-09-28 12:11:35 UTC (rev 8290)
+++ trunk/lib/AtomParser.php 2012-09-28 13:31:15 UTC (rev 8291)
@@ -1,5 +1,4 @@
-<?php // -*-php-*-
-
+<?php
/*
* Copyright 2010 Sébastien Le Callonnec
*
Modified: trunk/wikilist.php
===================================================================
--- trunk/wikilist.php 2012-09-28 12:11:35 UTC (rev 8290)
+++ trunk/wikilist.php 2012-09-28 13:31:15 UTC (rev 8291)
@@ -90,4 +90,3 @@
echo $HTML->listTableBottom();
site_admin_footer(array());
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-09-28 17:00:14
|
Revision: 8322
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8322&view=rev
Author: vargenau
Date: 2012-09-28 16:59:59 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Let us say this is PhpWiki 1.4.0
Modified Paths:
--------------
trunk/lib/prepend.php
trunk/locale/de/pgsrc/%C3%84hnlicheSeiten
trunk/locale/de/pgsrc/AlleBenutzer
trunk/locale/de/pgsrc/AlleSeiten
trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir
trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir
trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir
trunk/locale/de/pgsrc/BackLinks
trunk/locale/de/pgsrc/BenutzerEinstellungen
trunk/locale/de/pgsrc/BeobachteSeite
trunk/locale/de/pgsrc/DebugAuthInfo
trunk/locale/de/pgsrc/DebugGruppenInfo
trunk/locale/de/pgsrc/DebugInfo
trunk/locale/de/pgsrc/EditiereText
trunk/locale/de/pgsrc/Einstellungen
trunk/locale/de/pgsrc/FuzzySuche
trunk/locale/de/pgsrc/G%C3%A4steBuch
trunk/locale/de/pgsrc/GaesteBuch
trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen
trunk/locale/de/pgsrc/GleicheSeiten
trunk/locale/de/pgsrc/Hilfe
trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite
trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln
trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin
trunk/locale/de/pgsrc/Hilfe%2FGuterStil
trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow
trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb
trunk/locale/de/pgsrc/HochLaden
trunk/locale/de/pgsrc/InterWikiListe
trunk/locale/de/pgsrc/KategorieAktionSeite
trunk/locale/de/pgsrc/KategorieKategorie
trunk/locale/de/pgsrc/KategorieWikiPlugin
trunk/locale/de/pgsrc/LinkSuche
trunk/locale/de/pgsrc/ListeRelationen
trunk/locale/de/pgsrc/ListeSeiten
trunk/locale/de/pgsrc/MeistBesucht
trunk/locale/de/pgsrc/ModerierteSeite
trunk/locale/de/pgsrc/NeueSeite
trunk/locale/de/pgsrc/Neueste%C3%84nderungen
trunk/locale/de/pgsrc/NeuesteSeiten
trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
trunk/locale/de/pgsrc/PhpWikiDokumentation
trunk/locale/de/pgsrc/PhpWikiSystemverwalten
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen
trunk/locale/de/pgsrc/PhpWikiUmfrage
trunk/locale/de/pgsrc/SandKasten
trunk/locale/de/pgsrc/SandKiste
trunk/locale/de/pgsrc/SeiteFinden
trunk/locale/de/pgsrc/SeiteSpeichern
trunk/locale/de/pgsrc/SeitenErzeugen
trunk/locale/de/pgsrc/SeitenInfo
trunk/locale/de/pgsrc/SeitenProtokoll
trunk/locale/de/pgsrc/SemantischeRelationen
trunk/locale/de/pgsrc/SemantischeSuche
trunk/locale/de/pgsrc/StartSeite
trunk/locale/de/pgsrc/StartSeiteAlias
trunk/locale/de/pgsrc/TitelSuche
trunk/locale/de/pgsrc/UpLoad
trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen
trunk/locale/de/pgsrc/VerwaisteSeiten
trunk/locale/de/pgsrc/VolltextSuche
trunk/locale/de/pgsrc/Vorlage%2FBeispiel
trunk/locale/de/pgsrc/WerIstOnline
trunk/locale/de/pgsrc/WikiAdminAuswahl
trunk/locale/de/pgsrc/WunschZettelSeiten
trunk/locale/de/pgsrc/ZufallsSeite
trunk/locale/es/pgsrc/Ayuda
trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas
trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo
trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto
trunk/locale/es/pgsrc/Ayuda%2FKBrown
trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica
trunk/locale/es/pgsrc/Ayuda%2FPhpWiki
trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
trunk/locale/es/pgsrc/Ayuda%2FViejoReglasDeFormatoDeTexto
trunk/locale/es/pgsrc/Ayuda%2FWabiSabi
trunk/locale/es/pgsrc/Ayuda%2FWikiWikiWeb
trunk/locale/es/pgsrc/BuscarP%C3%A1gina
trunk/locale/es/pgsrc/CajaDeArena
trunk/locale/es/pgsrc/CambiosRecientes
trunk/locale/es/pgsrc/MasPopulares
trunk/locale/es/pgsrc/P%C3%A1ginaPrincipal
trunk/locale/es/pgsrc/TodasLasPaginas
trunk/locale/es/pgsrc/VisitantesRecientes
trunk/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es
trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
trunk/locale/fr/pgsrc/AdministrationDePhpWiki
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer
trunk/locale/fr/pgsrc/Aide
trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
trunk/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage
trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki
trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
trunk/locale/fr/pgsrc/Aide%2FInterWiki
trunk/locale/fr/pgsrc/Aide%2FLienGoogle
trunk/locale/fr/pgsrc/Aide%2FPhpWiki
trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData
trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires
trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos
trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau
trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier
trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp
trunk/locale/fr/pgsrc/Aide%2FPluginCommenter
trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage
trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm
trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur
trunk/locale/fr/pgsrc/Aide%2FPluginHtmlPur
trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage
trunk/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me
trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer
trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages
trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier
trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne
trunk/locale/fr/pgsrc/Aide%2FPluginRedirection
trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle
trunk/locale/fr/pgsrc/Aide%2FPluginTeX2png
trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache
trunk/locale/fr/pgsrc/Aide%2FPluginWiki
trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog
trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
trunk/locale/fr/pgsrc/Aide%2FStyleCorrect
trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
trunk/locale/fr/pgsrc/Aide%2FWabiSabi
trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb
trunk/locale/fr/pgsrc/AliasAccueil
trunk/locale/fr/pgsrc/Bac%C3%80Sable
trunk/locale/fr/pgsrc/CarteInterWiki
trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie
trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes
trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction
trunk/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil
trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki
trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s
trunk/locale/fr/pgsrc/ChercherUnePage
trunk/locale/fr/pgsrc/ClassezLa
trunk/locale/fr/pgsrc/CommentairesR%C3%A9cents
trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage
trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier
trunk/locale/fr/pgsrc/Derni%C3%A8resModifs
trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes
trunk/locale/fr/pgsrc/DerniersVisiteurs
trunk/locale/fr/pgsrc/DocumentationDePhpWiki
trunk/locale/fr/pgsrc/GestionDesPlugins
trunk/locale/fr/pgsrc/HistoriqueDeLaPage
trunk/locale/fr/pgsrc/InfosAuthentification
trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage
trunk/locale/fr/pgsrc/InfosSurLaPage
trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es
trunk/locale/fr/pgsrc/ListeDePages
trunk/locale/fr/pgsrc/ManuelPhpWiki
trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
trunk/locale/fr/pgsrc/NotesDeVersion
trunk/locale/fr/pgsrc/PageAccueil
trunk/locale/fr/pgsrc/PageAl%C3%A9atoire
trunk/locale/fr/pgsrc/PagesFloues
trunk/locale/fr/pgsrc/PagesOrphelines
trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es
trunk/locale/fr/pgsrc/PagesSemblables
trunk/locale/fr/pgsrc/PierrickMeignen
trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs
trunk/locale/fr/pgsrc/QuiEstEnLigne
trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage
trunk/locale/fr/pgsrc/R%C3%A9troLiens
trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral
trunk/locale/fr/pgsrc/RechercheInterWiki
trunk/locale/fr/pgsrc/RechercheParTitre
trunk/locale/fr/pgsrc/SommaireDuProjet
trunk/locale/fr/pgsrc/SondagePhpWiki
trunk/locale/fr/pgsrc/SteveWainstead
trunk/locale/fr/pgsrc/Suivre
trunk/locale/fr/pgsrc/TousLesUtilisateurs
trunk/locale/fr/pgsrc/ToutesLesPages
trunk/locale/fr/pgsrc/TraduireUnTexte
trunk/locale/fr/pgsrc/VersionsR%C3%A9centes
trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents
trunk/locale/it/pgsrc/Aiuto
trunk/locale/it/pgsrc/Aiuto%2FAggiungerePagine
trunk/locale/it/pgsrc/Aiuto%2FBuonStile
trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki
trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs
trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto
trunk/locale/it/pgsrc/Aiuto%2FPhpWiki
trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto
trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento
trunk/locale/it/pgsrc/Aiuto%2FWabiSabi
trunk/locale/it/pgsrc/Aiuto%2FWikiWikiWeb
trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki%2FRimuovi
trunk/locale/it/pgsrc/CambiamentiRecenti
trunk/locale/it/pgsrc/FuzzyPages
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/locale/it/pgsrc/PaginaDiProva
trunk/locale/it/pgsrc/PaginaPrincipale
trunk/locale/it/pgsrc/PiuPopolari
trunk/locale/it/pgsrc/RicercaDelTesto
trunk/locale/it/pgsrc/RicercaSuTutto
trunk/locale/it/pgsrc/ScatolaDiSabbia
trunk/locale/it/pgsrc/SteveWainstead
trunk/locale/it/pgsrc/TrovaPagina
trunk/locale/it/pgsrc/TutteLePagine
trunk/locale/it/pgsrc/VisitatoriRecenti
trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2
trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8
trunk/locale/nl/pgsrc/Help
trunk/locale/nl/pgsrc/Help%2FGebruikersVoorkeuren
trunk/locale/nl/pgsrc/Help%2FGoedeStijl
trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken
trunk/locale/nl/pgsrc/Help%2FJanNieuwenhuizen
trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken
trunk/locale/nl/pgsrc/Help%2FOudTekstFormatteringsRegels
trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen
trunk/locale/nl/pgsrc/Help%2FPhpWiki
trunk/locale/nl/pgsrc/Help%2FRecenteBezoekers
trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels
trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs
trunk/locale/nl/pgsrc/Help%2FVeranderTekst
trunk/locale/nl/pgsrc/Help%2FWabiSabi
trunk/locale/nl/pgsrc/Help%2FWikiWikiWeb
trunk/locale/nl/pgsrc/MeestBezocht
trunk/locale/nl/pgsrc/PhpWikiBeheer
trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVervangt
trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVerwijder
trunk/locale/nl/pgsrc/RecenteVeranderingen
trunk/locale/nl/pgsrc/ThuisPagina
trunk/locale/nl/pgsrc/UitgaveNoten
trunk/locale/nl/pgsrc/ZandBak
trunk/locale/nl/pgsrc/ZoekPagina
trunk/locale/sv/pgsrc/Framsida
trunk/locale/sv/pgsrc/Hj%C3%A4lp
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FG%C3%A4stboken
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb
trunk/locale/sv/pgsrc/MestPopul%C3%A4r
trunk/locale/sv/pgsrc/PhpWikiAdministration
trunk/locale/sv/pgsrc/S%C3%B6kEfterSida
trunk/locale/sv/pgsrc/Sandl%C3%A5dan
trunk/locale/sv/pgsrc/Senaste%C3%84ndringar
trunk/locale/zh/pgsrc/%E9%A6%96%E9%A0%81
trunk/locale/zh/pgsrc/AllPages
trunk/locale/zh/pgsrc/AllUsers
trunk/locale/zh/pgsrc/BackLinks
trunk/locale/zh/pgsrc/DebugInfo
trunk/locale/zh/pgsrc/FindPage
trunk/locale/zh/pgsrc/FullRecentChanges
trunk/locale/zh/pgsrc/FullTextSearch
trunk/locale/zh/pgsrc/FuzzyPages
trunk/locale/zh/pgsrc/Help
trunk/locale/zh/pgsrc/Help%2FAddingPages
trunk/locale/zh/pgsrc/Help%2FCalendarPlugin
trunk/locale/zh/pgsrc/Help%2FCommentPlugin
trunk/locale/zh/pgsrc/Help%2FEditText
trunk/locale/zh/pgsrc/Help%2FExternalSearchPlugin
trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin
trunk/locale/zh/pgsrc/Help%2FHowToUseWiki
trunk/locale/zh/pgsrc/Help%2FInterWiki
trunk/locale/zh/pgsrc/Help%2FLinkIcons
trunk/locale/zh/pgsrc/Help%2FMagicPhpWikiURLs
trunk/locale/zh/pgsrc/Help%2FMoreAboutMechanics
trunk/locale/zh/pgsrc/Help%2FOldStyleTablePlugin
trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin
trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin
trunk/locale/zh/pgsrc/Help%2FPhpWeatherPlugin
trunk/locale/zh/pgsrc/Help%2FPhpWiki
trunk/locale/zh/pgsrc/Help%2FRedirectToPlugin
trunk/locale/zh/pgsrc/Help%2FSystemInfoPlugin
trunk/locale/zh/pgsrc/Help%2FTranscludePlugin
trunk/locale/zh/pgsrc/Help%2FWikiPlugin
trunk/locale/zh/pgsrc/Help%2FWikiWikiWeb
trunk/locale/zh/pgsrc/HomePage
trunk/locale/zh/pgsrc/HomePageAlias
trunk/locale/zh/pgsrc/InterWikiMap
trunk/locale/zh/pgsrc/InterWikiSearch
trunk/locale/zh/pgsrc/LikePages
trunk/locale/zh/pgsrc/OrphanedPages
trunk/locale/zh/pgsrc/PageDump
trunk/locale/zh/pgsrc/PhpWikiAdministration
trunk/locale/zh/pgsrc/RandomPage
trunk/locale/zh/pgsrc/RecentChanges
trunk/locale/zh/pgsrc/RecentEdits
trunk/locale/zh/pgsrc/RecentVisitors
trunk/locale/zh/pgsrc/SandBox
trunk/locale/zh/pgsrc/TitleSearch
trunk/locale/zh/pgsrc/UpLoad
trunk/locale/zh/pgsrc/UserPreferences
trunk/locale/zh/pgsrc/WantedPages
trunk/pgsrc/AllPages
trunk/pgsrc/AllPagesByAcl
trunk/pgsrc/AllPagesCreatedByMe
trunk/pgsrc/AllPagesLastEditedByMe
trunk/pgsrc/AllPagesOwnedByMe
trunk/pgsrc/AllUserPages
trunk/pgsrc/AllUsers
trunk/pgsrc/AppendText
trunk/pgsrc/AuthorHistory
trunk/pgsrc/BackLinks
trunk/pgsrc/BlogArchives
trunk/pgsrc/BlogJournal
trunk/pgsrc/CategoryActionPage
trunk/pgsrc/CategoryCategory
trunk/pgsrc/CategoryGroup
trunk/pgsrc/CategoryHomePages
trunk/pgsrc/CategoryWikiPlugin
trunk/pgsrc/CreatePage
trunk/pgsrc/DebugAuthInfo
trunk/pgsrc/DebugGroupInfo
trunk/pgsrc/DebugInfo
trunk/pgsrc/EditMetaData
trunk/pgsrc/FindPage
trunk/pgsrc/FullRecentChanges
trunk/pgsrc/FullTextSearch
trunk/pgsrc/FuzzyPages
trunk/pgsrc/Help
trunk/pgsrc/Help%2FActionPage
trunk/pgsrc/Help%2FAddCommentPlugin
trunk/pgsrc/Help%2FAddingPages
trunk/pgsrc/Help%2FAdobe%20Flash
trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users
trunk/pgsrc/Help%2FAllPagesPlugin
trunk/pgsrc/Help%2FAllUsersPlugin
trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
trunk/pgsrc/Help%2FAppendTextPlugin
trunk/pgsrc/Help%2FAsciiMathPlugin
trunk/pgsrc/Help%2FAsciiSVGPlugin
trunk/pgsrc/Help%2FAtomFeedPlugin
trunk/pgsrc/Help%2FAuthorHistoryPlugin
trunk/pgsrc/Help%2FBackLinksPlugin
trunk/pgsrc/Help%2FBlogArchivesPlugin
trunk/pgsrc/Help%2FBlogJournalPlugin
trunk/pgsrc/Help%2FBoxRightPlugin
trunk/pgsrc/Help%2FCacheTestPlugin
trunk/pgsrc/Help%2FCalendarListPlugin
trunk/pgsrc/Help%2FCalendarPlugin
trunk/pgsrc/Help%2FCategories
trunk/pgsrc/Help%2FCategoryPagePlugin
trunk/pgsrc/Help%2FChartPlugin
trunk/pgsrc/Help%2FCommentPlugin
trunk/pgsrc/Help%2FCreateBibPlugin
trunk/pgsrc/Help%2FCreatePagePlugin
trunk/pgsrc/Help%2FCreateTocPlugin
trunk/pgsrc/Help%2FCurrentTimePlugin
trunk/pgsrc/Help%2FDeadEndPagesPlugin
trunk/pgsrc/Help%2FDiffPlugin
trunk/pgsrc/Help%2FDynamicIncludePagePlugin
trunk/pgsrc/Help%2FEditMetaDataPlugin
trunk/pgsrc/Help%2FEditText
trunk/pgsrc/Help%2FExternalSearchPlugin
trunk/pgsrc/Help%2FFacebookLikePlugin
trunk/pgsrc/Help%2FFileInfoPlugin
trunk/pgsrc/Help%2FFoafViewerPlugin
trunk/pgsrc/Help%2FFrameIncludePlugin
trunk/pgsrc/Help%2FFullTextSearchPlugin
trunk/pgsrc/Help%2FFuzzyPagesPlugin
trunk/pgsrc/Help%2FGoToPlugin
trunk/pgsrc/Help%2FGoodStyle
trunk/pgsrc/Help%2FGoogleLink
trunk/pgsrc/Help%2FGoogleMapsPlugin
trunk/pgsrc/Help%2FGooglePluginPlugin
trunk/pgsrc/Help%2FGraphVizPlugin
trunk/pgsrc/Help%2FHelloWorldPlugin
trunk/pgsrc/Help%2FHowToUseWiki
trunk/pgsrc/Help%2FHtmlConverterPlugin
trunk/pgsrc/Help%2FImages
trunk/pgsrc/Help%2FIncludePagePlugin
trunk/pgsrc/Help%2FIncludePagesPlugin
trunk/pgsrc/Help%2FIncludeSiteMapPlugin
trunk/pgsrc/Help%2FIncludeTreePlugin
trunk/pgsrc/Help%2FInterWiki
trunk/pgsrc/Help%2FInterWikiSearchPlugin
trunk/pgsrc/Help%2FJabberPresencePlugin
trunk/pgsrc/Help%2FLdapSearchPlugin
trunk/pgsrc/Help%2FLikePagesPlugin
trunk/pgsrc/Help%2FLinkDatabasePlugin
trunk/pgsrc/Help%2FLinkIcons
trunk/pgsrc/Help%2FListPagesPlugin
trunk/pgsrc/Help%2FListSubpagesPlugin
trunk/pgsrc/Help%2FMagicPhpWikiURLs
trunk/pgsrc/Help%2FMediawikiTablePlugin
trunk/pgsrc/Help%2FModeratedPagePlugin
trunk/pgsrc/Help%2FMoreAboutMechanics
trunk/pgsrc/Help%2FMostPopularPlugin
trunk/pgsrc/Help%2FNewPagesPerUserPlugin
trunk/pgsrc/Help%2FNoCachePlugin
trunk/pgsrc/Help%2FOldStyleTablePlugin
trunk/pgsrc/Help%2FOldTextFormattingRules
trunk/pgsrc/Help%2FOrphanedPagesPlugin
trunk/pgsrc/Help%2FPageDumpPlugin
trunk/pgsrc/Help%2FPageGroupPlugin
trunk/pgsrc/Help%2FPageHistoryPlugin
trunk/pgsrc/Help%2FPageInfoPlugin
trunk/pgsrc/Help%2FPageList
trunk/pgsrc/Help%2FPagePermissions
trunk/pgsrc/Help%2FPageTrailPlugin
trunk/pgsrc/Help%2FPasswordResetPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides
trunk/pgsrc/Help%2FPhpHighlightPlugin
trunk/pgsrc/Help%2FPhpWeatherPlugin
trunk/pgsrc/Help%2FPhpWiki
trunk/pgsrc/Help%2FPloticusPlugin
trunk/pgsrc/Help%2FPluginManagerPlugin
trunk/pgsrc/Help%2FPopUpPlugin
trunk/pgsrc/Help%2FPopularNearbyPlugin
trunk/pgsrc/Help%2FPredefinedIcons
trunk/pgsrc/Help%2FPreferenceAppPlugin
trunk/pgsrc/Help%2FPrevNextPlugin
trunk/pgsrc/Help%2FRandomPagePlugin
trunk/pgsrc/Help%2FRateItPlugin
trunk/pgsrc/Help%2FRawHtmlPlugin
trunk/pgsrc/Help%2FRecentChangesCachedPlugin
trunk/pgsrc/Help%2FRecentChangesPlugin
trunk/pgsrc/Help%2FRecentCommentsPlugin
trunk/pgsrc/Help%2FRecentEditsPlugin
trunk/pgsrc/Help%2FRecentReferrersPlugin
trunk/pgsrc/Help%2FRedirectToPlugin
trunk/pgsrc/Help%2FRelatedChangesPlugin
trunk/pgsrc/Help%2FRichTablePlugin
trunk/pgsrc/Help%2FRssFeedPlugin
trunk/pgsrc/Help%2FSearchHighlightPlugin
trunk/pgsrc/Help%2FSemanticRelations
trunk/pgsrc/Help%2FSemanticRelationsPlugin
trunk/pgsrc/Help%2FSemanticSearchPlugin
trunk/pgsrc/Help%2FSiteMapPlugin
trunk/pgsrc/Help%2FSpreadsheet
trunk/pgsrc/Help%2FSqlResultPlugin
trunk/pgsrc/Help%2FSyncWikiPlugin
trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
trunk/pgsrc/Help%2FSystemInfoPlugin
trunk/pgsrc/Help%2FTeX2pngPlugin
trunk/pgsrc/Help%2FTemplatePlugin
trunk/pgsrc/Help%2FTexToPngPlugin
trunk/pgsrc/Help%2FTextFormattingRules
trunk/pgsrc/Help%2FTitleSearchPlugin
trunk/pgsrc/Help%2FTranscludePlugin
trunk/pgsrc/Help%2FTranslateTextPlugin
trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
trunk/pgsrc/Help%2FUpLoadPlugin
trunk/pgsrc/Help%2FUserPreferencesPlugin
trunk/pgsrc/Help%2FUserRatingsPlugin
trunk/pgsrc/Help%2FVideoPlugin
trunk/pgsrc/Help%2FVisualWikiPlugin
trunk/pgsrc/Help%2FWabiSabi
trunk/pgsrc/Help%2FWantedPagesOldPlugin
trunk/pgsrc/Help%2FWantedPagesPlugin
trunk/pgsrc/Help%2FWatchPagePlugin
trunk/pgsrc/Help%2FWhoIsOnlinePlugin
trunk/pgsrc/Help%2FWikiAdminChmodPlugin
trunk/pgsrc/Help%2FWikiAdminChownPlugin
trunk/pgsrc/Help%2FWikiAdminMarkupPlugin
trunk/pgsrc/Help%2FWikiAdminPurgePlugin
trunk/pgsrc/Help%2FWikiAdminRemovePlugin
trunk/pgsrc/Help%2FWikiAdminRenamePlugin
trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin
trunk/pgsrc/Help%2FWikiAdminSelectPlugin
trunk/pgsrc/Help%2FWikiAdminSetAclPlugin
trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
trunk/pgsrc/Help%2FWikiBlogPlugin
trunk/pgsrc/Help%2FWikiFormPlugin
trunk/pgsrc/Help%2FWikiFormRichPlugin
trunk/pgsrc/Help%2FWikiForumPlugin
trunk/pgsrc/Help%2FWikiPlugin
trunk/pgsrc/Help%2FWikiPollPlugin
trunk/pgsrc/Help%2FWikiWikiWeb
trunk/pgsrc/Help%2FWikicreole
trunk/pgsrc/Help%2FYouTubePlugin
trunk/pgsrc/Help%2F_AuthInfoPlugin
trunk/pgsrc/Help%2F_BackendInfoPlugin
trunk/pgsrc/Help%2F_GroupInfoPlugin
trunk/pgsrc/Help%2F_PreferencesInfoPlugin
trunk/pgsrc/Help%2F_WikiTranslationPlugin
trunk/pgsrc/Help%2Ftext2pngPlugin
trunk/pgsrc/HomePage
trunk/pgsrc/HomePageAlias
trunk/pgsrc/InterWikiMap
trunk/pgsrc/InterWikiSearch
trunk/pgsrc/LdapSearch
trunk/pgsrc/LeastPopular
trunk/pgsrc/LikePages
trunk/pgsrc/LinkDatabase
trunk/pgsrc/LinkSearch
trunk/pgsrc/ListRelations
trunk/pgsrc/LockedPages
trunk/pgsrc/ModeratedPage
trunk/pgsrc/MostPopular
trunk/pgsrc/MyRatings
trunk/pgsrc/MyRecentChanges
trunk/pgsrc/MyRecentEdits
trunk/pgsrc/NewPagesPerUser
trunk/pgsrc/OrphanedPages
trunk/pgsrc/PageDump
trunk/pgsrc/PageHistory
trunk/pgsrc/PageInfo
trunk/pgsrc/PasswordReset
trunk/pgsrc/PhpWikiAdministration
trunk/pgsrc/PhpWikiAdministration%2FChmod
trunk/pgsrc/PhpWikiAdministration%2FChown
trunk/pgsrc/PhpWikiAdministration%2FMarkup
trunk/pgsrc/PhpWikiAdministration%2FPurge
trunk/pgsrc/PhpWikiAdministration%2FRemove
trunk/pgsrc/PhpWikiAdministration%2FRename
trunk/pgsrc/PhpWikiAdministration%2FSearchReplace
trunk/pgsrc/PhpWikiAdministration%2FSetAcl
trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/pgsrc/PhpWikiDebug
trunk/pgsrc/PhpWikiDocumentation
trunk/pgsrc/PhpWikiManual
trunk/pgsrc/PhpWikiPoll
trunk/pgsrc/PhpWikiRecentChanges
trunk/pgsrc/PluginManager
trunk/pgsrc/ProjectSummary
trunk/pgsrc/RandomPage
trunk/pgsrc/RateIt
trunk/pgsrc/RecentChanges
trunk/pgsrc/RecentChangesMyPages
trunk/pgsrc/RecentComments
trunk/pgsrc/RecentEdits
trunk/pgsrc/RecentNewPages
trunk/pgsrc/RecentReleases
trunk/pgsrc/RecentVisitors
trunk/pgsrc/RelatedChanges
trunk/pgsrc/ReleaseNotes
trunk/pgsrc/San%20Diego
trunk/pgsrc/SandBox
trunk/pgsrc/SearchHighlight
trunk/pgsrc/SemanticRelations
trunk/pgsrc/SemanticSearch
trunk/pgsrc/SetGlobalAccessRights
trunk/pgsrc/SetGlobalAccessRightsSimple
trunk/pgsrc/SpecialPages
trunk/pgsrc/SpellCheck
trunk/pgsrc/SteveWainstead
trunk/pgsrc/SystemInfo
trunk/pgsrc/Template%2FAttribute
trunk/pgsrc/Template%2FCategory
trunk/pgsrc/Template%2FExample
trunk/pgsrc/Template%2FLinkto
trunk/pgsrc/Template%2FNewPlugin
trunk/pgsrc/Template%2FRelation
trunk/pgsrc/Template%2FTalk
trunk/pgsrc/Template%2FUserPage
trunk/pgsrc/TitleSearch
trunk/pgsrc/TranslateText
trunk/pgsrc/UpLoad
trunk/pgsrc/UriResolver
trunk/pgsrc/UserContribs
trunk/pgsrc/UserPreferences
trunk/pgsrc/UserRatings
trunk/pgsrc/WantedPages
trunk/pgsrc/WatchPage
trunk/pgsrc/WhoIsOnline
trunk/pgsrc/WikiAdminSelect
trunk/pgsrc/WikiBlog
trunk/pgsrc/area
trunk/pgsrc/is_a
trunk/pgsrc/located_in
trunk/pgsrc/population
trunk/themes/blog/pgsrc/About
trunk/themes/blog/pgsrc/Blog
trunk/themes/blog/pgsrc/BlogArchives
trunk/themes/blog/pgsrc/CategoryHowTo
trunk/themes/blog/pgsrc/HomePage
trunk/themes/blog/pgsrc/HowTo
trunk/themes/blog/pgsrc/PhotoAlbum
trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates
trunk/themes/fusionforge/pgsrc/CategoryWiki%20user
trunk/themes/fusionforge/pgsrc/ExternalPages
trunk/themes/fusionforge/pgsrc/FindPage
trunk/themes/fusionforge/pgsrc/HomePage
trunk/themes/fusionforge/pgsrc/InterWikiMap
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
trunk/themes/fusionforge/pgsrc/SpecialPages
trunk/themes/fusionforge/pgsrc/TextFormattingRules
trunk/themes/fusionforge/pgsrc/UpLoad
trunk/themes/fusionforge/pgsrc/colorbox
trunk/themes/fusionforge/pgsrc/titlebar
trunk/themes/wikilens/pgsrc/LeftbarContent
Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/lib/prepend.php 2012-09-28 16:59:59 UTC (rev 8322)
@@ -4,9 +4,8 @@
* Things which must be done and defined before anything else.
*/
-
// see lib/stdlib.php: phpwiki_version()
-define('PHPWIKI_VERSION', '1.4.0RC1');
+define('PHPWIKI_VERSION', '1.4.0');
/**
* Returns true if current php version is at mimimum a.b.c
Modified: trunk/locale/de/pgsrc/%C3%84hnlicheSeiten
===================================================================
--- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=%C3%84hnlicheSeiten;
Modified: trunk/locale/de/pgsrc/AlleBenutzer
===================================================================
--- trunk/locale/de/pgsrc/AlleBenutzer 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/AlleBenutzer 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleBenutzer;
Modified: trunk/locale/de/pgsrc/AlleSeiten
===================================================================
--- trunk/locale/de/pgsrc/AlleSeiten 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/AlleSeiten 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleSeiten;
Modified: trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleSeitenEditiertVonMir;
Modified: trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleSeitenErzeugtVonMir;
Modified: trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleSeitenImBesitzVonMir;
Modified: trunk/locale/de/pgsrc/BackLinks
===================================================================
--- trunk/locale/de/pgsrc/BackLinks 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/BackLinks 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=BackLinks;
Modified: trunk/locale/de/pgsrc/BenutzerEinstellungen
===================================================================
--- trunk/locale/de/pgsrc/BenutzerEinstellungen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/BenutzerEinstellungen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=BenutzerEinstellungen;
Modified: trunk/locale/de/pgsrc/BeobachteSeite
===================================================================
--- trunk/locale/de/pgsrc/BeobachteSeite 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/BeobachteSeite 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=BeobachteSeite;
Modified: trunk/locale/de/pgsrc/DebugAuthInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugAuthInfo 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/DebugAuthInfo 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=DebugAuthInfo;
Modified: trunk/locale/de/pgsrc/DebugGruppenInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugGruppenInfo 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/DebugGruppenInfo 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=DebugGruppenInfo;
Modified: trunk/locale/de/pgsrc/DebugInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugInfo 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/DebugInfo 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=DebugInfo;
Modified: trunk/locale/de/pgsrc/EditiereText
===================================================================
--- trunk/locale/de/pgsrc/EditiereText 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/EditiereText 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:14:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=EditiereText;
Modified: trunk/locale/de/pgsrc/Einstellungen
===================================================================
--- trunk/locale/de/pgsrc/Einstellungen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Einstellungen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Einstellungen;
Modified: trunk/locale/de/pgsrc/FuzzySuche
===================================================================
--- trunk/locale/de/pgsrc/FuzzySuche 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/FuzzySuche 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=FuzzySuche;
Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch
===================================================================
--- trunk/locale/de/pgsrc/G%C3%A4steBuch 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=G%C3%A4steBuch;
Modified: trunk/locale/de/pgsrc/GaesteBuch
===================================================================
--- trunk/locale/de/pgsrc/GaesteBuch 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/GaesteBuch 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=GaesteBuch;
Modified: trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Geringf%C3%BCgige%C3%84nderungen;
Modified: trunk/locale/de/pgsrc/GleicheSeiten
===================================================================
--- trunk/locale/de/pgsrc/GleicheSeiten 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/GleicheSeiten 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=GleicheSeiten;
Modified: trunk/locale/de/pgsrc/Hilfe
===================================================================
--- trunk/locale/de/pgsrc/Hilfe 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe;
Modified: trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FAktionsSeite;
Modified: trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FAlteTextFormatierungsRegeln;
Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FAutorenProtokollPlugin;
Modified: trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FGraphVizPlugin;
Modified: trunk/locale/de/pgsrc/Hilfe%2FGuterStil
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FGuterStil;
Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHalloWeltPlugin;
Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHochLadenPlugin;
Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FInhaltsVerzeichnisPlugin;
Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FNeueSeitePlugin;
Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FNeuerKommentarPlugin;
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhotoAlbumPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhotoAlbumPlugin%2FDiashow;
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhpWiki;
Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FTextBearbeiten;
Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FTextFormatierungsRegeln;
Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FVorlagePlugin;
Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWabiSabi;
Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWieManWikiBenutzt;
Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWikiTechnik;
Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWikiWikiWeb;
Modified: trunk/locale/de/pgsrc/HochLaden
===================================================================
--- trunk/locale/de/pgsrc/HochLaden 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/HochLaden 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=HochLaden;
Modified: trunk/locale/de/pgsrc/InterWikiListe
===================================================================
--- trunk/locale/de/pgsrc/InterWikiListe 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/InterWikiListe 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=InterWikiListe;
Modified: trunk/locale/de/pgsrc/KategorieAktionSeite
===================================================================
--- trunk/locale/de/pgsrc/KategorieAktionSeite 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/KategorieAktionSeite 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=KategorieAktionSeite;
Modified: trunk/locale/de/pgsrc/KategorieKategorie
===================================================================
--- trunk/locale/de/pgsrc/KategorieKategorie 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/KategorieKategorie 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=KategorieKategorie;
Modified: trunk/locale/de/pgsrc/KategorieWikiPlugin
===================================================================
--- trunk/locale/de/pgsrc/KategorieWikiPlugin 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/KategorieWikiPlugin 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=KategorieWikiPlugin;
Modified: trunk/locale/de/pgsrc/LinkSuche
===================================================================
--- trunk/locale/de/pgsrc/LinkSuche 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/LinkSuche 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=LinkSuche;
Modified: trunk/locale/de/pgsrc/ListeRelationen
===================================================================
--- trunk/locale/de/pgsrc/ListeRelationen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/ListeRelationen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=ListeRelationen;
Modified: trunk/locale/de/pgsrc/ListeSeiten
===================================================================
--- trunk/locale/de/pgsrc/ListeSeiten 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/ListeSeiten 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=ListeSeiten;
Modified: trunk/locale/de/pgsrc/MeistBesucht
===================================================================
--- trunk/locale/de/pgsrc/MeistBesucht 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/MeistBesucht 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=MeistBesucht;
Modified: trunk/locale/de/pgsrc/ModerierteSeite
===================================================================
--- trunk/locale/de/pgsrc/ModerierteSeite 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/ModerierteSeite 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=ModerierteSeite;
Modified: trunk/locale/de/pgsrc/NeueSeite
===================================================================
--- trunk/locale/de/pgsrc/NeueSeite 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/NeueSeite 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=NeueSeite;
Modified: trunk/locale/de/pgsrc/Neueste%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Neueste%C3%84nderungen;
Modified: trunk/locale/de/pgsrc/NeuesteSeiten
===================================================================
--- trunk/locale/de/pgsrc/NeuesteSeiten 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/NeuesteSeiten 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=NeuesteSeiten;
Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
===================================================================
--- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PasswortZur%C3%BCcksetzen;
Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiDokumentation 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PhpWikiDokumentation 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiDokumentation;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 4 Feb 2011 16:36:18 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FAclSetzen;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FChmod;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FChown;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FL%C3%B6schen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FSuchenErsetzen;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FUmbenennen;
Modified: trunk/locale/de/pgsrc/PhpWikiUmfrage
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiUmfrage 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/PhpWikiUmfrage 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
Content-Type: application/x-phpwiki;
pagename=PhpWikiUmfrage;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SandKasten
===================================================================
--- trunk/locale/de/pgsrc/SandKasten 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/SandKasten 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SandKasten;
Modified: trunk/locale/de/pgsrc/SandKiste
===================================================================
--- trunk/locale/de/pgsrc/SandKiste 2012-09-28 16:26:49 UTC (rev 8321)
+++ trunk/locale/de/pgsrc/SandKiste 2012-09-28 16:59:59 UTC (rev 8322)
@@ -1,5 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
+Mime-Version: 1...
[truncated message content] |
|
From: <var...@us...> - 2012-09-28 17:25:03
|
Revision: 8323
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8323&view=rev
Author: vargenau
Date: 2012-09-28 17:24:49 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
Remove X-Rcs-Id
Modified Paths:
--------------
trunk/locale/de/pgsrc/%C3%84hnlicheSeiten
trunk/locale/de/pgsrc/AlleBenutzer
trunk/locale/de/pgsrc/AlleSeiten
trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir
trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir
trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir
trunk/locale/de/pgsrc/BackLinks
trunk/locale/de/pgsrc/BenutzerEinstellungen
trunk/locale/de/pgsrc/BeobachteSeite
trunk/locale/de/pgsrc/DebugAuthInfo
trunk/locale/de/pgsrc/DebugGruppenInfo
trunk/locale/de/pgsrc/DebugInfo
trunk/locale/de/pgsrc/EditiereText
trunk/locale/de/pgsrc/Einstellungen
trunk/locale/de/pgsrc/FuzzySuche
trunk/locale/de/pgsrc/G%C3%A4steBuch
trunk/locale/de/pgsrc/GaesteBuch
trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen
trunk/locale/de/pgsrc/GleicheSeiten
trunk/locale/de/pgsrc/Hilfe
trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite
trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln
trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin
trunk/locale/de/pgsrc/Hilfe%2FGuterStil
trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow
trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb
trunk/locale/de/pgsrc/HochLaden
trunk/locale/de/pgsrc/InterWikiListe
trunk/locale/de/pgsrc/KategorieAktionSeite
trunk/locale/de/pgsrc/KategorieKategorie
trunk/locale/de/pgsrc/KategorieWikiPlugin
trunk/locale/de/pgsrc/LinkSuche
trunk/locale/de/pgsrc/ListeRelationen
trunk/locale/de/pgsrc/ListeSeiten
trunk/locale/de/pgsrc/MeistBesucht
trunk/locale/de/pgsrc/ModerierteSeite
trunk/locale/de/pgsrc/NeueSeite
trunk/locale/de/pgsrc/Neueste%C3%84nderungen
trunk/locale/de/pgsrc/NeuesteSeiten
trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
trunk/locale/de/pgsrc/PhpWikiDokumentation
trunk/locale/de/pgsrc/PhpWikiSystemverwalten
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen
trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen
trunk/locale/de/pgsrc/SandKasten
trunk/locale/de/pgsrc/SandKiste
trunk/locale/de/pgsrc/SeiteFinden
trunk/locale/de/pgsrc/SeiteSpeichern
trunk/locale/de/pgsrc/SeitenErzeugen
trunk/locale/de/pgsrc/SeitenInfo
trunk/locale/de/pgsrc/SeitenProtokoll
trunk/locale/de/pgsrc/SemantischeRelationen
trunk/locale/de/pgsrc/SemantischeSuche
trunk/locale/de/pgsrc/StartSeite
trunk/locale/de/pgsrc/StartSeiteAlias
trunk/locale/de/pgsrc/TitelSuche
trunk/locale/de/pgsrc/UpLoad
trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen
trunk/locale/de/pgsrc/VerwaisteSeiten
trunk/locale/de/pgsrc/VolltextSuche
trunk/locale/de/pgsrc/Vorlage%2FBeispiel
trunk/locale/de/pgsrc/WerIstOnline
trunk/locale/de/pgsrc/WikiAdminAuswahl
trunk/locale/de/pgsrc/WunschZettelSeiten
trunk/locale/de/pgsrc/ZufallsSeite
trunk/locale/es/pgsrc/Ayuda
trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas
trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo
trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki
trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto
trunk/locale/es/pgsrc/Ayuda%2FKBrown
trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica
trunk/locale/es/pgsrc/Ayuda%2FPhpWiki
trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto
trunk/locale/es/pgsrc/Ayuda%2FViejoReglasDeFormatoDeTexto
trunk/locale/es/pgsrc/Ayuda%2FWabiSabi
trunk/locale/es/pgsrc/Ayuda%2FWikiWikiWeb
trunk/locale/es/pgsrc/BuscarP%C3%A1gina
trunk/locale/es/pgsrc/CajaDeArena
trunk/locale/es/pgsrc/CambiosRecientes
trunk/locale/es/pgsrc/MasPopulares
trunk/locale/es/pgsrc/P%C3%A1ginaPrincipal
trunk/locale/es/pgsrc/TodasLasPaginas
trunk/locale/es/pgsrc/VisitantesRecientes
trunk/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es
trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes
trunk/locale/fr/pgsrc/AdministrationDePhpWiki
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer
trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer
trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu
trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages
trunk/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage
trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki
trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques
trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien
trunk/locale/fr/pgsrc/Aide%2FInterWiki
trunk/locale/fr/pgsrc/Aide%2FLienGoogle
trunk/locale/fr/pgsrc/Aide%2FPhpWiki
trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData
trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires
trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos
trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau
trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde
trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier
trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp
trunk/locale/fr/pgsrc/Aide%2FPluginCommenter
trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage
trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm
trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur
trunk/locale/fr/pgsrc/Aide%2FPluginHtmlPur
trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage
trunk/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me
trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer
trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages
trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier
trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp
trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne
trunk/locale/fr/pgsrc/Aide%2FPluginRedirection
trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss
trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle
trunk/locale/fr/pgsrc/Aide%2FPluginTeX2png
trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache
trunk/locale/fr/pgsrc/Aide%2FPluginWiki
trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog
trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes
trunk/locale/fr/pgsrc/Aide%2FStyleCorrect
trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki
trunk/locale/fr/pgsrc/Aide%2FWabiSabi
trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb
trunk/locale/fr/pgsrc/AliasAccueil
trunk/locale/fr/pgsrc/Bac%C3%80Sable
trunk/locale/fr/pgsrc/CarteInterWiki
trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie
trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes
trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction
trunk/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil
trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki
trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s
trunk/locale/fr/pgsrc/ChercherUnePage
trunk/locale/fr/pgsrc/ClassezLa
trunk/locale/fr/pgsrc/CommentairesR%C3%A9cents
trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage
trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier
trunk/locale/fr/pgsrc/Derni%C3%A8resModifs
trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes
trunk/locale/fr/pgsrc/DerniersVisiteurs
trunk/locale/fr/pgsrc/DocumentationDePhpWiki
trunk/locale/fr/pgsrc/GestionDesPlugins
trunk/locale/fr/pgsrc/HistoriqueDeLaPage
trunk/locale/fr/pgsrc/InfosAuthentification
trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage
trunk/locale/fr/pgsrc/InfosSurLaPage
trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es
trunk/locale/fr/pgsrc/ListeDePages
trunk/locale/fr/pgsrc/ManuelPhpWiki
trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki
trunk/locale/fr/pgsrc/NotesDeVersion
trunk/locale/fr/pgsrc/PageAccueil
trunk/locale/fr/pgsrc/PageAl%C3%A9atoire
trunk/locale/fr/pgsrc/PagesFloues
trunk/locale/fr/pgsrc/PagesOrphelines
trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es
trunk/locale/fr/pgsrc/PagesSemblables
trunk/locale/fr/pgsrc/PierrickMeignen
trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs
trunk/locale/fr/pgsrc/QuiEstEnLigne
trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage
trunk/locale/fr/pgsrc/R%C3%A9troLiens
trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral
trunk/locale/fr/pgsrc/RechercheInterWiki
trunk/locale/fr/pgsrc/RechercheParTitre
trunk/locale/fr/pgsrc/SommaireDuProjet
trunk/locale/fr/pgsrc/SondagePhpWiki
trunk/locale/fr/pgsrc/SteveWainstead
trunk/locale/fr/pgsrc/Suivre
trunk/locale/fr/pgsrc/TousLesUtilisateurs
trunk/locale/fr/pgsrc/ToutesLesPages
trunk/locale/fr/pgsrc/TraduireUnTexte
trunk/locale/fr/pgsrc/VersionsR%C3%A9centes
trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents
trunk/locale/it/pgsrc/Aiuto
trunk/locale/it/pgsrc/Aiuto%2FAggiungerePagine
trunk/locale/it/pgsrc/Aiuto%2FBuonStile
trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki
trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs
trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto
trunk/locale/it/pgsrc/Aiuto%2FPhpWiki
trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto
trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento
trunk/locale/it/pgsrc/Aiuto%2FWabiSabi
trunk/locale/it/pgsrc/Aiuto%2FWikiWikiWeb
trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki
trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki%2FRimuovi
trunk/locale/it/pgsrc/CambiamentiRecenti
trunk/locale/it/pgsrc/FuzzyPages
trunk/locale/it/pgsrc/NoteDiRilascio
trunk/locale/it/pgsrc/PaginaDiProva
trunk/locale/it/pgsrc/PaginaPrincipale
trunk/locale/it/pgsrc/PiuPopolari
trunk/locale/it/pgsrc/RicercaDelTesto
trunk/locale/it/pgsrc/RicercaSuTutto
trunk/locale/it/pgsrc/ScatolaDiSabbia
trunk/locale/it/pgsrc/SteveWainstead
trunk/locale/it/pgsrc/TrovaPagina
trunk/locale/it/pgsrc/TutteLePagine
trunk/locale/it/pgsrc/VisitatoriRecenti
trunk/locale/nl/pgsrc/Help
trunk/locale/nl/pgsrc/Help%2FGebruikersVoorkeuren
trunk/locale/nl/pgsrc/Help%2FGoedeStijl
trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken
trunk/locale/nl/pgsrc/Help%2FJanNieuwenhuizen
trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken
trunk/locale/nl/pgsrc/Help%2FOudTekstFormatteringsRegels
trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen
trunk/locale/nl/pgsrc/Help%2FPhpWiki
trunk/locale/nl/pgsrc/Help%2FRecenteBezoekers
trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels
trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs
trunk/locale/nl/pgsrc/Help%2FVeranderTekst
trunk/locale/nl/pgsrc/Help%2FWabiSabi
trunk/locale/nl/pgsrc/Help%2FWikiWikiWeb
trunk/locale/nl/pgsrc/MeestBezocht
trunk/locale/nl/pgsrc/PhpWikiBeheer
trunk/locale/nl/pgsrc/RecenteVeranderingen
trunk/locale/nl/pgsrc/ThuisPagina
trunk/locale/nl/pgsrc/UitgaveNoten
trunk/locale/nl/pgsrc/ZandBak
trunk/locale/nl/pgsrc/ZoekPagina
trunk/locale/sv/pgsrc/Framsida
trunk/locale/sv/pgsrc/Hj%C3%A4lp
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FG%C3%A4stboken
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler
trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb
trunk/locale/sv/pgsrc/MestPopul%C3%A4r
trunk/locale/sv/pgsrc/PhpWikiAdministration
trunk/locale/sv/pgsrc/S%C3%B6kEfterSida
trunk/locale/sv/pgsrc/Sandl%C3%A5dan
trunk/locale/sv/pgsrc/Senaste%C3%84ndringar
trunk/locale/zh/pgsrc/%E9%A6%96%E9%A0%81
trunk/locale/zh/pgsrc/AllPages
trunk/locale/zh/pgsrc/AllUsers
trunk/locale/zh/pgsrc/BackLinks
trunk/locale/zh/pgsrc/DebugInfo
trunk/locale/zh/pgsrc/FindPage
trunk/locale/zh/pgsrc/FullRecentChanges
trunk/locale/zh/pgsrc/FullTextSearch
trunk/locale/zh/pgsrc/FuzzyPages
trunk/locale/zh/pgsrc/Help
trunk/locale/zh/pgsrc/Help%2FAddingPages
trunk/locale/zh/pgsrc/Help%2FCalendarPlugin
trunk/locale/zh/pgsrc/Help%2FCommentPlugin
trunk/locale/zh/pgsrc/Help%2FEditText
trunk/locale/zh/pgsrc/Help%2FExternalSearchPlugin
trunk/locale/zh/pgsrc/Help%2FHowToUseWiki
trunk/locale/zh/pgsrc/Help%2FInterWiki
trunk/locale/zh/pgsrc/Help%2FLinkIcons
trunk/locale/zh/pgsrc/Help%2FMagicPhpWikiURLs
trunk/locale/zh/pgsrc/Help%2FMoreAboutMechanics
trunk/locale/zh/pgsrc/Help%2FOldStyleTablePlugin
trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin
trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin
trunk/locale/zh/pgsrc/Help%2FPhpWeatherPlugin
trunk/locale/zh/pgsrc/Help%2FPhpWiki
trunk/locale/zh/pgsrc/Help%2FTranscludePlugin
trunk/locale/zh/pgsrc/Help%2FWikiPlugin
trunk/locale/zh/pgsrc/Help%2FWikiWikiWeb
trunk/locale/zh/pgsrc/HomePage
trunk/locale/zh/pgsrc/InterWikiMap
trunk/locale/zh/pgsrc/InterWikiSearch
trunk/locale/zh/pgsrc/LikePages
trunk/locale/zh/pgsrc/OrphanedPages
trunk/locale/zh/pgsrc/PageDump
trunk/locale/zh/pgsrc/PhpWikiAdministration
trunk/locale/zh/pgsrc/RandomPage
trunk/locale/zh/pgsrc/RecentChanges
trunk/locale/zh/pgsrc/RecentEdits
trunk/locale/zh/pgsrc/RecentVisitors
trunk/locale/zh/pgsrc/SandBox
trunk/locale/zh/pgsrc/TitleSearch
trunk/locale/zh/pgsrc/UpLoad
trunk/locale/zh/pgsrc/UserPreferences
trunk/locale/zh/pgsrc/WantedPages
trunk/pgsrc/AllPages
trunk/pgsrc/AllPagesByAcl
trunk/pgsrc/AllPagesCreatedByMe
trunk/pgsrc/AllPagesLastEditedByMe
trunk/pgsrc/AllPagesOwnedByMe
trunk/pgsrc/AllUserPages
trunk/pgsrc/AllUsers
trunk/pgsrc/AppendText
trunk/pgsrc/AuthorHistory
trunk/pgsrc/BackLinks
trunk/pgsrc/BlogArchives
trunk/pgsrc/BlogJournal
trunk/pgsrc/CategoryActionPage
trunk/pgsrc/CategoryCategory
trunk/pgsrc/CategoryGroup
trunk/pgsrc/CategoryHomePages
trunk/pgsrc/CategoryWikiPlugin
trunk/pgsrc/CreatePage
trunk/pgsrc/DebugAuthInfo
trunk/pgsrc/DebugGroupInfo
trunk/pgsrc/DebugInfo
trunk/pgsrc/EditMetaData
trunk/pgsrc/FindPage
trunk/pgsrc/FullRecentChanges
trunk/pgsrc/FullTextSearch
trunk/pgsrc/FuzzyPages
trunk/pgsrc/Help
trunk/pgsrc/Help%2FActionPage
trunk/pgsrc/Help%2FAddCommentPlugin
trunk/pgsrc/Help%2FAddingPages
trunk/pgsrc/Help%2FAdobe%20Flash
trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users
trunk/pgsrc/Help%2FAllPagesPlugin
trunk/pgsrc/Help%2FAllUsersPlugin
trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
trunk/pgsrc/Help%2FAppendTextPlugin
trunk/pgsrc/Help%2FAsciiMathPlugin
trunk/pgsrc/Help%2FAsciiSVGPlugin
trunk/pgsrc/Help%2FAtomFeedPlugin
trunk/pgsrc/Help%2FAuthorHistoryPlugin
trunk/pgsrc/Help%2FBackLinksPlugin
trunk/pgsrc/Help%2FBlogArchivesPlugin
trunk/pgsrc/Help%2FBlogJournalPlugin
trunk/pgsrc/Help%2FBoxRightPlugin
trunk/pgsrc/Help%2FCacheTestPlugin
trunk/pgsrc/Help%2FCalendarListPlugin
trunk/pgsrc/Help%2FCalendarPlugin
trunk/pgsrc/Help%2FCategories
trunk/pgsrc/Help%2FCategoryPagePlugin
trunk/pgsrc/Help%2FChartPlugin
trunk/pgsrc/Help%2FCommentPlugin
trunk/pgsrc/Help%2FCreateBibPlugin
trunk/pgsrc/Help%2FCreatePagePlugin
trunk/pgsrc/Help%2FCreateTocPlugin
trunk/pgsrc/Help%2FCurrentTimePlugin
trunk/pgsrc/Help%2FDeadEndPagesPlugin
trunk/pgsrc/Help%2FDiffPlugin
trunk/pgsrc/Help%2FDynamicIncludePagePlugin
trunk/pgsrc/Help%2FEditMetaDataPlugin
trunk/pgsrc/Help%2FEditText
trunk/pgsrc/Help%2FExternalSearchPlugin
trunk/pgsrc/Help%2FFacebookLikePlugin
trunk/pgsrc/Help%2FFileInfoPlugin
trunk/pgsrc/Help%2FFoafViewerPlugin
trunk/pgsrc/Help%2FFrameIncludePlugin
trunk/pgsrc/Help%2FFullTextSearchPlugin
trunk/pgsrc/Help%2FFuzzyPagesPlugin
trunk/pgsrc/Help%2FGoToPlugin
trunk/pgsrc/Help%2FGoodStyle
trunk/pgsrc/Help%2FGoogleLink
trunk/pgsrc/Help%2FGoogleMapsPlugin
trunk/pgsrc/Help%2FGooglePluginPlugin
trunk/pgsrc/Help%2FGraphVizPlugin
trunk/pgsrc/Help%2FHelloWorldPlugin
trunk/pgsrc/Help%2FHowToUseWiki
trunk/pgsrc/Help%2FHtmlConverterPlugin
trunk/pgsrc/Help%2FImages
trunk/pgsrc/Help%2FIncludePagePlugin
trunk/pgsrc/Help%2FIncludePagesPlugin
trunk/pgsrc/Help%2FIncludeSiteMapPlugin
trunk/pgsrc/Help%2FIncludeTreePlugin
trunk/pgsrc/Help%2FInterWiki
trunk/pgsrc/Help%2FInterWikiSearchPlugin
trunk/pgsrc/Help%2FJabberPresencePlugin
trunk/pgsrc/Help%2FLdapSearchPlugin
trunk/pgsrc/Help%2FLikePagesPlugin
trunk/pgsrc/Help%2FLinkDatabasePlugin
trunk/pgsrc/Help%2FLinkIcons
trunk/pgsrc/Help%2FListPagesPlugin
trunk/pgsrc/Help%2FListSubpagesPlugin
trunk/pgsrc/Help%2FMagicPhpWikiURLs
trunk/pgsrc/Help%2FMediawikiTablePlugin
trunk/pgsrc/Help%2FModeratedPagePlugin
trunk/pgsrc/Help%2FMoreAboutMechanics
trunk/pgsrc/Help%2FMostPopularPlugin
trunk/pgsrc/Help%2FNewPagesPerUserPlugin
trunk/pgsrc/Help%2FNoCachePlugin
trunk/pgsrc/Help%2FOldStyleTablePlugin
trunk/pgsrc/Help%2FOldTextFormattingRules
trunk/pgsrc/Help%2FOrphanedPagesPlugin
trunk/pgsrc/Help%2FPageDumpPlugin
trunk/pgsrc/Help%2FPageGroupPlugin
trunk/pgsrc/Help%2FPageHistoryPlugin
trunk/pgsrc/Help%2FPageInfoPlugin
trunk/pgsrc/Help%2FPageList
trunk/pgsrc/Help%2FPagePermissions
trunk/pgsrc/Help%2FPageTrailPlugin
trunk/pgsrc/Help%2FPasswordResetPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin
trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides
trunk/pgsrc/Help%2FPhpHighlightPlugin
trunk/pgsrc/Help%2FPhpWeatherPlugin
trunk/pgsrc/Help%2FPhpWiki
trunk/pgsrc/Help%2FPloticusPlugin
trunk/pgsrc/Help%2FPluginManagerPlugin
trunk/pgsrc/Help%2FPopUpPlugin
trunk/pgsrc/Help%2FPopularNearbyPlugin
trunk/pgsrc/Help%2FPredefinedIcons
trunk/pgsrc/Help%2FPreferenceAppPlugin
trunk/pgsrc/Help%2FPrevNextPlugin
trunk/pgsrc/Help%2FRandomPagePlugin
trunk/pgsrc/Help%2FRateItPlugin
trunk/pgsrc/Help%2FRawHtmlPlugin
trunk/pgsrc/Help%2FRecentChangesCachedPlugin
trunk/pgsrc/Help%2FRecentChangesPlugin
trunk/pgsrc/Help%2FRecentCommentsPlugin
trunk/pgsrc/Help%2FRecentEditsPlugin
trunk/pgsrc/Help%2FRecentReferrersPlugin
trunk/pgsrc/Help%2FRedirectToPlugin
trunk/pgsrc/Help%2FRelatedChangesPlugin
trunk/pgsrc/Help%2FRichTablePlugin
trunk/pgsrc/Help%2FRssFeedPlugin
trunk/pgsrc/Help%2FSearchHighlightPlugin
trunk/pgsrc/Help%2FSemanticRelations
trunk/pgsrc/Help%2FSemanticRelationsPlugin
trunk/pgsrc/Help%2FSemanticSearchPlugin
trunk/pgsrc/Help%2FSiteMapPlugin
trunk/pgsrc/Help%2FSpreadsheet
trunk/pgsrc/Help%2FSqlResultPlugin
trunk/pgsrc/Help%2FSyncWikiPlugin
trunk/pgsrc/Help%2FSyntaxHighlighterPlugin
trunk/pgsrc/Help%2FSystemInfoPlugin
trunk/pgsrc/Help%2FTeX2pngPlugin
trunk/pgsrc/Help%2FTemplatePlugin
trunk/pgsrc/Help%2FTexToPngPlugin
trunk/pgsrc/Help%2FTextFormattingRules
trunk/pgsrc/Help%2FTitleSearchPlugin
trunk/pgsrc/Help%2FTranscludePlugin
trunk/pgsrc/Help%2FTranslateTextPlugin
trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
trunk/pgsrc/Help%2FUpLoadPlugin
trunk/pgsrc/Help%2FUserPreferencesPlugin
trunk/pgsrc/Help%2FUserRatingsPlugin
trunk/pgsrc/Help%2FVideoPlugin
trunk/pgsrc/Help%2FVisualWikiPlugin
trunk/pgsrc/Help%2FWabiSabi
trunk/pgsrc/Help%2FWantedPagesOldPlugin
trunk/pgsrc/Help%2FWantedPagesPlugin
trunk/pgsrc/Help%2FWatchPagePlugin
trunk/pgsrc/Help%2FWhoIsOnlinePlugin
trunk/pgsrc/Help%2FWikiAdminChmodPlugin
trunk/pgsrc/Help%2FWikiAdminChownPlugin
trunk/pgsrc/Help%2FWikiAdminMarkupPlugin
trunk/pgsrc/Help%2FWikiAdminPurgePlugin
trunk/pgsrc/Help%2FWikiAdminRemovePlugin
trunk/pgsrc/Help%2FWikiAdminRenamePlugin
trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin
trunk/pgsrc/Help%2FWikiAdminSelectPlugin
trunk/pgsrc/Help%2FWikiAdminSetAclPlugin
trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
trunk/pgsrc/Help%2FWikiAdminUtilsPlugin
trunk/pgsrc/Help%2FWikiBlogPlugin
trunk/pgsrc/Help%2FWikiFormPlugin
trunk/pgsrc/Help%2FWikiFormRichPlugin
trunk/pgsrc/Help%2FWikiForumPlugin
trunk/pgsrc/Help%2FWikiPlugin
trunk/pgsrc/Help%2FWikiPollPlugin
trunk/pgsrc/Help%2FWikiWikiWeb
trunk/pgsrc/Help%2FWikicreole
trunk/pgsrc/Help%2FYouTubePlugin
trunk/pgsrc/Help%2F_AuthInfoPlugin
trunk/pgsrc/Help%2F_BackendInfoPlugin
trunk/pgsrc/Help%2F_GroupInfoPlugin
trunk/pgsrc/Help%2F_PreferencesInfoPlugin
trunk/pgsrc/Help%2F_WikiTranslationPlugin
trunk/pgsrc/Help%2Ftext2pngPlugin
trunk/pgsrc/HomePage
trunk/pgsrc/HomePageAlias
trunk/pgsrc/InterWikiMap
trunk/pgsrc/InterWikiSearch
trunk/pgsrc/LdapSearch
trunk/pgsrc/LeastPopular
trunk/pgsrc/LikePages
trunk/pgsrc/LinkDatabase
trunk/pgsrc/LinkSearch
trunk/pgsrc/ListRelations
trunk/pgsrc/LockedPages
trunk/pgsrc/ModeratedPage
trunk/pgsrc/MostPopular
trunk/pgsrc/MyRatings
trunk/pgsrc/MyRecentChanges
trunk/pgsrc/MyRecentEdits
trunk/pgsrc/NewPagesPerUser
trunk/pgsrc/OrphanedPages
trunk/pgsrc/PageDump
trunk/pgsrc/PageHistory
trunk/pgsrc/PageInfo
trunk/pgsrc/PasswordReset
trunk/pgsrc/PhpWikiAdministration
trunk/pgsrc/PhpWikiAdministration%2FChmod
trunk/pgsrc/PhpWikiAdministration%2FChown
trunk/pgsrc/PhpWikiAdministration%2FMarkup
trunk/pgsrc/PhpWikiAdministration%2FPurge
trunk/pgsrc/PhpWikiAdministration%2FRemove
trunk/pgsrc/PhpWikiAdministration%2FRename
trunk/pgsrc/PhpWikiAdministration%2FSearchReplace
trunk/pgsrc/PhpWikiAdministration%2FSetAcl
trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/pgsrc/PhpWikiDebug
trunk/pgsrc/PhpWikiDocumentation
trunk/pgsrc/PhpWikiManual
trunk/pgsrc/PhpWikiPoll
trunk/pgsrc/PhpWikiRecentChanges
trunk/pgsrc/PluginManager
trunk/pgsrc/ProjectSummary
trunk/pgsrc/RandomPage
trunk/pgsrc/RateIt
trunk/pgsrc/RecentChanges
trunk/pgsrc/RecentChangesMyPages
trunk/pgsrc/RecentComments
trunk/pgsrc/RecentEdits
trunk/pgsrc/RecentNewPages
trunk/pgsrc/RecentReleases
trunk/pgsrc/RecentVisitors
trunk/pgsrc/RelatedChanges
trunk/pgsrc/ReleaseNotes
trunk/pgsrc/San%20Diego
trunk/pgsrc/SandBox
trunk/pgsrc/SearchHighlight
trunk/pgsrc/SemanticRelations
trunk/pgsrc/SemanticSearch
trunk/pgsrc/SetGlobalAccessRights
trunk/pgsrc/SetGlobalAccessRightsSimple
trunk/pgsrc/SpecialPages
trunk/pgsrc/SpellCheck
trunk/pgsrc/SteveWainstead
trunk/pgsrc/SystemInfo
trunk/pgsrc/Template%2FAttribute
trunk/pgsrc/Template%2FCategory
trunk/pgsrc/Template%2FExample
trunk/pgsrc/Template%2FLinkto
trunk/pgsrc/Template%2FNewPlugin
trunk/pgsrc/Template%2FRelation
trunk/pgsrc/Template%2FTalk
trunk/pgsrc/Template%2FUserPage
trunk/pgsrc/TitleSearch
trunk/pgsrc/TranslateText
trunk/pgsrc/UpLoad
trunk/pgsrc/UriResolver
trunk/pgsrc/UserContribs
trunk/pgsrc/UserPreferences
trunk/pgsrc/UserRatings
trunk/pgsrc/WantedPages
trunk/pgsrc/WatchPage
trunk/pgsrc/WhoIsOnline
trunk/pgsrc/WikiAdminSelect
trunk/pgsrc/WikiBlog
trunk/pgsrc/area
trunk/pgsrc/is_a
trunk/pgsrc/located_in
trunk/pgsrc/population
trunk/themes/blog/pgsrc/About
trunk/themes/blog/pgsrc/Blog
trunk/themes/blog/pgsrc/BlogArchives
trunk/themes/blog/pgsrc/CategoryHowTo
trunk/themes/blog/pgsrc/HomePage
trunk/themes/blog/pgsrc/HowTo
trunk/themes/blog/pgsrc/PhotoAlbum
trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates
trunk/themes/fusionforge/pgsrc/CategoryWiki%20user
trunk/themes/fusionforge/pgsrc/ExternalPages
trunk/themes/fusionforge/pgsrc/FindPage
trunk/themes/fusionforge/pgsrc/HomePage
trunk/themes/fusionforge/pgsrc/InterWikiMap
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal
trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
trunk/themes/fusionforge/pgsrc/SpecialPages
trunk/themes/fusionforge/pgsrc/TextFormattingRules
trunk/themes/fusionforge/pgsrc/UpLoad
trunk/themes/fusionforge/pgsrc/colorbox
trunk/themes/fusionforge/pgsrc/titlebar
trunk/themes/wikilens/pgsrc/LeftbarContent
Modified: trunk/locale/de/pgsrc/%C3%84hnlicheSeiten
===================================================================
--- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=%C3%84hnlicheSeiten;
flags="";
Modified: trunk/locale/de/pgsrc/AlleBenutzer
===================================================================
--- trunk/locale/de/pgsrc/AlleBenutzer 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/AlleBenutzer 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleBenutzer;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/AlleSeiten
===================================================================
--- trunk/locale/de/pgsrc/AlleSeiten 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/AlleSeiten 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleSeiten;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleSeitenEditiertVonMir;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleSeitenErzeugtVonMir;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir
===================================================================
--- trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=AlleSeitenImBesitzVonMir;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/BackLinks
===================================================================
--- trunk/locale/de/pgsrc/BackLinks 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/BackLinks 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=BackLinks;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/BenutzerEinstellungen
===================================================================
--- trunk/locale/de/pgsrc/BenutzerEinstellungen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/BenutzerEinstellungen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=BenutzerEinstellungen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/BeobachteSeite
===================================================================
--- trunk/locale/de/pgsrc/BeobachteSeite 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/BeobachteSeite 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=BeobachteSeite;
flags="";
Modified: trunk/locale/de/pgsrc/DebugAuthInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugAuthInfo 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/DebugAuthInfo 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=DebugAuthInfo;
flags=LOCKED;
Modified: trunk/locale/de/pgsrc/DebugGruppenInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugGruppenInfo 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/DebugGruppenInfo 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=DebugGruppenInfo;
flags=LOCKED;
Modified: trunk/locale/de/pgsrc/DebugInfo
===================================================================
--- trunk/locale/de/pgsrc/DebugInfo 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/DebugInfo 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=DebugInfo;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/EditiereText
===================================================================
--- trunk/locale/de/pgsrc/EditiereText 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/EditiereText 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 4 Feb 2011 17:14:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=EditiereText;
flags="";
Modified: trunk/locale/de/pgsrc/Einstellungen
===================================================================
--- trunk/locale/de/pgsrc/Einstellungen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Einstellungen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Einstellungen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/FuzzySuche
===================================================================
--- trunk/locale/de/pgsrc/FuzzySuche 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/FuzzySuche 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=FuzzySuche;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch
===================================================================
--- trunk/locale/de/pgsrc/G%C3%A4steBuch 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=G%C3%A4steBuch;
flags="";
Modified: trunk/locale/de/pgsrc/GaesteBuch
===================================================================
--- trunk/locale/de/pgsrc/GaesteBuch 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/GaesteBuch 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=GaesteBuch;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Geringf%C3%BCgige%C3%84nderungen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/GleicheSeiten
===================================================================
--- trunk/locale/de/pgsrc/GleicheSeiten 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/GleicheSeiten 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=GleicheSeiten;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Hilfe
===================================================================
--- trunk/locale/de/pgsrc/Hilfe 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe;
flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
Modified: trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FAktionsSeite;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FAlteTextFormatierungsRegeln;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FAutorenProtokollPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FGraphVizPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FGuterStil
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FGuterStil;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHalloWeltPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FHochLadenPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FInhaltsVerzeichnisPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FNeueSeitePlugin;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FNeuerKommentarPlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhotoAlbumPlugin%2FDiashow;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FPhpWiki;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FTextBearbeiten;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FTextFormatierungsRegeln;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FVorlagePlugin;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWabiSabi;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWieManWikiBenutzt;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWikiTechnik;
flags="";
Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Hilfe%2FWikiWikiWeb;
flags="";
Modified: trunk/locale/de/pgsrc/HochLaden
===================================================================
--- trunk/locale/de/pgsrc/HochLaden 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/HochLaden 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=HochLaden;
flags="";
Modified: trunk/locale/de/pgsrc/InterWikiListe
===================================================================
--- trunk/locale/de/pgsrc/InterWikiListe 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/InterWikiListe 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=InterWikiListe;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/KategorieAktionSeite
===================================================================
--- trunk/locale/de/pgsrc/KategorieAktionSeite 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/KategorieAktionSeite 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=KategorieAktionSeite;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/KategorieKategorie
===================================================================
--- trunk/locale/de/pgsrc/KategorieKategorie 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/KategorieKategorie 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=KategorieKategorie;
flags="";
Modified: trunk/locale/de/pgsrc/KategorieWikiPlugin
===================================================================
--- trunk/locale/de/pgsrc/KategorieWikiPlugin 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/KategorieWikiPlugin 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=KategorieWikiPlugin;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/LinkSuche
===================================================================
--- trunk/locale/de/pgsrc/LinkSuche 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/LinkSuche 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=LinkSuche;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/ListeRelationen
===================================================================
--- trunk/locale/de/pgsrc/ListeRelationen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/ListeRelationen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=ListeRelationen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/ListeSeiten
===================================================================
--- trunk/locale/de/pgsrc/ListeSeiten 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/ListeSeiten 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=ListeSeiten;
flags="";
Modified: trunk/locale/de/pgsrc/MeistBesucht
===================================================================
--- trunk/locale/de/pgsrc/MeistBesucht 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/MeistBesucht 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=MeistBesucht;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/ModerierteSeite
===================================================================
--- trunk/locale/de/pgsrc/ModerierteSeite 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/ModerierteSeite 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=ModerierteSeite;
flags="LOCKED";
Modified: trunk/locale/de/pgsrc/NeueSeite
===================================================================
--- trunk/locale/de/pgsrc/NeueSeite 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/NeueSeite 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=NeueSeite;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/Neueste%C3%84nderungen
===================================================================
--- trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=Neueste%C3%84nderungen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/NeuesteSeiten
===================================================================
--- trunk/locale/de/pgsrc/NeuesteSeiten 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/NeuesteSeiten 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=NeuesteSeiten;
flags="";
Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen
===================================================================
--- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PasswortZur%C3%BCcksetzen;
flags="";
Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiDokumentation 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/PhpWikiDokumentation 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiDokumentation;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 4 Feb 2011 16:36:18 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FAclSetzen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FChmod;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FChown;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FSuchenErsetzen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=PhpWikiSystemverwalten%2FUmbenennen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SandKasten
===================================================================
--- trunk/locale/de/pgsrc/SandKasten 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/SandKasten 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SandKasten;
flags="";
Modified: trunk/locale/de/pgsrc/SandKiste
===================================================================
--- trunk/locale/de/pgsrc/SandKiste 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/SandKiste 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SandKiste;
flags="";
Modified: trunk/locale/de/pgsrc/SeiteFinden
===================================================================
--- trunk/locale/de/pgsrc/SeiteFinden 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/SeiteFinden 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SeiteFinden;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SeiteSpeichern
===================================================================
--- trunk/locale/de/pgsrc/SeiteSpeichern 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/SeiteSpeichern 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 4 Feb 2011 17:33:12 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SeiteSpeichern;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SeitenErzeugen
===================================================================
--- trunk/locale/de/pgsrc/SeitenErzeugen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/SeitenErzeugen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Tue, 4 Jan 2011 11:59:41 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SeitenErzeugen;
flags="";
Modified: trunk/locale/de/pgsrc/SeitenInfo
===================================================================
--- trunk/locale/de/pgsrc/SeitenInfo 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/SeitenInfo 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SeitenInfo;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SeitenProtokoll
===================================================================
--- trunk/locale/de/pgsrc/SeitenProtokoll 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/SeitenProtokoll 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SeitenProtokoll;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SemantischeRelationen
===================================================================
--- trunk/locale/de/pgsrc/SemantischeRelationen 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/SemantischeRelationen 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SemantischeRelationen;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/SemantischeSuche
===================================================================
--- trunk/locale/de/pgsrc/SemantischeSuche 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/SemantischeSuche 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=SemantischeSuche;
flags=PAGE_LOCKED;
Modified: trunk/locale/de/pgsrc/StartSeite
===================================================================
--- trunk/locale/de/pgsrc/StartSeite 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/StartSeite 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Wed, 26 Jan 2011 17:26:56 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=StartSeite;
flags="";
Modified: trunk/locale/de/pgsrc/StartSeiteAlias
===================================================================
--- trunk/locale/de/pgsrc/StartSeiteAlias 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/StartSeiteAlias 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=StartSeiteAlias;
flags="";
Modified: trunk/locale/de/pgsrc/TitelSuche
===================================================================
--- trunk/locale/de/pgsrc/TitelSuche 2012-09-28 16:59:59 UTC (rev 8322)
+++ trunk/locale/de/pgsrc/TitelSuche 2012-09-28 17:24:49 UTC (rev 8323)
@@ -1,6 +1,5 @@
Date: Fri, 10 Sep 2010 13:48:42 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
-X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=TitelSuche;
flags=PAGE_...
[truncated message content] |
|
From: <var...@us...> - 2012-09-29 18:54:08
|
Revision: 8324
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8324&view=rev
Author: vargenau
Date: 2012-09-29 18:54:02 +0000 (Sat, 29 Sep 2012)
Log Message:
-----------
Remove $Id
Modified Paths:
--------------
trunk/INSTALL
trunk/UPGRADING
Property Changed:
----------------
trunk/INSTALL
trunk/UPGRADING
trunk/wikiadmin.php
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2012-09-28 17:24:49 UTC (rev 8323)
+++ trunk/INSTALL 2012-09-29 18:54:02 UTC (rev 8324)
@@ -154,5 +154,3 @@
<http://lists.sourceforge.net/lists/listinfo/phpwiki-talk>
FIN
-
-$Id$
Property changes on: trunk/INSTALL
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/UPGRADING
===================================================================
--- trunk/UPGRADING 2012-09-28 17:24:49 UTC (rev 8323)
+++ trunk/UPGRADING 2012-09-29 18:54:02 UTC (rev 8324)
@@ -156,5 +156,3 @@
An older note on the same subject can be found at:
http://sourceforge.net/forum/message.php?msg_id=107858
-
-$Id$
Property changes on: trunk/UPGRADING
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/wikiadmin.php
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X